Skip to content

Commit af01a25

Browse files
author
duke
committedOct 15, 2020
Automatic merge of jdk:master into master
2 parents 4087881 + abe5137 commit af01a25

34 files changed

+42
-83
lines changed
 

‎src/hotspot/share/gc/z/zCollectedHeap.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#include "gc/z/zUtils.inline.hpp"
3838
#include "memory/iterator.hpp"
3939
#include "memory/universe.hpp"
40-
#include "runtime/mutexLocker.hpp"
4140
#include "utilities/align.hpp"
4241

4342
ZCollectedHeap* ZCollectedHeap::heap() {

‎src/hotspot/share/gc/z/zDirector.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
2626
#include "gc/z/zDirector.hpp"
2727
#include "gc/z/zHeap.inline.hpp"
2828
#include "gc/z/zStat.hpp"
29-
#include "gc/z/zUtils.hpp"
3029
#include "logging/log.hpp"
3130

3231
const double ZDirector::one_in_1000 = 3.290527;

‎src/hotspot/share/gc/z/zForwarding.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
2424
#include "precompiled.hpp"
2525
#include "gc/z/zForwarding.inline.hpp"
2626
#include "gc/z/zPage.inline.hpp"
27-
#include "memory/allocation.hpp"
2827
#include "utilities/debug.hpp"
2928
#include "utilities/powerOfTwo.hpp"
3029

‎src/hotspot/share/gc/z/zForwarding.inline.hpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
2626

2727
#include "gc/z/zAttachedArray.inline.hpp"
2828
#include "gc/z/zForwarding.hpp"
29-
#include "gc/z/zGlobals.hpp"
3029
#include "gc/z/zHash.inline.hpp"
3130
#include "gc/z/zHeap.hpp"
3231
#include "gc/z/zVirtualMemory.inline.hpp"

‎src/hotspot/share/gc/z/zHeap.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#include "gc/z/zRelocationSetSelector.inline.hpp"
3636
#include "gc/z/zResurrection.hpp"
3737
#include "gc/z/zStat.hpp"
38-
#include "gc/z/zTask.hpp"
3938
#include "gc/z/zThread.inline.hpp"
4039
#include "gc/z/zVerify.hpp"
4140
#include "gc/z/zWorkers.inline.hpp"

‎src/hotspot/share/gc/z/zHeap.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include "gc/z/zForwardingTable.hpp"
2929
#include "gc/z/zMark.hpp"
3030
#include "gc/z/zObjectAllocator.hpp"
31-
#include "gc/z/zPage.hpp"
3231
#include "gc/z/zPageAllocator.hpp"
3332
#include "gc/z/zPageTable.hpp"
3433
#include "gc/z/zReferenceProcessor.hpp"
@@ -40,6 +39,7 @@
4039
#include "gc/z/zWorkers.hpp"
4140

4241
class ThreadClosure;
42+
class ZPage;
4343

4444
class ZHeap {
4545
friend class VMStructs;

‎src/hotspot/share/gc/z/zHeap.inline.hpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
3030
#include "gc/z/zHash.inline.hpp"
3131
#include "gc/z/zHeap.hpp"
3232
#include "gc/z/zMark.inline.hpp"
33-
#include "gc/z/zOop.inline.hpp"
3433
#include "gc/z/zPage.inline.hpp"
3534
#include "gc/z/zPageTable.inline.hpp"
3635
#include "utilities/debug.hpp"

‎src/hotspot/share/gc/z/zHeapIterator.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "gc/z/zLock.inline.hpp"
3232
#include "gc/z/zOop.inline.hpp"
3333
#include "memory/iterator.inline.hpp"
34-
#include "runtime/stackWatermarkSet.hpp"
3534
#include "utilities/bitMap.inline.hpp"
3635

3736
class ZHeapIteratorBitMap : public CHeapObj<mtGC> {

‎src/hotspot/share/gc/z/zMark.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
#include "precompiled.hpp"
2525
#include "classfile/classLoaderDataGraph.hpp"
26+
#include "gc/shared/suspendibleThreadSet.hpp"
2627
#include "gc/z/zBarrier.inline.hpp"
2728
#include "gc/z/zMark.inline.hpp"
2829
#include "gc/z/zMarkCache.inline.hpp"
@@ -600,7 +601,6 @@ class ZMarkConcurrentRootsIteratorClosure : public ZRootsIteratorClosure {
600601
}
601602
};
602603

603-
604604
class ZMarkConcurrentRootsTask : public ZTask {
605605
private:
606606
ZMark* const _mark;

‎src/hotspot/share/gc/z/zMark.hpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
2626

2727
#include "gc/z/zMarkStack.hpp"
2828
#include "gc/z/zMarkStackAllocator.hpp"
29+
#include "gc/z/zMarkStackEntry.hpp"
2930
#include "gc/z/zMarkTerminate.hpp"
3031
#include "oops/oopsHierarchy.hpp"
3132
#include "utilities/globalDefinitions.hpp"
@@ -36,9 +37,7 @@ class ZPageTable;
3637
class ZWorkers;
3738

3839
class ZMark {
39-
friend class ZMarkRootsTask;
4040
friend class ZMarkTask;
41-
friend class ZMarkTryCompleteTask;
4241

4342
private:
4443
ZWorkers* const _workers;

‎src/hotspot/share/gc/z/zMemory.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "gc/z/zList.inline.hpp"
2626
#include "gc/z/zLock.inline.hpp"
2727
#include "gc/z/zMemory.inline.hpp"
28-
#include "memory/allocation.inline.hpp"
2928

3029
ZMemory* ZMemoryManager::create(uintptr_t start, size_t size) {
3130
ZMemory* const area = new ZMemory(start, size);

‎src/hotspot/share/gc/z/zMessagePort.hpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
2626

2727
#include "gc/z/zFuture.hpp"
2828
#include "gc/z/zList.hpp"
29-
#include "memory/allocation.hpp"
3029
#include "runtime/mutex.hpp"
3130

3231
template <typename T> class ZMessageRequest;

‎src/hotspot/share/gc/z/zNMethod.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "code/icBuffer.hpp"
2828
#include "gc/shared/barrierSet.hpp"
2929
#include "gc/shared/barrierSetNMethod.hpp"
30+
#include "gc/shared/suspendibleThreadSet.hpp"
3031
#include "gc/z/zGlobals.hpp"
3132
#include "gc/z/zLock.inline.hpp"
3233
#include "gc/z/zNMethod.hpp"
@@ -55,7 +56,7 @@ void ZNMethod::attach_gc_data(nmethod* nm) {
5556
GrowableArray<oop*> immediate_oops;
5657
bool non_immediate_oops = false;
5758

58-
// Find all oops relocations
59+
// Find all oop relocations
5960
RelocIterator iter(nm);
6061
while (iter.next()) {
6162
if (iter.type() != relocInfo::oop_type) {

‎src/hotspot/share/gc/z/zObjectAllocator.cpp

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -22,21 +22,17 @@
2222
*/
2323

2424
#include "precompiled.hpp"
25-
#include "gc/z/zCollectedHeap.hpp"
2625
#include "gc/z/zGlobals.hpp"
2726
#include "gc/z/zHeap.inline.hpp"
2827
#include "gc/z/zHeuristics.hpp"
2928
#include "gc/z/zObjectAllocator.hpp"
3029
#include "gc/z/zPage.inline.hpp"
3130
#include "gc/z/zStat.hpp"
3231
#include "gc/z/zThread.inline.hpp"
33-
#include "gc/z/zUtils.inline.hpp"
3432
#include "gc/z/zValue.inline.hpp"
3533
#include "logging/log.hpp"
3634
#include "runtime/atomic.hpp"
3735
#include "runtime/safepoint.hpp"
38-
#include "runtime/thread.hpp"
39-
#include "runtime/threadSMR.hpp"
4036
#include "utilities/align.hpp"
4137
#include "utilities/debug.hpp"
4238

‎src/hotspot/share/gc/z/zObjectAllocator.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,9 @@
2525
#define SHARE_GC_Z_ZOBJECTALLOCATOR_HPP
2626

2727
#include "gc/z/zAllocationFlags.hpp"
28-
#include "gc/z/zPage.hpp"
2928
#include "gc/z/zValue.hpp"
30-
#include "memory/allocation.hpp"
29+
30+
class ZPage;
3131

3232
class ZObjectAllocator {
3333
private:

‎src/hotspot/share/gc/z/zPage.inline.hpp

-2
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,10 @@
2727
#include "gc/z/zAddress.inline.hpp"
2828
#include "gc/z/zGlobals.hpp"
2929
#include "gc/z/zLiveMap.inline.hpp"
30-
#include "gc/z/zMark.hpp"
3130
#include "gc/z/zNUMA.hpp"
3231
#include "gc/z/zPage.hpp"
3332
#include "gc/z/zPhysicalMemory.inline.hpp"
3433
#include "gc/z/zVirtualMemory.inline.hpp"
35-
#include "oops/oop.inline.hpp"
3634
#include "runtime/atomic.hpp"
3735
#include "runtime/os.hpp"
3836
#include "utilities/align.hpp"

‎src/hotspot/share/gc/z/zPageAllocator.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "precompiled.hpp"
2525
#include "gc/shared/gcLogPrecious.hpp"
2626
#include "gc/shared/suspendibleThreadSet.hpp"
27-
#include "gc/z/zAddress.inline.hpp"
2827
#include "gc/z/zCollectedHeap.hpp"
2928
#include "gc/z/zFuture.inline.hpp"
3029
#include "gc/z/zGlobals.hpp"
@@ -35,7 +34,6 @@
3534
#include "gc/z/zSafeDelete.inline.hpp"
3635
#include "gc/z/zStat.hpp"
3736
#include "gc/z/zTask.hpp"
38-
#include "gc/z/zTracer.inline.hpp"
3937
#include "gc/z/zUncommitter.hpp"
4038
#include "gc/z/zUnmapper.hpp"
4139
#include "gc/z/zWorkers.hpp"

‎src/hotspot/share/gc/z/zPageCache.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "gc/z/zPageCache.hpp"
3030
#include "gc/z/zStat.hpp"
3131
#include "gc/z/zValue.inline.hpp"
32-
#include "logging/log.hpp"
3332
#include "memory/allocation.hpp"
3433
#include "runtime/globals.hpp"
3534
#include "runtime/os.hpp"

‎src/hotspot/share/gc/z/zReferenceProcessor.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
3131
#include "gc/z/zStat.hpp"
3232
#include "gc/z/zTask.hpp"
3333
#include "gc/z/zTracer.inline.hpp"
34-
#include "gc/z/zUtils.inline.hpp"
3534
#include "gc/z/zValue.inline.hpp"
3635
#include "memory/universe.hpp"
3736
#include "runtime/atomic.hpp"

‎src/hotspot/share/gc/z/zRelocate.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,13 @@
2727
#include "gc/z/zForwarding.inline.hpp"
2828
#include "gc/z/zHeap.hpp"
2929
#include "gc/z/zOopClosures.inline.hpp"
30-
#include "gc/z/zPage.hpp"
30+
#include "gc/z/zPage.inline.hpp"
3131
#include "gc/z/zRelocate.hpp"
3232
#include "gc/z/zRelocationSet.inline.hpp"
3333
#include "gc/z/zRootsIterator.hpp"
3434
#include "gc/z/zStat.hpp"
3535
#include "gc/z/zTask.hpp"
3636
#include "gc/z/zThread.inline.hpp"
37-
#include "gc/z/zThreadLocalAllocBuffer.hpp"
3837
#include "gc/z/zWorkers.hpp"
3938
#include "logging/log.hpp"
4039

‎src/hotspot/share/gc/z/zRelocate.hpp

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -24,11 +24,10 @@
2424
#ifndef SHARE_GC_Z_ZRELOCATE_HPP
2525
#define SHARE_GC_Z_ZRELOCATE_HPP
2626

27-
#include "gc/z/zRelocationSet.hpp"
28-
#include "gc/z/zWorkers.hpp"
29-
#include "memory/allocation.hpp"
30-
3127
class ZForwarding;
28+
class ZRelocationSet;
29+
class ZRelocationSetParallelIterator;
30+
class ZWorkers;
3231

3332
class ZRelocate {
3433
friend class ZRelocateTask;

‎src/hotspot/share/gc/z/zRootsIterator.cpp

+1-20
Original file line numberDiff line numberDiff line change
@@ -22,35 +22,16 @@
2222
*/
2323

2424
#include "precompiled.hpp"
25-
#include "classfile/classLoaderDataGraph.hpp"
26-
#include "classfile/stringTable.hpp"
27-
#include "code/codeCache.hpp"
28-
#include "compiler/oopMap.hpp"
29-
#include "gc/shared/barrierSet.hpp"
30-
#include "gc/shared/barrierSetNMethod.hpp"
31-
#include "gc/shared/oopStorageSet.hpp"
3225
#include "gc/shared/oopStorageSetParState.inline.hpp"
33-
#include "gc/shared/suspendibleThreadSet.hpp"
34-
#include "gc/z/zBarrierSetNMethod.hpp"
35-
#include "gc/z/zGlobals.hpp"
36-
#include "gc/z/zLock.inline.hpp"
3726
#include "gc/z/zNMethod.hpp"
3827
#include "gc/z/zNMethodTable.hpp"
39-
#include "gc/z/zOopClosures.inline.hpp"
4028
#include "gc/z/zRootsIterator.hpp"
4129
#include "gc/z/zStat.hpp"
42-
#include "gc/z/zThreadLocalData.hpp"
43-
#include "memory/iterator.hpp"
4430
#include "memory/resourceArea.hpp"
45-
#include "memory/universe.hpp"
4631
#include "prims/jvmtiExport.hpp"
47-
#include "prims/resolvedMethodTable.hpp"
4832
#include "runtime/atomic.hpp"
33+
#include "runtime/globals.hpp"
4934
#include "runtime/safepoint.hpp"
50-
#include "runtime/stackWatermark.hpp"
51-
#include "runtime/synchronizer.hpp"
52-
#include "runtime/thread.hpp"
53-
#include "runtime/vmThread.hpp"
5435
#include "utilities/debug.hpp"
5536

5637
static const ZStatSubPhase ZSubPhasePauseRootsJVMTIWeakExport("Pause Roots JVMTIWeakExport");

‎src/hotspot/share/gc/z/zRootsIterator.hpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,11 @@
2424
#ifndef SHARE_GC_Z_ZROOTSITERATOR_HPP
2525
#define SHARE_GC_Z_ZROOTSITERATOR_HPP
2626

27+
#include "classfile/classLoaderDataGraph.hpp"
2728
#include "gc/shared/oopStorageSetParState.hpp"
28-
#include "gc/shared/suspendibleThreadSet.hpp"
2929
#include "memory/allocation.hpp"
3030
#include "memory/iterator.hpp"
31-
#include "runtime/thread.hpp"
3231
#include "runtime/threadSMR.hpp"
33-
#include "utilities/globalDefinitions.hpp"
3432

3533
class ZRootsIteratorClosure;
3634

‎src/hotspot/share/gc/z/zRuntimeWorkers.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
#include "precompiled.hpp"
2525
#include "gc/shared/gcLogPrecious.hpp"
26-
#include "gc/shared/workgroup.hpp"
2726
#include "gc/z/zRuntimeWorkers.hpp"
2827
#include "gc/z/zThread.hpp"
2928
#include "runtime/java.hpp"
29+
#include "runtime/mutex.hpp"
3030
#include "runtime/mutexLocker.hpp"
3131

3232
class ZRuntimeWorkersInitializeTask : public AbstractGangTask {

0 commit comments

Comments
 (0)
Please sign in to comment.