Mercurial > hg > truffle

comparison src/share/vm/services/memoryManager.cpp @ 14380:e6195383bcaf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8034080: Remove the USDT1 dtrace code from Hotspot Reviewed-by: dholmes, coleenp
author sla
date Tue, 18 Feb 2014 09:15:40 +0100
parents 190899198332
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
14379:c66479743828 14380:e6195383bcaf
34 #include "services/memoryPool.hpp" 34 #include "services/memoryPool.hpp"
35 #include "services/memoryService.hpp" 35 #include "services/memoryService.hpp"
36 #include "services/gcNotifier.hpp" 36 #include "services/gcNotifier.hpp"
37 #include "utilities/dtrace.hpp" 37 #include "utilities/dtrace.hpp"
38 38
39 #ifndef USDT2
40 HS_DTRACE_PROBE_DECL8(hotspot, mem__pool__gc__begin, char*, int, char*, int,
41 size_t, size_t, size_t, size_t);
42 HS_DTRACE_PROBE_DECL8(hotspot, mem__pool__gc__end, char*, int, char*, int,
43 size_t, size_t, size_t, size_t);
44 #endif /* !USDT2 */
45
46 MemoryManager::MemoryManager() { 39 MemoryManager::MemoryManager() {
47 _num_pools = 0; 40 _num_pools = 0;
48 (void)const_cast<instanceOop&>(_memory_mgr_obj = NULL); 41 (void)const_cast<instanceOop&>(_memory_mgr_obj = NULL);
49 } 42 }
50 43
240 // Keep memory usage of all memory pools 233 // Keep memory usage of all memory pools
241 for (int i = 0; i < MemoryService::num_memory_pools(); i++) { 234 for (int i = 0; i < MemoryService::num_memory_pools(); i++) {
242 MemoryPool* pool = MemoryService::get_memory_pool(i); 235 MemoryPool* pool = MemoryService::get_memory_pool(i);
243 MemoryUsage usage = pool->get_memory_usage(); 236 MemoryUsage usage = pool->get_memory_usage();
244 _current_gc_stat->set_before_gc_usage(i, usage); 237 _current_gc_stat->set_before_gc_usage(i, usage);
245 #ifndef USDT2
246 HS_DTRACE_PROBE8(hotspot, mem__pool__gc__begin,
247 name(), strlen(name()),
248 pool->name(), strlen(pool->name()),
249 usage.init_size(), usage.used(),
250 usage.committed(), usage.max_size());
251 #else /* USDT2 */
252 HOTSPOT_MEM_POOL_GC_BEGIN( 238 HOTSPOT_MEM_POOL_GC_BEGIN(
253 (char *) name(), strlen(name()), 239 (char *) name(), strlen(name()),
254 (char *) pool->name(), strlen(pool->name()), 240 (char *) pool->name(), strlen(pool->name()),
255 usage.init_size(), usage.used(), 241 usage.init_size(), usage.used(),
256 usage.committed(), usage.max_size()); 242 usage.committed(), usage.max_size());
257 #endif /* USDT2 */
258 } 243 }
259 } 244 }
260 } 245 }
261 246
262 // A collector MUST, even if it does not complete for some reason, 247 // A collector MUST, even if it does not complete for some reason,
278 // keep the last gc statistics for all memory pools 263 // keep the last gc statistics for all memory pools
279 for (i = 0; i < MemoryService::num_memory_pools(); i++) { 264 for (i = 0; i < MemoryService::num_memory_pools(); i++) {
280 MemoryPool* pool = MemoryService::get_memory_pool(i); 265 MemoryPool* pool = MemoryService::get_memory_pool(i);
281 MemoryUsage usage = pool->get_memory_usage(); 266 MemoryUsage usage = pool->get_memory_usage();
282 267
283 #ifndef USDT2
284 HS_DTRACE_PROBE8(hotspot, mem__pool__gc__end,
285 name(), strlen(name()),
286 pool->name(), strlen(pool->name()),
287 usage.init_size(), usage.used(),
288 usage.committed(), usage.max_size());
289 #else /* USDT2 */
290 HOTSPOT_MEM_POOL_GC_END( 268 HOTSPOT_MEM_POOL_GC_END(
291 (char *) name(), strlen(name()), 269 (char *) name(), strlen(name()),
292 (char *) pool->name(), strlen(pool->name()), 270 (char *) pool->name(), strlen(pool->name()),
293 usage.init_size(), usage.used(), 271 usage.init_size(), usage.used(),
294 usage.committed(), usage.max_size()); 272 usage.committed(), usage.max_size());
295 #endif /* USDT2 */
296 273
297 _current_gc_stat->set_after_gc_usage(i, usage); 274 _current_gc_stat->set_after_gc_usage(i, usage);
298 } 275 }
299 276
300 // Set last collection usage of the memory pools managed by this collector 277 // Set last collection usage of the memory pools managed by this collector