---

yaml
---
r: 64601
b: refs/heads/snap-stage3
c: 4beda4e
h: refs/heads/master
i:
  64599: d177051
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: f8c4d99df67d411d5f7b48823bc082d81cdfaa37
+refs/heads/snap-stage3: 4beda4e582e4fe008aaf866a5f3ad6a20dec9876
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/os.rs

@@ -869,26 +869,38 @@ pub fn change_dir(p: &Path) -> bool {
 /// CWD to what it was before, returning true.
 /// Returns false if the directory doesn't exist or if the directory change
 /// is otherwise unsuccessful.
+/// FIXME #7870 This probably shouldn't be part of the public API
 pub fn change_dir_locked(p: &Path, action: &fn()) -> bool {
-    use unstable::global::global_data_clone_create;
-    use unstable::sync::{Exclusive, exclusive};
-
-    fn key(_: Exclusive<()>) { }
+    use task;
+    use unstable::finally::Finally;
 
     unsafe {
-        let result = global_data_clone_create(key, || { ~exclusive(()) });
-
-        do result.with_imm() |_| {
-            let old_dir = os::getcwd();
-            if change_dir(p) {
-                action();
-                change_dir(&old_dir)
-            }
-            else {
-                false
+        // This is really sketchy. Using a pthread mutex so descheduling
+        // in the `action` callback can cause deadlock. Doing it in
+        // `task::atomically` to try to avoid that, but ... I don't know
+        // this is all bogus.
+        return do task::atomically {
+            rust_take_change_dir_lock();
+
+            do (||{
+                let old_dir = os::getcwd();
+                if change_dir(p) {
+                    action();
+                    change_dir(&old_dir)
+                }
+                else {
+                    false
+                }
+            }).finally {
+                rust_drop_change_dir_lock();
             }
         }
     }
+
+    extern {
+        fn rust_take_change_dir_lock();
+        fn rust_drop_change_dir_lock();
+    }
 }
 
 /// Copies a file from one location to another

branches/snap-stage3/src/rt/rust_builtin.cpp

@@ -947,6 +947,18 @@ rust_get_exit_status_newrt() {
     return exit_status;
 }
 
+static lock_and_signal change_dir_lock;
+
+extern "C" CDECL void
+rust_take_change_dir_lock() {
+    global_args_lock.lock();
+}
+
+extern "C" CDECL void
+rust_drop_change_dir_lock() {
+    global_args_lock.unlock();
+}
+
 //
 // Local Variables:
 // mode: C++

branches/snap-stage3/src/rt/rustrt.def.in

@@ -268,3 +268,5 @@ rust_take_global_args_lock
 rust_drop_global_args_lock
 rust_set_exit_status_newrt
 rust_get_exit_status_newrt
+rust_take_change_dir_lock
+rust_drop_change_dir_lock