- Add an OSThread structure which is the generic TLS structure for all C++

runtime/lib/timeline.cc

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/bootstrap_natives.h"
 
 #include "include/dart_api.h"
 
 #include "vm/native_entry.h"
 #include "vm/object.h"
@@ skipping 37 matching lines @@
   if (recorder == NULL) {
     return Object::null();
   }
 
   if (!isolate->GetDartStream()->Enabled()) {
     // Dart stream is not enabled for this isolate, do nothing.
     return Object::null();
   }
 
   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 ","
       "\"ts\":%" Pd64 ",\"ph\":\"%s\",\"id\":%" Pd64 ", \"args\":%s}",
       name.ToCString(),
       category.ToCString(),
       tid,
       pid,
       start.AsInt64Value(),
       phase.ToCString(),
@@ skipping 25 matching lines @@
     return Object::null();
   }
 
   if (!isolate->GetDartStream()->Enabled()) {
     // Dart stream is not enabled for this isolate, do nothing.
     return Object::null();
   }
 
   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 ","
       "\"ts\":%" Pd64 ",\"ph\":\"X\",\"dur\":%" Pd64 ",\"args\":%s}",
       name.ToCString(),
       category.ToCString(),
       tid,
       pid,
       start.AsInt64Value(),
       duration,
@@ skipping 22 matching lines @@
   if (recorder == NULL) {
     return Object::null();
   }
 
   if (!isolate->GetDartStream()->Enabled()) {
     // Dart stream is not enabled for this isolate, do nothing.
     return Object::null();
   }
 
   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 ","
       "\"ts\":%" Pd64 ",\"ph\":\"I\",\"args\":%s}",
       name.ToCString(),
       category.ToCString(),
       tid,
       pid,
       start.AsInt64Value(),
       args.ToCString());
 
   TimelineEvent* event = isolate->GetDartStream()->StartEvent();
   if (event == NULL) {
     // Stream was turned off.
     return Object::null();
   }
   // json was allocated in the zone and a copy will be stored in event.
   event->SerializedJSON(json);
   event->Complete();
 
   return Object::null();
 }
 
 }  // namespace dart