Change the thread interface in runtime/platform and use it starting all threads

runtime/platform/thread_linux.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/thread.h"
 
 #include <errno.h>
 #include <sys/time.h>
 
 #include "platform/assert.h"
 
 namespace dart {
 
+const ThreadHandle Thread::kInvalidThreadHandle = 0;
+
 #define VALIDATE_PTHREAD_RESULT(result) \
   if (result != 0) { \
     FATAL2("pthread error: %d (%s)", result, strerror(result)); \
   }
 
 
 static void ComputeTimeSpec(struct timespec* ts, int64_t millis) {
   int64_t secs = millis / kMillisecondsPerSecond;
   int64_t nanos =
       (millis - (secs * kMillisecondsPerSecond)) * kNanosecondsPerMillisecond;
   int result = clock_gettime(CLOCK_MONOTONIC, ts);
   ASSERT(result == 0);
   ts->tv_sec += secs;
   ts->tv_nsec += nanos;
   if (ts->tv_nsec >= kNanosecondsPerSecond) {
     ts->tv_sec += 1;
     ts->tv_nsec -= kNanosecondsPerSecond;
   }
 }
 
 
-class ThreadStartData {
- public:
-  ThreadStartData(Thread::ThreadStartFunction function,
-                  uword parameter,
-                  Thread* thread)
-      : function_(function), parameter_(parameter), thread_(thread) {}
-
-  Thread::ThreadStartFunction function() const { return function_; }
-  uword parameter() const { return parameter_; }
-  Thread* thread() const { return thread_; }
-
- private:
-  Thread::ThreadStartFunction function_;
-  uword parameter_;
-  Thread* thread_;
-
-  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);
-
-  Thread::ThreadStartFunction function = data->function();
-  uword parameter = data->parameter();
-  Thread* thread = data->thread();
-  delete data;
-
-  // Call the supplied thread start function handing it its parameters.
-  function(parameter);
-
-  // When the function returns here, make sure that the thread is deleted.
-  delete thread;
-
-  return NULL;
-}
-
-
-Thread::Thread(ThreadStartFunction function, uword parameter) {
+ThreadHandle Thread::Start(ThreadStartFunction function, uword parameter) {
   pthread_attr_t attr;
   int result = pthread_attr_init(&attr);
   VALIDATE_PTHREAD_RESULT(result);
 
   result = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
   VALIDATE_PTHREAD_RESULT(result);
 
   result = pthread_attr_setstacksize(&attr, 1024 * KB);
   VALIDATE_PTHREAD_RESULT(result);
 
-  ThreadStartData* data = new ThreadStartData(function, parameter, this);
-
   pthread_t tid;
   result = pthread_create(&tid,
                           &attr,
-                          ThreadStart,
-                          data);
+                          reinterpret_cast<void* (*)(void*)>(function),  // NOLINT

[Mads Ager (google), 2012/01/20 12:35:34]

Can we typedef the 'void* (*)(void*)' function type and do the casting on the
line before? I find this hard to read.

[Søren Gjesse, 2012/01/20 13:25:45]

typedefed as PThreadStartFunction (in Mac OS file as well).

+                          reinterpret_cast<void*>(parameter));
   VALIDATE_PTHREAD_RESULT(result);
 
-  data_.tid_ = tid;
-
   result = pthread_attr_destroy(&attr);
   VALIDATE_PTHREAD_RESULT(result);
+
+  return tid;
 }
 
 
-Thread::~Thread() {
+bool Thread::Join(ThreadHandle thread, int64_t millis) {
+  int result;
+  if (millis == kNoTimeout) {
+    result = pthread_join(thread, NULL);
+    VALIDATE_PTHREAD_RESULT(result);
+    return true;
+  } else {
+    struct timespec ts;
+    ComputeTimeSpec(&ts, millis);
+    result = pthread_timedjoin_np(thread, NULL, &ts);
+    if (result == ETIMEDOUT) {
+      return false;
+    }
+    VALIDATE_PTHREAD_RESULT(result);
+    return true;
+  }
 }
 
 
 Mutex::Mutex() {
   pthread_mutexattr_t attr;
   int result = pthread_mutexattr_init(&attr);
   VALIDATE_PTHREAD_RESULT(result);
 
 #if defined(DEBUG)
   result = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
@@ skipping 127 matching lines @@
 }
 
 
 void Monitor::NotifyAll() {
   // TODO(iposva): Do we need to track lock owners?
   int result = pthread_cond_broadcast(data_.cond());
   VALIDATE_PTHREAD_RESULT(result);
 }
 
 }  // namespace dart