RFR: 8265696 move cds sources

David Holmes dholmes at openjdk.java.net
Thu Apr 22 04:22:25 UTC 2021


On Wed, 21 Apr 2021 21:55:25 GMT, Ioi Lam <iklam at openjdk.org> wrote:

> The number of CDS source files have grown significantly. To improve modularity, the following files should be moved a new directory, src/hotspot/share/cds.
> 
> - src/hotspot/share/classfile/classListParser.cpp
> - src/hotspot/share/classfile/classListParser.hpp
> - src/hotspot/share/classfile/classListWriter.hpp
> - src/hotspot/share/classfile/compactHashtable.cpp
> - src/hotspot/share/classfile/compactHashtable.hpp
> - src/hotspot/share/classfile/lambdaFormInvokers.cpp
> - src/hotspot/share/classfile/lambdaFormInvokers.hpp
> - src/hotspot/share/memory/archiveBuilder.cpp
> - src/hotspot/share/memory/archiveBuilder.hpp
> - src/hotspot/share/memory/archiveUtils.cpp
> - src/hotspot/share/memory/archiveUtils.hpp
> - src/hotspot/share/memory/archiveUtils.inline.hpp
> - src/hotspot/share/memory/cppVtables.cpp
> - src/hotspot/share/memory/cppVtables.hpp
> - src/hotspot/share/memory/dumpAllocStats.cpp
> - src/hotspot/share/memory/dumpAllocStats.hpp
> - src/hotspot/share/memory/dynamicArchive.cpp
> - src/hotspot/share/memory/dynamicArchive.hpp
> - src/hotspot/share/memory/filemap.cpp
> - src/hotspot/share/memory/filemap.hpp
> - src/hotspot/share/memory/heapShared.cpp
> - src/hotspot/share/memory/heapShared.hpp
> - src/hotspot/share/memory/heapShared.inline.hpp
> - src/hotspot/share/memory/metaspaceShared.cpp
> - src/hotspot/share/memory/metaspaceShared.hpp
> - src/hotspot/share/prims/cdsoffsets.cpp
> - src/hotspot/share/prims/cdsoffsets.hpp
> 
> Testing with mach5: tier1, builds-tier2, builds-tier3, builds-tier4 and builds-tier5. Also locally: aarch64, arm, ppc64, s390, x86, and zero.

Hi Ioi,

Moving these files to their own directory is fine, but all the moved headers need further adjustments for the include guards.

Thanks,
David

src/hotspot/share/cds/archiveUtils.inline.hpp line 25:

> 23:  */
> 24: 
> 25: #ifndef SHARE_MEMORY_ARCHIVEUTILS_INLINE_HPP

The header file include guards all need updating for the new path.

src/hotspot/share/cds/dynamicArchive.hpp line 38:

> 36: #include "utilities/resourceHash.hpp"
> 37: 
> 38: #if INCLUDE_CDS

I have to wonder who is including this file and why, if CDS is not enabled.

-------------

Changes requested by dholmes (Reviewer).

PR: https://git.openjdk.java.net/jdk/pull/3610



More information about the build-dev mailing list