---

yaml
---
r: 15257
b: refs/heads/try
c: de47fcf
h: refs/heads/master
i:
  15255: ee4b7bc
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 21064637ed8b8259d1305f21ace12c40b9561706
+refs/heads/try: de47fcfdf9404d53940099f5e7810bdb2bf37af3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/mk/rt.mk

@@ -50,8 +50,11 @@ RUNTIME_CS_$(1) := \
               rt/rust_builtin.cpp \
               rt/rust_run_program.cpp \
               rt/rust_env.cpp \
-              rt/rust_task_thread.cpp \
+              rt/rust_sched_loop.cpp \
+              rt/rust_sched_launcher.cpp \
+              rt/rust_sched_driver.cpp \
               rt/rust_scheduler.cpp \
+              rt/rust_sched_reaper.cpp \
               rt/rust_task.cpp \
               rt/rust_stack.cpp \
               rt/rust_port.cpp \

branches/try/mk/tests.mk

@@ -74,34 +74,13 @@ check-full: tidy all check-stage1 check-stage2 check-stage3 \
 ifdef CFG_NOTIDY
 tidy:
 else
-
-ALL_CS := $(wildcard $(S)src/rt/*.cpp \
-                     $(S)src/rt/*/*.cpp \
-                     $(S)src/rt/*/*/*.cpp \
-                     $(S)srcrustllvm/*.cpp)
-ALL_CS := $(filter-out $(S)src/rt/bigint/bigint_ext.cpp \
-                       $(S)src/rt/bigint/bigint_int.cpp \
-	,$(ALL_CS))
-ALL_HS := $(wildcard $(S)src/rt/*.h \
-                     $(S)src/rt/*/*.h \
-                     $(S)src/rt/*/*/*.h \
-                     $(S)srcrustllvm/*.h)
-ALL_HS := $(filter-out $(S)src/rt/vg/valgrind.h \
-                       $(S)src/rt/vg/memcheck.h \
-                       $(S)src/rt/uthash/uthash.h \
-                       $(S)src/rt/uthash/utlist.h \
-                       $(S)src/rt/msvc/typeof.h \
-                       $(S)src/rt/msvc/stdint.h \
-                       $(S)src/rt/msvc/inttypes.h \
-                       $(S)src/rt/bigint/bigint.h \
-	,$(ALL_HS))
-
 tidy:
 		@$(call E, check: formatting)
 		$(Q)echo \
+	  	  $(addprefix $(S)src/, $(RUSTLLVM_LIB_CS) $(RUSTLLVM_OBJS_CS) \
+	    	  $(RUSTLLVM_HDR) \
+                $(RUNTIME_CS) $(RUNTIME_HDR) $(RUNTIME_S)) \
               $(wildcard $(S)src/etc/*.py)  \
-              $(ALL_CS) \
-              $(ALL_HS) \
               $(COMPILER_CRATE) \
               $(COMPILER_INPUTS) \
               $(CORELIB_CRATE) \

branches/try/src/etc/x86.supp

@@ -389,6 +389,34 @@
    fun:uv_loop_delete
 }
 
+{
+   lock_and_signal-probably-threadsafe-access-outside-of-lock
+   Helgrind:Race
+   fun:_ZN15lock_and_signal27lock_held_by_current_threadEv
+   ...
+}  
+
+{
+   lock_and_signal-probably-threadsafe-access-outside-of-lock2
+   Helgrind:Race
+   fun:_ZN15lock_and_signal6unlockEv
+   ...
+}
+
+{
+   lock_and_signal-probably-threadsafe-access-outside-of-lock3
+   Helgrind:Race
+   fun:_ZN15lock_and_signal4lockEv
+   ...
+}
+
+{
+   lock_and_signal-probably-threadsafe-access-outside-of-lock4
+   Helgrind:Race
+   fun:_ZN15lock_and_signal4waitEv
+   ...
+}
+
 {
    uv-async-send-does-racy-things
    Helgrind:Race

branches/try/src/rt/arch/x86_64/context.h

@@ -31,11 +31,11 @@ struct registers_t {
 class context {
 public:
     registers_t regs;
-
+    
     context();
-
+    
     context *next;
-
+    
     void swap(context &out);
     void call(void *f, void *arg, void *sp);
 };

branches/try/src/rt/memory_region.h

@@ -41,6 +41,7 @@ class memory_region {
 
     inline alloc_header *get_header(void *mem);
     inline void *get_data(alloc_header *);
+    
 
     rust_srv *_srv;
     memory_region *_parent;

branches/try/src/rt/rust.cpp

@@ -80,21 +80,20 @@ rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
     rust_sched_id sched_id = kernel->create_scheduler(env->num_sched_threads);
     rust_scheduler *sched = kernel->get_scheduler_by_id(sched_id);
     rust_task *root_task = sched->create_task(NULL, "main");
-    rust_task_thread *thread = root_task->thread;
     command_line_args *args
         = new (kernel, "main command line args")
         command_line_args(root_task, argc, argv);
 
-    DLOG(thread, dom, "startup: %d args in 0x%" PRIxPTR,
+    LOG(root_task, dom, "startup: %d args in 0x%" PRIxPTR,
              args->argc, (uintptr_t)args->args);
     for (int i = 0; i < args->argc; i++) {
-        DLOG(thread, dom, "startup: arg[%d] = '%s'", i, args->argv[i]);
+        LOG(root_task, dom, "startup: arg[%d] = '%s'", i, args->argv[i]);
     }
 
     root_task->start((spawn_fn)main_fn, NULL, args->args);
     root_task = NULL;
 
-    int ret = kernel->wait_for_schedulers();
+    int ret = kernel->wait_for_exit();
     delete args;
     delete kernel;
     delete srv;

branches/try/src/rt/rust_box_annihilator.cpp

@@ -58,8 +58,7 @@ class annihilator : public shape::data<annihilator,shape::ptr> {
     }
 
     void walk_tag2(shape::tag_info &tinfo, uint32_t tag_variant) {
-        shape::data<annihilator,shape::ptr>
-          ::walk_variant1(tinfo, tag_variant);
+        shape::data<annihilator,shape::ptr>::walk_variant1(tinfo, tag_variant);
     }
 
     void walk_uniq2() {
@@ -84,7 +83,7 @@ class annihilator : public shape::data<annihilator,shape::ptr> {
               if (pair.env) {
                   // free closed over data:
                   shape::data<annihilator,shape::ptr>::walk_fn_contents1();
-
+                  
                   // now free the ptr:
                   task->kernel->free(pair.env);
               }