OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Stop using spawn_conversation in chan_from_global_ptr

Browse Source
This commit is contained in:
Brian Anderson 2012-12-12 19:15:47 -08:00
parent c35a8589ab
commit 01a6524d00
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libcore/private.rs
View File

@ -70,15 +70,21 @@ pub unsafe fn chan_from_global_ptr<T: Owned>(
log(debug,~"is probably zero..."); log(debug,~"is probably zero...");
// There's no global channel. We must make it // There's no global channel. We must make it
let (setup_po, setup_ch) = do task_fn().spawn_conversation let (setup1_po, setup1_ch) = pipes::stream();
|move f, setup_po, setup_ch| { let (setup2_po, setup2_ch) = pipes::stream();
// XXX: Ugly type inference hints
let setup1_po: pipes::Port<comm::Chan<T>> = setup1_po;
let setup2_po: pipes::Port<Msg> = setup2_po;
do task_fn().spawn |move f, move setup1_ch, move setup2_po| {
let po = comm::Port::<T>(); let po = comm::Port::<T>();
let ch = comm::Chan(&po); let ch = comm::Chan(&po);
comm::send(setup_ch, ch); setup1_ch.send(ch);
// Wait to hear if we are the official instance of // Wait to hear if we are the official instance of
// this global task // this global task
match comm::recv::<Msg>(setup_po) { match setup2_po.recv() {
Proceed => f(move po), Proceed => f(move po),
Abort => () Abort => ()
} }
@ -86,7 +92,7 @@ pub unsafe fn chan_from_global_ptr<T: Owned>(
log(debug,~"before setup recv.."); log(debug,~"before setup recv..");
// This is the proposed global channel // This is the proposed global channel
let ch = comm::recv(setup_po); let ch = setup1_po.recv();
// 0 is our sentinal value. It is not a valid channel // 0 is our sentinal value. It is not a valid channel
assert *ch != 0; assert *ch != 0;
@ -99,11 +105,11 @@ pub unsafe fn chan_from_global_ptr<T: Owned>(
if swapped { if swapped {
// Success! // Success!
comm::send(setup_ch, Proceed); setup2_ch.send(Proceed);
ch ch
} else { } else {
// Somebody else got in before we did // Somebody else got in before we did
comm::send(setup_ch, Abort); setup2_ch.send(Abort);
cast::reinterpret_cast(&*global) cast::reinterpret_cast(&*global)
} }
} else { } else {