--- old/src/share/vm/runtime/safepoint.cpp	2017-07-12 15:25:46.794932067 +0200
+++ new/src/share/vm/runtime/safepoint.cpp	2017-07-12 15:25:46.733933138 +0200
@@ -597,7 +597,7 @@
     if (!_subtasks.is_task_claimed(SafepointSynchronize::SAFEPOINT_CLEANUP_COMPILATION_POLICY)) {
       const char* name = "compilation policy safepoint handler";
       EventSafepointCleanupTask event;
-      TraceTime timer("compilation policy safepoint handler", TRACETIME_LOG(Info, safepoint, cleanup));
+      TraceTime timer(name, TRACETIME_LOG(Info, safepoint, cleanup));
       CompilationPolicy::policy()->do_safepoint_work();
       event_safepoint_cleanup_task_commit(event, name);
     }
@@ -638,6 +638,8 @@
 // Various cleaning tasks that should be done periodically at safepoints.
 void SafepointSynchronize::do_cleanup_tasks() {
 
+  TraceTime timer("safepoint cleanup tasks", TRACETIME_LOG(Info, safepoint, cleanup));
+
   // Prepare for monitor deflation.
   DeflateMonitorCounters deflate_counters;
   ObjectSynchronizer::prepare_deflate_idle_monitors(&deflate_counters);