Make benchmark compile on stable

Bathtor · Mar 20, 2019 · e9c5f16 · e9c5f16
1 parent 23e758f
commit e9c5f16
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/executor-performance/src/experiment.rs b/executor-performance/src/experiment.rs
@@ -11,8 +11,13 @@ use std::default::Default;
 use std::thread;
 use std::sync::Arc;
 use synchronoise::CountdownEvent;
+
+#[cfg(feature = "nightly")]
 use test::black_box;
 
+#[cfg(not(feature = "nightly"))]
+fn black_box<T>(dummy: T) -> T { dummy }
+
 #[derive(Clone, Debug)]
 pub struct ExperimentSettings {
     num_threads: usize,

diff --git a/executor-performance/src/main.rs b/executor-performance/src/main.rs
@@ -5,12 +5,16 @@
 // <LICENSE or http://opensource.org/licenses/MIT>.
 // This file may not be copied, modified, or distributed
 // except according to those terms.
-#![feature(test)]
+#![cfg_attr(feature = "nightly", feature(test))]
+
 #![allow(unused_parens)]
 extern crate executors;
 extern crate synchronoise;
 extern crate time;
+
+#[cfg(feature = "nightly")]
 extern crate test;
+
 #[macro_use]
 extern crate clap;
 

diff --git a/executor-performance/threadinc.sh b/executor-performance/threadinc.sh
@@ -10,6 +10,6 @@ OUT_LOC="out.csv"
 rm $OUT_LOC;
 for i in $(seq $MIN_THREADS $MAX_THREADS); do
 	echo "Run $i starting";
-	$BIN_LOC -t $i -p $INPAR -m $MSGS -a $AMP -o $OUT_LOC --pre 100 --post 100 --skip-tpe;
+	$BIN_LOC -t $i -p $INPAR -m $MSGS -a $AMP -o $OUT_LOC --pre 10000 --post 10000 --skip-tpe;
 	echo "Run $i finished";
-done
+done