--- old/src/share/vm/code/codeBlob.hpp 2014-09-30 15:03:50.762871969 +0200 +++ new/src/share/vm/code/codeBlob.hpp 2014-09-30 15:03:50.438871984 +0200 @@ -36,7 +36,7 @@ enum { MethodNonProfiled = 0, // Execution level 1 and 4 (non-profiled) nmethods (including native nmethods) MethodProfiled = 1, // Execution level 2 and 3 (profiled) nmethods - NonMethod = 2, // Non-methods like Buffers, Adapters and Runtime Stubs + NonMethod = 2, // Non-nmethods like Buffers, Adapters and Runtime Stubs All = 3, // All types (No code cache segmentation) NumTypes = 4 // Number of CodeBlobTypes }; --- old/test/compiler/codecache/CheckSegmentedCodeCache.java 2014-09-30 15:03:50.806871967 +0200 +++ new/test/compiler/codecache/CheckSegmentedCodeCache.java 2014-09-30 15:03:50.426871985 +0200 @@ -32,7 +32,7 @@ */ public class CheckSegmentedCodeCache { // Code heap names - private static final String NON_METHOD = "CodeHeap 'non-methods'"; + private static final String NON_METHOD = "CodeHeap 'non-nmethods'"; private static final String PROFILED = "CodeHeap 'profiled nmethods'"; private static final String NON_PROFILED = "CodeHeap 'non-profiled nmethods'"; @@ -40,7 +40,7 @@ OutputAnalyzer out = new OutputAnalyzer(pb.start()); if (enabled) { try { - // Non-method code heap should be always available with the segmented code cache + // Non-nmethod code heap should be always available with the segmented code cache out.shouldContain(NON_METHOD); } catch (RuntimeException e) { // TieredCompilation is disabled in a client VM @@ -111,7 +111,7 @@ "-XX:+PrintCodeCache", "-version"); verifyCodeHeapNotExists(pb, PROFILED); - // Fails with too small non-method code heap size + // Fails with too small non-nmethod code heap size pb = ProcessTools.createJavaProcessBuilder("-XX:NonMethodCodeHeapSize=100K"); failsWith(pb, "Invalid NonMethodCodeHeapSize"); @@ -127,6 +127,6 @@ pb = ProcessTools.createJavaProcessBuilder("-XX:+SegmentedCodeCache", "-XX:ReservedCodeCacheSize=1700K", "-XX:InitialCodeCacheSize=100K"); - failsWith(pb, "Not enough space in non-method code heap to run VM"); + failsWith(pb, "Not enough space in non-nmethod code heap to run VM"); } } --- old/src/share/vm/code/codeCache.hpp 2014-09-30 15:03:50.830871966 +0200 +++ new/src/share/vm/code/codeCache.hpp 2014-09-30 15:03:50.526871980 +0200 @@ -41,7 +41,7 @@ // The CodeCache consists of one or more CodeHeaps, each of which contains // CodeBlobs of a specific CodeBlobType. Currently heaps for the following // types are available: -// - Non-methods: Non-methods like Buffers, Adapters and Runtime Stubs +// - Non-methods: Non-nmethods like Buffers, Adapters and Runtime Stubs // - Profiled nmethods: nmethods that are profiled, i.e., those // executed at level 2 or 3 // - Non-Profiled nmethods: nmethods that are not profiled, i.e., those --- old/test/serviceability/dcmd/CodeCacheTest.java 2014-09-30 15:03:50.926871962 +0200 +++ new/test/serviceability/dcmd/CodeCacheTest.java 2014-09-30 15:03:50.514871981 +0200 @@ -52,7 +52,7 @@ * * Expected output with code cache segmentation (number of segments may change): * - * CodeHeap 'non-methods': size=5696Kb used=2236Kb max_used=2238Kb free=3459Kb + * CodeHeap 'non-nmethods': size=5696Kb used=2236Kb max_used=2238Kb free=3459Kb * bounds [0x00007fa0f0ffe000, 0x00007fa0f126e000, 0x00007fa0f158e000] * CodeHeap 'profiled nmethods': size=120036Kb used=8Kb max_used=8Kb free=120027Kb * bounds [0x00007fa0f158e000, 0x00007fa0f17fe000, 0x00007fa0f8ac7000] @@ -95,7 +95,7 @@ // Tiered compilation: use all segments segmentsCount = 3; } else { - // No TieredCompilation: only non-method and non-profiled segment + // No TieredCompilation: only non-nmethod and non-profiled segment segmentsCount = 2; } --- old/src/share/vm/runtime/globals.hpp 2014-09-30 15:03:51.034871957 +0200 +++ new/src/share/vm/runtime/globals.hpp 2014-09-30 15:03:50.494871982 +0200 @@ -3371,7 +3371,7 @@ "Size of code heap with profiled methods (in bytes)") \ \ product_pd(uintx, NonMethodCodeHeapSize, \ - "Size of code heap with non-methods (in bytes)") \ + "Size of code heap with non-nmethods (in bytes)") \ \ product(uintx, CodeCacheMinimumFreeSpace, 500*K, \ "When less than X space left, we stop compiling") \ --- old/src/share/vm/code/codeCache.cpp 2014-09-30 15:03:51.026871957 +0200 +++ new/src/share/vm/code/codeCache.cpp 2014-09-30 15:03:50.506871981 +0200 @@ -213,7 +213,7 @@ // ---------- high ----------- // Non-profiled nmethods // Profiled nmethods - // Non-methods + // Non-nmethods // ---------- low ------------ ReservedCodeSpace rs = reserve_heap_memory(non_profiled_size + profiled_size + non_method_size); ReservedSpace non_method_space = rs.first_part(non_method_size); @@ -221,12 +221,12 @@ ReservedSpace profiled_space = rest.first_part(profiled_size); ReservedSpace non_profiled_space = rest.last_part(profiled_size); - // Non-methods (stubs, adapters, ...) - add_heap(non_method_space, "Code Heap 'non-methods'", init_non_method_size, CodeBlobType::NonMethod); + // Non-nmethods (stubs, adapters, ...) + add_heap(non_method_space, "CodeHeap 'non-nmethods'", init_non_method_size, CodeBlobType::NonMethod); // Tier 2 and tier 3 (profiled) methods - add_heap(profiled_space, "Code Heap 'profiled nmethods'", init_profiled_size, CodeBlobType::MethodProfiled); + add_heap(profiled_space, "CodeHeap 'profiled nmethods'", init_profiled_size, CodeBlobType::MethodProfiled); // Tier 1 and tier 4 (non-profiled) methods and native methods - add_heap(non_profiled_space, "Code Heap 'non-profiled nmethods'", init_non_profiled_size, CodeBlobType::MethodNonProfiled); + add_heap(non_profiled_space, "CodeHeap 'non-profiled nmethods'", init_non_profiled_size, CodeBlobType::MethodNonProfiled); } ReservedCodeSpace CodeCache::reserve_heap_memory(size_t size) { @@ -366,7 +366,7 @@ if (SegmentedCodeCache) { tty->print("%s", heap->name()); } else { - tty->print("Code Cache"); + tty->print("CodeCache"); } tty->print_cr(" extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" SSIZE_FORMAT " bytes)", (intptr_t)heap->low_boundary(), (intptr_t)heap->high(), @@ -820,7 +820,7 @@ } else { // Use a single code heap ReservedCodeSpace rs = reserve_heap_memory(ReservedCodeCacheSize); - add_heap(rs, "Code Cache", InitialCodeCacheSize, CodeBlobType::All); + add_heap(rs, "CodeCache", InitialCodeCacheSize, CodeBlobType::All); } // Initialize ICache flush mechanism @@ -1241,7 +1241,7 @@ if (SegmentedCodeCache) { st->print("%s:", heap->name()); } else { - st->print("Code Cache:"); + st->print("CodeCache:"); } st->print_cr(" size=" SIZE_FORMAT "Kb used=" SIZE_FORMAT "Kb max_used=" SIZE_FORMAT "Kb free=" SIZE_FORMAT "Kb",