comparison src/share/vm/services/memoryService.cpp @ 8826:338b3a9e29b5

Merge
author stefank
date Mon, 25 Mar 2013 11:00:19 +0100
parents 8b4ce9870fd6 dbd5837b342f
children 42e370795a39
comparison
equal deleted inserted replaced
8801:59a41e1357ab 8826:338b3a9e29b5
58 GrowableArray<MemoryPool*>* MemoryService::_pools_list = 58 GrowableArray<MemoryPool*>* MemoryService::_pools_list =
59 new (ResourceObj::C_HEAP, mtInternal) GrowableArray<MemoryPool*>(init_pools_list_size, true); 59 new (ResourceObj::C_HEAP, mtInternal) GrowableArray<MemoryPool*>(init_pools_list_size, true);
60 GrowableArray<MemoryManager*>* MemoryService::_managers_list = 60 GrowableArray<MemoryManager*>* MemoryService::_managers_list =
61 new (ResourceObj::C_HEAP, mtInternal) GrowableArray<MemoryManager*>(init_managers_list_size, true); 61 new (ResourceObj::C_HEAP, mtInternal) GrowableArray<MemoryManager*>(init_managers_list_size, true);
62 62
63 GCMemoryManager* MemoryService::_minor_gc_manager = NULL; 63 GCMemoryManager* MemoryService::_minor_gc_manager = NULL;
64 GCMemoryManager* MemoryService::_major_gc_manager = NULL; 64 GCMemoryManager* MemoryService::_major_gc_manager = NULL;
65 MemoryPool* MemoryService::_code_heap_pool = NULL; 65 MemoryPool* MemoryService::_code_heap_pool = NULL;
66 MemoryPool* MemoryService::_metaspace_pool = NULL;
67 MemoryPool* MemoryService::_class_metaspace_pool = NULL;
66 68
67 class GcThreadCountClosure: public ThreadClosure { 69 class GcThreadCountClosure: public ThreadClosure {
68 private: 70 private:
69 int _count; 71 int _count;
70 public: 72 public:
394 true /* support_usage_threshold */); 396 true /* support_usage_threshold */);
395 MemoryManager* mgr = MemoryManager::get_code_cache_memory_manager(); 397 MemoryManager* mgr = MemoryManager::get_code_cache_memory_manager();
396 mgr->add_pool(_code_heap_pool); 398 mgr->add_pool(_code_heap_pool);
397 399
398 _pools_list->append(_code_heap_pool); 400 _pools_list->append(_code_heap_pool);
401 _managers_list->append(mgr);
402 }
403
404 void MemoryService::add_metaspace_memory_pools() {
405 _metaspace_pool = new MetaspacePool();
406 _class_metaspace_pool = new ClassMetaspacePool();
407
408 MemoryManager* mgr = MemoryManager::get_metaspace_memory_manager();
409 mgr->add_pool(_metaspace_pool);
410 mgr->add_pool(_class_metaspace_pool);
411
412 _pools_list->append(_metaspace_pool);
413 _pools_list->append(_class_metaspace_pool);
399 _managers_list->append(mgr); 414 _managers_list->append(mgr);
400 } 415 }
401 416
402 MemoryManager* MemoryService::get_memory_manager(instanceHandle mh) { 417 MemoryManager* MemoryService::get_memory_manager(instanceHandle mh) {
403 for (int i = 0; i < _managers_list->length(); i++) { 418 for (int i = 0; i < _managers_list->length(); i++) {