# HG changeset patch
# User egahlin
# Date 1508165063 -7200
# Node ID 494e1490b341bf49f600fef1db301afe5b0a1a61
# Parent  ba91aaeec3a9883ee451186de6158c1f85b6bf47
8173917: Safepoint ID is not consistent across event-based tracing events
Reviewed-by: egahlin, mgronlun
Contributed-by: robin.westberg@oracle.com

diff -r ba91aaeec3a9 -r 494e1490b341 src/hotspot/share/runtime/safepoint.cpp
--- a/src/hotspot/share/runtime/safepoint.cpp	Mon Oct 16 17:03:56 2017 +0200
+++ b/src/hotspot/share/runtime/safepoint.cpp	Mon Oct 16 16:44:23 2017 +0200
@@ -333,7 +333,8 @@
     }
 
     if (sync_event.should_commit()) {
-      sync_event.set_safepointId(safepoint_counter());
+      // Group this event together with the ones committed after the counter is increased
+      sync_event.set_safepointId(safepoint_counter() + 1);
       sync_event.set_initialThreadCount(initial_running);
       sync_event.set_runningThreadCount(_waiting_to_block);
       sync_event.set_iterations(iterations);