--- old/src/share/vm/trace/trace.xml	2016-02-10 16:20:45.709137811 +0100
+++ new/src/share/vm/trace/trace.xml	2016-02-10 16:20:45.649137513 +0100
@@ -37,6 +37,7 @@
     <relation_decl id="COMP_ID" uri="vm/compiler/id"/>
     <relation_decl id="SWEEP_ID" uri="vm/code_sweeper/id"/>
     <relation_decl id="JAVA_MONITOR_ADDRESS" uri="java/monitor/address"/>
+    <relation_decl id="SAFEPOINT_ID" uri="vm/runtime/safepoint/id"/>
   </relation_decls>
 
 <!--
@@ -546,6 +547,45 @@
       <value type="INTEGER" field="fullCount" label="Full Count"/>
     </event>
 
+    <!-- Safepoint events -->
+
+    <event id="SafepointBegin" path="vm/runtime/safepoint/begin" label="Safepoint Begin"
+           description="Safepointing begin" has_thread="true" is_instant="false" has_stacktrace="false">
+      <value type="INTEGER" field="safepointId" label="Safepoint ID" relation="SAFEPOINT_ID"/>
+      <value type="INTEGER" field="totalThreadCount" label="Total Threads" description="The total number of threads at the start of safe point"/>
+      <value type="INTEGER" field="jniCriticalThreadCount" label="JNI Critical Threads" description="The number of threads in JNI critical sections"/>
+    </event>
+
+    <event id="SafepointStateSync" path="vm/runtime/safepoint/statesync" label="Safepoint State Sync"
+           description="Synchronize run state of threads" has_thread="true" is_instant="false" has_stacktrace="false">
+      <value type="INTEGER" field="safepointId" label="Safepoint ID" relation="SAFEPOINT_ID"/>
+      <value type="INTEGER" field="initialThreadCount" label="Initial Threads" description="The number of threads running at the beginning of state check"/>
+      <value type="INTEGER" field="runningThreadCount" label="Running Threads" description="The number of threads still running"/>
+      <value type="INTEGER" field="iterations" label="Iterations" description="Number of state check iterations"/>
+    </event>
+
+    <event id="SafepointWaitBlocked" path="vm/runtime/safepoint/waitblocked" label="Safepoint Wait Blocked"
+           description="Safepointing begin waiting on running threads to block" has_thread="true" is_instant="false" has_stacktrace="false">
+      <value type="INTEGER" field="safepointId" label="Safepoint ID" relation="SAFEPOINT_ID"/>
+      <value type="INTEGER" field="runningThreadCount" label="Running Threads" description="The number running of threads wait for safe point"/>
+    </event>
+
+    <event id="SafepointCleanup" path="vm/runtime/safepoint/cleanup" label="Safepoint Cleanup"
+           description="Safepointing begin running cleanup tasks" has_thread="true" is_instant="false" has_stacktrace="false">
+      <value type="INTEGER" field="safepointId" label="Safepoint ID" relation="SAFEPOINT_ID"/>
+    </event>
+
+    <event id="SafepointCleanupTask" path="vm/runtime/safepoint/cleanuptask" label="Safepoint Cleanup Task"
+           description="Safepointing begin running cleanup tasks" has_thread="true" is_instant="false" has_stacktrace="false">
+      <value type="INTEGER" field="safepointId" label="Safepoint ID" relation="SAFEPOINT_ID"/>
+      <value type="UTF8" field="name" label="Task Name" description="The task name"/>
+    </event>
+
+    <event id="SafepointEnd" path="vm/runtime/safepoint/end" label="Safepoint End" description="Safepointing end"
+           has_thread="true" is_instant="false" has_stacktrace="false">
+      <value type="INTEGER" field="safepointId" label="Safepoint ID" relation="SAFEPOINT_ID"/>
+    </event>
+
     <event id="ExecuteVMOperation" path="vm/runtime/execute_vm_operation" label="VM Operation"
         description="Execution of a VM Operation" has_thread="true">
       <value type="VMOPERATIONTYPE" field="operation" label="Operation" />