Skip to content

Commit 3f51130

Browse files
Aatchbrson
authored andcommitted
---
yaml --- r: 142574 b: refs/heads/try2 c: 6d8d73c h: refs/heads/master v: v3
1 parent 4af518a commit 3f51130

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 807269041437411df49a9a893c86310283d6eb91
8+
refs/heads/try2: 6d8d73cfc4cba2fdb2ee67448df39d89be08ce69
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcore/unstable/sync.rs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,26 @@ extern {
205205
fn rust_unlock_little_lock(lock: rust_little_lock);
206206
}
207207

208+
/* *********************************************************************/
209+
210+
//FIXME: #5042 This should be replaced by proper atomic type
211+
pub struct AtomicUint(uint);
212+
pub impl AtomicUint {
213+
fn load(&self) -> uint {
214+
unsafe { intrinsics::atomic_load(cast::transmute(self)) as uint }
215+
}
216+
fn store(&mut self, val:uint) {
217+
unsafe { intrinsics::atomic_store(cast::transmute(self), val as int); }
218+
}
219+
fn add(&mut self, val:int) -> uint {
220+
unsafe { intrinsics::atomic_xadd(cast::transmute(self), val as int) as uint }
221+
}
222+
fn cas(&self, old:uint, new:uint) -> uint {
223+
unsafe { intrinsics::atomic_cxchg(cast::transmute(self), old as int, new as int) as uint }
224+
}
225+
}
226+
227+
208228
#[cfg(test)]
209229
mod tests {
210230
use comm;

0 commit comments

Comments
 (0)