---

yaml
---
r: 654
b: refs/heads/master
c: 616b7af
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13d6f874316c9f69ab3a29f120ce410da2290a64
+refs/heads/master: 616b7afb724a32df41eebfaf95402d008c60b411

trunk/src/Makefile

@@ -248,8 +248,7 @@ BOOT_CMIS := $(BOOT_MLS:.ml=.cmi)
 
 RUNTIME_CS := rt/sync/timer.cpp \
               rt/sync/sync.cpp \
-              rt/sync/spin_lock.cpp \
-              rt/sync/condition_variable.cpp \
+              rt/sync/lock_and_signal.cpp \
               rt/rust.cpp \
               rt/rust_builtin.cpp \
               rt/rust_crate.cpp \
@@ -383,6 +382,9 @@ self: $(CFG_COMPILER)
 TASK_XFAILS := test/run-pass/task-comm-8.rs \
                test/run-pass/task-comm-10.rs \
                test/run-pass/task-comm-15.rs \
+               test/run-pass/task-comm-12.rs \
+               test/run-pass/task-comm-2.rs \
+               test/run-pass/task-comm-9.rs \
                test/run-pass/task-life-0.rs \
                test/run-pass/alt-type-simple.rs \
                test/run-pass/many.rs
@@ -936,3 +938,11 @@ clean:
 	$(CFG_QUIET)rm -Rf $(PKG_NAME)-*.tar.gz dist
 	$(CFG_QUIET)rm -f $(foreach ext,cmx cmi cmo cma o a d exe,\
                         $(wildcard boot/*/*.$(ext) boot/*/*/*.$(ext)))
+
+
+# Local Variables:
+# mode: makefile-gmake
+# fill-column: 78;
+# buffer-file-coding-system: utf-8-unix
+# compile-command: "make -k 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+# End:

trunk/src/rt/memory_region.h

@@ -9,7 +9,7 @@
 #ifndef MEMORY_REGION_H
 #define MEMORY_REGION_H
 
-#include "sync/spin_lock.h"
+#include "sync/lock_and_signal.h"
 
 class rust_srv;
 
@@ -20,7 +20,7 @@ class memory_region {
     size_t _live_allocations;
     array_list<void *> _allocation_list;
     const bool _synchronized;
-    spin_lock _lock;
+    lock_and_signal _lock;
 public:
     enum memory_region_type {
         LOCAL = 0x1, SYNCHRONIZED = 0x2
@@ -42,4 +42,15 @@ inline void *operator new(size_t size, memory_region *region) {
     return region->malloc(size);
 }
 
+//
+// Local Variables:
+// mode: C++
+// fill-column: 78;
+// indent-tabs-mode: nil
+// c-basic-offset: 4
+// buffer-file-coding-system: utf-8-unix
+// compile-command: "make -k -C .. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// End:
+//
+
 #endif /* MEMORY_REGION_H */

trunk/src/rt/rust_internal.h

@@ -42,7 +42,7 @@ extern "C" {
 #include "util/hash_map.h"
 #include "sync/sync.h"
 #include "sync/timer.h"
-#include "sync/condition_variable.h"
+#include "sync/lock_and_signal.h"
 #include "sync/lock_free_queue.h"
 
 class rust_dom;

trunk/src/rt/rust_kernel.cpp

@@ -12,7 +12,7 @@ rust_kernel::rust_kernel(rust_srv *srv) :
 
 rust_handle<rust_dom> *
 rust_kernel::create_domain(const rust_crate *crate, const char *name) {
-    LOCK(_kernel_lock);
+    _kernel_lock.lock();
     rust_message_queue *message_queue =
         new (this) rust_message_queue(_srv, this);
     rust_srv *srv = _srv->clone();
@@ -22,21 +22,23 @@ rust_kernel::create_domain(const rust_crate *crate, const char *name) {
     message_queue->associate(handle);
     domains.append(dom);
     message_queues.append(message_queue);
-    UNLOCK(_kernel_lock);
+    _kernel_lock.unlock();
+    _kernel_lock.signal();
     return handle;
 }
 
 void
 rust_kernel::destroy_domain(rust_dom *dom) {
-    LOCK(_kernel_lock);
+    _kernel_lock.lock();
     log(rust_log::KERN, "deleting domain: " PTR ", index: %d, domains %d",
         dom, dom->list_index, domains.length());
     domains.remove(dom);
     dom->message_queue->disassociate();
     rust_srv *srv = dom->srv;
     delete dom;
     delete srv;
-    UNLOCK(_kernel_lock);
+    _kernel_lock.unlock();
+    _kernel_lock.signal();
 }
 
 rust_handle<rust_dom> *
@@ -52,29 +54,29 @@ rust_kernel::internal_get_dom_handle(rust_dom *dom) {
 
 rust_handle<rust_dom> *
 rust_kernel::get_dom_handle(rust_dom *dom) {
-    LOCK(_kernel_lock);
+    _kernel_lock.lock();
     rust_handle<rust_dom> *handle = internal_get_dom_handle(dom);
-    UNLOCK(_kernel_lock);
+    _kernel_lock.unlock();
     return handle;
 }
 
 rust_handle<rust_task> *
 rust_kernel::get_task_handle(rust_task *task) {
-    LOCK(_kernel_lock);
+    _kernel_lock.lock();
     rust_handle<rust_task> *handle = NULL;
     if (_task_handles.get(task, &handle) == false) {
         handle =
             new (this) rust_handle<rust_task>(this, task->dom->message_queue,
                                               task);
         _task_handles.put(task, handle);
     }
-    UNLOCK(_kernel_lock);
+    _kernel_lock.unlock();
     return handle;
 }
 
 rust_handle<rust_port> *
 rust_kernel::get_port_handle(rust_port *port) {
-    PLOCK(_kernel_lock);
+    _kernel_lock.lock();
     rust_handle<rust_port> *handle = NULL;
     if (_port_handles.get(port, &handle) == false) {
         handle =
@@ -83,7 +85,7 @@ rust_kernel::get_port_handle(rust_port *port) {
                                               port);
         _port_handles.put(port, handle);
     }
-    PUNLOCK(_kernel_lock);
+    _kernel_lock.unlock();
     return handle;
 }
 
@@ -126,7 +128,6 @@ rust_kernel::log(uint32_t type_bits, char const *fmt, ...) {
 
 void
 rust_kernel::pump_message_queues() {
-    LOCK(_kernel_lock);
     for (size_t i = 0; i < message_queues.length(); i++) {
         rust_message_queue *queue = message_queues[i];
         if (queue->is_associated() == false) {
@@ -137,27 +138,16 @@ rust_kernel::pump_message_queues() {
             }
         }
     }
-    UNLOCK(_kernel_lock);
 }
 
 void
 rust_kernel::start_kernel_loop() {
+    _kernel_lock.lock();
     while (_interrupt_kernel_loop == false) {
+        _kernel_lock.wait();
         pump_message_queues();
-
-        // FIXME: this is a complete hack to make the testsuite finish in a
-        // sane time when executing under valgrind. The whole message-loop
-        // system here needs replacement with an OS-level event-queue such
-        // that actually wait on inter-thread notices, rather than
-        // busy-waiting.
-
-        size_t ms = TIME_SLICE_IN_MS;
-#if defined(__WIN32__)
-        Sleep(ms);
-#else
-        usleep(ms * 1000);
-#endif
     }
+    _kernel_lock.unlock();
 }
 
 void
@@ -171,6 +161,7 @@ void
 rust_kernel::terminate_kernel_loop() {
     log(rust_log::KERN, "terminating kernel loop");
     _interrupt_kernel_loop = true;
+    _kernel_lock.signal();
     join();
 }
 

trunk/src/rt/rust_kernel.h

@@ -32,12 +32,6 @@ rust_handle :
     }
 };
 
-#define LOCK(x) x.lock();
-#define UNLOCK(x) x.unlock();
-
-#define PLOCK(x) printf("LOCKING @ %d\n", __LINE__); x.lock();
-#define PUNLOCK(x) x.unlock(); printf("UNLOCKED @ %d\n", __LINE__);
-
 /**
  * A global object shared by all thread domains. Most of the data structures
  * in this class are synchronized since they are accessed from multiple
@@ -59,9 +53,9 @@ class rust_kernel : public rust_thread {
 
     void run();
     void start_kernel_loop();
-    bool volatile _interrupt_kernel_loop;
+    bool _interrupt_kernel_loop;
 
-    spin_lock _kernel_lock;
+    lock_and_signal _kernel_lock;
 
     void terminate_kernel_loop();
     void pump_message_queues();

trunk/src/rt/rust_log.cpp

@@ -4,7 +4,6 @@
  */
 
 #include "rust_internal.h"
-#include "sync/spin_lock.h"
 #include "util/array_list.h"
 #include <stdarg.h>
 
@@ -64,7 +63,7 @@ static const char * _foreground_colors[] = { "[37m",
 /**
  * Synchronizes access to the underlying logging mechanism.
  */
-static spin_lock _log_lock;
+static lock_and_signal _log_lock;
 static uint32_t _last_thread_id;
 
 rust_log::rust_log(rust_srv *srv, rust_dom *dom) :