---

yaml
---
r: 12249
b: refs/heads/master
c: cf0c4cd
h: refs/heads/master
i:
  12247: 4913937
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a17097a57b7563ee94e090b0d428332bb28ef424
+refs/heads/master: cf0c4cd7d2918205c13df38c4a62f93e1c72c1ac
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/mk/rt.mk

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

trunk/mk/tests.mk

@@ -74,13 +74,34 @@ 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) \

trunk/src/etc/x86.supp

@@ -389,34 +389,6 @@
    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

trunk/src/rt/rust.cpp

@@ -80,20 +80,21 @@ 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);
 
-    LOG(root_task, dom, "startup: %d args in 0x%" PRIxPTR,
+    DLOG(thread, dom, "startup: %d args in 0x%" PRIxPTR,
              args->argc, (uintptr_t)args->args);
     for (int i = 0; i < args->argc; i++) {
-        LOG(root_task, dom, "startup: arg[%d] = '%s'", i, args->argv[i]);
+        DLOG(thread, 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_exit();
+    int ret = kernel->wait_for_schedulers();
     delete args;
     delete kernel;
     delete srv;