545d4718c8
There are currently a number of return values from the std::comm methods, not all of which are necessarily completely expressive: Sender::try_send(t: T) -> bool This method currently doesn't transmit back the data `t` if the send fails due to the other end having disconnected. Additionally, this shares the name of the synchronous try_send method, but it differs in semantics in that it only has one failure case, not two (the buffer can never be full). SyncSender::try_send(t: T) -> TrySendResult<T> This method accurately conveys all possible information, but it uses a custom type to the std::comm module with no convenience methods on it. Additionally, if you want to inspect the result you're forced to import something from `std::comm`. SyncSender::send_opt(t: T) -> Option<T> This method uses Some(T) as an "error value" and None as a "success value", but almost all other uses of Option<T> have Some/None the other way Receiver::try_recv(t: T) -> TryRecvResult<T> Similarly to the synchronous try_send, this custom return type is lacking in terms of usability (no convenience methods). With this number of drawbacks in mind, I believed it was time to re-work the return types of these methods. The new API for the comm module is: Sender::send(t: T) -> () Sender::send_opt(t: T) -> Result<(), T> SyncSender::send(t: T) -> () SyncSender::send_opt(t: T) -> Result<(), T> SyncSender::try_send(t: T) -> Result<(), TrySendError<T>> Receiver::recv() -> T Receiver::recv_opt() -> Result<T, ()> Receiver::try_recv() -> Result<T, TryRecvError> The notable changes made are: * Sender::try_send => Sender::send_opt. This renaming brings the semantics in line with the SyncSender::send_opt method. An asychronous send only has one failure case, unlike the synchronous try_send method which has two failure cases (full/disconnected). * Sender::send_opt returns the data back to the caller if the send is guaranteed to fail. This method previously returned `bool`, but then it was unable to retrieve the data if the data was guaranteed to fail to send. There is still a race such that when `Ok(())` is returned the data could still fail to be received, but that's inherent to an asynchronous channel. * Result is now the basis of all return values. This not only adds lots of convenience methods to all return values for free, but it also means that you can inspect the return values with no extra imports (Ok/Err are in the prelude). Additionally, it's now self documenting when something failed or not because the return value has "Err" in the name. Things I'm a little uneasy about: * The methods send_opt and recv_opt are not returning options, but rather results. I felt more strongly that Option was the wrong return type than the _opt prefix was wrong, and I coudn't think of a much better name for these methods. One possible way to think about them is to read the _opt suffix as "optionally". * Result<T, ()> is often better expressed as Option<T>. This is only applicable to the recv_opt() method, but I thought it would be more consistent for everything to return Result rather than one method returning an Option. Despite my two reasons to feel uneasy, I feel much better about the consistency in return values at this point, and I think the only real open question is if there's a better suffix for {send,recv}_opt. Closes #11527
119 lines
3.4 KiB
Rust
119 lines
3.4 KiB
Rust
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
// A port of the simplistic benchmark from
|
|
//
|
|
// http://github.com/PaulKeeble/ScalaVErlangAgents
|
|
//
|
|
// I *think* it's the same, more or less.
|
|
|
|
extern crate time;
|
|
|
|
use std::os;
|
|
use std::task;
|
|
use std::uint;
|
|
|
|
fn move_out<T>(_x: T) {}
|
|
|
|
enum request {
|
|
get_count,
|
|
bytes(uint),
|
|
stop
|
|
}
|
|
|
|
fn server(requests: &Receiver<request>, responses: &Sender<uint>) {
|
|
let mut count: uint = 0;
|
|
let mut done = false;
|
|
while !done {
|
|
match requests.recv_opt() {
|
|
Ok(get_count) => { responses.send(count.clone()); }
|
|
Ok(bytes(b)) => {
|
|
//println!("server: received {:?} bytes", b);
|
|
count += b;
|
|
}
|
|
Err(..) => { done = true; }
|
|
_ => { }
|
|
}
|
|
}
|
|
responses.send(count);
|
|
//println!("server exiting");
|
|
}
|
|
|
|
fn run(args: &[~str]) {
|
|
let (to_parent, from_child) = channel();
|
|
|
|
let size = from_str::<uint>(args[1]).unwrap();
|
|
let workers = from_str::<uint>(args[2]).unwrap();
|
|
let num_bytes = 100;
|
|
let start = time::precise_time_s();
|
|
let mut worker_results = Vec::new();
|
|
let from_parent = if workers == 1 {
|
|
let (to_child, from_parent) = channel();
|
|
let mut builder = task::task();
|
|
worker_results.push(builder.future_result());
|
|
builder.spawn(proc() {
|
|
for _ in range(0u, size / workers) {
|
|
//println!("worker {:?}: sending {:?} bytes", i, num_bytes);
|
|
to_child.send(bytes(num_bytes));
|
|
}
|
|
//println!("worker {:?} exiting", i);
|
|
});
|
|
from_parent
|
|
} else {
|
|
let (to_child, from_parent) = channel();
|
|
for _ in range(0u, workers) {
|
|
let to_child = to_child.clone();
|
|
let mut builder = task::task();
|
|
worker_results.push(builder.future_result());
|
|
builder.spawn(proc() {
|
|
for _ in range(0u, size / workers) {
|
|
//println!("worker {:?}: sending {:?} bytes", i, num_bytes);
|
|
to_child.send(bytes(num_bytes));
|
|
}
|
|
//println!("worker {:?} exiting", i);
|
|
});
|
|
}
|
|
from_parent
|
|
};
|
|
task::spawn(proc() {
|
|
server(&from_parent, &to_parent);
|
|
});
|
|
|
|
for r in worker_results.iter() {
|
|
r.recv();
|
|
}
|
|
|
|
//println!("sending stop message");
|
|
//to_child.send(stop);
|
|
//move_out(to_child);
|
|
let result = from_child.recv();
|
|
let end = time::precise_time_s();
|
|
let elapsed = end - start;
|
|
print!("Count is {:?}\n", result);
|
|
print!("Test took {:?} seconds\n", elapsed);
|
|
let thruput = ((size / workers * workers) as f64) / (elapsed as f64);
|
|
print!("Throughput={} per sec\n", thruput);
|
|
assert_eq!(result, num_bytes * size);
|
|
}
|
|
|
|
fn main() {
|
|
let args = os::args();
|
|
let args = if os::getenv("RUST_BENCH").is_some() {
|
|
vec!(~"", ~"1000000", ~"8")
|
|
} else if args.len() <= 1u {
|
|
vec!(~"", ~"10000", ~"4")
|
|
} else {
|
|
args.clone().move_iter().collect()
|
|
};
|
|
|
|
println!("{:?}", args);
|
|
run(args.as_slice());
|
|
}
|