---

bblum · bblum · commit 4d4967072844 · 2012-07-24T20:28:30.000-04:00
yaml --- r: 22719 b: refs/heads/master c: a038d27 h: refs/heads/master i: 22717: dc0e32a 22715: 93655f9 22711: ffc5857 22703: b9f95d6 22687: 0e67732 22655: 3da9029 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: bb5db3bc8a4087c29ff37376edb2a3c01200f65d
+refs/heads/master: a038d272b0b01d74b54c419f28d29d3ee7cee647
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
diff --git a/trunk/src/libcore/sys.rs b/trunk/src/libcore/sys.rs
@@ -105,17 +105,17 @@ class unlock {
 
 impl methods for lock_and_signal {
     unsafe fn lock<T>(f: fn() -> T) -> T {
-        rustrt::rust_lock_cond_lock(self.lock);
-        let _r = unlock(self.lock);
         do atomically {
+            rustrt::rust_lock_cond_lock(self.lock);
+            let _r = unlock(self.lock);
             f()
         }
     }
 
     unsafe fn lock_cond<T>(f: fn(condition) -> T) -> T {
-        rustrt::rust_lock_cond_lock(self.lock);
-        let _r = unlock(self.lock);
         do atomically {
+            rustrt::rust_lock_cond_lock(self.lock);
+            let _r = unlock(self.lock);
             f(condition_(self.lock))
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -105,17 +105,17 @@ class unlock {`
`105`	`105`
`106`	`106`	`impl methods for lock_and_signal {`
`107`	`107`	`unsafe fn lock<T>(f: fn() -> T) -> T {`
`108`		`- rustrt::rust_lock_cond_lock(self.lock);`
`109`		`- let _r = unlock(self.lock);`
`110`	`108`	`do atomically {`
	`109`	`+ rustrt::rust_lock_cond_lock(self.lock);`
	`110`	`+ let _r = unlock(self.lock);`
`111`	`111`	`f()`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`unsafe fn lock_cond<T>(f: fn(condition) -> T) -> T {`
`116`		`- rustrt::rust_lock_cond_lock(self.lock);`
`117`		`- let _r = unlock(self.lock);`
`118`	`116`	`do atomically {`
	`117`	`+ rustrt::rust_lock_cond_lock(self.lock);`
	`118`	`+ let _r = unlock(self.lock);`
`119`	`119`	`f(condition_(self.lock))`
`120`	`120`	`}`
`121`	`121`	`}`