|
1 |
| -// Copyright 2012 The Rust Project Developers. See the COPYRIGHT |
| 1 | +// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT |
2 | 2 | // file at the top-level directory of this distribution and at
|
3 | 3 | // http://rust-lang.org/COPYRIGHT.
|
4 | 4 | //
|
|
8 | 8 | // option. This file may not be copied, modified, or distributed
|
9 | 9 | // except according to those terms.
|
10 | 10 |
|
11 |
| -// Based on threadring.erlang by Jira Isa |
12 |
| - |
13 |
| -use std::os; |
| 11 | +#![feature(phase)] |
| 12 | +#[phase(syntax)] extern crate green; |
| 13 | +green_start!(main) |
14 | 14 |
|
15 | 15 | fn start(n_tasks: int, token: int) {
|
16 | 16 | let (tx, mut rx) = channel();
|
17 | 17 | tx.send(token);
|
18 |
| - // FIXME could not get this to work with a range closure |
19 |
| - let mut i = 2; |
20 |
| - while i <= n_tasks { |
| 18 | + for i in range(2, n_tasks + 1) { |
21 | 19 | let (tx, next_rx) = channel();
|
22 |
| - let imm_i = i; |
23 |
| - let imm_rx = rx; |
24 |
| - spawn(proc() { |
25 |
| - roundtrip(imm_i, n_tasks, &imm_rx, &tx); |
26 |
| - }); |
| 20 | + spawn(proc() roundtrip(i, tx, rx)); |
27 | 21 | rx = next_rx;
|
28 |
| - i += 1; |
29 | 22 | }
|
30 |
| - let imm_rx = rx; |
31 |
| - spawn(proc() { |
32 |
| - roundtrip(1, n_tasks, &imm_rx, &tx); |
33 |
| - }); |
| 23 | + spawn(proc() roundtrip(1, tx, rx)); |
34 | 24 | }
|
35 | 25 |
|
36 |
| -fn roundtrip(id: int, n_tasks: int, p: &Receiver<int>, ch: &Sender<int>) { |
37 |
| - loop { |
38 |
| - match p.recv() { |
39 |
| - 1 => { |
40 |
| - println!("{}\n", id); |
41 |
| - return; |
42 |
| - } |
43 |
| - token => { |
44 |
| - println!("thread: {} got token: {}", id, token); |
45 |
| - ch.send(token - 1); |
46 |
| - if token <= n_tasks { |
47 |
| - return; |
48 |
| - } |
49 |
| - } |
| 26 | +fn roundtrip(id: int, tx: Sender<int>, rx: Receiver<int>) { |
| 27 | + for token in rx.iter() { |
| 28 | + if token == 1 { |
| 29 | + println!("{}", id); |
| 30 | + break; |
50 | 31 | }
|
| 32 | + tx.send(token - 1); |
51 | 33 | }
|
52 | 34 | }
|
53 | 35 |
|
54 | 36 | fn main() {
|
55 |
| - use std::from_str::FromStr; |
56 |
| - |
57 |
| - let args = if os::getenv("RUST_BENCH").is_some() { |
58 |
| - vec!("".to_owned(), "2000000".to_owned(), "503".to_owned()) |
| 37 | + let args = std::os::args(); |
| 38 | + let token = if std::os::getenv("RUST_BENCH").is_some() { |
| 39 | + 2000000 |
59 | 40 | } else {
|
60 |
| - os::args().move_iter().collect() |
61 |
| - }; |
62 |
| - let token = if args.len() > 1u { |
63 |
| - FromStr::from_str(*args.get(1)).unwrap() |
64 |
| - } |
65 |
| - else { |
66 |
| - 1000 |
| 41 | + args.get(1).and_then(|arg| from_str(*arg)).unwrap_or(1000) |
67 | 42 | };
|
68 |
| - let n_tasks = if args.len() > 2u { |
69 |
| - FromStr::from_str(*args.get(2)).unwrap() |
70 |
| - } |
71 |
| - else { |
72 |
| - 503 |
73 |
| - }; |
74 |
| - start(n_tasks, token); |
| 43 | + let n_tasks = args.get(2).and_then(|arg| from_str(*arg)).unwrap_or(503); |
75 | 44 |
|
| 45 | + start(n_tasks, token); |
76 | 46 | }
|
0 commit comments