1.1 --- a/src/share/vm/services/memoryService.cpp Fri Jan 18 05:33:32 2013 -0800
1.2 +++ b/src/share/vm/services/memoryService.cpp Wed Jan 23 13:02:39 2013 -0500
1.3 @@ -43,7 +43,8 @@
1.4 #include "services/memoryPool.hpp"
1.5 #include "services/memoryService.hpp"
1.6 #include "utilities/growableArray.hpp"
1.7 -#ifndef SERIALGC
1.8 +#include "utilities/macros.hpp"
1.9 +#if INCLUDE_ALL_GCS
1.10 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
1.11 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
1.12 #include "gc_implementation/parNew/parNewGeneration.hpp"
1.13 @@ -52,7 +53,7 @@
1.14 #include "gc_implementation/parallelScavenge/psYoungGen.hpp"
1.15 #include "services/g1MemoryPool.hpp"
1.16 #include "services/psMemoryPool.hpp"
1.17 -#endif
1.18 +#endif // INCLUDE_ALL_GCS
1.19
1.20 GrowableArray<MemoryPool*>* MemoryService::_pools_list =
1.21 new (ResourceObj::C_HEAP, mtInternal) GrowableArray<MemoryPool*>(init_pools_list_size, true);
1.22 @@ -83,7 +84,7 @@
1.23 add_gen_collected_heap_info(GenCollectedHeap::heap());
1.24 break;
1.25 }
1.26 -#ifndef SERIALGC
1.27 +#if INCLUDE_ALL_GCS
1.28 case CollectedHeap::ParallelScavengeHeap : {
1.29 add_parallel_scavenge_heap_info(ParallelScavengeHeap::heap());
1.30 break;
1.31 @@ -92,7 +93,7 @@
1.32 add_g1_heap_info(G1CollectedHeap::heap());
1.33 break;
1.34 }
1.35 -#endif // SERIALGC
1.36 +#endif // INCLUDE_ALL_GCS
1.37 default: {
1.38 guarantee(false, "Unrecognized kind of heap");
1.39 }
1.40 @@ -130,22 +131,22 @@
1.41 case Generation::DefNew:
1.42 _minor_gc_manager = MemoryManager::get_copy_memory_manager();
1.43 break;
1.44 -#ifndef SERIALGC
1.45 +#if INCLUDE_ALL_GCS
1.46 case Generation::ParNew:
1.47 case Generation::ASParNew:
1.48 _minor_gc_manager = MemoryManager::get_parnew_memory_manager();
1.49 break;
1.50 -#endif // SERIALGC
1.51 +#endif // INCLUDE_ALL_GCS
1.52 default:
1.53 guarantee(false, "Unrecognized generation spec");
1.54 break;
1.55 }
1.56 if (policy->is_mark_sweep_policy()) {
1.57 _major_gc_manager = MemoryManager::get_msc_memory_manager();
1.58 -#ifndef SERIALGC
1.59 +#if INCLUDE_ALL_GCS
1.60 } else if (policy->is_concurrent_mark_sweep_policy()) {
1.61 _major_gc_manager = MemoryManager::get_cms_memory_manager();
1.62 -#endif // SERIALGC
1.63 +#endif // INCLUDE_ALL_GCS
1.64 } else {
1.65 guarantee(false, "Unknown two-gen policy");
1.66 }
1.67 @@ -159,7 +160,7 @@
1.68 add_generation_memory_pool(heap->get_gen(major), _major_gc_manager);
1.69 }
1.70
1.71 -#ifndef SERIALGC
1.72 +#if INCLUDE_ALL_GCS
1.73 // Add memory pools for ParallelScavengeHeap
1.74 // This function currently only supports two generations collected heap.
1.75 // The collector for ParallelScavengeHeap will have two memory managers.
1.76 @@ -185,7 +186,7 @@
1.77 add_g1YoungGen_memory_pool(g1h, _major_gc_manager, _minor_gc_manager);
1.78 add_g1OldGen_memory_pool(g1h, _major_gc_manager);
1.79 }
1.80 -#endif // SERIALGC
1.81 +#endif // INCLUDE_ALL_GCS
1.82
1.83 MemoryPool* MemoryService::add_gen(Generation* gen,
1.84 const char* name,
1.85 @@ -222,7 +223,7 @@
1.86 return (MemoryPool*) pool;
1.87 }
1.88
1.89 -#ifndef SERIALGC
1.90 +#if INCLUDE_ALL_GCS
1.91 MemoryPool* MemoryService::add_cms_space(CompactibleFreeListSpace* space,
1.92 const char* name,
1.93 bool is_heap,
1.94 @@ -233,7 +234,7 @@
1.95 _pools_list->append(pool);
1.96 return (MemoryPool*) pool;
1.97 }
1.98 -#endif // SERIALGC
1.99 +#endif // INCLUDE_ALL_GCS
1.100
1.101 // Add memory pool(s) for one generation
1.102 void MemoryService::add_generation_memory_pool(Generation* gen,
1.103 @@ -261,7 +262,7 @@
1.104 break;
1.105 }
1.106
1.107 -#ifndef SERIALGC
1.108 +#if INCLUDE_ALL_GCS
1.109 case Generation::ParNew:
1.110 case Generation::ASParNew:
1.111 {
1.112 @@ -282,7 +283,7 @@
1.113
1.114 break;
1.115 }
1.116 -#endif // SERIALGC
1.117 +#endif // INCLUDE_ALL_GCS
1.118
1.119 case Generation::MarkSweepCompact: {
1.120 assert(major_mgr != NULL && minor_mgr == NULL, "Should have only one manager");
1.121 @@ -293,7 +294,7 @@
1.122 break;
1.123 }
1.124
1.125 -#ifndef SERIALGC
1.126 +#if INCLUDE_ALL_GCS
1.127 case Generation::ConcurrentMarkSweep:
1.128 case Generation::ASConcurrentMarkSweep:
1.129 {
1.130 @@ -306,7 +307,7 @@
1.131 true /* support_usage_threshold */);
1.132 break;
1.133 }
1.134 -#endif // SERIALGC
1.135 +#endif // INCLUDE_ALL_GCS
1.136
1.137 default:
1.138 assert(false, "should not reach here");
1.139 @@ -326,7 +327,7 @@
1.140 }
1.141
1.142
1.143 -#ifndef SERIALGC
1.144 +#if INCLUDE_ALL_GCS
1.145 void MemoryService::add_psYoung_memory_pool(PSYoungGen* gen, MemoryManager* major_mgr, MemoryManager* minor_mgr) {
1.146 assert(major_mgr != NULL && minor_mgr != NULL, "Should have two managers");
1.147
1.148 @@ -384,7 +385,7 @@
1.149 mgr->add_pool(old_gen);
1.150 _pools_list->append(old_gen);
1.151 }
1.152 -#endif // SERIALGC
1.153 +#endif // INCLUDE_ALL_GCS
1.154
1.155 void MemoryService::add_code_heap_memory_pool(CodeHeap* heap) {
1.156 _code_heap_pool = new CodeHeapPool(heap,
1.157 @@ -534,17 +535,17 @@
1.158 TraceMemoryManagerStats::TraceMemoryManagerStats(Generation::Name kind, GCCause::Cause cause) {
1.159 switch (kind) {
1.160 case Generation::DefNew:
1.161 -#ifndef SERIALGC
1.162 +#if INCLUDE_ALL_GCS
1.163 case Generation::ParNew:
1.164 case Generation::ASParNew:
1.165 -#endif // SERIALGC
1.166 +#endif // INCLUDE_ALL_GCS
1.167 _fullGC=false;
1.168 break;
1.169 case Generation::MarkSweepCompact:
1.170 -#ifndef SERIALGC
1.171 +#if INCLUDE_ALL_GCS
1.172 case Generation::ConcurrentMarkSweep:
1.173 case Generation::ASConcurrentMarkSweep:
1.174 -#endif // SERIALGC
1.175 +#endif // INCLUDE_ALL_GCS
1.176 _fullGC=true;
1.177 break;
1.178 default:
