diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2011-12-22 17:53:53 -0800 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2011-12-22 17:53:53 -0800 |
| commit | f0dfbe7b1b8d630488441982cf3d46f82a3a89db (patch) | |
| tree | 8e26605c3d3628cd336e566b8ec7391c058c3a1a /src/test/bench | |
| parent | ccb5b6fb259d5de9be751175fc53df1eaea4cd2c (diff) | |
Register new snapshots, purge log_err and log_full in favour of log(...).
Diffstat (limited to 'src/test/bench')
| -rw-r--r-- | src/test/bench/99bob-iter.rs | 8 | ||||
| -rw-r--r-- | src/test/bench/99bob-simple.rs | 8 | ||||
| -rw-r--r-- | src/test/bench/shootout-fannkuchredux.rs | 2 | ||||
| -rw-r--r-- | src/test/bench/shootout-fasta.rs | 12 | ||||
| -rw-r--r-- | src/test/bench/shootout-fibo.rs | 4 | ||||
| -rw-r--r-- | src/test/bench/shootout-nbody.rs | 4 | ||||
| -rw-r--r-- | src/test/bench/shootout-pfib.rs | 2 | ||||
| -rw-r--r-- | src/test/bench/task-perf-word-count-generic.rs | 10 | ||||
| -rw-r--r-- | src/test/bench/task-perf-word-count.rs | 10 |
9 files changed, 30 insertions, 30 deletions
diff --git a/src/test/bench/99bob-iter.rs b/src/test/bench/99bob-iter.rs index aec0422f5bf..eaab9d6b731 100644 --- a/src/test/bench/99bob-iter.rs +++ b/src/test/bench/99bob-iter.rs @@ -47,10 +47,10 @@ fn ninetynine(it: block(int)) { fn main() { ninetynine {|n| - log_full(core::debug, sub(b1(), n)); - log_full(core::debug, sub(b2(), n - 1)); + log(debug, sub(b1(), n)); + log(debug, sub(b2(), n - 1)); #debug(""); }; - log_full(core::debug, b7()); - log_full(core::debug, b8()); + log(debug, b7()); + log(debug, b8()); } diff --git a/src/test/bench/99bob-simple.rs b/src/test/bench/99bob-simple.rs index 51439a8bd97..6d8a17cc932 100644 --- a/src/test/bench/99bob-simple.rs +++ b/src/test/bench/99bob-simple.rs @@ -43,10 +43,10 @@ fn sub(t: str, n: int) -> str { fn main() { let n: int = 99; while n > 0 { - log_full(core::debug, sub(b1(), n)); - log_full(core::debug, sub(b2(), n - 1)); + log(debug, sub(b1(), n)); + log(debug, sub(b2(), n - 1)); #debug(""); n -= 1; } - log_full(core::debug, b7()); - log_full(core::debug, sub(b8(), 99)); + log(debug, b7()); + log(debug, sub(b8(), 99)); } diff --git a/src/test/bench/shootout-fannkuchredux.rs b/src/test/bench/shootout-fannkuchredux.rs index 1e4283443b9..c833cc92f80 100644 --- a/src/test/bench/shootout-fannkuchredux.rs +++ b/src/test/bench/shootout-fannkuchredux.rs @@ -43,7 +43,7 @@ fn fannkuch(n: int) -> int { let go = true; while go { - if r == n { log_full(core::debug, checksum); ret flips; } + if r == n { log(debug, checksum); ret flips; } let p0 = perm1[0]; i = 0; while i < r { let j = i + 1; perm1[i] = perm1[j]; i = j; } diff --git a/src/test/bench/shootout-fasta.rs b/src/test/bench/shootout-fasta.rs index 97bec11f43f..a47c0548a27 100644 --- a/src/test/bench/shootout-fasta.rs +++ b/src/test/bench/shootout-fasta.rs @@ -44,31 +44,31 @@ fn select_random(r: u32, genelist: [aminoacids]) -> char { } fn make_random_fasta(id: str, desc: str, genelist: [aminoacids], n: int) { - log_full(core::debug, ">" + id + " " + desc); + log(debug, ">" + id + " " + desc); let rng = myrandom(std::rand::mk_rng().next()); let op: str = ""; uint::range(0u, n as uint) {|i| str::push_byte(op, select_random(rng.next(100u32), genelist) as u8); if str::byte_len(op) >= LINE_LENGTH() { - log_full(core::debug, op); + log(debug, op); op = ""; } } - if str::byte_len(op) > 0u { log_full(core::debug, op); } + if str::byte_len(op) > 0u { log(debug, op); } } fn make_repeat_fasta(id: str, desc: str, s: str, n: int) { - log_full(core::debug, ">" + id + " " + desc); + log(debug, ">" + id + " " + desc); let op: str = ""; let sl: uint = str::byte_len(s); uint::range(0u, n as uint) {|i| str::push_byte(op, s[i % sl]); if str::byte_len(op) >= LINE_LENGTH() { - log_full(core::debug, op); + log(debug, op); op = ""; } } - if str::byte_len(op) > 0u { log_full(core::debug, op); } + if str::byte_len(op) > 0u { log(debug, op); } } fn acid(ch: char, prob: u32) -> aminoacids { ret {ch: ch, prob: prob}; } diff --git a/src/test/bench/shootout-fibo.rs b/src/test/bench/shootout-fibo.rs index b9624ecb9e6..afb1b4a9289 100644 --- a/src/test/bench/shootout-fibo.rs +++ b/src/test/bench/shootout-fibo.rs @@ -14,6 +14,6 @@ fn fib(n: int) -> int { fn main() { assert (fib(8) == 21); assert (fib(15) == 610); - log_full(core::debug, fib(8)); - log_full(core::debug, fib(15)); + log(debug, fib(8)); + log(debug, fib(15)); } diff --git a/src/test/bench/shootout-nbody.rs b/src/test/bench/shootout-nbody.rs index 72c98a4c3be..136d1057d20 100644 --- a/src/test/bench/shootout-nbody.rs +++ b/src/test/bench/shootout-nbody.rs @@ -20,11 +20,11 @@ fn main() { for n: int in inputs { - log_full(core::debug, NBodySystem::energy(bodies)); + log(debug, NBodySystem::energy(bodies)); let i: int = 0; while i < n { NBodySystem::advance(bodies, 0.01); i += 1; } - log_full(core::debug, NBodySystem::energy(bodies)); + log(debug, NBodySystem::energy(bodies)); } } diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs index 5c008c49019..3ba6a6f7e2e 100644 --- a/src/test/bench/shootout-pfib.rs +++ b/src/test/bench/shootout-pfib.rs @@ -87,7 +87,7 @@ fn stress(num_tasks: int) { fn main(argv: [str]) { if vec::len(argv) == 1u { assert (fib(8) == 21); - log_full(core::debug, fib(8)); + log(debug, fib(8)); } else { // Interactive mode! Wooo!!!! let opts = parse_opts(argv); diff --git a/src/test/bench/task-perf-word-count-generic.rs b/src/test/bench/task-perf-word-count-generic.rs index dcab0e8bde5..cf8986aa0f7 100644 --- a/src/test/bench/task-perf-word-count-generic.rs +++ b/src/test/bench/task-perf-word-count-generic.rs @@ -88,7 +88,7 @@ mod map_reduce { send V>(-map: mapper<K1, K2, V>, -ctrl: chan<ctrl_proto<K2, V>>, -input: K1) { - // log_full(core::error, "map_task " + input); + // log(error, "map_task " + input); let intermediates = treemap::init(); fn emit<send K2, @@ -172,15 +172,15 @@ mod map_reduce { } find_reducer(k, cc) { let c; - // log_full(core::error, "finding reducer for " + k); + // log(error, "finding reducer for " + k); alt treemap::find(reducers, k) { some(_c) { - // log_full(core::error, + // log(error, // "reusing existing reducer for " + k); c = _c; } none. { - // log_full(core::error, "creating new reducer for " + k); + // log(error, "creating new reducer for " + k); let p = port(); let r = reduce, kk = k; tasks += @@ -229,7 +229,7 @@ fn main(argv: [str]) { let elapsed = stop - start; elapsed /= 1000000u64; - log_full(core::error, "MapReduce completed in " + log(error, "MapReduce completed in " + u64::str(elapsed) + "ms"); } diff --git a/src/test/bench/task-perf-word-count.rs b/src/test/bench/task-perf-word-count.rs index a05ce493ddf..26d40d9c731 100644 --- a/src/test/bench/task-perf-word-count.rs +++ b/src/test/bench/task-perf-word-count.rs @@ -78,7 +78,7 @@ mod map_reduce { fn map_task(args: (chan<ctrl_proto>, str)) { let (ctrl, input) = args; - // log_full(core::error, "map_task " + input); + // log(error, "map_task " + input); let intermediates = map::new_str_hash(); fn emit(im: map::hashmap<str, chan<reduce_proto>>, @@ -158,15 +158,15 @@ mod map_reduce { } find_reducer(k, cc) { let c; - // log_full(core::error, "finding reducer for " + k); + // log(error, "finding reducer for " + k); alt reducers.find(k) { some(_c) { - // log_full(core::error, + // log(error, // "reusing existing reducer for " + k); c = _c; } none. { - // log_full(core::error, "creating new reducer for " + k); + // log(error, "creating new reducer for " + k); let p = port(); tasks += [task::spawn_joinable((k, chan(p)), reduce_task)]; @@ -201,7 +201,7 @@ fn main(argv: [str]) { let elapsed = stop - start; elapsed /= 1000000u64; - log_full(core::error, "MapReduce completed in " + log(error, "MapReduce completed in " + u64::str(elapsed) + "ms"); } |
