Index: runtime/lib/timeline.cc |
diff --git a/runtime/lib/timeline.cc b/runtime/lib/timeline.cc |
index a26c847cf74b6ba3f50e20eeda39851a73f256f2..39fa28babfc9d18178f2124c0a656b6f82c2fb6e 100644 |
--- a/runtime/lib/timeline.cc |
+++ b/runtime/lib/timeline.cc |
@@ -55,7 +55,9 @@ DEFINE_NATIVE_ENTRY(Timeline_reportTaskEvent, 6) { |
} |
int64_t pid = OS::ProcessId(); |
- int64_t tid = OSThread::ThreadIdToIntPtr(OSThread::GetCurrentThreadTraceId()); |
+ OSThread* os_thread = thread->os_thread(); |
+ ASSERT(os_thread != NULL); |
+ int64_t tid = OSThread::ThreadIdToIntPtr(os_thread->trace_id()); |
char* json = OS::SCreate(zone, |
"{\"name\":\"%s\",\"cat\":\"%s\",\"tid\":%" Pd64 ",\"pid\":%" Pd64 "," |
@@ -101,7 +103,9 @@ DEFINE_NATIVE_ENTRY(Timeline_reportCompleteEvent, 5) { |
int64_t duration = end.AsInt64Value() - start.AsInt64Value(); |
int64_t pid = OS::ProcessId(); |
- int64_t tid = OSThread::ThreadIdToIntPtr(OSThread::GetCurrentThreadTraceId()); |
+ OSThread* os_thread = thread->os_thread(); |
+ ASSERT(os_thread != NULL); |
+ int64_t tid = OSThread::ThreadIdToIntPtr(os_thread->trace_id()); |
char* json = OS::SCreate(zone, |
"{\"name\":\"%s\",\"cat\":\"%s\",\"tid\":%" Pd64 ",\"pid\":%" Pd64 "," |
@@ -144,7 +148,9 @@ DEFINE_NATIVE_ENTRY(Timeline_reportInstantEvent, 4) { |
} |
int64_t pid = OS::ProcessId(); |
- int64_t tid = OSThread::ThreadIdToIntPtr(OSThread::GetCurrentThreadTraceId()); |
+ OSThread* os_thread = thread->os_thread(); |
+ ASSERT(os_thread != NULL); |
+ int64_t tid = OSThread::ThreadIdToIntPtr(os_thread->trace_id()); |
char* json = OS::SCreate(zone, |
"{\"name\":\"%s\",\"cat\":\"%s\",\"tid\":%" Pd64 ",\"pid\":%" Pd64 "," |