Mercurial > hg > truffle
diff src/share/vm/services/memoryManager.cpp @ 14909:4ca6dc0799b6
Backout jdk9 merge
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Tue, 01 Apr 2014 13:57:07 +0200 |
| parents | e6195383bcaf |
| children | 7848fc12602b |
line wrap: on
line diff
--- a/src/share/vm/services/memoryManager.cpp Tue Apr 01 14:09:03 2014 +0200 +++ b/src/share/vm/services/memoryManager.cpp Tue Apr 01 13:57:07 2014 +0200 @@ -36,6 +36,13 @@ #include "services/gcNotifier.hpp" #include "utilities/dtrace.hpp" +#ifndef USDT2 +HS_DTRACE_PROBE_DECL8(hotspot, mem__pool__gc__begin, char*, int, char*, int, + size_t, size_t, size_t, size_t); +HS_DTRACE_PROBE_DECL8(hotspot, mem__pool__gc__end, char*, int, char*, int, + size_t, size_t, size_t, size_t); +#endif /* !USDT2 */ + MemoryManager::MemoryManager() { _num_pools = 0; (void)const_cast<instanceOop&>(_memory_mgr_obj = NULL); @@ -235,11 +242,19 @@ MemoryPool* pool = MemoryService::get_memory_pool(i); MemoryUsage usage = pool->get_memory_usage(); _current_gc_stat->set_before_gc_usage(i, usage); +#ifndef USDT2 + HS_DTRACE_PROBE8(hotspot, mem__pool__gc__begin, + name(), strlen(name()), + pool->name(), strlen(pool->name()), + usage.init_size(), usage.used(), + usage.committed(), usage.max_size()); +#else /* USDT2 */ HOTSPOT_MEM_POOL_GC_BEGIN( (char *) name(), strlen(name()), (char *) pool->name(), strlen(pool->name()), usage.init_size(), usage.used(), usage.committed(), usage.max_size()); +#endif /* USDT2 */ } } } @@ -265,11 +280,19 @@ MemoryPool* pool = MemoryService::get_memory_pool(i); MemoryUsage usage = pool->get_memory_usage(); +#ifndef USDT2 + HS_DTRACE_PROBE8(hotspot, mem__pool__gc__end, + name(), strlen(name()), + pool->name(), strlen(pool->name()), + usage.init_size(), usage.used(), + usage.committed(), usage.max_size()); +#else /* USDT2 */ HOTSPOT_MEM_POOL_GC_END( (char *) name(), strlen(name()), (char *) pool->name(), strlen(pool->name()), usage.init_size(), usage.used(), usage.committed(), usage.max_size()); +#endif /* USDT2 */ _current_gc_stat->set_after_gc_usage(i, usage); }