jdk-sandbox: comparison hotspot/src/share/vm/gc/shared/gcTraceSend.cpp

equal deleted inserted replaced

-:a2b2936240b9
+:1ec65b303bb7
 // All GC dependencies against the trace framework is contained within this file.
 typedef uintptr_t TraceAddress;
 void GCTracer::send_garbage_collection_event() const {
-EventGCGarbageCollection event(UNTIMED);
+EventGarbageCollection event(UNTIMED);
 if (event.should_commit()) {
 event.set_gcId(GCId::current());
 event.set_name(_shared_gc_info.name());
 event.set_cause((u2) _shared_gc_info.cause());
 event.set_sumOfPauses(_shared_gc_info.sum_of_pauses());
 e.commit();
 }
 }
 void ParallelOldTracer::send_parallel_old_event() const {
-EventGCParallelOld e(UNTIMED);
+EventParallelOldGarbageCollection e(UNTIMED);
 if (e.should_commit()) {
 e.set_gcId(GCId::current());
 e.set_densePrefix((TraceAddress)_parallel_old_gc_info.dense_prefix());
 e.set_starttime(_shared_gc_info.start_timestamp());
 e.set_endtime(_shared_gc_info.end_timestamp());
 e.commit();
 }
 }
 void YoungGCTracer::send_young_gc_event() const {
-EventGCYoungGarbageCollection e(UNTIMED);
+EventYoungGarbageCollection e(UNTIMED);
 if (e.should_commit()) {
 e.set_gcId(GCId::current());
 e.set_tenuringThreshold(_tenuring_threshold);
 e.set_starttime(_shared_gc_info.start_timestamp());
 e.set_endtime(_shared_gc_info.end_timestamp());
 size_t plab_size) const {
 EventPromoteObjectInNewPLAB event;
 if (event.should_commit()) {
 event.set_gcId(GCId::current());
-event.set_class(klass);
+event.set_objectClass(klass);
 event.set_objectSize(obj_size);
 event.set_tenured(tenured);
 event.set_tenuringAge(age);
 event.set_plabSize(plab_size);
 event.commit();
 uint age, bool tenured) const {
 EventPromoteObjectOutsidePLAB event;
 if (event.should_commit()) {
 event.set_gcId(GCId::current());
-event.set_class(klass);
+event.set_objectClass(klass);
 event.set_objectSize(obj_size);
 event.set_tenured(tenured);
 event.set_tenuringAge(age);
 event.commit();
 }
 }
 void OldGCTracer::send_old_gc_event() const {
-EventGCOldGarbageCollection e(UNTIMED);
+EventOldGarbageCollection e(UNTIMED);
 if (e.should_commit()) {
 e.set_gcId(GCId::current());
 e.set_starttime(_shared_gc_info.start_timestamp());
 e.set_endtime(_shared_gc_info.end_timestamp());
 e.commit();
 void YoungGCTracer::send_promotion_failed_event(const PromotionFailedInfo& pf_info) const {
 EventPromotionFailed e;
 if (e.should_commit()) {
 e.set_gcId(GCId::current());
-e.set_data(to_trace_struct(pf_info));
+e.set_promotionFailed(to_trace_struct(pf_info));
 e.set_thread(pf_info.thread_trace_id());
 e.commit();
 }
 }
 }
 }
 #if INCLUDE_ALL_GCS
 void G1NewTracer::send_g1_young_gc_event() {
-EventGCG1GarbageCollection e(UNTIMED);
+EventG1GarbageCollection e(UNTIMED);
 if (e.should_commit()) {
 e.set_gcId(GCId::current());
 e.set_type(_g1_young_gc_info.type());
 e.set_starttime(_shared_gc_info.start_timestamp());
 e.set_endtime(_shared_gc_info.end_timestamp());
 e.commit();
 }
 }
 void G1MMUTracer::send_g1_mmu_event(double timeSlice, double gcTime, double maxTime) {
-EventGCG1MMU e;
+EventG1MMU e;
 if (e.should_commit()) {
 e.set_gcId(GCId::current());
 e.set_timeSlice(timeSlice);
 e.set_gcTime(gcTime);
 e.set_maxGcTime(maxTime);
 e.commit();
 }
 }
 void G1NewTracer::send_evacuation_info_event(EvacuationInfo* info) {
-EventEvacuationInfo e;
+EventEvacuationInformation e;
 if (e.should_commit()) {
 e.set_gcId(GCId::current());
 e.set_cSetRegions(info->collectionset_regions());
 e.set_cSetUsedBefore(info->collectionset_used_before());
 e.set_cSetUsedAfter(info->collectionset_used_after());
 e.set_allocationRegions(info->allocation_regions());
-e.set_allocRegionsUsedBefore(info->alloc_regions_used_before());
+e.set_allocationRegionsUsedBefore(info->alloc_regions_used_before());
-e.set_allocRegionsUsedAfter(info->alloc_regions_used_before() + info->bytes_copied());
+e.set_allocationRegionsUsedAfter(info->alloc_regions_used_before() + info->bytes_copied());
 e.set_bytesCopied(info->bytes_copied());
 e.set_regionsFreed(info->regions_freed());
 e.commit();
 }
 }
 void G1NewTracer::send_evacuation_failed_event(const EvacuationFailedInfo& ef_info) const {
 EventEvacuationFailed e;
 if (e.should_commit()) {
 e.set_gcId(GCId::current());
-e.set_data(to_trace_struct(ef_info));
+e.set_evacuationFailed(to_trace_struct(ef_info));
 e.commit();
 }
 }
-static TraceStructG1EvacStats create_g1_evacstats(unsigned gcid, const G1EvacSummary& summary) {
+static TraceStructG1EvacuationStatistics
-TraceStructG1EvacStats s;
+create_g1_evacstats(unsigned gcid, const G1EvacSummary& summary) {
+TraceStructG1EvacuationStatistics s;
 s.set_gcId(gcid);
 s.set_allocated(summary.allocated() * HeapWordSize);
 s.set_wasted(summary.wasted() * HeapWordSize);
 s.set_used(summary.used() * HeapWordSize);
 s.set_undoWaste(summary.undo_wasted() * HeapWordSize);
 s.set_failureWaste(summary.failure_waste() * HeapWordSize);
 return s;
 }
 void G1NewTracer::send_young_evacuation_statistics(const G1EvacSummary& summary) const {
-EventGCG1EvacuationYoungStatistics surv_evt;
+EventG1EvacuationYoungStatistics surv_evt;
 if (surv_evt.should_commit()) {
-surv_evt.set_stats(create_g1_evacstats(GCId::current(), summary));
+surv_evt.set_statistics(create_g1_evacstats(GCId::current(), summary));
 surv_evt.commit();
 }
 }
 void G1NewTracer::send_old_evacuation_statistics(const G1EvacSummary& summary) const {
-EventGCG1EvacuationOldStatistics old_evt;
+EventG1EvacuationOldStatistics old_evt;
 if (old_evt.should_commit()) {
-old_evt.set_stats(create_g1_evacstats(GCId::current(), summary));
+old_evt.set_statistics(create_g1_evacstats(GCId::current(), summary));
 old_evt.commit();
 }
 }
 void G1NewTracer::send_basic_ihop_statistics(size_t threshold,
 size_t target_occupancy,
 size_t current_occupancy,
 size_t last_allocation_size,
 double last_allocation_duration,
 double last_marking_length) {
-EventGCG1BasicIHOP evt;
+EventG1BasicIHOP evt;
 if (evt.should_commit()) {
 evt.set_gcId(GCId::current());
 evt.set_threshold(threshold);
 evt.set_targetOccupancy(target_occupancy);
 evt.set_thresholdPercentage(target_occupancy > 0 ? ((double)threshold / target_occupancy) : 0.0);
 size_t current_occupancy,
 size_t additional_buffer_size,
 double predicted_allocation_rate,
 double predicted_marking_length,
 bool prediction_active) {
-EventGCG1AdaptiveIHOP evt;
+EventG1AdaptiveIHOP evt;
 if (evt.should_commit()) {
 evt.set_gcId(GCId::current());
 evt.set_threshold(threshold);
 evt.set_thresholdPercentage(internal_target_occupancy > 0 ? ((double)threshold / internal_target_occupancy) : 0.0);
 evt.set_internalTargetOccupancy(internal_target_occupancy);

changeset 40664	1ec65b303bb7
parent 39980	dcef6760667c
child 41076	8c6aa0873dd1