0682ad0eb9
Changes: - Refactor move mode computation - Removes move mode arguments, unary move, capture clauses (though they still parse for backwards compatibility) - Simplify how moves are handled in trans - Fix a number of illegal copies that cropped up - Workaround for bug involving def-ids in params (see details below) Future work (I'll open bugs for these...): - Improve error messages for moves that are due to bindings - Add support for moving owned content like a.b.c to borrow check, test in trans (but I think it'll "just work") - Proper fix for def-ids in params Def ids in params: Move captures into a map instead of recomputing. This is a workaround for a larger bug having to do with the def-ids associated with ty_params, which are not always properly preserved when inlining. I am not sure of my preferred fix for the larger bug yet. This current fix removes the only code in trans that I know of which relies on ty_param def-ids, but feels fragile.
75 lines
1.9 KiB
Rust
75 lines
1.9 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.
|
|
|
|
// xfail-fast
|
|
#[legacy_modes];
|
|
|
|
extern mod std;
|
|
use pipes::Chan;
|
|
use pipes::send;
|
|
use pipes::recv;
|
|
|
|
fn main() { debug!("===== WITHOUT THREADS ====="); test00(); }
|
|
|
|
fn test00_start(ch: Chan<int>, message: int, count: int) {
|
|
debug!("Starting test00_start");
|
|
let mut i: int = 0;
|
|
while i < count {
|
|
debug!("Sending Message");
|
|
ch.send(message + 0);
|
|
i = i + 1;
|
|
}
|
|
debug!("Ending test00_start");
|
|
}
|
|
|
|
fn test00() {
|
|
let number_of_tasks: int = 16;
|
|
let number_of_messages: int = 4;
|
|
|
|
debug!("Creating tasks");
|
|
|
|
let po = pipes::PortSet();
|
|
|
|
let mut i: int = 0;
|
|
|
|
// Create and spawn tasks...
|
|
let mut results = ~[];
|
|
while i < number_of_tasks {
|
|
let ch = po.chan();
|
|
task::task().future_result(|+r| {
|
|
results.push(move r);
|
|
}).spawn({
|
|
let i = i;
|
|
|move ch| test00_start(ch, i, number_of_messages)
|
|
});
|
|
i = i + 1;
|
|
}
|
|
|
|
// Read from spawned tasks...
|
|
let mut sum = 0;
|
|
for results.each |r| {
|
|
i = 0;
|
|
while i < number_of_messages {
|
|
let value = po.recv();
|
|
sum += value;
|
|
i = i + 1;
|
|
}
|
|
}
|
|
|
|
// Join spawned tasks...
|
|
for results.each |r| { r.recv(); }
|
|
|
|
debug!("Completed: Final number is: ");
|
|
log(error, sum);
|
|
// assert (sum == (((number_of_tasks * (number_of_tasks - 1)) / 2) *
|
|
// number_of_messages));
|
|
assert (sum == 480);
|
|
}
|