From 616b7afb724a32df41eebfaf95402d008c60b411 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Wed, 8 Sep 2010 19:13:49 -0700
Subject: Tidy up the sync dir, remove dead or mis-designed code in favour of
 OS primitives, switch rust_kernel to use a lock/signal pair and wait rather
 than spin.

---
 src/rt/sync/sync.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/rt/sync/sync.cpp')

diff --git a/src/rt/sync/sync.cpp b/src/rt/sync/sync.cpp
index fdfc065249d..c754392aece 100644
--- a/src/rt/sync/sync.cpp
+++ b/src/rt/sync/sync.cpp
@@ -11,7 +11,7 @@ void sync::yield() {
 #endif
 }
 
-rust_thread::rust_thread() : _is_running(false) {
+rust_thread::rust_thread() : _is_running(false), thread(0) {
     // Nop.
 }
 
@@ -25,7 +25,6 @@ static void *
 rust_thread_start(void *ptr) {
     rust_thread *thread = (rust_thread *) ptr;
     thread->run();
-    thread->thread = 0;
     return 0;
 }
 
@@ -46,9 +45,11 @@ rust_thread::start() {
 void
 rust_thread::join() {
 #if defined(__WIN32__)
-   WaitForSingleObject(thread, INFINITE);
+   if (thread)
+     WaitForSingleObject(thread, INFINITE);
 #else
-   pthread_join(thread, NULL);
+   if (thread)
+     pthread_join(thread, NULL);
 #endif
    thread = 0;
    _is_running = false;
-- 
cgit 1.4.1-3-g733a5