3dcd215740
This breaks code that referred to variant names in the same namespace as
their enum. Reexport the variants in the old location or alter code to
refer to the new locations:
```
pub enum Foo {
A,
B
}
fn main() {
let a = A;
}
```
=>
```
pub use self::Foo::{A, B};
pub enum Foo {
A,
B
}
fn main() {
let a = A;
}
```
or
```
pub enum Foo {
A,
B
}
fn main() {
let a = Foo::A;
}
```
[breaking-change]
117 lines
3.7 KiB
Rust
117 lines
3.7 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.
|
|
|
|
use std::os;
|
|
use std::task;
|
|
use std::time::Duration;
|
|
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(request::get_count) => { responses.send(count.clone()); }
|
|
Ok(request::bytes(b)) => {
|
|
//println!("server: received {} bytes", b);
|
|
count += b;
|
|
}
|
|
Err(..) => { done = true; }
|
|
_ => { }
|
|
}
|
|
}
|
|
responses.send(count);
|
|
//println!("server exiting");
|
|
}
|
|
|
|
fn run(args: &[String]) {
|
|
let (to_parent, from_child) = channel();
|
|
|
|
let size = from_str::<uint>(args[1].as_slice()).unwrap();
|
|
let workers = from_str::<uint>(args[2].as_slice()).unwrap();
|
|
let num_bytes = 100;
|
|
let mut result = None;
|
|
let mut to_parent = Some(to_parent);
|
|
let dur = Duration::span(|| {
|
|
let to_parent = to_parent.take().unwrap();
|
|
let mut worker_results = Vec::new();
|
|
let from_parent = if workers == 1 {
|
|
let (to_child, from_parent) = channel();
|
|
worker_results.push(task::try_future(proc() {
|
|
for _ in range(0u, size / workers) {
|
|
//println!("worker {}: sending {} bytes", i, num_bytes);
|
|
to_child.send(request::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();
|
|
worker_results.push(task::try_future(proc() {
|
|
for _ in range(0u, size / workers) {
|
|
//println!("worker {}: sending {} bytes", i, num_bytes);
|
|
to_child.send(request::bytes(num_bytes));
|
|
}
|
|
//println!("worker {} exiting", i);
|
|
}));
|
|
}
|
|
from_parent
|
|
};
|
|
task::spawn(proc() {
|
|
server(&from_parent, &to_parent);
|
|
});
|
|
|
|
for r in worker_results.into_iter() {
|
|
r.unwrap();
|
|
}
|
|
|
|
//println!("sending stop message");
|
|
//to_child.send(stop);
|
|
//move_out(to_child);
|
|
result = Some(from_child.recv());
|
|
});
|
|
let result = result.unwrap();
|
|
print!("Count is {}\n", result);
|
|
print!("Test took {} ms\n", dur.num_milliseconds());
|
|
let thruput = ((size / workers * workers) as f64) / (dur.num_milliseconds() as f64);
|
|
print!("Throughput={} per sec\n", thruput / 1000.0);
|
|
assert_eq!(result, num_bytes * size);
|
|
}
|
|
|
|
fn main() {
|
|
let args = os::args();
|
|
let args = if os::getenv("RUST_BENCH").is_some() {
|
|
vec!("".to_string(), "1000000".to_string(), "8".to_string())
|
|
} else if args.len() <= 1u {
|
|
vec!("".to_string(), "10000".to_string(), "4".to_string())
|
|
} else {
|
|
args.clone().into_iter().map(|x| x.to_string()).collect()
|
|
};
|
|
|
|
println!("{}", args);
|
|
run(args.as_slice());
|
|
}
|