Mercurial > hg > graal-compiler
changeset 11115:6aa440bc1125
8015683: object_count_after_gc should have the same timestamp for all events
Reviewed-by: mgerdin, stefank
author | ehelin |
---|---|
date | Wed, 12 Jun 2013 15:21:41 +0200 |
parents | 63cffb381adc |
children | 27c53c9f3a7e |
files | src/share/vm/gc_implementation/shared/gcTrace.cpp src/share/vm/gc_implementation/shared/objectCountEventSender.cpp src/share/vm/gc_implementation/shared/objectCountEventSender.hpp |
diffstat | 3 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/shared/gcTrace.cpp Wed Jun 12 15:50:14 2013 +0200 +++ b/src/share/vm/gc_implementation/shared/gcTrace.cpp Wed Jun 12 15:21:41 2013 +0200 @@ -30,6 +30,7 @@ #include "gc_implementation/shared/objectCountEventSender.hpp" #include "memory/heapInspection.hpp" #include "memory/referenceProcessorStats.hpp" +#include "runtime/os.hpp" #include "utilities/globalDefinitions.hpp" #if INCLUDE_ALL_GCS @@ -96,17 +97,19 @@ const GCId _gc_id; const double _size_threshold_percentage; const size_t _total_size_in_words; + const jlong _timestamp; public: - ObjectCountEventSenderClosure(GCId gc_id, size_t total_size_in_words) : + ObjectCountEventSenderClosure(GCId gc_id, size_t total_size_in_words, jlong timestamp) : _gc_id(gc_id), _size_threshold_percentage(ObjectCountCutOffPercent / 100), - _total_size_in_words(total_size_in_words) + _total_size_in_words(total_size_in_words), + _timestamp(timestamp) {} virtual void do_cinfo(KlassInfoEntry* entry) { if (should_send_event(entry)) { - ObjectCountEventSender::send(entry, _gc_id); + ObjectCountEventSender::send(entry, _gc_id, _timestamp); } } @@ -129,7 +132,8 @@ HeapInspection hi(false, false, false, NULL); hi.populate_table(&cit, is_alive_cl); - ObjectCountEventSenderClosure event_sender(_shared_gc_info.id(), cit.size_of_instances_in_words()); + jlong timestamp = os::elapsed_counter(); + ObjectCountEventSenderClosure event_sender(_shared_gc_info.id(), cit.size_of_instances_in_words(), timestamp); cit.iterate(&event_sender); } }
--- a/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp Wed Jun 12 15:50:14 2013 +0200 +++ b/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp Wed Jun 12 15:21:41 2013 +0200 @@ -31,15 +31,16 @@ #if INCLUDE_SERVICES -void ObjectCountEventSender::send(const KlassInfoEntry* entry, GCId gc_id) { +void ObjectCountEventSender::send(const KlassInfoEntry* entry, GCId gc_id, jlong timestamp) { assert(Tracing::is_event_enabled(EventObjectCountAfterGC::eventId), "Only call this method if the event is enabled"); - EventObjectCountAfterGC event; + EventObjectCountAfterGC event(UNTIMED); event.set_gcId(gc_id); event.set_class(entry->klass()); event.set_count(entry->count()); event.set_totalSize(entry->words() * BytesPerWord); + event.set_endtime(timestamp); event.commit(); }
--- a/src/share/vm/gc_implementation/shared/objectCountEventSender.hpp Wed Jun 12 15:50:14 2013 +0200 +++ b/src/share/vm/gc_implementation/shared/objectCountEventSender.hpp Wed Jun 12 15:21:41 2013 +0200 @@ -35,7 +35,7 @@ class ObjectCountEventSender : public AllStatic { public: - static void send(const KlassInfoEntry* entry, GCId gc_id); + static void send(const KlassInfoEntry* entry, GCId gc_id, jlong timestamp); static bool should_send_event(); };