From 731f795bc0c1c502dc6cac8f866ff45a15bdd02d Mon Sep 17 00:00:00 2001 From: tstuefe Date: Sat, 19 Sep 2020 14:50:07 +0200 Subject: [PATCH] JEP387 review feedback round 2 --- .../share/gc/shared/jvmFlagConstraintsGC.hpp | 1 - src/hotspot/share/memory/metaspace.cpp | 18 ++--- ...llocationGuard.hpp => allocationGuard.hpp} | 15 ++-- .../metaspace/{msBinList.hpp => binList.hpp} | 10 +-- .../{msBlockTree.cpp => blockTree.cpp} | 2 +- .../{msBlockTree.hpp => blockTree.hpp} | 10 +-- ...hunkHeaderPool.cpp => chunkHeaderPool.cpp} | 2 +- ...hunkHeaderPool.hpp => chunkHeaderPool.hpp} | 12 +-- .../{msChunkManager.cpp => chunkManager.cpp} | 35 ++++++--- .../{msChunkManager.hpp => chunkManager.hpp} | 14 ++-- .../{msChunklevel.cpp => chunklevel.cpp} | 2 +- .../{msChunklevel.hpp => chunklevel.hpp} | 6 +- ...Metaspace.cpp => classLoaderMetaspace.cpp} | 14 ++-- ...{msCommitLimiter.cpp => commitLimiter.cpp} | 2 +- ...{msCommitLimiter.hpp => commitLimiter.hpp} | 8 +- .../{msCommitMask.cpp => commitMask.cpp} | 6 +- .../{msCommitMask.hpp => commitMask.hpp} | 6 +- .../metaspace/{msCounter.hpp => counters.hpp} | 6 +- .../{msFreeBlocks.cpp => freeBlocks.cpp} | 2 +- .../{msFreeBlocks.hpp => freeBlocks.hpp} | 12 +-- ...{msFreeChunkList.cpp => freeChunkList.cpp} | 2 +- ...{msFreeChunkList.hpp => freeChunkList.hpp} | 14 ++-- ...{msInternalStats.cpp => internalStats.cpp} | 2 +- ...{msInternalStats.hpp => internalStats.hpp} | 6 +- .../{msMetachunk.cpp => metachunk.cpp} | 8 +- .../{msMetachunk.hpp => metachunk.hpp} | 10 +-- ...{msMetachunkList.cpp => metachunkList.cpp} | 2 +- ...{msMetachunkList.hpp => metachunkList.hpp} | 12 +-- .../{msArena.cpp => metaspaceArena.cpp} | 76 +++++++++++++------ .../{msArena.hpp => metaspaceArena.hpp} | 17 +++-- ...icy.cpp => metaspaceArenaGrowthPolicy.cpp} | 2 +- ...icy.hpp => metaspaceArenaGrowthPolicy.hpp} | 8 +- .../{msCommon.cpp => metaspaceCommon.cpp} | 10 +-- .../{msCommon.hpp => metaspaceCommon.hpp} | 8 +- .../{msContext.cpp => metaspaceContext.cpp} | 8 +- .../{msContext.hpp => metaspaceContext.hpp} | 6 +- .../{msDCmd.cpp => metaspaceDCmd.cpp} | 4 +- .../{msDCmd.hpp => metaspaceDCmd.hpp} | 6 +- .../{msReport.cpp => metaspaceReporter.cpp} | 20 ++--- .../{msReport.hpp => metaspaceReporter.hpp} | 6 +- .../{msSettings.cpp => metaspaceSettings.cpp} | 4 +- .../{msSettings.hpp => metaspaceSettings.hpp} | 8 +- ...Statistics.cpp => metaspaceStatistics.cpp} | 4 +- ...Statistics.hpp => metaspaceStatistics.hpp} | 8 +- ...e.cpp => printCLDMetaspaceInfoClosure.cpp} | 6 +- ...e.hpp => printCLDMetaspaceInfoClosure.hpp} | 8 +- ...cpp => printMetaspaceInfoKlassClosure.cpp} | 2 +- ...hpp => printMetaspaceInfoKlassClosure.hpp} | 6 +- ...{msRootChunkArea.cpp => rootChunkArea.cpp} | 12 +-- ...{msRootChunkArea.hpp => rootChunkArea.hpp} | 8 +- ...unningCounters.cpp => runningCounters.cpp} | 8 +- ...unningCounters.hpp => runningCounters.hpp} | 9 +-- .../{msTestHelpers.cpp => testHelpers.cpp} | 8 +- .../{msTestHelpers.hpp => testHelpers.hpp} | 13 ++-- ...tualSpaceList.cpp => virtualSpaceList.cpp} | 47 ++++++------ ...tualSpaceList.hpp => virtualSpaceList.hpp} | 16 ++-- ...tualSpaceNode.cpp => virtualSpaceNode.cpp} | 24 +++--- ...tualSpaceNode.hpp => virtualSpaceNode.hpp} | 14 ++-- src/hotspot/share/prims/whitebox.cpp | 2 +- src/hotspot/share/runtime/vmOperations.cpp | 2 +- .../share/services/diagnosticCommand.cpp | 2 +- .../metaspace/metaspaceGtestContexts.cpp | 4 +- .../metaspace/metaspaceGtestContexts.hpp | 6 +- .../metaspace/metaspaceGtestRangeHelpers.hpp | 2 +- .../gtest/metaspace/test_allocationGuard.cpp | 24 ++++-- .../metaspace/test_arenagrowthpolicy.cpp | 4 +- test/hotspot/gtest/metaspace/test_binlist.cpp | 4 +- .../gtest/metaspace/test_blocktree.cpp | 4 +- .../metaspace/test_chunkManager_stress.cpp | 6 +- .../gtest/metaspace/test_chunkheaderpool.cpp | 6 +- .../gtest/metaspace/test_commitmask.cpp | 4 +- .../gtest/metaspace/test_freeblocks.cpp | 4 +- .../gtest/metaspace/test_internstats.cpp | 2 +- .../gtest/metaspace/test_is_metaspace_obj.cpp | 2 +- .../gtest/metaspace/test_metachunk.cpp | 10 +-- .../gtest/metaspace/test_metachunklist.cpp | 6 +- .../gtest/metaspace/test_metaspace_misc.cpp | 4 +- .../gtest/metaspace/test_metaspacearena.cpp | 14 ++-- .../metaspace/test_metaspacearena_stress.cpp | 10 +-- .../gtest/metaspace/test_virtualspacenode.cpp | 16 ++-- 80 files changed, 394 insertions(+), 359 deletions(-) rename src/hotspot/share/memory/metaspace/{msAllocationGuard.hpp => allocationGuard.hpp} (86%) rename src/hotspot/share/memory/metaspace/{msBinList.hpp => binList.hpp} (96%) rename src/hotspot/share/memory/metaspace/{msBlockTree.cpp => blockTree.cpp} (99%) rename src/hotspot/share/memory/metaspace/{msBlockTree.hpp => blockTree.hpp} (98%) rename src/hotspot/share/memory/metaspace/{msChunkHeaderPool.cpp => chunkHeaderPool.cpp} (98%) rename src/hotspot/share/memory/metaspace/{msChunkHeaderPool.hpp => chunkHeaderPool.hpp} (92%) rename src/hotspot/share/memory/metaspace/{msChunkManager.cpp => chunkManager.cpp} (92%) rename src/hotspot/share/memory/metaspace/{msChunkManager.hpp => chunkManager.hpp} (95%) rename src/hotspot/share/memory/metaspace/{msChunklevel.cpp => chunklevel.cpp} (97%) rename src/hotspot/share/memory/metaspace/{msChunklevel.hpp => chunklevel.hpp} (96%) rename src/hotspot/share/memory/metaspace/{msClassLoaderMetaspace.cpp => classLoaderMetaspace.cpp} (95%) rename src/hotspot/share/memory/metaspace/{msCommitLimiter.cpp => commitLimiter.cpp} (97%) rename src/hotspot/share/memory/metaspace/{msCommitLimiter.hpp => commitLimiter.hpp} (94%) rename src/hotspot/share/memory/metaspace/{msCommitMask.cpp => commitMask.cpp} (94%) rename src/hotspot/share/memory/metaspace/{msCommitMask.hpp => commitMask.hpp} (97%) rename src/hotspot/share/memory/metaspace/{msCounter.hpp => counters.hpp} (97%) rename src/hotspot/share/memory/metaspace/{msFreeBlocks.cpp => freeBlocks.cpp} (98%) rename src/hotspot/share/memory/metaspace/{msFreeBlocks.hpp => freeBlocks.hpp} (93%) rename src/hotspot/share/memory/metaspace/{msFreeChunkList.cpp => freeChunkList.cpp} (99%) rename src/hotspot/share/memory/metaspace/{msFreeChunkList.hpp => freeChunkList.hpp} (96%) rename src/hotspot/share/memory/metaspace/{msInternalStats.cpp => internalStats.cpp} (97%) rename src/hotspot/share/memory/metaspace/{msInternalStats.hpp => internalStats.hpp} (97%) rename src/hotspot/share/memory/metaspace/{msMetachunk.cpp => metachunk.cpp} (98%) rename src/hotspot/share/memory/metaspace/{msMetachunk.hpp => metachunk.hpp} (98%) rename src/hotspot/share/memory/metaspace/{msMetachunkList.cpp => metachunkList.cpp} (98%) rename src/hotspot/share/memory/metaspace/{msMetachunkList.hpp => metachunkList.hpp} (90%) rename src/hotspot/share/memory/metaspace/{msArena.cpp => metaspaceArena.cpp} (88%) rename src/hotspot/share/memory/metaspace/{msArena.hpp => metaspaceArena.hpp} (94%) rename src/hotspot/share/memory/metaspace/{msArenaGrowthPolicy.cpp => metaspaceArenaGrowthPolicy.cpp} (98%) rename src/hotspot/share/memory/metaspace/{msArenaGrowthPolicy.hpp => metaspaceArenaGrowthPolicy.hpp} (92%) rename src/hotspot/share/memory/metaspace/{msCommon.cpp => metaspaceCommon.cpp} (96%) rename src/hotspot/share/memory/metaspace/{msCommon.hpp => metaspaceCommon.hpp} (96%) rename src/hotspot/share/memory/metaspace/{msContext.cpp => metaspaceContext.cpp} (94%) rename src/hotspot/share/memory/metaspace/{msContext.hpp => metaspaceContext.hpp} (96%) rename src/hotspot/share/memory/metaspace/{msDCmd.cpp => metaspaceDCmd.cpp} (97%) rename src/hotspot/share/memory/metaspace/{msDCmd.hpp => metaspaceDCmd.hpp} (93%) rename src/hotspot/share/memory/metaspace/{msReport.cpp => metaspaceReporter.cpp} (96%) rename src/hotspot/share/memory/metaspace/{msReport.hpp => metaspaceReporter.hpp} (93%) rename src/hotspot/share/memory/metaspace/{msSettings.cpp => metaspaceSettings.cpp} (99%) rename src/hotspot/share/memory/metaspace/{msSettings.hpp => metaspaceSettings.hpp} (94%) rename src/hotspot/share/memory/metaspace/{msStatistics.cpp => metaspaceStatistics.cpp} (98%) rename src/hotspot/share/memory/metaspace/{msStatistics.hpp => metaspaceStatistics.hpp} (95%) rename src/hotspot/share/memory/metaspace/{msPrintCLDMetaspaceInfoClosure.cpp => printCLDMetaspaceInfoClosure.cpp} (96%) rename src/hotspot/share/memory/metaspace/{msPrintCLDMetaspaceInfoClosure.hpp => printCLDMetaspaceInfoClosure.hpp} (90%) rename src/hotspot/share/memory/metaspace/{msPrintMetaspaceInfoKlassClosure.cpp => printMetaspaceInfoKlassClosure.cpp} (96%) rename src/hotspot/share/memory/metaspace/{msPrintMetaspaceInfoKlassClosure.hpp => printMetaspaceInfoKlassClosure.hpp} (89%) rename src/hotspot/share/memory/metaspace/{msRootChunkArea.cpp => rootChunkArea.cpp} (98%) rename src/hotspot/share/memory/metaspace/{msRootChunkArea.hpp => rootChunkArea.hpp} (97%) rename src/hotspot/share/memory/metaspace/{msRunningCounters.cpp => runningCounters.cpp} (94%) rename src/hotspot/share/memory/metaspace/{msRunningCounters.hpp => runningCounters.hpp} (92%) rename src/hotspot/share/memory/metaspace/{msTestHelpers.cpp => testHelpers.cpp} (95%) rename src/hotspot/share/memory/metaspace/{msTestHelpers.hpp => testHelpers.hpp} (93%) rename src/hotspot/share/memory/metaspace/{msVirtualSpaceList.cpp => virtualSpaceList.cpp} (90%) rename src/hotspot/share/memory/metaspace/{msVirtualSpaceList.hpp => virtualSpaceList.hpp} (93%) rename src/hotspot/share/memory/metaspace/{msVirtualSpaceNode.cpp => virtualSpaceNode.cpp} (96%) rename src/hotspot/share/memory/metaspace/{msVirtualSpaceNode.hpp => virtualSpaceNode.hpp} (97%) diff --git a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp index f2962b41c63ea..1f9ecbd40f610 100644 --- a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp +++ b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp @@ -56,7 +56,6 @@ \ f(uintx, MaxGCPauseMillisConstraintFunc) \ f(uintx, GCPauseIntervalMillisConstraintFunc) \ - f(size_t, InitialBootClassLoaderMetaspaceSizeConstraintFunc) \ f(size_t, MinHeapSizeConstraintFunc) \ f(size_t, InitialHeapSizeConstraintFunc) \ f(size_t, MaxHeapSizeConstraintFunc) \ diff --git a/src/hotspot/share/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp index 65eed9a57e9d0..9402f0eb79def 100644 --- a/src/hotspot/share/memory/metaspace.cpp +++ b/src/hotspot/share/memory/metaspace.cpp @@ -29,16 +29,16 @@ #include "logging/log.hpp" #include "logging/logStream.hpp" #include "memory/filemap.hpp" +#include "memory/metaspace/chunkHeaderPool.hpp" +#include "memory/metaspace/chunkManager.hpp" +#include "memory/metaspace/commitLimiter.hpp" +#include "memory/metaspace/metaspaceCommon.hpp" +#include "memory/metaspace/metaspaceContext.hpp" +#include "memory/metaspace/metaspaceReporter.hpp" +#include "memory/metaspace/metaspaceSettings.hpp" #include "memory/metaspace/metaspaceSizesSnapshot.hpp" -#include "memory/metaspace/msChunkHeaderPool.hpp" -#include "memory/metaspace/msChunkManager.hpp" -#include "memory/metaspace/msCommitLimiter.hpp" -#include "memory/metaspace/msCommon.hpp" -#include "memory/metaspace/msContext.hpp" -#include "memory/metaspace/msReport.hpp" -#include "memory/metaspace/msRunningCounters.hpp" -#include "memory/metaspace/msSettings.hpp" -#include "memory/metaspace/msVirtualSpaceList.hpp" +#include "memory/metaspace/runningCounters.hpp" +#include "memory/metaspace/virtualSpaceList.hpp" #include "memory/metaspace.hpp" #include "memory/metaspaceShared.hpp" #include "memory/metaspaceTracer.hpp" diff --git a/src/hotspot/share/memory/metaspace/msAllocationGuard.hpp b/src/hotspot/share/memory/metaspace/allocationGuard.hpp similarity index 86% rename from src/hotspot/share/memory/metaspace/msAllocationGuard.hpp rename to src/hotspot/share/memory/metaspace/allocationGuard.hpp index 3333cf409e2ae..6565e4e32ce68 100644 --- a/src/hotspot/share/memory/metaspace/msAllocationGuard.hpp +++ b/src/hotspot/share/memory/metaspace/allocationGuard.hpp @@ -23,12 +23,11 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSALLOCATIONGUARD_HPP -#define SHARE_MEMORY_METASPACE_MSALLOCATIONGUARD_HPP +#ifndef SHARE_MEMORY_METASPACE_ALLOCATIONGUARD_HPP +#define SHARE_MEMORY_METASPACE_ALLOCATIONGUARD_HPP #include "memory/allocation.hpp" -#include "memory/metaspace/msChunklevel.hpp" -#include "utilities/debug.hpp" +#include "memory/metaspace/chunklevel.hpp" #include "utilities/globalDefinitions.hpp" // In Debug builds, Metadata in Metaspace can be optionally guarded - enclosed in canaries - @@ -90,10 +89,8 @@ struct Prefix { return (MetaWord*)(this + 1); } - void check() const { - assert(_mark == EyeCatcher, "Corrupt block: missing eyecatcher (at " PTR_FORMAT ").", p2i(this)); - assert(_word_size > 0 && _word_size < chunklevel::MAX_CHUNK_WORD_SIZE, - "Corrupt block: invalid size " SIZE_FORMAT " (at " PTR_FORMAT ").", _word_size, p2i(this)); + bool is_valid() const { + return _mark == EyeCatcher && _word_size > 0 && _word_size < chunklevel::MAX_CHUNK_WORD_SIZE; } }; @@ -116,4 +113,4 @@ inline MetaWord* establish_prefix(MetaWord* p_raw, size_t raw_word_size) { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSALLOCATIONGUARD_HPP +#endif // SHARE_MEMORY_METASPACE_ALLOCATIONGUARD_HPP diff --git a/src/hotspot/share/memory/metaspace/msBinList.hpp b/src/hotspot/share/memory/metaspace/binList.hpp similarity index 96% rename from src/hotspot/share/memory/metaspace/msBinList.hpp rename to src/hotspot/share/memory/metaspace/binList.hpp index a563969841183..b7b1abfb431a7 100644 --- a/src/hotspot/share/memory/metaspace/msBinList.hpp +++ b/src/hotspot/share/memory/metaspace/binList.hpp @@ -23,11 +23,11 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSBINLIST_HPP -#define SHARE_MEMORY_METASPACE_MSBINLIST_HPP +#ifndef SHARE_MEMORY_METASPACE_BINLIST_HPP +#define SHARE_MEMORY_METASPACE_BINLIST_HPP -#include "memory/metaspace/msCommon.hpp" -#include "memory/metaspace/msCounter.hpp" +#include "memory/metaspace/counters.hpp" +#include "memory/metaspace/metaspaceCommon.hpp" #include "utilities/align.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" @@ -222,4 +222,4 @@ typedef BinListImpl<2, 32> BinList32; } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSBINLIST_HPP +#endif // SHARE_MEMORY_METASPACE_BINLIST_HPP diff --git a/src/hotspot/share/memory/metaspace/msBlockTree.cpp b/src/hotspot/share/memory/metaspace/blockTree.cpp similarity index 99% rename from src/hotspot/share/memory/metaspace/msBlockTree.cpp rename to src/hotspot/share/memory/metaspace/blockTree.cpp index 75d8e17ee2b93..273f55910ddf4 100644 --- a/src/hotspot/share/memory/metaspace/msBlockTree.cpp +++ b/src/hotspot/share/memory/metaspace/blockTree.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" -#include "memory/metaspace/msBlockTree.hpp" +#include "memory/metaspace/blockTree.hpp" #include "memory/resourceArea.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/memory/metaspace/msBlockTree.hpp b/src/hotspot/share/memory/metaspace/blockTree.hpp similarity index 98% rename from src/hotspot/share/memory/metaspace/msBlockTree.hpp rename to src/hotspot/share/memory/metaspace/blockTree.hpp index 6f14984e3c2cb..afac11ec4eafd 100644 --- a/src/hotspot/share/memory/metaspace/msBlockTree.hpp +++ b/src/hotspot/share/memory/metaspace/blockTree.hpp @@ -23,12 +23,12 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSBLOCKTREE_HPP -#define SHARE_MEMORY_METASPACE_MSBLOCKTREE_HPP +#ifndef SHARE_MEMORY_METASPACE_BLOCKTREE_HPP +#define SHARE_MEMORY_METASPACE_BLOCKTREE_HPP #include "memory/allocation.hpp" -#include "memory/metaspace/msChunklevel.hpp" -#include "memory/metaspace/msCounter.hpp" +#include "memory/metaspace/chunklevel.hpp" +#include "memory/metaspace/counters.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" @@ -404,4 +404,4 @@ class BlockTree: public CHeapObj { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSBLOCKTREE_HPP +#endif // SHARE_MEMORY_METASPACE_BLOCKTREE_HPP diff --git a/src/hotspot/share/memory/metaspace/msChunkHeaderPool.cpp b/src/hotspot/share/memory/metaspace/chunkHeaderPool.cpp similarity index 98% rename from src/hotspot/share/memory/metaspace/msChunkHeaderPool.cpp rename to src/hotspot/share/memory/metaspace/chunkHeaderPool.cpp index e92a2774b637a..d03fb0d4e52e2 100644 --- a/src/hotspot/share/memory/metaspace/msChunkHeaderPool.cpp +++ b/src/hotspot/share/memory/metaspace/chunkHeaderPool.cpp @@ -24,7 +24,7 @@ */ #include "precompiled.hpp" -#include "memory/metaspace/msChunkHeaderPool.hpp" +#include "memory/metaspace/chunkHeaderPool.hpp" #include "runtime/os.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/memory/metaspace/msChunkHeaderPool.hpp b/src/hotspot/share/memory/metaspace/chunkHeaderPool.hpp similarity index 92% rename from src/hotspot/share/memory/metaspace/msChunkHeaderPool.hpp rename to src/hotspot/share/memory/metaspace/chunkHeaderPool.hpp index 5811960f002ba..0f985b3d199bd 100644 --- a/src/hotspot/share/memory/metaspace/msChunkHeaderPool.hpp +++ b/src/hotspot/share/memory/metaspace/chunkHeaderPool.hpp @@ -23,13 +23,13 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSCHUNKHEADERPOOL_HPP -#define SHARE_MEMORY_METASPACE_MSCHUNKHEADERPOOL_HPP +#ifndef SHARE_MEMORY_METASPACE_CHUNKHEADERPOOL_HPP +#define SHARE_MEMORY_METASPACE_CHUNKHEADERPOOL_HPP #include "memory/allocation.hpp" -#include "memory/metaspace/msCounter.hpp" -#include "memory/metaspace/msMetachunk.hpp" -#include "memory/metaspace/msMetachunkList.hpp" +#include "memory/metaspace/counters.hpp" +#include "memory/metaspace/metachunk.hpp" +#include "memory/metaspace/metachunkList.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" @@ -142,4 +142,4 @@ class ChunkHeaderPool : public CHeapObj { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSCHUNKHEADERPOOL_HPP +#endif // SHARE_MEMORY_METASPACE_CHUNKHEADERPOOL_HPP diff --git a/src/hotspot/share/memory/metaspace/msChunkManager.cpp b/src/hotspot/share/memory/metaspace/chunkManager.cpp similarity index 92% rename from src/hotspot/share/memory/metaspace/msChunkManager.cpp rename to src/hotspot/share/memory/metaspace/chunkManager.cpp index b893cc19d25e1..5c3358ad63e7d 100644 --- a/src/hotspot/share/memory/metaspace/msChunkManager.cpp +++ b/src/hotspot/share/memory/metaspace/chunkManager.cpp @@ -27,16 +27,16 @@ #include "logging/log.hpp" #include "logging/logStream.hpp" -#include "memory/metaspace/msArenaGrowthPolicy.hpp" -#include "memory/metaspace/msChunkManager.hpp" -#include "memory/metaspace/msCommon.hpp" -#include "memory/metaspace/msContext.hpp" -#include "memory/metaspace/msInternalStats.hpp" -#include "memory/metaspace/msMetachunk.hpp" -#include "memory/metaspace/msSettings.hpp" -#include "memory/metaspace/msStatistics.hpp" -#include "memory/metaspace/msVirtualSpaceList.hpp" -#include "memory/metaspace/msVirtualSpaceNode.hpp" +#include "memory/metaspace/chunkManager.hpp" +#include "memory/metaspace/internalStats.hpp" +#include "memory/metaspace/metaspaceArenaGrowthPolicy.hpp" +#include "memory/metaspace/metaspaceCommon.hpp" +#include "memory/metaspace/metaspaceContext.hpp" +#include "memory/metaspace/metachunk.hpp" +#include "memory/metaspace/metaspaceSettings.hpp" +#include "memory/metaspace/metaspaceStatistics.hpp" +#include "memory/metaspace/virtualSpaceList.hpp" +#include "memory/metaspace/virtualSpaceNode.hpp" #include "runtime/mutexLocker.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" @@ -369,11 +369,22 @@ void ChunkManager::purge() { const size_t committed_before = _vslist->committed_words(); int num_nodes_purged = 0; - // 1) purge virtual space list + // We purge to return unused memory to the Operating System. We do this in + // two independent steps. + + // 1) We purge the virtual space list: any memory mappings which are + // completely deserted can be potentially unmapped. We iterate over the list + // of mappings (VirtualSpaceList::purge) and delete every node whose memory + // only contains free chunks. Deleting that node includes unmapping its memory, + // so all chunk vanish automatically. + // Of course we need to remove the chunk headers of those vanished chunks from + // the ChunkManager freelist. num_nodes_purged = _vslist->purge(&_chunks); InternalStats::inc_num_purges(); - // 2) uncommit free chunks + // 2) Since (1) is rather ineffective - it is rare that a whole node only contains + // free chunks - we now iterate over all remaining free chunks and + // and uncommit those which can be uncommitted (>= commit granule size). if (Settings::uncommit_free_chunks()) { const chunklevel_t max_level = chunklevel::level_fitting_word_size(Settings::commit_granule_words()); diff --git a/src/hotspot/share/memory/metaspace/msChunkManager.hpp b/src/hotspot/share/memory/metaspace/chunkManager.hpp similarity index 95% rename from src/hotspot/share/memory/metaspace/msChunkManager.hpp rename to src/hotspot/share/memory/metaspace/chunkManager.hpp index fa08dc7bb3e93..0d79e6b3466bc 100644 --- a/src/hotspot/share/memory/metaspace/msChunkManager.hpp +++ b/src/hotspot/share/memory/metaspace/chunkManager.hpp @@ -23,14 +23,14 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSCHUNKMANAGER_HPP -#define SHARE_MEMORY_METASPACE_MSCHUNKMANAGER_HPP +#ifndef SHARE_MEMORY_METASPACE_CHUNKMANAGER_HPP +#define SHARE_MEMORY_METASPACE_CHUNKMANAGER_HPP #include "memory/allocation.hpp" -#include "memory/metaspace/msChunklevel.hpp" -#include "memory/metaspace/msCounter.hpp" -#include "memory/metaspace/msFreeChunkList.hpp" -#include "memory/metaspace/msMetachunk.hpp" +#include "memory/metaspace/chunklevel.hpp" +#include "memory/metaspace/counters.hpp" +#include "memory/metaspace/freeChunkList.hpp" +#include "memory/metaspace/metachunk.hpp" namespace metaspace { @@ -185,4 +185,4 @@ class ChunkManager : public CHeapObj { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSCHUNKMANAGER_HPP +#endif // SHARE_MEMORY_METASPACE_CHUNKMANAGER_HPP diff --git a/src/hotspot/share/memory/metaspace/msChunklevel.cpp b/src/hotspot/share/memory/metaspace/chunklevel.cpp similarity index 97% rename from src/hotspot/share/memory/metaspace/msChunklevel.cpp rename to src/hotspot/share/memory/metaspace/chunklevel.cpp index 47dbba1e61b7b..d6894315eed17 100644 --- a/src/hotspot/share/memory/metaspace/msChunklevel.cpp +++ b/src/hotspot/share/memory/metaspace/chunklevel.cpp @@ -24,7 +24,7 @@ */ #include "precompiled.hpp" -#include "memory/metaspace/msChunklevel.hpp" +#include "memory/metaspace/chunklevel.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" #include "utilities/ostream.hpp" diff --git a/src/hotspot/share/memory/metaspace/msChunklevel.hpp b/src/hotspot/share/memory/metaspace/chunklevel.hpp similarity index 96% rename from src/hotspot/share/memory/metaspace/msChunklevel.hpp rename to src/hotspot/share/memory/metaspace/chunklevel.hpp index 6a514e7e46d6e..8dbc2467fd7b9 100644 --- a/src/hotspot/share/memory/metaspace/msChunklevel.hpp +++ b/src/hotspot/share/memory/metaspace/chunklevel.hpp @@ -23,8 +23,8 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSCHUNKLEVEL_HPP -#define SHARE_MEMORY_METASPACE_MSCHUNKLEVEL_HPP +#ifndef SHARE_MEMORY_METASPACE_CHUNKLEVEL_HPP +#define SHARE_MEMORY_METASPACE_CHUNKLEVEL_HPP #include "utilities/globalDefinitions.hpp" @@ -127,4 +127,4 @@ void print_chunk_size(outputStream* st, chunklevel_t lvl); } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSCHUNKLEVEL_HPP +#endif // SHARE_MEMORY_METASPACE_CHUNKLEVEL_HPP diff --git a/src/hotspot/share/memory/metaspace/msClassLoaderMetaspace.cpp b/src/hotspot/share/memory/metaspace/classLoaderMetaspace.cpp similarity index 95% rename from src/hotspot/share/memory/metaspace/msClassLoaderMetaspace.cpp rename to src/hotspot/share/memory/metaspace/classLoaderMetaspace.cpp index 0009acd8e00d9..c0ab6a42c5e63 100644 --- a/src/hotspot/share/memory/metaspace/msClassLoaderMetaspace.cpp +++ b/src/hotspot/share/memory/metaspace/classLoaderMetaspace.cpp @@ -26,13 +26,13 @@ #include "precompiled.hpp" #include "logging/log.hpp" -#include "memory/metaspace/msArena.hpp" -#include "memory/metaspace/msArenaGrowthPolicy.hpp" -#include "memory/metaspace/msChunkManager.hpp" -#include "memory/metaspace/msInternalStats.hpp" -#include "memory/metaspace/msRunningCounters.hpp" -#include "memory/metaspace/msSettings.hpp" -#include "memory/metaspace/msStatistics.hpp" +#include "memory/metaspace/chunkManager.hpp" +#include "memory/metaspace/internalStats.hpp" +#include "memory/metaspace/metaspaceArena.hpp" +#include "memory/metaspace/metaspaceArenaGrowthPolicy.hpp" +#include "memory/metaspace/metaspaceSettings.hpp" +#include "memory/metaspace/metaspaceStatistics.hpp" +#include "memory/metaspace/runningCounters.hpp" #include "memory/metaspace.hpp" #include "memory/metaspaceTracer.hpp" #include "runtime/atomic.hpp" diff --git a/src/hotspot/share/memory/metaspace/msCommitLimiter.cpp b/src/hotspot/share/memory/metaspace/commitLimiter.cpp similarity index 97% rename from src/hotspot/share/memory/metaspace/msCommitLimiter.cpp rename to src/hotspot/share/memory/metaspace/commitLimiter.cpp index a041c91bde4cd..a20e99c9e2a68 100644 --- a/src/hotspot/share/memory/metaspace/msCommitLimiter.cpp +++ b/src/hotspot/share/memory/metaspace/commitLimiter.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" -#include "memory/metaspace/msCommitLimiter.hpp" +#include "memory/metaspace/commitLimiter.hpp" #include "memory/metaspace.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/memory/metaspace/msCommitLimiter.hpp b/src/hotspot/share/memory/metaspace/commitLimiter.hpp similarity index 94% rename from src/hotspot/share/memory/metaspace/msCommitLimiter.hpp rename to src/hotspot/share/memory/metaspace/commitLimiter.hpp index b9f212904a340..f9b6598127cd6 100644 --- a/src/hotspot/share/memory/metaspace/msCommitLimiter.hpp +++ b/src/hotspot/share/memory/metaspace/commitLimiter.hpp @@ -23,11 +23,11 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSCOMMITLIMITER_HPP -#define SHARE_MEMORY_METASPACE_MSCOMMITLIMITER_HPP +#ifndef SHARE_MEMORY_METASPACE_COMMITLIMITER_HPP +#define SHARE_MEMORY_METASPACE_COMMITLIMITER_HPP #include "memory/allocation.hpp" -#include "memory/metaspace/msCounter.hpp" +#include "memory/metaspace/counters.hpp" namespace metaspace { @@ -81,4 +81,4 @@ class CommitLimiter : public CHeapObj { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSCOMMITLIMITER_HPP +#endif // SHARE_MEMORY_METASPACE_COMMITLIMITER_HPP diff --git a/src/hotspot/share/memory/metaspace/msCommitMask.cpp b/src/hotspot/share/memory/metaspace/commitMask.cpp similarity index 94% rename from src/hotspot/share/memory/metaspace/msCommitMask.cpp rename to src/hotspot/share/memory/metaspace/commitMask.cpp index 02fd51b8c4811..0c7bf08d1ee48 100644 --- a/src/hotspot/share/memory/metaspace/msCommitMask.cpp +++ b/src/hotspot/share/memory/metaspace/commitMask.cpp @@ -25,9 +25,9 @@ #include "precompiled.hpp" -#include "memory/metaspace/msCommitMask.hpp" -#include "memory/metaspace/msCommon.hpp" -#include "memory/metaspace/msSettings.hpp" +#include "memory/metaspace/commitMask.hpp" +#include "memory/metaspace/metaspaceCommon.hpp" +#include "memory/metaspace/metaspaceSettings.hpp" #include "runtime/stubRoutines.hpp" #include "utilities/align.hpp" diff --git a/src/hotspot/share/memory/metaspace/msCommitMask.hpp b/src/hotspot/share/memory/metaspace/commitMask.hpp similarity index 97% rename from src/hotspot/share/memory/metaspace/msCommitMask.hpp rename to src/hotspot/share/memory/metaspace/commitMask.hpp index 9bf5e7408eaa8..c6c4bf4399abc 100644 --- a/src/hotspot/share/memory/metaspace/msCommitMask.hpp +++ b/src/hotspot/share/memory/metaspace/commitMask.hpp @@ -23,8 +23,8 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSCOMMITMASK_HPP -#define SHARE_MEMORY_METASPACE_MSCOMMITMASK_HPP +#ifndef SHARE_MEMORY_METASPACE_COMMITMASK_HPP +#define SHARE_MEMORY_METASPACE_COMMITMASK_HPP #include "utilities/debug.hpp" #include "utilities/bitMap.hpp" @@ -175,4 +175,4 @@ class CommitMask : public CHeapBitMap { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSCOMMITMASK_HPP +#endif // SHARE_MEMORY_METASPACE_COMMITMASK_HPP diff --git a/src/hotspot/share/memory/metaspace/msCounter.hpp b/src/hotspot/share/memory/metaspace/counters.hpp similarity index 97% rename from src/hotspot/share/memory/metaspace/msCounter.hpp rename to src/hotspot/share/memory/metaspace/counters.hpp index 99774da91a2d4..eafe3cfe285c3 100644 --- a/src/hotspot/share/memory/metaspace/msCounter.hpp +++ b/src/hotspot/share/memory/metaspace/counters.hpp @@ -23,8 +23,8 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSCOUNTER_HPP -#define SHARE_MEMORY_METASPACE_MSCOUNTER_HPP +#ifndef SHARE_MEMORY_METASPACE_COUNTERS_HPP +#define SHARE_MEMORY_METASPACE_COUNTERS_HPP #include "metaprogramming/isSigned.hpp" #include "runtime/atomic.hpp" @@ -179,5 +179,5 @@ typedef AbstractMemoryRangeCounter MemRangeCounter; } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSCOUNTER_HPP +#endif // SHARE_MEMORY_METASPACE_COUNTERS_HPP diff --git a/src/hotspot/share/memory/metaspace/msFreeBlocks.cpp b/src/hotspot/share/memory/metaspace/freeBlocks.cpp similarity index 98% rename from src/hotspot/share/memory/metaspace/msFreeBlocks.cpp rename to src/hotspot/share/memory/metaspace/freeBlocks.cpp index ab39a3e72263e..3d5b7037ddf0a 100644 --- a/src/hotspot/share/memory/metaspace/msFreeBlocks.cpp +++ b/src/hotspot/share/memory/metaspace/freeBlocks.cpp @@ -24,7 +24,7 @@ */ #include "precompiled.hpp" -#include "memory/metaspace/msFreeBlocks.hpp" +#include "memory/metaspace/freeBlocks.hpp" #include "utilities/globalDefinitions.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/memory/metaspace/msFreeBlocks.hpp b/src/hotspot/share/memory/metaspace/freeBlocks.hpp similarity index 93% rename from src/hotspot/share/memory/metaspace/msFreeBlocks.hpp rename to src/hotspot/share/memory/metaspace/freeBlocks.hpp index 7758208c232f6..acf9d95556fda 100644 --- a/src/hotspot/share/memory/metaspace/msFreeBlocks.hpp +++ b/src/hotspot/share/memory/metaspace/freeBlocks.hpp @@ -23,14 +23,14 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSFREEBLOCKS_HPP -#define SHARE_MEMORY_METASPACE_MSFREEBLOCKS_HPP +#ifndef SHARE_MEMORY_METASPACE_FREEBLOCKS_HPP +#define SHARE_MEMORY_METASPACE_FREEBLOCKS_HPP #include "memory/allocation.hpp" -#include "memory/metaspace/msBinList.hpp" -#include "memory/metaspace/msBlockTree.hpp" -#include "memory/metaspace/msCounter.hpp" +#include "memory/metaspace/binList.hpp" +#include "memory/metaspace/blockTree.hpp" +#include "memory/metaspace/counters.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" @@ -112,4 +112,4 @@ class FreeBlocks : public CHeapObj { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSFREEBLOCKS_HPP +#endif // SHARE_MEMORY_METASPACE_FREEBLOCKS_HPP diff --git a/src/hotspot/share/memory/metaspace/msFreeChunkList.cpp b/src/hotspot/share/memory/metaspace/freeChunkList.cpp similarity index 99% rename from src/hotspot/share/memory/metaspace/msFreeChunkList.cpp rename to src/hotspot/share/memory/metaspace/freeChunkList.cpp index 16abd11d5f911..acdb0be12a671 100644 --- a/src/hotspot/share/memory/metaspace/msFreeChunkList.cpp +++ b/src/hotspot/share/memory/metaspace/freeChunkList.cpp @@ -24,7 +24,7 @@ */ #include "precompiled.hpp" -#include "memory/metaspace/msFreeChunkList.hpp" +#include "memory/metaspace/freeChunkList.hpp" #include "utilities/globalDefinitions.hpp" #include "utilities/debug.hpp" #include "utilities/ostream.hpp" diff --git a/src/hotspot/share/memory/metaspace/msFreeChunkList.hpp b/src/hotspot/share/memory/metaspace/freeChunkList.hpp similarity index 96% rename from src/hotspot/share/memory/metaspace/msFreeChunkList.hpp rename to src/hotspot/share/memory/metaspace/freeChunkList.hpp index 71b957701c2e8..8e49effe3fe4c 100644 --- a/src/hotspot/share/memory/metaspace/msFreeChunkList.hpp +++ b/src/hotspot/share/memory/metaspace/freeChunkList.hpp @@ -23,14 +23,14 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSFREECHUNKLIST_HPP -#define SHARE_MEMORY_METASPACE_MSFREECHUNKLIST_HPP +#ifndef SHARE_MEMORY_METASPACE_FREECHUNKLIST_HPP +#define SHARE_MEMORY_METASPACE_FREECHUNKLIST_HPP #include "memory/allocation.hpp" -#include "memory/metaspace/msChunklevel.hpp" -#include "memory/metaspace/msCounter.hpp" -#include "memory/metaspace/msMetachunk.hpp" -#include "memory/metaspace/msMetachunkList.hpp" +#include "memory/metaspace/chunklevel.hpp" +#include "memory/metaspace/counters.hpp" +#include "memory/metaspace/metachunk.hpp" +#include "memory/metaspace/metachunkList.hpp" class outputStream; @@ -269,4 +269,4 @@ class FreeChunkListVector { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSFREECHUNKLIST_HPP +#endif // SHARE_MEMORY_METASPACE_FREECHUNKLIST_HPP diff --git a/src/hotspot/share/memory/metaspace/msInternalStats.cpp b/src/hotspot/share/memory/metaspace/internalStats.cpp similarity index 97% rename from src/hotspot/share/memory/metaspace/msInternalStats.cpp rename to src/hotspot/share/memory/metaspace/internalStats.cpp index 1c30d8b0962f0..27937cf7995c8 100644 --- a/src/hotspot/share/memory/metaspace/msInternalStats.cpp +++ b/src/hotspot/share/memory/metaspace/internalStats.cpp @@ -24,7 +24,7 @@ */ #include "precompiled.hpp" -#include "memory/metaspace/msInternalStats.hpp" +#include "memory/metaspace/internalStats.hpp" #include "utilities/globalDefinitions.hpp" #include "utilities/ostream.hpp" diff --git a/src/hotspot/share/memory/metaspace/msInternalStats.hpp b/src/hotspot/share/memory/metaspace/internalStats.hpp similarity index 97% rename from src/hotspot/share/memory/metaspace/msInternalStats.hpp rename to src/hotspot/share/memory/metaspace/internalStats.hpp index 58d2636aad1c9..5ede3777f2c3a 100644 --- a/src/hotspot/share/memory/metaspace/msInternalStats.hpp +++ b/src/hotspot/share/memory/metaspace/internalStats.hpp @@ -23,8 +23,8 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSINTERNALSTATS_HPP -#define SHARE_MEMORY_METASPACE_MSINTERNALSTATS_HPP +#ifndef SHARE_MEMORY_METASPACE_INTERNALSTATS_HPP +#define SHARE_MEMORY_METASPACE_INTERNALSTATS_HPP #include "memory/allocation.hpp" #include "runtime/atomic.hpp" @@ -121,4 +121,4 @@ class InternalStats : public AllStatic { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSINTERNALSTATS_HPP +#endif // SHARE_MEMORY_METASPACE_INTERNALSTATS_HPP diff --git a/src/hotspot/share/memory/metaspace/msMetachunk.cpp b/src/hotspot/share/memory/metaspace/metachunk.cpp similarity index 98% rename from src/hotspot/share/memory/metaspace/msMetachunk.cpp rename to src/hotspot/share/memory/metaspace/metachunk.cpp index 6c8585fd8714f..8d66cb6c5bafa 100644 --- a/src/hotspot/share/memory/metaspace/msMetachunk.cpp +++ b/src/hotspot/share/memory/metaspace/metachunk.cpp @@ -26,10 +26,10 @@ #include "precompiled.hpp" #include "logging/log.hpp" -#include "memory/metaspace/msCommon.hpp" -#include "memory/metaspace/msMetachunk.hpp" -#include "memory/metaspace/msSettings.hpp" -#include "memory/metaspace/msVirtualSpaceNode.hpp" +#include "memory/metaspace/metachunk.hpp" +#include "memory/metaspace/metaspaceCommon.hpp" +#include "memory/metaspace/metaspaceSettings.hpp" +#include "memory/metaspace/virtualSpaceNode.hpp" #include "runtime/mutexLocker.hpp" #include "utilities/align.hpp" diff --git a/src/hotspot/share/memory/metaspace/msMetachunk.hpp b/src/hotspot/share/memory/metaspace/metachunk.hpp similarity index 98% rename from src/hotspot/share/memory/metaspace/msMetachunk.hpp rename to src/hotspot/share/memory/metaspace/metachunk.hpp index 95c928b8376b1..ffaf640b123a2 100644 --- a/src/hotspot/share/memory/metaspace/msMetachunk.hpp +++ b/src/hotspot/share/memory/metaspace/metachunk.hpp @@ -23,11 +23,11 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSMETACHUNK_HPP -#define SHARE_MEMORY_METASPACE_MSMETACHUNK_HPP +#ifndef SHARE_MEMORY_METASPACE_METACHUNK_HPP +#define SHARE_MEMORY_METASPACE_METACHUNK_HPP -#include "memory/metaspace/msChunklevel.hpp" -#include "memory/metaspace/msCounter.hpp" +#include "memory/metaspace/chunklevel.hpp" +#include "memory/metaspace/counters.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" @@ -311,4 +311,4 @@ class Metachunk { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSMETACHUNK_HPP +#endif // SHARE_MEMORY_METASPACE_METACHUNK_HPP diff --git a/src/hotspot/share/memory/metaspace/msMetachunkList.cpp b/src/hotspot/share/memory/metaspace/metachunkList.cpp similarity index 98% rename from src/hotspot/share/memory/metaspace/msMetachunkList.cpp rename to src/hotspot/share/memory/metaspace/metachunkList.cpp index 68fb990e61e43..671b679a4d3fa 100644 --- a/src/hotspot/share/memory/metaspace/msMetachunkList.cpp +++ b/src/hotspot/share/memory/metaspace/metachunkList.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" -#include "memory/metaspace/msMetachunkList.hpp" +#include "memory/metaspace/metachunkList.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" #include "utilities/ostream.hpp" diff --git a/src/hotspot/share/memory/metaspace/msMetachunkList.hpp b/src/hotspot/share/memory/metaspace/metachunkList.hpp similarity index 90% rename from src/hotspot/share/memory/metaspace/msMetachunkList.hpp rename to src/hotspot/share/memory/metaspace/metachunkList.hpp index 52e7681d3cf8c..13853f5d83bfc 100644 --- a/src/hotspot/share/memory/metaspace/msMetachunkList.hpp +++ b/src/hotspot/share/memory/metaspace/metachunkList.hpp @@ -23,12 +23,12 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSMETACHUNKLIST_HPP -#define SHARE_MEMORY_METASPACE_MSMETACHUNKLIST_HPP +#ifndef SHARE_MEMORY_METASPACE_METACHUNKLIST_HPP +#define SHARE_MEMORY_METASPACE_METACHUNKLIST_HPP -#include "memory/metaspace/msCommon.hpp" -#include "memory/metaspace/msCounter.hpp" -#include "memory/metaspace/msMetachunk.hpp" +#include "memory/metaspace/counters.hpp" +#include "memory/metaspace/metachunk.hpp" +#include "memory/metaspace/metaspaceCommon.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" @@ -99,4 +99,4 @@ class MetachunkList { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSMETACHUNKLIST_HPP +#endif // SHARE_MEMORY_METASPACE_METACHUNKLIST_HPP diff --git a/src/hotspot/share/memory/metaspace/msArena.cpp b/src/hotspot/share/memory/metaspace/metaspaceArena.cpp similarity index 88% rename from src/hotspot/share/memory/metaspace/msArena.cpp rename to src/hotspot/share/memory/metaspace/metaspaceArena.cpp index 126720ba11098..ce3c5706eaaf7 100644 --- a/src/hotspot/share/memory/metaspace/msArena.cpp +++ b/src/hotspot/share/memory/metaspace/metaspaceArena.cpp @@ -27,17 +27,17 @@ #include "logging/log.hpp" #include "logging/logStream.hpp" -#include "memory/metaspace/msAllocationGuard.hpp" -#include "memory/metaspace/msArena.hpp" -#include "memory/metaspace/msArenaGrowthPolicy.hpp" -#include "memory/metaspace/msChunkManager.hpp" -#include "memory/metaspace/msCommon.hpp" -#include "memory/metaspace/msFreeBlocks.hpp" -#include "memory/metaspace/msInternalStats.hpp" -#include "memory/metaspace/msMetachunk.hpp" -#include "memory/metaspace/msSettings.hpp" -#include "memory/metaspace/msStatistics.hpp" -#include "memory/metaspace/msVirtualSpaceList.hpp" +#include "memory/metaspace/allocationGuard.hpp" +#include "memory/metaspace/chunkManager.hpp" +#include "memory/metaspace/freeBlocks.hpp" +#include "memory/metaspace/internalStats.hpp" +#include "memory/metaspace/metachunk.hpp" +#include "memory/metaspace/metaspaceArena.hpp" +#include "memory/metaspace/metaspaceArenaGrowthPolicy.hpp" +#include "memory/metaspace/metaspaceCommon.hpp" +#include "memory/metaspace/metaspaceSettings.hpp" +#include "memory/metaspace/metaspaceStatistics.hpp" +#include "memory/metaspace/virtualSpaceList.hpp" #include "runtime/atomic.hpp" #include "runtime/init.hpp" #include "services/memoryService.hpp" @@ -142,7 +142,12 @@ MetaspaceArena::MetaspaceArena(ChunkManager* chunk_manager, MetaspaceArena::~MetaspaceArena() { - DEBUG_ONLY(verify();) +#ifdef ASSERT + verify(); + if (Settings::use_allocation_guard()) { + verify_allocation_guards(); + } +#endif MutexLocker fcl(lock(), Mutex::_no_safepoint_check_flag); @@ -252,6 +257,8 @@ MetaWord* MetaspaceArena::allocate(size_t requested_word_size) { const size_t raw_word_size = get_raw_word_size_for_requested_word_size(requested_word_size); // 1) Attempt to allocate from the free blocks list + // (Note: to reduce complexity, deallocation handling is disabled if allocation guards + // are enabled, see Settings::ergo_initialize()) if (Settings::handle_deallocations() && _fbl != NULL && !_fbl->is_empty()) { p = _fbl->remove_block(raw_word_size); if (p != NULL) { @@ -352,7 +359,8 @@ MetaWord* MetaspaceArena::allocate(size_t requested_word_size) { if (p == NULL) { UL(info, "allocation failed, returned NULL."); } else { - UL2(trace, "after allocation: %u chunk(s), current:" METACHUNK_FULL_FORMAT, _chunks.count(), METACHUNK_FULL_FORMAT_ARGS(current_chunk())); + UL2(trace, "after allocation: %u chunk(s), current:" METACHUNK_FULL_FORMAT, + _chunks.count(), METACHUNK_FULL_FORMAT_ARGS(current_chunk())); UL2(trace, "returning " PTR_FORMAT ".", p2i(p)); } @@ -457,19 +465,41 @@ void MetaspaceArena::verify_locked() const { _fbl->verify(); } - // Verify guard zones of all allocations. - SOMETIMES( - if (Settings::use_allocation_guard()) { - for (const Metachunk* c = _chunks.first(); c != NULL; c = c->next()) { - const MetaWord* p = c->base(); - while (p < c->top()) { - const Prefix* pp = (const Prefix*)p; - pp->check(); - p += pp->_word_size; +} + +void MetaspaceArena::verify_allocation_guards() const { + + assert(Settings::use_allocation_guard(), "Don't call with guards disabled."); + + // Verify canaries of all allocations. + // (We can walk all allocations since at the start of a chunk an allocation + // must be present, and the allocation header contains its size, so we can + // find the next one). + for (const Metachunk* c = _chunks.first(); c != NULL; c = c->next()) { + const Prefix* first_broken_block = NULL; + int num_broken_blocks = 0; + const MetaWord* p = c->base(); + while (p < c->top()) { + const Prefix* pp = (const Prefix*)p; + if (!pp->is_valid()) { + UL2(error, "Corrupt block at " PTR_FORMAT " (chunk: " METACHUNK_FORMAT ").", + p2i(pp), METACHUNK_FORMAT_ARGS(c)); + if (first_broken_block == NULL) { + first_broken_block = pp; } + num_broken_blocks ++; } + p += pp->_word_size; + } + // After examining all blocks in a chunk, assert if any of those blocks + // was found to be corrupted. + if (first_broken_block != NULL) { + assert(false, "Corrupt block: found at least %d corrupt metaspace block(s) - " + "first corrupted block at " PTR_FORMAT ".", + num_broken_blocks, p2i(first_broken_block)); } - ) + } + } diff --git a/src/hotspot/share/memory/metaspace/msArena.hpp b/src/hotspot/share/memory/metaspace/metaspaceArena.hpp similarity index 94% rename from src/hotspot/share/memory/metaspace/msArena.hpp rename to src/hotspot/share/memory/metaspace/metaspaceArena.hpp index 8604dd6f4f58c..d51d8047738ab 100644 --- a/src/hotspot/share/memory/metaspace/msArena.hpp +++ b/src/hotspot/share/memory/metaspace/metaspaceArena.hpp @@ -23,15 +23,15 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSARENA_HPP -#define SHARE_MEMORY_METASPACE_MSARENA_HPP +#ifndef SHARE_MEMORY_METASPACE_ARENA_HPP +#define SHARE_MEMORY_METASPACE_ARENA_HPP #include "memory/allocation.hpp" -#include "memory/metaspace/msChunkManager.hpp" -#include "memory/metaspace/msCommon.hpp" -#include "memory/metaspace/msCounter.hpp" -#include "memory/metaspace/msMetachunk.hpp" -#include "memory/metaspace/msMetachunkList.hpp" +#include "memory/metaspace/chunkManager.hpp" +#include "memory/metaspace/counters.hpp" +#include "memory/metaspace/metachunk.hpp" +#include "memory/metaspace/metachunkList.hpp" +#include "memory/metaspace/metaspaceCommon.hpp" #include "memory/metaspace.hpp" class outputStream; @@ -169,6 +169,7 @@ class MetaspaceArena : public CHeapObj { DEBUG_ONLY(void verify() const;) DEBUG_ONLY(void verify_locked() const;) + DEBUG_ONLY(void verify_allocation_guards() const;) void print_on(outputStream* st) const; void print_on_locked(outputStream* st) const; @@ -177,5 +178,5 @@ class MetaspaceArena : public CHeapObj { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSARENA_HPP +#endif // SHARE_MEMORY_METASPACE_ARENA_HPP diff --git a/src/hotspot/share/memory/metaspace/msArenaGrowthPolicy.cpp b/src/hotspot/share/memory/metaspace/metaspaceArenaGrowthPolicy.cpp similarity index 98% rename from src/hotspot/share/memory/metaspace/msArenaGrowthPolicy.cpp rename to src/hotspot/share/memory/metaspace/metaspaceArenaGrowthPolicy.cpp index 8a5654b783f57..35c58c8c4422e 100644 --- a/src/hotspot/share/memory/metaspace/msArenaGrowthPolicy.cpp +++ b/src/hotspot/share/memory/metaspace/metaspaceArenaGrowthPolicy.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" -#include "memory/metaspace/msArenaGrowthPolicy.hpp" +#include "memory/metaspace/metaspaceArenaGrowthPolicy.hpp" #include "utilities/globalDefinitions.hpp" namespace metaspace { diff --git a/src/hotspot/share/memory/metaspace/msArenaGrowthPolicy.hpp b/src/hotspot/share/memory/metaspace/metaspaceArenaGrowthPolicy.hpp similarity index 92% rename from src/hotspot/share/memory/metaspace/msArenaGrowthPolicy.hpp rename to src/hotspot/share/memory/metaspace/metaspaceArenaGrowthPolicy.hpp index eee80ca692ab1..0c54d94f79281 100644 --- a/src/hotspot/share/memory/metaspace/msArenaGrowthPolicy.hpp +++ b/src/hotspot/share/memory/metaspace/metaspaceArenaGrowthPolicy.hpp @@ -23,10 +23,10 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSARENAGROWTHPOLICY_HPP -#define SHARE_MEMORY_METASPACE_MSARENAGROWTHPOLICY_HPP +#ifndef SHARE_MEMORY_METASPACE_ARENAGROWTHPOLICY_HPP +#define SHARE_MEMORY_METASPACE_ARENAGROWTHPOLICY_HPP -#include "memory/metaspace/msChunklevel.hpp" +#include "memory/metaspace/chunklevel.hpp" #include "memory/metaspace.hpp" // For Metaspace::MetaspaceType #include "utilities/debug.hpp" @@ -74,4 +74,4 @@ class ArenaGrowthPolicy { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSARENAGROWTHPOLICY_HPP +#endif // SHARE_MEMORY_METASPACE_ARENAGROWTHPOLICY_HPP diff --git a/src/hotspot/share/memory/metaspace/msCommon.cpp b/src/hotspot/share/memory/metaspace/metaspaceCommon.cpp similarity index 96% rename from src/hotspot/share/memory/metaspace/msCommon.cpp rename to src/hotspot/share/memory/metaspace/metaspaceCommon.cpp index fbb92e87efcaa..10b6b7302293d 100644 --- a/src/hotspot/share/memory/metaspace/msCommon.cpp +++ b/src/hotspot/share/memory/metaspace/metaspaceCommon.cpp @@ -25,11 +25,11 @@ #include "precompiled.hpp" -#include "memory/metaspace/msCommon.hpp" -#include "memory/metaspace/msAllocationGuard.hpp" -#include "memory/metaspace/msFreeBlocks.hpp" -#include "memory/metaspace/msSettings.hpp" -#include "memory/metaspace/msVirtualSpaceNode.hpp" +#include "memory/metaspace/allocationGuard.hpp" +#include "memory/metaspace/freeBlocks.hpp" +#include "memory/metaspace/metaspaceCommon.hpp" +#include "memory/metaspace/metaspaceSettings.hpp" +#include "memory/metaspace/virtualSpaceNode.hpp" #include "utilities/align.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/memory/metaspace/msCommon.hpp b/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp similarity index 96% rename from src/hotspot/share/memory/metaspace/msCommon.hpp rename to src/hotspot/share/memory/metaspace/metaspaceCommon.hpp index 6c9447787ab5c..6ce10199e42b3 100644 --- a/src/hotspot/share/memory/metaspace/msCommon.hpp +++ b/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp @@ -23,8 +23,8 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSCOMMON_HPP -#define SHARE_MEMORY_METASPACE_MSCOMMON_HPP +#ifndef SHARE_MEMORY_METASPACE_METASPACECOMMON_HPP +#define SHARE_MEMORY_METASPACE_METASPACECOMMON_HPP #include "runtime/globals.hpp" #include "utilities/align.hpp" @@ -99,7 +99,7 @@ void print_number_of_classes(outputStream* out, uintx classes, uintx classes_sha { static int counter_ = 0; \ if (n > 0) { \ counter_++; \ - if (counter_ > n) { \ + if (counter_ >= n) { \ counter_ = 0; \ #define END_EVERY_NTH } } } @@ -143,4 +143,4 @@ void print_number_of_classes(outputStream* out, uintx classes, uintx classes_sha } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSCOMMON_HPP +#endif // SHARE_MEMORY_METASPACE_METASPACECOMMON_HPP diff --git a/src/hotspot/share/memory/metaspace/msContext.cpp b/src/hotspot/share/memory/metaspace/metaspaceContext.cpp similarity index 94% rename from src/hotspot/share/memory/metaspace/msContext.cpp rename to src/hotspot/share/memory/metaspace/metaspaceContext.cpp index 0b6c93d29ced2..a085577033282 100644 --- a/src/hotspot/share/memory/metaspace/msContext.cpp +++ b/src/hotspot/share/memory/metaspace/metaspaceContext.cpp @@ -25,10 +25,10 @@ #include "precompiled.hpp" -#include "memory/metaspace/msChunkManager.hpp" -#include "memory/metaspace/msCommitLimiter.hpp" -#include "memory/metaspace/msContext.hpp" -#include "memory/metaspace/msVirtualSpaceList.hpp" +#include "memory/metaspace/chunkManager.hpp" +#include "memory/metaspace/commitLimiter.hpp" +#include "memory/metaspace/metaspaceContext.hpp" +#include "memory/metaspace/virtualSpaceList.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" #include "utilities/ostream.hpp" diff --git a/src/hotspot/share/memory/metaspace/msContext.hpp b/src/hotspot/share/memory/metaspace/metaspaceContext.hpp similarity index 96% rename from src/hotspot/share/memory/metaspace/msContext.hpp rename to src/hotspot/share/memory/metaspace/metaspaceContext.hpp index e2cf113b5e39e..423f59bc1d232 100644 --- a/src/hotspot/share/memory/metaspace/msContext.hpp +++ b/src/hotspot/share/memory/metaspace/metaspaceContext.hpp @@ -23,8 +23,8 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSCONTEXT_HPP -#define SHARE_MEMORY_METASPACE_MSCONTEXT_HPP +#ifndef SHARE_MEMORY_METASPACE_METASPACECONTEXT_HPP +#define SHARE_MEMORY_METASPACE_METASPACECONTEXT_HPP #include "memory/allocation.hpp" #include "memory/virtualspace.hpp" @@ -104,5 +104,5 @@ class MetaspaceContext : public CHeapObj { } // end namespace -#endif // SHARE_MEMORY_METASPACE_MSCONTEXT_HPP +#endif // SHARE_MEMORY_METASPACE_METASPACECONTEXT_HPP diff --git a/src/hotspot/share/memory/metaspace/msDCmd.cpp b/src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp similarity index 97% rename from src/hotspot/share/memory/metaspace/msDCmd.cpp rename to src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp index e067d5c26198b..0f8dcfc175038 100644 --- a/src/hotspot/share/memory/metaspace/msDCmd.cpp +++ b/src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp @@ -24,8 +24,8 @@ */ #include "precompiled.hpp" -#include "memory/metaspace/msDCmd.hpp" -#include "memory/metaspace/msReport.hpp" +#include "memory/metaspace/metaspaceDCmd.hpp" +#include "memory/metaspace/metaspaceReporter.hpp" #include "memory/resourceArea.hpp" #include "services/diagnosticCommand.hpp" #include "services/nmtCommon.hpp" diff --git a/src/hotspot/share/memory/metaspace/msDCmd.hpp b/src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp similarity index 93% rename from src/hotspot/share/memory/metaspace/msDCmd.hpp rename to src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp index db0c1a716572b..0c0f49795d5ac 100644 --- a/src/hotspot/share/memory/metaspace/msDCmd.hpp +++ b/src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp @@ -23,8 +23,8 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSDCMD_HPP -#define SHARE_MEMORY_METASPACE_MSDCMD_HPP +#ifndef SHARE_MEMORY_METASPACE_METASPACEDCMD_HPP +#define SHARE_MEMORY_METASPACE_METASPACEDCMD_HPP #include "services/diagnosticCommand.hpp" @@ -62,4 +62,4 @@ class MetaspaceDCmd : public DCmdWithParser { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSDCMD_HPP +#endif // SHARE_MEMORY_METASPACE_METASPACEDCMD_HPP diff --git a/src/hotspot/share/memory/metaspace/msReport.cpp b/src/hotspot/share/memory/metaspace/metaspaceReporter.cpp similarity index 96% rename from src/hotspot/share/memory/metaspace/msReport.cpp rename to src/hotspot/share/memory/metaspace/metaspaceReporter.cpp index d1acfc7989e6b..7fcdae4c9dfff 100644 --- a/src/hotspot/share/memory/metaspace/msReport.cpp +++ b/src/hotspot/share/memory/metaspace/metaspaceReporter.cpp @@ -26,16 +26,16 @@ #include "precompiled.hpp" #include "classfile/classLoaderData.hpp" #include "classfile/classLoaderDataGraph.hpp" -#include "memory/metaspace/msChunkHeaderPool.hpp" -#include "memory/metaspace/msChunkManager.hpp" -#include "memory/metaspace/msCommon.hpp" -#include "memory/metaspace/msInternalStats.hpp" -#include "memory/metaspace/msPrintCLDMetaspaceInfoClosure.hpp" -#include "memory/metaspace/msReport.hpp" -#include "memory/metaspace/msRunningCounters.hpp" -#include "memory/metaspace/msSettings.hpp" -#include "memory/metaspace/msStatistics.hpp" -#include "memory/metaspace/msVirtualSpaceList.hpp" +#include "memory/metaspace/chunkHeaderPool.hpp" +#include "memory/metaspace/chunkManager.hpp" +#include "memory/metaspace/internalStats.hpp" +#include "memory/metaspace/metaspaceCommon.hpp" +#include "memory/metaspace/metaspaceReporter.hpp" +#include "memory/metaspace/metaspaceSettings.hpp" +#include "memory/metaspace/metaspaceStatistics.hpp" +#include "memory/metaspace/printCLDMetaspaceInfoClosure.hpp" +#include "memory/metaspace/runningCounters.hpp" +#include "memory/metaspace/virtualSpaceList.hpp" #include "memory/metaspace.hpp" #include "runtime/os.hpp" diff --git a/src/hotspot/share/memory/metaspace/msReport.hpp b/src/hotspot/share/memory/metaspace/metaspaceReporter.hpp similarity index 93% rename from src/hotspot/share/memory/metaspace/msReport.hpp rename to src/hotspot/share/memory/metaspace/metaspaceReporter.hpp index 86770cfc83e07..45c76b69e9dc4 100644 --- a/src/hotspot/share/memory/metaspace/msReport.hpp +++ b/src/hotspot/share/memory/metaspace/metaspaceReporter.hpp @@ -23,8 +23,8 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSREPORT_HPP -#define SHARE_MEMORY_METASPACE_MSREPORT_HPP +#ifndef SHARE_MEMORY_METASPACE_METASPACEREPORTER_HPP +#define SHARE_MEMORY_METASPACE_METASPACEREPORTER_HPP #include "memory/allocation.hpp" @@ -61,4 +61,4 @@ class MetaspaceReporter : public AllStatic { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSREPORT_HPP +#endif // SHARE_MEMORY_METASPACE_METASPACEREPORTER_HPP diff --git a/src/hotspot/share/memory/metaspace/msSettings.cpp b/src/hotspot/share/memory/metaspace/metaspaceSettings.cpp similarity index 99% rename from src/hotspot/share/memory/metaspace/msSettings.cpp rename to src/hotspot/share/memory/metaspace/metaspaceSettings.cpp index 9023d19ec5c58..23fd9a6da6945 100644 --- a/src/hotspot/share/memory/metaspace/msSettings.cpp +++ b/src/hotspot/share/memory/metaspace/metaspaceSettings.cpp @@ -27,9 +27,7 @@ #include "logging/log.hpp" #include "logging/logStream.hpp" - -#include "memory/metaspace/msSettings.hpp" - +#include "memory/metaspace/metaspaceSettings.hpp" #include "runtime/java.hpp" #include "utilities/globalDefinitions.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/memory/metaspace/msSettings.hpp b/src/hotspot/share/memory/metaspace/metaspaceSettings.hpp similarity index 94% rename from src/hotspot/share/memory/metaspace/msSettings.hpp rename to src/hotspot/share/memory/metaspace/metaspaceSettings.hpp index 3d8787e6ee56b..71de6ae6ae5a8 100644 --- a/src/hotspot/share/memory/metaspace/msSettings.hpp +++ b/src/hotspot/share/memory/metaspace/metaspaceSettings.hpp @@ -23,11 +23,11 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSSETTINGS_HPP -#define SHARE_MEMORY_METASPACE_MSSETTINGS_HPP +#ifndef SHARE_MEMORY_METASPACE_METASPACESETTINGS_HPP +#define SHARE_MEMORY_METASPACE_METASPACESETTINGS_HPP #include "memory/allocation.hpp" -#include "memory/metaspace/msChunklevel.hpp" +#include "memory/metaspace/chunklevel.hpp" #include "utilities/globalDefinitions.hpp" namespace metaspace { @@ -87,4 +87,4 @@ class Settings : public AllStatic { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSSETTINGS_HPP +#endif // SHARE_MEMORY_METASPACE_METASPACESETTINGS_HPP diff --git a/src/hotspot/share/memory/metaspace/msStatistics.cpp b/src/hotspot/share/memory/metaspace/metaspaceStatistics.cpp similarity index 98% rename from src/hotspot/share/memory/metaspace/msStatistics.cpp rename to src/hotspot/share/memory/metaspace/metaspaceStatistics.cpp index c46415f8d0cf3..9fa55e1736b64 100644 --- a/src/hotspot/share/memory/metaspace/msStatistics.cpp +++ b/src/hotspot/share/memory/metaspace/metaspaceStatistics.cpp @@ -25,8 +25,8 @@ #include "precompiled.hpp" -#include "memory/metaspace/msCommon.hpp" -#include "memory/metaspace/msStatistics.hpp" +#include "memory/metaspace/metaspaceCommon.hpp" +#include "memory/metaspace/metaspaceStatistics.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/memory/metaspace/msStatistics.hpp b/src/hotspot/share/memory/metaspace/metaspaceStatistics.hpp similarity index 95% rename from src/hotspot/share/memory/metaspace/msStatistics.hpp rename to src/hotspot/share/memory/metaspace/metaspaceStatistics.hpp index c2bf03aefbdbe..529d4a6a1dc6c 100644 --- a/src/hotspot/share/memory/metaspace/msStatistics.hpp +++ b/src/hotspot/share/memory/metaspace/metaspaceStatistics.hpp @@ -23,10 +23,10 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSSTATISTICS_HPP -#define SHARE_MEMORY_METASPACE_MSSTATISTICS_HPP +#ifndef SHARE_MEMORY_METASPACE_METASPACESTATISTICS_HPP +#define SHARE_MEMORY_METASPACE_METASPACESTATISTICS_HPP -#include "memory/metaspace/msChunklevel.hpp" +#include "memory/metaspace/chunklevel.hpp" #include "memory/metaspace.hpp" // for MetadataType enum #include "utilities/globalDefinitions.hpp" @@ -161,5 +161,5 @@ struct ClmsStats { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSSTATISTICS_HPP +#endif // SHARE_MEMORY_METASPACE_METASPACESTATISTICS_HPP diff --git a/src/hotspot/share/memory/metaspace/msPrintCLDMetaspaceInfoClosure.cpp b/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.cpp similarity index 96% rename from src/hotspot/share/memory/metaspace/msPrintCLDMetaspaceInfoClosure.cpp rename to src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.cpp index dcbd6e23c3d64..0364aa8a72373 100644 --- a/src/hotspot/share/memory/metaspace/msPrintCLDMetaspaceInfoClosure.cpp +++ b/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.cpp @@ -26,9 +26,9 @@ #include "precompiled.hpp" #include "classfile/classLoaderData.inline.hpp" #include "classfile/javaClasses.hpp" -#include "memory/metaspace/msCommon.hpp" -#include "memory/metaspace/msPrintCLDMetaspaceInfoClosure.hpp" -#include "memory/metaspace/msPrintMetaspaceInfoKlassClosure.hpp" +#include "memory/metaspace/metaspaceCommon.hpp" +#include "memory/metaspace/printCLDMetaspaceInfoClosure.hpp" +#include "memory/metaspace/printMetaspaceInfoKlassClosure.hpp" #include "memory/metaspace.hpp" #include "memory/resourceArea.hpp" #include "runtime/safepoint.hpp" diff --git a/src/hotspot/share/memory/metaspace/msPrintCLDMetaspaceInfoClosure.hpp b/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.hpp similarity index 90% rename from src/hotspot/share/memory/metaspace/msPrintCLDMetaspaceInfoClosure.hpp rename to src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.hpp index 34d664491cc0c..8bbcc1ca57a8b 100644 --- a/src/hotspot/share/memory/metaspace/msPrintCLDMetaspaceInfoClosure.hpp +++ b/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.hpp @@ -23,11 +23,11 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSPRINTCLDMETASPACEINFOCLOSURE_HPP -#define SHARE_MEMORY_METASPACE_MSPRINTCLDMETASPACEINFOCLOSURE_HPP +#ifndef SHARE_MEMORY_METASPACE_PRINTCLDMETASPACEINFOCLOSURE_HPP +#define SHARE_MEMORY_METASPACE_PRINTCLDMETASPACEINFOCLOSURE_HPP #include "memory/iterator.hpp" -#include "memory/metaspace/msStatistics.hpp" +#include "memory/metaspace/metaspaceStatistics.hpp" #include "memory/metaspace.hpp" #include "utilities/globalDefinitions.hpp" @@ -66,4 +66,4 @@ class PrintCLDMetaspaceInfoClosure : public CLDClosure { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSPRINTCLDMETASPACEINFOCLOSURE_HPP +#endif // SHARE_MEMORY_METASPACE_PRINTCLDMETASPACEINFOCLOSURE_HPP diff --git a/src/hotspot/share/memory/metaspace/msPrintMetaspaceInfoKlassClosure.cpp b/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.cpp similarity index 96% rename from src/hotspot/share/memory/metaspace/msPrintMetaspaceInfoKlassClosure.cpp rename to src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.cpp index d1290501cfd04..e320004e31621 100644 --- a/src/hotspot/share/memory/metaspace/msPrintMetaspaceInfoKlassClosure.cpp +++ b/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "memory/metaspaceShared.hpp" -#include "memory/metaspace/msPrintMetaspaceInfoKlassClosure.hpp" +#include "memory/metaspace/printMetaspaceInfoKlassClosure.hpp" #include "memory/resourceArea.hpp" #include "oops/reflectionAccessorImplKlassHelper.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/memory/metaspace/msPrintMetaspaceInfoKlassClosure.hpp b/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.hpp similarity index 89% rename from src/hotspot/share/memory/metaspace/msPrintMetaspaceInfoKlassClosure.hpp rename to src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.hpp index 1bbd85fbf72dd..14d1c1a0f842f 100644 --- a/src/hotspot/share/memory/metaspace/msPrintMetaspaceInfoKlassClosure.hpp +++ b/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.hpp @@ -23,8 +23,8 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSPRINTMETASPACEINFOKLASSCLOSURE_HPP -#define SHARE_MEMORY_METASPACE_MSPRINTMETASPACEINFOKLASSCLOSURE_HPP +#ifndef SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP +#define SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP #include "memory/iterator.hpp" #include "utilities/globalDefinitions.hpp" @@ -51,4 +51,4 @@ class PrintMetaspaceInfoKlassClosure : public KlassClosure { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSPRINTMETASPACEINFOKLASSCLOSURE_HPP +#endif // SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP diff --git a/src/hotspot/share/memory/metaspace/msRootChunkArea.cpp b/src/hotspot/share/memory/metaspace/rootChunkArea.cpp similarity index 98% rename from src/hotspot/share/memory/metaspace/msRootChunkArea.cpp rename to src/hotspot/share/memory/metaspace/rootChunkArea.cpp index 5f594331fc717..37f406e011483 100644 --- a/src/hotspot/share/memory/metaspace/msRootChunkArea.cpp +++ b/src/hotspot/share/memory/metaspace/rootChunkArea.cpp @@ -27,12 +27,12 @@ #include "logging/log.hpp" #include "memory/allocation.hpp" -#include "memory/metaspace/msChunkHeaderPool.hpp" -#include "memory/metaspace/msChunkManager.hpp" -#include "memory/metaspace/msCommon.hpp" -#include "memory/metaspace/msFreeChunkList.hpp" -#include "memory/metaspace/msMetachunk.hpp" -#include "memory/metaspace/msRootChunkArea.hpp" +#include "memory/metaspace/chunkHeaderPool.hpp" +#include "memory/metaspace/chunkManager.hpp" +#include "memory/metaspace/freeChunkList.hpp" +#include "memory/metaspace/metachunk.hpp" +#include "memory/metaspace/metaspaceCommon.hpp" +#include "memory/metaspace/rootChunkArea.hpp" #include "runtime/mutexLocker.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/memory/metaspace/msRootChunkArea.hpp b/src/hotspot/share/memory/metaspace/rootChunkArea.hpp similarity index 97% rename from src/hotspot/share/memory/metaspace/msRootChunkArea.hpp rename to src/hotspot/share/memory/metaspace/rootChunkArea.hpp index da3366e3e1e85..9ba6d7360183d 100644 --- a/src/hotspot/share/memory/metaspace/msRootChunkArea.hpp +++ b/src/hotspot/share/memory/metaspace/rootChunkArea.hpp @@ -23,11 +23,11 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSROOTCHUNKAREA_HPP -#define SHARE_MEMORY_METASPACE_MSROOTCHUNKAREA_HPP +#ifndef SHARE_MEMORY_METASPACE_ROOTCHUNKAREA_HPP +#define SHARE_MEMORY_METASPACE_ROOTCHUNKAREA_HPP #include "memory/allocation.hpp" -#include "memory/metaspace/msChunklevel.hpp" +#include "memory/metaspace/chunklevel.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" @@ -204,4 +204,4 @@ class RootChunkAreaLUT { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSROOTCHUNKAREA_HPP +#endif // SHARE_MEMORY_METASPACE_ROOTCHUNKAREA_HPP diff --git a/src/hotspot/share/memory/metaspace/msRunningCounters.cpp b/src/hotspot/share/memory/metaspace/runningCounters.cpp similarity index 94% rename from src/hotspot/share/memory/metaspace/msRunningCounters.cpp rename to src/hotspot/share/memory/metaspace/runningCounters.cpp index 350010bb9a4fb..8b54202182a15 100644 --- a/src/hotspot/share/memory/metaspace/msRunningCounters.cpp +++ b/src/hotspot/share/memory/metaspace/runningCounters.cpp @@ -24,10 +24,10 @@ */ #include "precompiled.hpp" -#include "memory/metaspace/msChunkManager.hpp" -#include "memory/metaspace/msCounter.hpp" -#include "memory/metaspace/msRunningCounters.hpp" -#include "memory/metaspace/msVirtualSpaceList.hpp" +#include "memory/metaspace/chunkManager.hpp" +#include "memory/metaspace/counters.hpp" +#include "memory/metaspace/runningCounters.hpp" +#include "memory/metaspace/virtualSpaceList.hpp" namespace metaspace { diff --git a/src/hotspot/share/memory/metaspace/msRunningCounters.hpp b/src/hotspot/share/memory/metaspace/runningCounters.hpp similarity index 92% rename from src/hotspot/share/memory/metaspace/msRunningCounters.hpp rename to src/hotspot/share/memory/metaspace/runningCounters.hpp index c043c4c761a17..8ef751896d3e1 100644 --- a/src/hotspot/share/memory/metaspace/msRunningCounters.hpp +++ b/src/hotspot/share/memory/metaspace/runningCounters.hpp @@ -23,11 +23,11 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSRUNNINGCOUNTERS_HPP -#define SHARE_MEMORY_METASPACE_MSRUNNINGCOUNTERS_HPP +#ifndef SHARE_MEMORY_METASPACE_RUNNINGCOUNTERS_HPP +#define SHARE_MEMORY_METASPACE_RUNNINGCOUNTERS_HPP #include "memory/allocation.hpp" -#include "memory/metaspace/msCounter.hpp" +#include "memory/metaspace/counters.hpp" namespace metaspace { @@ -73,5 +73,4 @@ class RunningCounters : public AllStatic { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSRUNNINGCOUNTERS_HPP - +#endif // SHARE_MEMORY_METASPACE_RUNNINGCOUNTERS_HPP diff --git a/src/hotspot/share/memory/metaspace/msTestHelpers.cpp b/src/hotspot/share/memory/metaspace/testHelpers.cpp similarity index 95% rename from src/hotspot/share/memory/metaspace/msTestHelpers.cpp rename to src/hotspot/share/memory/metaspace/testHelpers.cpp index 6baa4480f4017..048b63b9fe99d 100644 --- a/src/hotspot/share/memory/metaspace/msTestHelpers.cpp +++ b/src/hotspot/share/memory/metaspace/testHelpers.cpp @@ -26,10 +26,10 @@ #include "precompiled.hpp" -#include "memory/metaspace/msArena.hpp" -#include "memory/metaspace/msArenaGrowthPolicy.hpp" -#include "memory/metaspace/msContext.hpp" -#include "memory/metaspace/msTestHelpers.hpp" +#include "memory/metaspace/metaspaceArena.hpp" +#include "memory/metaspace/metaspaceArenaGrowthPolicy.hpp" +#include "memory/metaspace/metaspaceContext.hpp" +#include "memory/metaspace/testHelpers.hpp" #include "runtime/mutexLocker.hpp" #include "utilities/debug.hpp" #include "utilities/ostream.hpp" diff --git a/src/hotspot/share/memory/metaspace/msTestHelpers.hpp b/src/hotspot/share/memory/metaspace/testHelpers.hpp similarity index 93% rename from src/hotspot/share/memory/metaspace/msTestHelpers.hpp rename to src/hotspot/share/memory/metaspace/testHelpers.hpp index 50e3c00aad8ba..5e40a179bc652 100644 --- a/src/hotspot/share/memory/metaspace/msTestHelpers.hpp +++ b/src/hotspot/share/memory/metaspace/testHelpers.hpp @@ -23,13 +23,13 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSTESTHELPERS_HPP -#define SHARE_MEMORY_METASPACE_MSTESTHELPERS_HPP +#ifndef SHARE_MEMORY_METASPACE_TESTHELPERS_HPP +#define SHARE_MEMORY_METASPACE_TESTHELPERS_HPP #include "memory/allocation.hpp" -#include "memory/metaspace/msCommitLimiter.hpp" -#include "memory/metaspace/msContext.hpp" -#include "memory/metaspace/msCounter.hpp" +#include "memory/metaspace/commitLimiter.hpp" +#include "memory/metaspace/metaspaceContext.hpp" +#include "memory/metaspace/counters.hpp" #include "memory/metaspace.hpp" #include "memory/virtualspace.hpp" #include "utilities/globalDefinitions.hpp" @@ -116,5 +116,4 @@ class MetaspaceTestContext : public CHeapObj { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSTESTHELPERS_HPP - +#endif // SHARE_MEMORY_METASPACE_TESTHELPERS_HPP diff --git a/src/hotspot/share/memory/metaspace/msVirtualSpaceList.cpp b/src/hotspot/share/memory/metaspace/virtualSpaceList.cpp similarity index 90% rename from src/hotspot/share/memory/metaspace/msVirtualSpaceList.cpp rename to src/hotspot/share/memory/metaspace/virtualSpaceList.cpp index d93d78d304c67..4d3c27e6a5174 100644 --- a/src/hotspot/share/memory/metaspace/msVirtualSpaceList.cpp +++ b/src/hotspot/share/memory/metaspace/virtualSpaceList.cpp @@ -25,13 +25,13 @@ #include "precompiled.hpp" #include "logging/log.hpp" -#include "memory/metaspace/msChunkManager.hpp" -#include "memory/metaspace/msCommitLimiter.hpp" -#include "memory/metaspace/msContext.hpp" -#include "memory/metaspace/msCounter.hpp" -#include "memory/metaspace/msFreeChunkList.hpp" -#include "memory/metaspace/msVirtualSpaceList.hpp" -#include "memory/metaspace/msVirtualSpaceNode.hpp" +#include "memory/metaspace/chunkManager.hpp" +#include "memory/metaspace/commitLimiter.hpp" +#include "memory/metaspace/counters.hpp" +#include "memory/metaspace/freeChunkList.hpp" +#include "memory/metaspace/metaspaceContext.hpp" +#include "memory/metaspace/virtualSpaceList.hpp" +#include "memory/metaspace/virtualSpaceNode.hpp" #include "memory/metaspace.hpp" #include "runtime/mutexLocker.hpp" @@ -45,7 +45,6 @@ VirtualSpaceList::VirtualSpaceList(const char* name, CommitLimiter* commit_limit : _name(name), _first_node(NULL), _can_expand(true), - _can_purge(true), _commit_limiter(commit_limiter), _reserved_words_counter(), _committed_words_counter() @@ -55,13 +54,12 @@ VirtualSpaceList::VirtualSpaceList(const char* name, CommitLimiter* commit_limit // Create a new list. The list will contain one node only, which uses the given ReservedSpace. // It will be not expandable beyond that first node. VirtualSpaceList::VirtualSpaceList(const char* name, ReservedSpace rs, CommitLimiter* commit_limiter) -: _name(name), - _first_node(NULL), - _can_expand(false), - _can_purge(false), - _commit_limiter(commit_limiter), - _reserved_words_counter(), - _committed_words_counter() + : _name(name), + _first_node(NULL), + _can_expand(false), + _commit_limiter(commit_limiter), + _reserved_words_counter(), + _committed_words_counter() { // Create the first node spanning the existing ReservedSpace. This will be the only node created // for this list since we cannot expand. @@ -96,7 +94,6 @@ void VirtualSpaceList::create_new_node() { VirtualSpaceNode* vsn = VirtualSpaceNode::create_node(Settings::virtual_space_node_default_word_size(), _commit_limiter, &_reserved_words_counter, &_committed_words_counter); - assert(vsn != NULL, "node creation failed"); vsn->set_next(_first_node); _first_node = vsn; _nodes_counter.increment(); @@ -110,13 +107,16 @@ Metachunk* VirtualSpaceList::allocate_root_chunk() { assert_lock_strong(MetaspaceExpand_lock); if (_first_node == NULL || - _first_node->free_words() == 0) { + _first_node->free_words() < chunklevel::MAX_CHUNK_WORD_SIZE) { +#ifdef ASSERT // Since all allocations from a VirtualSpaceNode happen in // root-chunk-size units, and the node size must be root-chunk-size aligned, // we should never have left-over space. - assert(_first_node == NULL || - _first_node->free_words() == 0, "Sanity"); + if (_first_node != NULL) { + assert(_first_node->free_words() == 0, "Sanity"); + } +#endif if (_can_expand) { create_new_node(); @@ -142,10 +142,6 @@ int VirtualSpaceList::purge(FreeChunkListVector* freelists) { assert_lock_strong(MetaspaceExpand_lock); - if (_can_purge == false) { - return 0; - } - UL(debug, "purging."); VirtualSpaceNode* vsn = _first_node; @@ -170,10 +166,11 @@ int VirtualSpaceList::purge(FreeChunkListVector* freelists) { prev_vsn = vsn; } vsn = next_vsn; - num++; + num ++; } - UL2(debug, "purged %d nodes (now: %d)", num_purged, num_nodes()); + UL2(debug, "purged %d nodes (before: %d, now: %d)", + num_purged, num, num_nodes()); return num_purged; diff --git a/src/hotspot/share/memory/metaspace/msVirtualSpaceList.hpp b/src/hotspot/share/memory/metaspace/virtualSpaceList.hpp similarity index 93% rename from src/hotspot/share/memory/metaspace/msVirtualSpaceList.hpp rename to src/hotspot/share/memory/metaspace/virtualSpaceList.hpp index 85a2f220fb7c9..9add1edfefd9a 100644 --- a/src/hotspot/share/memory/metaspace/msVirtualSpaceList.hpp +++ b/src/hotspot/share/memory/metaspace/virtualSpaceList.hpp @@ -23,13 +23,13 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSVIRTUALSPACELIST_HPP -#define SHARE_MEMORY_METASPACE_MSVIRTUALSPACELIST_HPP +#ifndef SHARE_MEMORY_METASPACE_VIRTUALSPACELIST_HPP +#define SHARE_MEMORY_METASPACE_VIRTUALSPACELIST_HPP #include "memory/allocation.hpp" -#include "memory/metaspace/msCounter.hpp" -#include "memory/metaspace/msCommitLimiter.hpp" -#include "memory/metaspace/msVirtualSpaceNode.hpp" +#include "memory/metaspace/counters.hpp" +#include "memory/metaspace/commitLimiter.hpp" +#include "memory/metaspace/virtualSpaceNode.hpp" #include "memory/virtualspace.hpp" #include "utilities/globalDefinitions.hpp" @@ -67,9 +67,6 @@ class VirtualSpaceList : public CHeapObj { // Whether this list can expand by allocating new nodes. const bool _can_expand; - // Whether this list can be purged. - const bool _can_purge; - // Used to check limits before committing memory. CommitLimiter* const _commit_limiter; @@ -149,5 +146,4 @@ class VirtualSpaceList : public CHeapObj { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSVIRTUALSPACELIST_HPP - +#endif // SHARE_MEMORY_METASPACE_VIRTUALSPACELIST_HPP diff --git a/src/hotspot/share/memory/metaspace/msVirtualSpaceNode.cpp b/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp similarity index 96% rename from src/hotspot/share/memory/metaspace/msVirtualSpaceNode.cpp rename to src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp index d2674c61e557e..0a85e5d1095e8 100644 --- a/src/hotspot/share/memory/metaspace/msVirtualSpaceNode.cpp +++ b/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp @@ -27,18 +27,18 @@ #include "logging/log.hpp" -#include "memory/metaspace/msChunkHeaderPool.hpp" -#include "memory/metaspace/msChunklevel.hpp" -#include "memory/metaspace/msCommitLimiter.hpp" -#include "memory/metaspace/msCommon.hpp" -#include "memory/metaspace/msCounter.hpp" -#include "memory/metaspace/msFreeChunkList.hpp" -#include "memory/metaspace/msInternalStats.hpp" -#include "memory/metaspace/msMetachunk.hpp" -#include "memory/metaspace/msRootChunkArea.hpp" -#include "memory/metaspace/msRunningCounters.hpp" -#include "memory/metaspace/msSettings.hpp" -#include "memory/metaspace/msVirtualSpaceNode.hpp" +#include "memory/metaspace/chunkHeaderPool.hpp" +#include "memory/metaspace/chunklevel.hpp" +#include "memory/metaspace/commitLimiter.hpp" +#include "memory/metaspace/counters.hpp" +#include "memory/metaspace/freeChunkList.hpp" +#include "memory/metaspace/internalStats.hpp" +#include "memory/metaspace/metachunk.hpp" +#include "memory/metaspace/metaspaceCommon.hpp" +#include "memory/metaspace/metaspaceSettings.hpp" +#include "memory/metaspace/rootChunkArea.hpp" +#include "memory/metaspace/runningCounters.hpp" +#include "memory/metaspace/virtualSpaceNode.hpp" #include "memory/metaspace.hpp" #include "runtime/globals.hpp" diff --git a/src/hotspot/share/memory/metaspace/msVirtualSpaceNode.hpp b/src/hotspot/share/memory/metaspace/virtualSpaceNode.hpp similarity index 97% rename from src/hotspot/share/memory/metaspace/msVirtualSpaceNode.hpp rename to src/hotspot/share/memory/metaspace/virtualSpaceNode.hpp index 95c3c3c869072..5146ff5617fda 100644 --- a/src/hotspot/share/memory/metaspace/msVirtualSpaceNode.hpp +++ b/src/hotspot/share/memory/metaspace/virtualSpaceNode.hpp @@ -23,14 +23,14 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_MSVIRTUALSPACENODE_HPP -#define SHARE_MEMORY_METASPACE_MSVIRTUALSPACENODE_HPP +#ifndef SHARE_MEMORY_METASPACE_VIRTUALSPACENODE_HPP +#define SHARE_MEMORY_METASPACE_VIRTUALSPACENODE_HPP #include "memory/allocation.hpp" -#include "memory/metaspace/msCommitMask.hpp" -#include "memory/metaspace/msCounter.hpp" -#include "memory/metaspace/msRootChunkArea.hpp" -#include "memory/metaspace/msSettings.hpp" +#include "memory/metaspace/commitMask.hpp" +#include "memory/metaspace/counters.hpp" +#include "memory/metaspace/metaspaceSettings.hpp" +#include "memory/metaspace/rootChunkArea.hpp" #include "memory/memRegion.hpp" #include "memory/virtualspace.hpp" #include "utilities/debug.hpp" @@ -286,4 +286,4 @@ class VirtualSpaceNode : public CHeapObj { } // namespace metaspace -#endif // SHARE_MEMORY_METASPACE_MSVIRTUALSPACENODE_HPP +#endif // SHARE_MEMORY_METASPACE_VIRTUALSPACENODE_HPP diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp index a7d117e97260a..5e5c14ba35ba0 100644 --- a/src/hotspot/share/prims/whitebox.cpp +++ b/src/hotspot/share/prims/whitebox.cpp @@ -46,7 +46,7 @@ #include "memory/heapShared.inline.hpp" #include "memory/metaspaceShared.hpp" #include "memory/metadataFactory.hpp" -#include "memory/metaspace/msTestHelpers.hpp" +#include "memory/metaspace/testHelpers.hpp" #include "memory/iterator.hpp" #include "memory/resourceArea.hpp" #include "memory/universe.hpp" diff --git a/src/hotspot/share/runtime/vmOperations.cpp b/src/hotspot/share/runtime/vmOperations.cpp index 17429cf4cd351..d0ec192b9cbfb 100644 --- a/src/hotspot/share/runtime/vmOperations.cpp +++ b/src/hotspot/share/runtime/vmOperations.cpp @@ -33,7 +33,7 @@ #include "logging/logStream.hpp" #include "logging/logConfiguration.hpp" #include "memory/heapInspection.hpp" -#include "memory/metaspace/msReport.hpp" +#include "memory/metaspace/metaspaceReporter.hpp" #include "memory/resourceArea.hpp" #include "memory/universe.hpp" #include "oops/symbol.hpp" diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp index d48a2090464fc..e884a3f3580cd 100644 --- a/src/hotspot/share/services/diagnosticCommand.cpp +++ b/src/hotspot/share/services/diagnosticCommand.cpp @@ -30,7 +30,7 @@ #include "compiler/compileBroker.hpp" #include "compiler/directivesParser.hpp" #include "gc/shared/gcVMOperations.hpp" -#include "memory/metaspace/msDCmd.hpp" +#include "memory/metaspace/metaspaceDCmd.hpp" #include "memory/resourceArea.hpp" #include "memory/universe.hpp" #include "oops/objArrayOop.inline.hpp" diff --git a/test/hotspot/gtest/metaspace/metaspaceGtestContexts.cpp b/test/hotspot/gtest/metaspace/metaspaceGtestContexts.cpp index 8f6657d3c7ca8..e39f2005af8dc 100644 --- a/test/hotspot/gtest/metaspace/metaspaceGtestContexts.cpp +++ b/test/hotspot/gtest/metaspace/metaspaceGtestContexts.cpp @@ -25,8 +25,8 @@ #include "precompiled.hpp" -#include "memory/metaspace/msChunkManager.hpp" -#include "memory/metaspace/msSettings.hpp" +#include "memory/metaspace/chunkManager.hpp" +#include "memory/metaspace/metaspaceSettings.hpp" #include "metaspaceGtestContexts.hpp" #include "metaspaceGtestCommon.hpp" diff --git a/test/hotspot/gtest/metaspace/metaspaceGtestContexts.hpp b/test/hotspot/gtest/metaspace/metaspaceGtestContexts.hpp index 1675be6cd3a26..cef3dfbdfb40d 100644 --- a/test/hotspot/gtest/metaspace/metaspaceGtestContexts.hpp +++ b/test/hotspot/gtest/metaspace/metaspaceGtestContexts.hpp @@ -27,9 +27,9 @@ #define GTEST_METASPACE_METASPACE_GTESTCONTEXTS_HPP #include "memory/allocation.hpp" -#include "memory/metaspace/msChunklevel.hpp" -#include "memory/metaspace/msMetachunk.hpp" -#include "memory/metaspace/msTestHelpers.hpp" +#include "memory/metaspace/chunklevel.hpp" +#include "memory/metaspace/metachunk.hpp" +#include "memory/metaspace/testHelpers.hpp" #include "metaspaceGtestCommon.hpp" diff --git a/test/hotspot/gtest/metaspace/metaspaceGtestRangeHelpers.hpp b/test/hotspot/gtest/metaspace/metaspaceGtestRangeHelpers.hpp index 17a197d9a75d0..6b4e94e6ebc98 100644 --- a/test/hotspot/gtest/metaspace/metaspaceGtestRangeHelpers.hpp +++ b/test/hotspot/gtest/metaspace/metaspaceGtestRangeHelpers.hpp @@ -30,7 +30,7 @@ // keeping the code small. #include "memory/allocation.hpp" -#include "memory/metaspace/msChunklevel.hpp" +#include "memory/metaspace/chunklevel.hpp" #include "runtime/os.hpp" // For os::random #include "utilities/align.hpp" #include "utilities/debug.hpp" diff --git a/test/hotspot/gtest/metaspace/test_allocationGuard.cpp b/test/hotspot/gtest/metaspace/test_allocationGuard.cpp index 1cf5e7a4ac40f..abd28e4a598d8 100644 --- a/test/hotspot/gtest/metaspace/test_allocationGuard.cpp +++ b/test/hotspot/gtest/metaspace/test_allocationGuard.cpp @@ -25,9 +25,11 @@ #include "precompiled.hpp" -#include "memory/metaspace/msArena.hpp" -#include "memory/metaspace/msTestHelpers.hpp" -#include "memory/metaspace/msSettings.hpp" +#include "memory/metaspace/metaspaceArena.hpp" +#include "memory/metaspace/metaspaceSettings.hpp" +#include "memory/metaspace/testHelpers.hpp" +#include "utilities/debug.hpp" +#include "utilities/ostream.hpp" //#define LOG_PLEASE #include "metaspaceGtestCommon.hpp" @@ -39,7 +41,6 @@ using metaspace::MetaspaceArena; using metaspace::MetaspaceTestArena; using metaspace::Settings; - // Test that overwriting memory triggers an assert if allocation guards are enabled. // Note: We use TEST_VM_ASSERT_MSG. However, an assert is only triggered if allocation // guards are enabled; if guards are disabled for the gtests, this test would fail. @@ -49,10 +50,17 @@ TEST_VM_ASSERT_MSG(metaspace, test_overwriter, "Corrupt block") { if (Settings::use_allocation_guard()) { MetaspaceGtestContext context; MetaspaceTestArena* arena = context.create_arena(Metaspace::StandardMetaspaceType); - MetaWord* p = arena->allocate(10); - MetaWord* p2 = arena->allocate(10); - p[10] = (MetaWord)0x9345; // Overwriter - // Checks should run in destructor: + // We allocate two blocks. We then write over the end of the first block, which + // should corrupt the eyecatcher at the start of the second block. + // Note: there is of course no guarantee that blocks allocated sequentially are neighbors; + // but in this case (clean standard-sized test arena and very small allocations) it can + // be safely assumed). + MetaWord* p1 = arena->allocate(8); + MetaWord* p2 = arena->allocate(2); + p1[8] = (MetaWord)0x9345; // Overwriter + // Now we delete the arena (as happens during class unloading); this will check all + // block canaries and should trigger an assert (see MetaspaceArena::verify_allocation_guards()). + tty->print_cr("Death test, please ignore the following \"Corrupt block\" printout."); delete arena; } else { assert(false, "Corrupt block fake message to satisfy tests"); diff --git a/test/hotspot/gtest/metaspace/test_arenagrowthpolicy.cpp b/test/hotspot/gtest/metaspace/test_arenagrowthpolicy.cpp index 0d57e44333a7d..47f70c84d89cc 100644 --- a/test/hotspot/gtest/metaspace/test_arenagrowthpolicy.cpp +++ b/test/hotspot/gtest/metaspace/test_arenagrowthpolicy.cpp @@ -26,8 +26,8 @@ #include "precompiled.hpp" #include "memory/metaspace.hpp" -#include "memory/metaspace/msArenaGrowthPolicy.hpp" -#include "memory/metaspace/msChunklevel.hpp" +#include "memory/metaspace/chunklevel.hpp" +#include "memory/metaspace/metaspaceArenaGrowthPolicy.hpp" //#define LOG_PLEASE #include "metaspaceGtestCommon.hpp" diff --git a/test/hotspot/gtest/metaspace/test_binlist.cpp b/test/hotspot/gtest/metaspace/test_binlist.cpp index eb2a228b38c74..126362c417700 100644 --- a/test/hotspot/gtest/metaspace/test_binlist.cpp +++ b/test/hotspot/gtest/metaspace/test_binlist.cpp @@ -25,8 +25,8 @@ #include "precompiled.hpp" -#include "memory/metaspace/msBinList.hpp" -#include "memory/metaspace/msCounter.hpp" +#include "memory/metaspace/binList.hpp" +#include "memory/metaspace/counters.hpp" //#define LOG_PLEASE #include "metaspaceGtestCommon.hpp" diff --git a/test/hotspot/gtest/metaspace/test_blocktree.cpp b/test/hotspot/gtest/metaspace/test_blocktree.cpp index 0a95df286de70..a36485e1ef6e9 100644 --- a/test/hotspot/gtest/metaspace/test_blocktree.cpp +++ b/test/hotspot/gtest/metaspace/test_blocktree.cpp @@ -25,8 +25,8 @@ #include "precompiled.hpp" -#include "memory/metaspace/msBlockTree.hpp" -#include "memory/metaspace/msCounter.hpp" +#include "memory/metaspace/blockTree.hpp" +#include "memory/metaspace/counters.hpp" #include "memory/resourceArea.hpp" // #define LOG_PLEASE diff --git a/test/hotspot/gtest/metaspace/test_chunkManager_stress.cpp b/test/hotspot/gtest/metaspace/test_chunkManager_stress.cpp index 5629513a75263..c5d19b0d7ef31 100644 --- a/test/hotspot/gtest/metaspace/test_chunkManager_stress.cpp +++ b/test/hotspot/gtest/metaspace/test_chunkManager_stress.cpp @@ -25,9 +25,9 @@ #include "precompiled.hpp" -#include "memory/metaspace/msChunkManager.hpp" -#include "memory/metaspace/msSettings.hpp" -#include "memory/metaspace/msVirtualSpaceList.hpp" +#include "memory/metaspace/chunkManager.hpp" +#include "memory/metaspace/metaspaceSettings.hpp" +#include "memory/metaspace/virtualSpaceList.hpp" //#define LOG_PLEASE #include "metaspaceGtestCommon.hpp" diff --git a/test/hotspot/gtest/metaspace/test_chunkheaderpool.cpp b/test/hotspot/gtest/metaspace/test_chunkheaderpool.cpp index b69731d79ac47..8a1194b1ef724 100644 --- a/test/hotspot/gtest/metaspace/test_chunkheaderpool.cpp +++ b/test/hotspot/gtest/metaspace/test_chunkheaderpool.cpp @@ -26,9 +26,9 @@ #include "precompiled.hpp" -#include "memory/metaspace/msChunkHeaderPool.hpp" -#include "memory/metaspace/msCounter.hpp" -#include "memory/metaspace/msMetachunk.hpp" +#include "memory/metaspace/chunkHeaderPool.hpp" +#include "memory/metaspace/counters.hpp" +#include "memory/metaspace/metachunk.hpp" //#define LOG_PLEASE #include "metaspaceGtestCommon.hpp" diff --git a/test/hotspot/gtest/metaspace/test_commitmask.cpp b/test/hotspot/gtest/metaspace/test_commitmask.cpp index e0256418e1950..0befec6591ca7 100644 --- a/test/hotspot/gtest/metaspace/test_commitmask.cpp +++ b/test/hotspot/gtest/metaspace/test_commitmask.cpp @@ -25,8 +25,8 @@ #include "precompiled.hpp" -#include "memory/metaspace/msCommitMask.hpp" -#include "memory/metaspace/msSettings.hpp" +#include "memory/metaspace/commitMask.hpp" +#include "memory/metaspace/metaspaceSettings.hpp" #include "runtime/os.hpp" #include "utilities/align.hpp" #include "utilities/debug.hpp" diff --git a/test/hotspot/gtest/metaspace/test_freeblocks.cpp b/test/hotspot/gtest/metaspace/test_freeblocks.cpp index 3149c3b9d498e..fcdb4bfa3ffd2 100644 --- a/test/hotspot/gtest/metaspace/test_freeblocks.cpp +++ b/test/hotspot/gtest/metaspace/test_freeblocks.cpp @@ -25,8 +25,8 @@ #include "precompiled.hpp" -#include "memory/metaspace/msCounter.hpp" -#include "memory/metaspace/msFreeBlocks.hpp" +#include "memory/metaspace/counters.hpp" +#include "memory/metaspace/freeBlocks.hpp" //#define LOG_PLEASE #include "metaspaceGtestCommon.hpp" diff --git a/test/hotspot/gtest/metaspace/test_internstats.cpp b/test/hotspot/gtest/metaspace/test_internstats.cpp index a5f0842a00281..3c29ac7047c56 100644 --- a/test/hotspot/gtest/metaspace/test_internstats.cpp +++ b/test/hotspot/gtest/metaspace/test_internstats.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" -#include "memory/metaspace/msInternalStats.hpp" +#include "memory/metaspace/internalStats.hpp" //#define LOG_PLEASE #include "metaspaceGtestCommon.hpp" diff --git a/test/hotspot/gtest/metaspace/test_is_metaspace_obj.cpp b/test/hotspot/gtest/metaspace/test_is_metaspace_obj.cpp index afc99ee5f18d1..97f20df1dbe2a 100644 --- a/test/hotspot/gtest/metaspace/test_is_metaspace_obj.cpp +++ b/test/hotspot/gtest/metaspace/test_is_metaspace_obj.cpp @@ -27,7 +27,7 @@ #include "memory/allocation.inline.hpp" #include "memory/metaspace.hpp" -#include "memory/metaspace/msVirtualSpaceList.hpp" +#include "memory/metaspace/virtualSpaceList.hpp" #include "runtime/mutex.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/os.hpp" diff --git a/test/hotspot/gtest/metaspace/test_metachunk.cpp b/test/hotspot/gtest/metaspace/test_metachunk.cpp index 9f45f00393176..5246d6eea5fd5 100644 --- a/test/hotspot/gtest/metaspace/test_metachunk.cpp +++ b/test/hotspot/gtest/metaspace/test_metachunk.cpp @@ -25,11 +25,11 @@ #include "precompiled.hpp" -#include "memory/metaspace/msChunkManager.hpp" -#include "memory/metaspace/msFreeChunkList.hpp" -#include "memory/metaspace/msMetachunk.hpp" -#include "memory/metaspace/msSettings.hpp" -#include "memory/metaspace/msVirtualSpaceNode.hpp" +#include "memory/metaspace/chunkManager.hpp" +#include "memory/metaspace/freeChunkList.hpp" +#include "memory/metaspace/metachunk.hpp" +#include "memory/metaspace/metaspaceSettings.hpp" +#include "memory/metaspace/virtualSpaceNode.hpp" #include "runtime/mutexLocker.hpp" #include "metaspaceGtestCommon.hpp" diff --git a/test/hotspot/gtest/metaspace/test_metachunklist.cpp b/test/hotspot/gtest/metaspace/test_metachunklist.cpp index 1f45f726d9a48..878267ba47fd5 100644 --- a/test/hotspot/gtest/metaspace/test_metachunklist.cpp +++ b/test/hotspot/gtest/metaspace/test_metachunklist.cpp @@ -25,9 +25,9 @@ #include "precompiled.hpp" -#include "memory/metaspace/msCounter.hpp" -#include "memory/metaspace/msFreeChunkList.hpp" -#include "memory/metaspace/msMetachunkList.hpp" +#include "memory/metaspace/counters.hpp" +#include "memory/metaspace/freeChunkList.hpp" +#include "memory/metaspace/metachunkList.hpp" //#define LOG_PLEASE #include "metaspaceGtestCommon.hpp" diff --git a/test/hotspot/gtest/metaspace/test_metaspace_misc.cpp b/test/hotspot/gtest/metaspace/test_metaspace_misc.cpp index 04b4122cf7dd5..6eb072ec5a40c 100644 --- a/test/hotspot/gtest/metaspace/test_metaspace_misc.cpp +++ b/test/hotspot/gtest/metaspace/test_metaspace_misc.cpp @@ -27,8 +27,8 @@ #include "classfile/classLoaderData.hpp" -#include "memory/metaspace/msChunklevel.hpp" -#include "memory/metaspace/msSettings.hpp" +#include "memory/metaspace/chunklevel.hpp" +#include "memory/metaspace/metaspaceSettings.hpp" #include "utilities/powerOfTwo.hpp" // #define LOG_PLEASE diff --git a/test/hotspot/gtest/metaspace/test_metaspacearena.cpp b/test/hotspot/gtest/metaspace/test_metaspacearena.cpp index cf169864959a2..7bdca7e971738 100644 --- a/test/hotspot/gtest/metaspace/test_metaspacearena.cpp +++ b/test/hotspot/gtest/metaspace/test_metaspacearena.cpp @@ -25,13 +25,13 @@ #include "precompiled.hpp" -#include "memory/metaspace/msArena.hpp" -#include "memory/metaspace/msArenaGrowthPolicy.hpp" -#include "memory/metaspace/msCommitLimiter.hpp" -#include "memory/metaspace/msCounter.hpp" -#include "memory/metaspace/msInternalStats.hpp" -#include "memory/metaspace/msSettings.hpp" -#include "memory/metaspace/msStatistics.hpp" +#include "memory/metaspace/commitLimiter.hpp" +#include "memory/metaspace/counters.hpp" +#include "memory/metaspace/internalStats.hpp" +#include "memory/metaspace/metaspaceArena.hpp" +#include "memory/metaspace/metaspaceArenaGrowthPolicy.hpp" +#include "memory/metaspace/metaspaceSettings.hpp" +#include "memory/metaspace/metaspaceStatistics.hpp" #include "runtime/mutex.hpp" #include "runtime/mutexLocker.hpp" #include "utilities/debug.hpp" diff --git a/test/hotspot/gtest/metaspace/test_metaspacearena_stress.cpp b/test/hotspot/gtest/metaspace/test_metaspacearena_stress.cpp index 91a03a24a9a50..64f1df922f040 100644 --- a/test/hotspot/gtest/metaspace/test_metaspacearena_stress.cpp +++ b/test/hotspot/gtest/metaspace/test_metaspacearena_stress.cpp @@ -25,11 +25,11 @@ #include "precompiled.hpp" -#include "memory/metaspace/msArena.hpp" -#include "memory/metaspace/msArenaGrowthPolicy.hpp" -#include "memory/metaspace/msChunkManager.hpp" -#include "memory/metaspace/msCounter.hpp" -#include "memory/metaspace/msStatistics.hpp" +#include "memory/metaspace/chunkManager.hpp" +#include "memory/metaspace/counters.hpp" +#include "memory/metaspace/metaspaceArena.hpp" +#include "memory/metaspace/metaspaceArenaGrowthPolicy.hpp" +#include "memory/metaspace/metaspaceStatistics.hpp" #include "runtime/mutexLocker.hpp" #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/test/hotspot/gtest/metaspace/test_virtualspacenode.cpp b/test/hotspot/gtest/metaspace/test_virtualspacenode.cpp index def068c91c888..508c7b5ae7018 100644 --- a/test/hotspot/gtest/metaspace/test_virtualspacenode.cpp +++ b/test/hotspot/gtest/metaspace/test_virtualspacenode.cpp @@ -25,14 +25,14 @@ #include "precompiled.hpp" -#include "memory/metaspace/msChunklevel.hpp" -#include "memory/metaspace/msCommitLimiter.hpp" -#include "memory/metaspace/msCounter.hpp" -#include "memory/metaspace/msFreeChunkList.hpp" -#include "memory/metaspace/msMetachunk.hpp" -#include "memory/metaspace/msMetachunkList.hpp" -#include "memory/metaspace/msSettings.hpp" -#include "memory/metaspace/msVirtualSpaceNode.hpp" +#include "memory/metaspace/chunklevel.hpp" +#include "memory/metaspace/commitLimiter.hpp" +#include "memory/metaspace/counters.hpp" +#include "memory/metaspace/freeChunkList.hpp" +#include "memory/metaspace/metachunk.hpp" +#include "memory/metaspace/metachunkList.hpp" +#include "memory/metaspace/metaspaceSettings.hpp" +#include "memory/metaspace/virtualSpaceNode.hpp" #include "runtime/mutexLocker.hpp" #include "utilities/debug.hpp"