---

bblum · bblum · commit b06a199f856d · 2012-07-24T20:28:30.000-04:00
yaml --- r: 31381 b: refs/heads/dist-snap c: a038d27 h: refs/heads/master i: 31379: ad060aa v: v3
diff --git a/[refs] b/[refs]
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: bb5db3bc8a4087c29ff37376edb2a3c01200f65d
+refs/heads/dist-snap: a038d272b0b01d74b54c419f28d29d3ee7cee647
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/dist-snap/src/libcore/sys.rs b/branches/dist-snap/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`	`}`