about summary refs log tree commit diff
path: root/src/test/bench
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-07-18 21:46:32 +0000
committerbors <bors@rust-lang.org>2014-07-18 21:46:32 +0000
commitef352faea84fa16616b773bd9aa5020d7c76bff0 (patch)
tree0ed3c22f4b984355886a4158d4a2b3f238e6f26a /src/test/bench
parent7502b4cd6b10693cec6862f5951b1adf0c7657ab (diff)
parent407fe9a08c4756b6a837c23756d12d483985b4e2 (diff)
downloadrust-ef352faea84fa16616b773bd9aa5020d7c76bff0.tar.gz
rust-ef352faea84fa16616b773bd9aa5020d7c76bff0.zip
auto merge of #15743 : Ryman/rust/mandelbrot_fix, r=alexcrichton
Matches the official sample output (N=200) again.

cc #15408
Diffstat (limited to 'src/test/bench')
-rw-r--r--src/test/bench/shootout-mandelbrot.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/bench/shootout-mandelbrot.rs b/src/test/bench/shootout-mandelbrot.rs
index 2d98668496c..b0e23983192 100644
--- a/src/test/bench/shootout-mandelbrot.rs
+++ b/src/test/bench/shootout-mandelbrot.rs
@@ -64,7 +64,7 @@ fn mandelbrot<W: io::Writer>(w: uint, mut out: W) -> io::IoResult<()> {
     let chunk_size = h / WORKERS;
 
     // Account for remainders in workload division, e.g. 1000 / 16 = 62.5
-    let first_chunk_size = if h % WORKERS != 0 {
+    let last_chunk_size = if h % WORKERS != 0 {
         chunk_size + h % WORKERS
     } else {
         chunk_size
@@ -87,8 +87,8 @@ fn mandelbrot<W: io::Writer>(w: uint, mut out: W) -> io::IoResult<()> {
             let mut is = Vec::with_capacity(w / WORKERS);
 
             let start = i * chunk_size;
-            let end = if i == 0 {
-                first_chunk_size
+            let end = if i == (WORKERS - 1) {
+                start + last_chunk_size
             } else {
                 (i + 1) * chunk_size
             };