< prev index next >
src/share/vm/services/memoryService.cpp
Print this page
rev 8396 : imported patch epsilon-base
*** 52,61 ****
--- 52,62 ----
#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
#include "gc_implementation/parallelScavenge/psOldGen.hpp"
#include "gc_implementation/parallelScavenge/psYoungGen.hpp"
#include "services/g1MemoryPool.hpp"
#include "services/psMemoryPool.hpp"
+ #include "services/epsilonMemoryPool.hpp"
#endif // INCLUDE_ALL_GCS
GrowableArray<MemoryPool*>* MemoryService::_pools_list =
new (ResourceObj::C_HEAP, mtInternal) GrowableArray<MemoryPool*>(init_pools_list_size, true);
GrowableArray<MemoryManager*>* MemoryService::_managers_list =
*** 94,103 ****
--- 95,108 ----
}
case CollectedHeap::G1CollectedHeap : {
add_g1_heap_info(G1CollectedHeap::heap());
break;
}
+ case CollectedHeap::EpsilonCollectedHeap : {
+ add_epsilon_heap_info(EpsilonCollectedHeap::heap());
+ break;
+ }
#endif // INCLUDE_ALL_GCS
default: {
guarantee(false, "Unrecognized kind of heap");
}
}
*** 187,196 ****
--- 192,218 ----
_managers_list->append(_major_gc_manager);
add_g1YoungGen_memory_pool(g1h, _major_gc_manager, _minor_gc_manager);
add_g1OldGen_memory_pool(g1h, _major_gc_manager);
}
+
+ void MemoryService::add_epsilon_heap_info(EpsilonCollectedHeap* eh) {
+ assert(UseEpsilonGC, "sanity");
+
+ _minor_gc_manager = MemoryManager::get_epsilon_memory_manager();
+ _major_gc_manager = MemoryManager::get_epsilon_memory_manager();
+ _managers_list->append(_minor_gc_manager);
+ _managers_list->append(_major_gc_manager);
+
+ EpsilonDummyMemoryPool* dummy = new EpsilonDummyMemoryPool();
+ _minor_gc_manager->add_pool(dummy);
+ _pools_list->append(dummy);
+
+ EpsilonMemoryPool* pool = new EpsilonMemoryPool(eh);
+ _major_gc_manager->add_pool(pool);
+ _pools_list->append(pool);
+ }
#endif // INCLUDE_ALL_GCS
MemoryPool* MemoryService::add_gen(Generation* gen,
const char* name,
bool is_heap,
< prev index next >