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

runtime/platform/thread_win.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 <process.h>
 
 #include "platform/assert.h"
 
 namespace dart {
 
+const ThreadHandle Thread::kInvalidThreadHandle = 0;
+
 class ThreadStartData {
  public:
   ThreadStartData(Thread::ThreadStartFunction function,
-                  uword parameter,
-                  Thread* thread)
-      : function_(function), parameter_(parameter), thread_(thread) {}
+                  uword parameter)
+      : function_(function), parameter_(parameter) {}
 
   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 unsigned int __stdcall ThreadEntry(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;
+  // When the function returns here, make sure to close the handle.
+  CloseHandle(GetCurrentThread());
 
   return 0;
 }
 
 
-Thread::Thread(ThreadStartFunction function, uword parameter) {
-  ThreadStartData* start_data = new ThreadStartData(function, parameter, this);
+ThreadHandle Thread::Start(ThreadStartFunction function, uword parameter) {
+  ThreadStartData* start_data = new ThreadStartData(function, parameter);
   uint32_t tid;
-  data_.thread_handle_ =
-    _beginthreadex(NULL, 64 * KB, ThreadEntry, start_data, 0, &tid);
-  if (data_.thread_handle_ == -1) {
+  ThreadHandle thread =
+      _beginthreadex(NULL, 64 * KB, ThreadEntry, start_data, 0, &tid);
+  if (thread == kInvalidThreadHandle) {
     FATAL("Thread creation failed");
   }
-  data_.tid_ = tid;
+  return thread;
 }
 
 
-Thread::~Thread() {
-  CloseHandle(reinterpret_cast<HANDLE>(data_.thread_handle_));
+bool Thread::Join(ThreadHandle thread, int64_t millis) {
+  HANDLE handle = reinterpret_cast<HANDLE>(thread);
+  if (millis == kNoTimeout) {
+    DWORD result = WaitForSingleObject(handle, INFINITE);
+    if (result != WAIT_OBJECT_0) {
+      FATAL("Thread join failed");
+    }
+    return true;
+  } else {
+    DWORD result = WaitForSingleObject(handle, millis);
+    return (result == WAIT_OBJECT_0);
+  }
 }
 
 
 Mutex::Mutex() {
   // Allocate unnamed semaphore with initial count 1 and max count 1.
   data_.semaphore_ = CreateSemaphore(NULL, 1, 1, NULL);
   if (data_.semaphore_ == NULL) {
     FATAL("Mutex allocation failed");
   }
 }
@@ skipping 85 matching lines @@
 void Monitor::Notify() {
   WakeConditionVariable(&data_.cond_);
 }
 
 
 void Monitor::NotifyAll() {
   WakeAllConditionVariable(&data_.cond_);
 }
 
 }  // namespace dart