comparison src/share/vm/services/memoryManager.cpp @ 11198:1e6d5dec4a4e

Merge.
author Christian Humer <christian.humer@gmail.com>
date Mon, 05 Aug 2013 13:20:06 +0200
parents 71963b3f802a
children 190899198332
comparison
equal deleted inserted replaced
11197:3479ab380552 11198:1e6d5dec4a4e
57 pool->add_manager(this); 57 pool->add_manager(this);
58 } 58 }
59 59
60 MemoryManager* MemoryManager::get_code_cache_memory_manager() { 60 MemoryManager* MemoryManager::get_code_cache_memory_manager() {
61 return (MemoryManager*) new CodeCacheMemoryManager(); 61 return (MemoryManager*) new CodeCacheMemoryManager();
62 }
63
64 MemoryManager* MemoryManager::get_metaspace_memory_manager() {
65 return (MemoryManager*) new MetaspaceMemoryManager();
62 } 66 }
63 67
64 GCMemoryManager* MemoryManager::get_copy_memory_manager() { 68 GCMemoryManager* MemoryManager::get_copy_memory_manager() {
65 return (GCMemoryManager*) new CopyMemoryManager(); 69 return (GCMemoryManager*) new CopyMemoryManager();
66 } 70 }