Convert pfib to pipes. This is a useful stress test.

diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs
index 2d2f9377820df2b29a220237fb53398efb502f03..5b309659ee5056925a81a858d4f10fdf24462379 100644 (file)
--- a/src/test/bench/shootout-pfib.rs
+++ b/src/test/bench/shootout-pfib.rs
@@ -15,10 +15,10 @@
 import std::{time, getopts};
 import io::writer_util;
 import int::range;
-import comm::port;
-import comm::chan;
-import comm::send;
-import comm::recv;
+import pipes::port;
+import pipes::chan;
+import pipes::send;
+import pipes::recv;
 
 import core::result;
 import result::{ok, err};
@@ -26,22 +26,22 @@
 fn fib(n: int) -> int {
     fn pfib(c: chan<int>, n: int) {
         if n == 0 {
-            send(c, 0);
+            c.send(0);
         } else if n <= 2 {
-            send(c, 1);
+            c.send(1);
         } else {
-            let p = port();
-            let ch = chan(p);
+            let p = pipes::port_set();
+            let ch = p.chan();
             task::spawn(|| pfib(ch, n - 1) );
+            let ch = p.chan();
             task::spawn(|| pfib(ch, n - 2) );
-            send(c, recv(p) + recv(p));
+            c.send(p.recv() + p.recv());
         }
     }
 
-    let p = port();
-    let ch = chan(p);
+    let (ch, p) = pipes::stream();
     let t = task::spawn(|| pfib(ch, n) );
-    return recv(p);
+    p.recv()
 }
 
 type config = {stress: bool};