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

runtime/vm/os_thread_android.cc

 // Copyright (c) 2012, 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 "platform/globals.h"  // NOLINT
 #if defined(TARGET_OS_ANDROID)
 
 #include "vm/os_thread.h"
 
 #include <errno.h>  // NOLINT
@@ skipping 46 matching lines @@
   ts->tv_nsec = (tv.tv_usec + remaining_micros) * kNanosecondsPerMicrosecond;
   if (ts->tv_nsec >= kNanosecondsPerSecond) {
     ts->tv_sec += 1;
     ts->tv_nsec -= kNanosecondsPerSecond;
   }
 }
 
 
 class ThreadStartData {
  public:
-  ThreadStartData(OSThread::ThreadStartFunction function,
+  ThreadStartData(const char* name,
+                  OSThread::ThreadStartFunction function,
                   uword parameter)
-      : function_(function), parameter_(parameter) {}
+      : name_(name), function_(function), parameter_(parameter) {}
 
+  const char* name() const { return name_; }
   OSThread::ThreadStartFunction function() const { return function_; }
   uword parameter() const { return parameter_; }
 
  private:
+  const char* name_;
   OSThread::ThreadStartFunction function_;
   uword parameter_;
 
   DISALLOW_COPY_AND_ASSIGN(ThreadStartData);
 };
 
 
 // Dispatch to the thread start function provided by the caller. This trampoline
 // is used to ensure that the thread is properly destroyed if the thread just
 // exits.
 static void* ThreadStart(void* data_ptr) {
   ThreadStartData* data = reinterpret_cast<ThreadStartData*>(data_ptr);
 
+  const char* name = data->name();
   OSThread::ThreadStartFunction function = data->function();
   uword parameter = data->parameter();
   delete data;
 
+  // Create new OSThread object and set as TLS for new thread.
+  OSThread* thread = new OSThread();
+  OSThread::SetCurrent(thread);
+  thread->set_name(name);
+
   // Call the supplied thread start function handing it its parameters.
   function(parameter);
 
   return NULL;
 }
 
 
-int OSThread::Start(ThreadStartFunction function, uword parameter) {
+int OSThread::Start(const char* name,
+                    ThreadStartFunction function,
+                    uword parameter) {
   pthread_attr_t attr;
   int result = pthread_attr_init(&attr);
   RETURN_ON_PTHREAD_FAILURE(result);
 
   result = pthread_attr_setstacksize(&attr, OSThread::GetMaxStackSize());
   RETURN_ON_PTHREAD_FAILURE(result);
 
-  ThreadStartData* data = new ThreadStartData(function, parameter);
+  ThreadStartData* data = new ThreadStartData(name, function, parameter);
 
   pthread_t tid;
   result = pthread_create(&tid, &attr, ThreadStart, data);
   RETURN_ON_PTHREAD_FAILURE(result);
 
   result = pthread_attr_destroy(&attr);
   RETURN_ON_PTHREAD_FAILURE(result);
 
   return 0;
 }
@@ skipping 277 matching lines @@
 void Monitor::NotifyAll() {
   // When running with assertions enabled we track the owner.
   ASSERT(IsOwnedByCurrentThread());
   int result = pthread_cond_broadcast(data_.cond());
   VALIDATE_PTHREAD_RESULT(result);
 }
 
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_ANDROID)