Skip to content

Commit 95f0fd6

Browse files
iklamiklam
committed
8265696: Move CDS sources to src/hotspot/shared/cds
Reviewed-by: erikj, dholmes, stuefe
1 parent a715b09 commit 95f0fd6

File tree

78 files changed

+180
-208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+180
-208
lines changed

‎make/hotspot/lib/JvmFeatures.gmk

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2013, 2021, 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
@@ -116,23 +116,10 @@ endif
116116
ifneq ($(call check-jvm-feature, cds), true)
117117
JVM_CFLAGS_FEATURES += -DINCLUDE_CDS=0
118118
JVM_EXCLUDE_FILES += \
119-
archiveBuilder.cpp \
120-
archiveUtils.cpp \
121-
classListParser.cpp \
122119
classLoaderDataShared.cpp \
123120
classLoaderExt.cpp \
124-
cppVtables.cpp \
125-
dumpAllocStats.cpp \
126-
dynamicArchive.cpp \
127-
filemap.cpp \
128-
heapShared.cpp \
129-
lambdaFormInvokers.cpp \
130-
metaspaceShared.cpp \
131-
metaspaceShared_$(HOTSPOT_TARGET_CPU).cpp \
132-
metaspaceShared_$(HOTSPOT_TARGET_CPU_ARCH).cpp \
133-
sharedClassUtil.cpp \
134-
sharedPathsMiscInfo.cpp \
135121
systemDictionaryShared.cpp
122+
JVM_EXCLUDE_PATTERNS += cds/
136123
endif
137124

138125
ifneq ($(call check-jvm-feature, nmt), true)

‎src/hotspot/os/aix/os_aix.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
#include "libodm_aix.hpp"
4343
#include "loadlib_aix.hpp"
4444
#include "memory/allocation.inline.hpp"
45-
#include "memory/filemap.hpp"
4645
#include "misc_aix.hpp"
4746
#include "oops/oop.inline.hpp"
4847
#include "os_aix.inline.hpp"

‎src/hotspot/os/bsd/os_bsd.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include "logging/log.hpp"
3535
#include "logging/logStream.hpp"
3636
#include "memory/allocation.inline.hpp"
37-
#include "memory/filemap.hpp"
3837
#include "oops/oop.inline.hpp"
3938
#include "os_bsd.inline.hpp"
4039
#include "os_posix.inline.hpp"

‎src/hotspot/os/linux/os_linux.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include "logging/log.hpp"
3535
#include "logging/logStream.hpp"
3636
#include "memory/allocation.inline.hpp"
37-
#include "memory/filemap.hpp"
3837
#include "oops/oop.inline.hpp"
3938
#include "os_linux.inline.hpp"
4039
#include "os_posix.inline.hpp"

‎src/hotspot/os/posix/vmError_posix.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525

2626
#include "precompiled.hpp"
27-
#include "memory/metaspaceShared.hpp"
27+
#include "cds/metaspaceShared.hpp"
2828
#include "runtime/os.hpp"
2929
#include "runtime/stubRoutines.hpp"
3030
#include "runtime/thread.hpp"

‎src/hotspot/os/windows/os_windows.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#include "logging/log.hpp"
4040
#include "logging/logStream.hpp"
4141
#include "memory/allocation.inline.hpp"
42-
#include "memory/filemap.hpp"
4342
#include "oops/oop.inline.hpp"
4443
#include "os_share_windows.hpp"
4544
#include "os_windows.inline.hpp"

‎src/hotspot/os/windows/vmError_windows.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2021, 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
@@ -23,7 +23,7 @@
2323
*/
2424

2525
#include "precompiled.hpp"
26-
#include "memory/metaspaceShared.hpp"
26+
#include "cds/metaspaceShared.hpp"
2727
#include "runtime/arguments.hpp"
2828
#include "runtime/os.hpp"
2929
#include "runtime/thread.hpp"

‎src/hotspot/os_cpu/bsd_aarch64/thread_bsd_aarch64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626

2727
#include "precompiled.hpp"
28-
#include "memory/metaspaceShared.hpp"
28+
#include "cds/metaspaceShared.hpp"
2929
#include "runtime/frame.inline.hpp"
3030
#include "runtime/thread.inline.hpp"
3131

‎src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
*/
2424

2525
#include "precompiled.hpp"
26-
#include "memory/metaspaceShared.hpp"
2726
#include "runtime/frame.inline.hpp"
2827
#include "runtime/thread.inline.hpp"
2928

‎src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
*/
2525

2626
#include "precompiled.hpp"
27-
#include "memory/metaspaceShared.hpp"
2827
#include "runtime/frame.inline.hpp"
2928
#include "runtime/thread.inline.hpp"
3029

‎src/hotspot/os_cpu/linux_arm/thread_linux_arm.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "gc/shared/cardTable.hpp"
2828
#include "gc/shared/cardTableBarrierSet.inline.hpp"
2929
#include "gc/shared/collectedHeap.hpp"
30-
#include "memory/metaspaceShared.hpp"
3130
#include "memory/universe.hpp"
3231
#include "runtime/frame.inline.hpp"
3332

‎src/hotspot/os_cpu/linux_x86/thread_linux_x86.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
*/
2424

2525
#include "precompiled.hpp"
26-
#include "memory/metaspaceShared.hpp"
2726
#include "runtime/frame.inline.hpp"
2827
#include "runtime/thread.inline.hpp"
2928

‎src/hotspot/os_cpu/windows_aarch64/thread_windows_aarch64.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
*/
2424

2525
#include "precompiled.hpp"
26-
#include "memory/metaspaceShared.hpp"
2726
#include "runtime/frame.inline.hpp"
2827
#include "runtime/thread.inline.hpp"
2928

‎src/hotspot/os_cpu/windows_x86/thread_windows_x86.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
*/
2424

2525
#include "precompiled.hpp"
26-
#include "memory/metaspaceShared.hpp"
2726
#include "runtime/frame.inline.hpp"
2827
#include "runtime/thread.inline.hpp"
2928

‎src/hotspot/share/memory/archiveBuilder.cpp renamed to ‎src/hotspot/share/cds/archiveBuilder.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323
*/
2424

2525
#include "precompiled.hpp"
26+
#include "cds/archiveBuilder.hpp"
27+
#include "cds/archiveUtils.hpp"
28+
#include "cds/cppVtables.hpp"
29+
#include "cds/dumpAllocStats.hpp"
30+
#include "cds/metaspaceShared.hpp"
2631
#include "classfile/classLoaderDataShared.hpp"
2732
#include "classfile/symbolTable.hpp"
2833
#include "classfile/systemDictionaryShared.hpp"
@@ -31,12 +36,7 @@
3136
#include "logging/log.hpp"
3237
#include "logging/logStream.hpp"
3338
#include "memory/allStatic.hpp"
34-
#include "memory/archiveBuilder.hpp"
35-
#include "memory/archiveUtils.hpp"
36-
#include "memory/cppVtables.hpp"
37-
#include "memory/dumpAllocStats.hpp"
3839
#include "memory/memRegion.hpp"
39-
#include "memory/metaspaceShared.hpp"
4040
#include "memory/resourceArea.hpp"
4141
#include "oops/instanceKlass.hpp"
4242
#include "oops/objArrayKlass.hpp"

‎src/hotspot/share/memory/archiveBuilder.hpp renamed to ‎src/hotspot/share/cds/archiveBuilder.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
*
2323
*/
2424

25-
#ifndef SHARE_MEMORY_ARCHIVEBUILDER_HPP
26-
#define SHARE_MEMORY_ARCHIVEBUILDER_HPP
25+
#ifndef SHARE_CDS_ARCHIVEBUILDER_HPP
26+
#define SHARE_CDS_ARCHIVEBUILDER_HPP
2727

28-
#include "memory/archiveUtils.hpp"
29-
#include "memory/dumpAllocStats.hpp"
28+
#include "cds/archiveUtils.hpp"
29+
#include "cds/dumpAllocStats.hpp"
3030
#include "memory/metaspaceClosure.hpp"
3131
#include "oops/array.hpp"
3232
#include "oops/klass.hpp"
@@ -430,4 +430,4 @@ class ArchiveBuilder : public StackObj {
430430
void report_out_of_space(const char* name, size_t needed_bytes);
431431
};
432432

433-
#endif // SHARE_MEMORY_ARCHIVEBUILDER_HPP
433+
#endif // SHARE_CDS_ARCHIVEBUILDER_HPP

‎src/hotspot/share/memory/archiveUtils.cpp renamed to ‎src/hotspot/share/cds/archiveUtils.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@
2323
*/
2424

2525
#include "precompiled.hpp"
26-
#include "classfile/classListParser.hpp"
27-
#include "classfile/classListWriter.hpp"
26+
#include "cds/archiveBuilder.hpp"
27+
#include "cds/archiveUtils.hpp"
28+
#include "cds/classListParser.hpp"
29+
#include "cds/classListWriter.hpp"
30+
#include "cds/dynamicArchive.hpp"
31+
#include "cds/filemap.hpp"
32+
#include "cds/heapShared.inline.hpp"
33+
#include "cds/metaspaceShared.hpp"
2834
#include "classfile/systemDictionaryShared.hpp"
2935
#include "classfile/vmClasses.hpp"
3036
#include "interpreter/bootstrapInfo.hpp"
31-
#include "memory/archiveBuilder.hpp"
32-
#include "memory/archiveUtils.hpp"
33-
#include "memory/dynamicArchive.hpp"
34-
#include "memory/filemap.hpp"
35-
#include "memory/heapShared.inline.hpp"
36-
#include "memory/metaspaceShared.hpp"
3737
#include "memory/metaspaceUtils.hpp"
3838
#include "memory/resourceArea.hpp"
3939
#include "oops/compressedOops.inline.hpp"

‎src/hotspot/share/memory/archiveUtils.hpp renamed to ‎src/hotspot/share/cds/archiveUtils.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
*
2323
*/
2424

25-
#ifndef SHARE_MEMORY_ARCHIVEUTILS_HPP
26-
#define SHARE_MEMORY_ARCHIVEUTILS_HPP
25+
#ifndef SHARE_CDS_ARCHIVEUTILS_HPP
26+
#define SHARE_CDS_ARCHIVEUTILS_HPP
2727

2828
#include "logging/log.hpp"
2929
#include "memory/iterator.hpp"
@@ -227,4 +227,4 @@ class ArchiveUtils {
227227
static void log_to_classlist(BootstrapInfo* bootstrap_specifier, TRAPS) NOT_CDS_RETURN;
228228
};
229229

230-
#endif // SHARE_MEMORY_ARCHIVEUTILS_HPP
230+
#endif // SHARE_CDS_ARCHIVEUTILS_HPP

‎src/hotspot/share/memory/archiveUtils.inline.hpp renamed to ‎src/hotspot/share/cds/archiveUtils.inline.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
*
2323
*/
2424

25-
#ifndef SHARE_MEMORY_ARCHIVEUTILS_INLINE_HPP
26-
#define SHARE_MEMORY_ARCHIVEUTILS_INLINE_HPP
25+
#ifndef SHARE_CDS_ARCHIVEUTILS_INLINE_HPP
26+
#define SHARE_CDS_ARCHIVEUTILS_INLINE_HPP
2727

28-
#include "memory/archiveUtils.hpp"
28+
#include "cds/archiveUtils.hpp"
2929
#include "utilities/bitMap.inline.hpp"
3030

3131
inline bool SharedDataRelocator::do_bit(size_t offset) {
@@ -46,4 +46,4 @@ inline bool SharedDataRelocator::do_bit(size_t offset) {
4646
return true; // keep iterating
4747
}
4848

49-
#endif // SHARE_MEMORY_ARCHIVEUTILS_INLINE_HPP
49+
#endif // SHARE_CDS_ARCHIVEUTILS_INLINE_HPP

‎src/hotspot/share/prims/cdsoffsets.cpp renamed to ‎src/hotspot/share/cds/cdsoffsets.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2014, 2021, 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
@@ -23,14 +23,13 @@
2323
*/
2424

2525
#include "precompiled.hpp"
26-
#include "utilities/macros.hpp"
27-
#if INCLUDE_CDS
26+
#include "cds/cdsoffsets.hpp"
27+
#include "cds/dynamicArchive.hpp"
28+
#include "cds/filemap.hpp"
2829
#include "runtime/os.hpp"
29-
#include "memory/dynamicArchive.hpp"
30-
#include "memory/filemap.hpp"
3130
#include "memory/allocation.hpp"
3231
#include "memory/allocation.inline.hpp"
33-
#include "prims/cdsoffsets.hpp"
32+
#include "utilities/macros.hpp"
3433

3534
CDSOffsets::CDSOffsets(const char* name, int offset, CDSOffsets* next) {
3635
_name = NEW_C_HEAP_ARRAY(char, strlen(name) + 1, mtInternal);
@@ -76,4 +75,3 @@ void CDSOffsets::add_end(CDSOffsets* n) {
7675
while(p && p->_next) { p = p->_next; }
7776
p->_next = n;
7877
}
79-
#endif // INCLUDE_CDS

‎src/hotspot/share/prims/cdsoffsets.hpp renamed to ‎src/hotspot/share/cds/cdsoffsets.hpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2014, 2021, 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,8 +22,10 @@
2222
*
2323
*/
2424

25-
#ifndef SHARE_PRIMS_CDSOFFSETS_HPP
26-
#define SHARE_PRIMS_CDSOFFSETS_HPP
25+
#ifndef SHARE_CDS_CDSOFFSETS_HPP
26+
#define SHARE_CDS_CDSOFFSETS_HPP
27+
28+
#include "memory/allocation.hpp"
2729

2830
class CDSOffsets: public CHeapObj<mtInternal> {
2931
private:
@@ -42,4 +44,4 @@ class CDSOffsets: public CHeapObj<mtInternal> {
4244
static int find_offset(const char* name);
4345
};
4446

45-
#endif // SHARE_PRIMS_CDSOFFSETS_HPP
47+
#endif // SHARE_CDS_CDSOFFSETS_HPP

‎src/hotspot/share/classfile/classListParser.cpp renamed to ‎src/hotspot/share/cds/classListParser.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@
2525
#include "precompiled.hpp"
2626
#include "jvm.h"
2727
#include "jimage.hpp"
28-
#include "classfile/classListParser.hpp"
28+
#include "cds/archiveUtils.hpp"
29+
#include "cds/classListParser.hpp"
30+
#include "cds/lambdaFormInvokers.hpp"
31+
#include "cds/metaspaceShared.hpp"
2932
#include "classfile/classLoaderExt.hpp"
3033
#include "classfile/javaClasses.inline.hpp"
31-
#include "classfile/lambdaFormInvokers.hpp"
3234
#include "classfile/symbolTable.hpp"
3335
#include "classfile/systemDictionary.hpp"
3436
#include "classfile/systemDictionaryShared.hpp"
@@ -39,8 +41,6 @@
3941
#include "interpreter/linkResolver.hpp"
4042
#include "logging/log.hpp"
4143
#include "logging/logTag.hpp"
42-
#include "memory/archiveUtils.hpp"
43-
#include "memory/metaspaceShared.hpp"
4444
#include "memory/resourceArea.hpp"
4545
#include "oops/constantPool.hpp"
4646
#include "runtime/atomic.hpp"

‎src/hotspot/share/classfile/classListParser.hpp renamed to ‎src/hotspot/share/cds/classListParser.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
*
2323
*/
2424

25-
#ifndef SHARE_CLASSFILE_CLASSLISTPARSER_HPP
26-
#define SHARE_CLASSFILE_CLASSLISTPARSER_HPP
25+
#ifndef SHARE_CDS_CLASSLISTPARSER_HPP
26+
#define SHARE_CDS_CLASSLISTPARSER_HPP
2727

2828
#include "utilities/exceptions.hpp"
2929
#include "utilities/globalDefinitions.hpp"
@@ -183,4 +183,4 @@ class ClassListParser : public StackObj {
183183

184184
static void populate_cds_indy_info(const constantPoolHandle &pool, int cp_index, CDSIndyInfo* cii, TRAPS);
185185
};
186-
#endif // SHARE_CLASSFILE_CLASSLISTPARSER_HPP
186+
#endif // SHARE_CDS_CLASSLISTPARSER_HPP

‎src/hotspot/share/classfile/classListWriter.hpp renamed to ‎src/hotspot/share/cds/classListWriter.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
*
2323
*/
2424

25-
#ifndef SHARE_CLASSFILE_CLASSLISTWRITER_HPP
26-
#define SHARE_CLASSFILE_CLASSLISTWRITER_HPP
25+
#ifndef SHARE_CDS_CLASSLISTWRITER_HPP
26+
#define SHARE_CDS_CLASSLISTWRITER_HPP
2727

2828
#include "runtime/mutexLocker.hpp"
2929
#include "runtime/thread.hpp"
@@ -79,4 +79,4 @@ class ClassListWriter {
7979
}
8080
};
8181

82-
#endif // SHARE_CLASSFILE_CLASSLISTWRITER_HPP
82+
#endif // SHARE_CDS_CLASSLISTWRITER_HPP

‎src/hotspot/share/memory/cppVtables.cpp renamed to ‎src/hotspot/share/cds/cppVtables.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
*/
2424

2525
#include "precompiled.hpp"
26+
#include "cds/archiveUtils.hpp"
27+
#include "cds/archiveBuilder.hpp"
28+
#include "cds/cppVtables.hpp"
29+
#include "cds/metaspaceShared.hpp"
2630
#include "logging/log.hpp"
27-
#include "memory/archiveUtils.hpp"
28-
#include "memory/archiveBuilder.hpp"
29-
#include "memory/cppVtables.hpp"
30-
#include "memory/metaspaceShared.hpp"
3131
#include "oops/instanceClassLoaderKlass.hpp"
3232
#include "oops/instanceMirrorKlass.hpp"
3333
#include "oops/instanceRefKlass.hpp"

0 commit comments

Comments
 (0)