---

yaml
---
r: 12254
b: refs/heads/master
c: 3a0477c
h: refs/heads/master
v: v3

Author: jsternberg

[refs]

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

trunk/AUTHORS.txt

@@ -36,7 +36,6 @@ Jeff Olson <[email protected]>
 Jeffrey Yasskin <[email protected]>
 Jesse Ruderman <[email protected]>
 Joe Pletcher <[email protected]>
-Jon Morton <[email protected]>
 Josh Matthews <[email protected]>
 Joshua Clark <[email protected]>
 Joshua Wise <[email protected]>

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,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) \

trunk/src/cargo/cargo.rs

@@ -434,7 +434,7 @@ fn for_each_package(c: cargo, b: fn(source, package)) {
 
 // Runs all programs in directory <buildpath>
 fn run_programs(buildpath: str) {
-    let newv = os::list_dir(buildpath);
+    let newv = os::list_dir_path(buildpath);
     for ct: str in newv {
         run::run_program(ct, []);
     }
@@ -471,7 +471,7 @@ fn install_one_crate(c: cargo, path: str, cf: str) {
       none { ret; }
       some(bp) { bp }
     };
-    let newv = os::list_dir(buildpath);
+    let newv = os::list_dir_path(buildpath);
     let exec_suffix = os::exe_suffix();
     for ct: str in newv {
         if (exec_suffix != "" && str::ends_with(ct, exec_suffix)) ||
@@ -524,7 +524,7 @@ fn rustc_sysroot() -> str {
 fn install_source(c: cargo, path: str) {
     #debug("source: %s", path);
     os::change_dir(path);
-    let contents = os::list_dir(".");
+    let contents = os::list_dir_path(".");
 
     #debug("contents: %s", str::connect(contents, ", "));
 

trunk/src/compiletest/compiletest.rs

@@ -127,7 +127,7 @@ fn test_opts(config: config) -> test::test_opts {
 fn make_tests(config: config) -> [test::test_desc] {
     #debug("making tests from %s", config.src_base);
     let mut tests = [];
-    for file: str in os::list_dir(config.src_base) {
+    for file: str in os::list_dir_path(config.src_base) {
         let file = file;
         #debug("inspecting file %s", file);
         if is_test(config, file) {

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/fuzzer/fuzzer.rs

@@ -25,7 +25,7 @@ fn find_rust_files(&files: [str], path: str) {
     } else if os::path_is_dir(path)
         && !contains(path, "compile-fail")
         && !contains(path, "build") {
-        for p in os::list_dir(path) {
+        for p in os::list_dir_path(path) {
             find_rust_files(files, p);
         }
     }

trunk/src/libcore/os.rs

@@ -29,8 +29,8 @@ export close, fclose, fsync_fd, waitpid;
 export env, getenv, setenv, fdopen, pipe;
 export getcwd, dll_filename, self_exe_path;
 export exe_suffix, dll_suffix, sysname;
-export homedir, list_dir, path_is_dir, path_exists, make_absolute,
-       make_dir, remove_dir, change_dir, remove_file;
+export homedir, list_dir, list_dir_path, path_is_dir, path_exists,
+       make_absolute, make_dir, remove_dir, change_dir, remove_file;
 
 // FIXME: move these to str perhaps?
 export as_c_charp, fill_charp_buf;
@@ -452,26 +452,37 @@ fn list_dir(p: path) -> [str] {
     #[cfg(target_os = "linux")]
     #[cfg(target_os = "macos")]
     #[cfg(target_os = "freebsd")]
-    fn star() -> str { "" }
+    fn star(p: str) -> str { p }
 
     #[cfg(target_os = "win32")]
-    fn star() -> str { "*" }
+    fn star(p: str) -> str {
+        let pl = str::len(p);
+        if pl == 0u || (p[pl - 1u] as char != path::consts::path_sep
+                        ** p[pl - 1u] as char != path::consts::alt_path_sep) {
+            p + path::path_sep() + "*"
+        } else {
+            p + "*"
+        }
+    }
 
+    rustrt::rust_list_files(star(p)).filter {|filename|
+        !str::eq(filename, ".") || !str::eq(filename, "..")
+    }
+}
+
+#[doc = "
+Lists the contents of a directory
+
+This version prepends each entry with the directory.
+"]
+fn list_dir_path(p: path) -> [str] {
     let mut p = p;
     let pl = str::len(p);
     if pl == 0u || (p[pl - 1u] as char != path::consts::path_sep
                     && p[pl - 1u] as char != path::consts::alt_path_sep) {
         p += path::path_sep();
     }
-    let mut full_paths: [str] = [];
-    for vec::each(rustrt::rust_list_files(p + star())) {|filename|
-        if !str::eq(filename, ".") {
-            if !str::eq(filename, "..") {
-                full_paths += [p + filename];
-            }
-        }
-    }
-    ret full_paths;
+    os::list_dir(p).map {|f| p + f}
 }
 
 #[doc = "Removes a directory at the specified path"]
@@ -750,4 +761,4 @@ mod tests {
         assert (!os::path_exists("test/nonexistent-bogus-path"));
     }
 
-}
+}

trunk/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);
 };

trunk/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;

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;

trunk/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);
               }