Changes in benchmark/readyQ/transfer.rs [65c9208:ebb6158]

File:

• benchmark/readyQ/transfer.rs (modified) (10 diffs)

benchmark/readyQ/transfer.rs

@@ -6 +6 @@
 use std::hint;
 use std::sync::Arc;
-use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
+use std::sync::atomic::{AtomicUsize, Ordering};
 use std::time::{Instant,Duration};
 
@@ -44 +44 @@
                         match val {
                                 "yes" => true,
-                                "Y" => true,
-                                "y" => true,
                                 "no"  => false,
-                                "N"  => false,
-                                "n"  => false,
                                 "maybe" | "I don't know" | "Can you repeat the question?" => {
                                         eprintln!("Lines for 'Malcolm in the Middle' are not acceptable values of parameter 'exhaust'");
@@ -68 +64 @@
         id: AtomicUsize,
         idx: AtomicUsize,
-        estop: AtomicBool,
         seed: u128,
 }
@@ -77 +72 @@
                         id: AtomicUsize::new(nthreads),
                         idx: AtomicUsize::new(0),
-                        estop: AtomicBool::new(false),
                         seed: process::id() as u128
                 };
@@ -106 +100 @@
 }
 
-fn waitgroup(leader: &LeaderInfo, idx: usize, threads: &Vec<Arc<MyThread>>, main_sem: &sync::Semaphore) {
+fn waitgroup(idx: usize, threads: &Vec<Arc<MyThread>>) {
         let start = Instant::now();
-        'outer: for t in threads {
+        for t in threads {
                 debug!( "Waiting for :{} ({})", t.id, t.idx.load(Ordering::Relaxed) );
                 while t.idx.load(Ordering::Relaxed) != idx {
@@ -114 +108 @@
                         if start.elapsed() > Duration::from_secs(5) {
                                 eprintln!("Programs has been blocked for more than 5 secs");
-                                leader.estop.store(true, Ordering::Relaxed);
-                                main_sem.add_permits(1);
-                                break 'outer;
+                                std::process::exit(1);
                         }
                 }
@@ -139 +131 @@
         leader.idx.store(nidx, Ordering::Relaxed);
 
-        if nidx as u64 > exp.stop_count || leader.estop.load(Ordering::Relaxed) {
+        if nidx as u64 > exp.stop_count {
                 debug!( "Leader {} done", this.id);
                 main_sem.add_permits(1);
@@ -147 +139 @@
         debug!( "====================\nLeader no {} : {}", nidx, this.id);
 
-        waitgroup(leader, nidx, threads, main_sem);
+        waitgroup(nidx, threads);
 
         leader.next( threads.len() );
@@ -200 +192 @@
                         wait( exhaust, &leader, &threads[me], &mut rechecks ).await;
                 }
-                if leader.idx.load(Ordering::Relaxed) as u64 > exp.stop_count || leader.estop.load(Ordering::Relaxed) { break; }
+                if leader.idx.load(Ordering::Relaxed) as u64 > exp.stop_count { break; }
         }
 
@@ -281 +273 @@
         println!("Number of processors    : {}", (nprocs).to_formatted_string(&Locale::en));
         println!("Number of threads       : {}", (nthreads).to_formatted_string(&Locale::en));
-        println!("Total Operations(ops)   : {:>15}", (leader.idx.load(Ordering::Relaxed) - 1).to_formatted_string(&Locale::en));
+        println!("Total Operations(ops)   : {:>15}", (exp.stop_count).to_formatted_string(&Locale::en));
         println!("Threads parking on wait : {}", if exhaust { "yes" } else { "no" });
         println!("Rechecking              : {}", rechecks );
-        println!("ns per transfer         : {}", ((duration.as_nanos() as f64) / leader.idx.load(Ordering::Relaxed) as f64));
-
-}
+}