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

runtime/platform/thread_win.cc

Index: runtime/platform/thread_win.cc
diff --git a/runtime/platform/thread_win.cc b/runtime/platform/thread_win.cc
index e3d76ea01643d58acdc66b03da4e7dd390fb9689..c84c1f0423546f34c8b400a258807e5bb51f7640 100644
--- a/runtime/platform/thread_win.cc
+++ b/runtime/platform/thread_win.cc
@@ -10,21 +10,20 @@
 
 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);
 };
@@ -38,33 +37,42 @@ static unsigned int __stdcall ThreadEntry(void* 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);
+  }
 }