Mercurial > hg > truffle
diff src/share/vm/services/gcNotifier.cpp @ 6275:957c266d8bc5
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Tue, 21 Aug 2012 10:39:19 +0200 |
| parents | d2a62e0f25eb |
| children | da91efe96a93 |
line wrap: on
line diff
--- a/src/share/vm/services/gcNotifier.cpp Mon Aug 20 15:21:31 2012 +0200 +++ b/src/share/vm/services/gcNotifier.cpp Tue Aug 21 10:39:19 2012 +0200 @@ -45,7 +45,7 @@ // GC may occur between now and the creation of the notification int num_pools = MemoryService::num_memory_pools(); // stat is deallocated inside GCNotificationRequest - GCStatInfo* stat = new(ResourceObj::C_HEAP) GCStatInfo(num_pools); + GCStatInfo* stat = new(ResourceObj::C_HEAP, mtGC) GCStatInfo(num_pools); mgr->get_last_gc_stat(stat); GCNotificationRequest *request = new GCNotificationRequest(os::javaTimeMillis(),mgr,action,cause,stat); addRequest(request); @@ -163,8 +163,8 @@ constructor_args.push_oop(gcInfo_instance); constructor_args.push_oop(getGcInfoBuilder(gcManager,THREAD)); constructor_args.push_long(gcStatInfo->gc_index()); - constructor_args.push_long(gcStatInfo->start_time()); - constructor_args.push_long(gcStatInfo->end_time()); + constructor_args.push_long(Management::ticks_to_ms(gcStatInfo->start_time())); + constructor_args.push_long(Management::ticks_to_ms(gcStatInfo->end_time())); constructor_args.push_oop(usage_before_gc_ah); constructor_args.push_oop(usage_after_gc_ah); constructor_args.push_oop(extra_array);