Changes in benchmark/readyQ/transfer.go [65c9208:6dc2db9]

File:

• benchmark/readyQ/transfer.go (modified) (11 diffs)

benchmark/readyQ/transfer.go

@@ -6 +6 @@
         "math/rand"
         "os"
-        "regexp"
         "runtime"
         "sync/atomic"
@@ -17 +16 @@
         id uint64
         idx uint64
-        estop uint64
         seed uint64
 }
@@ -36 +34 @@
 
 func NewLeader(size uint64) (*LeaderInfo) {
-        this := &LeaderInfo{0, 0, 0, uint64(os.Getpid())}
+        this := &LeaderInfo{0, 0, uint64(os.Getpid())}
 
         r := rand.Intn(10)
@@ -53 +51 @@
 }
 
-func waitgroup(leader * LeaderInfo, idx uint64, threads [] MyThread, main_sem chan struct {}) {
+func waitgroup(idx uint64, threads [] MyThread) {
         start := time.Now()
-        Outer:
         for i := 0; i < len(threads); i++ {
                 // fmt.Fprintf(os.Stderr, "Waiting for :%d (%d)\n", threads[i].id, atomic.LoadUint64(&threads[i].idx) );
@@ -64 +61 @@
                         if delta.Seconds() > 5 {
                                 fmt.Fprintf(os.Stderr, "Programs has been blocked for more than 5 secs")
-                                atomic.StoreUint64(&leader.estop, 1);
-                                main_sem <- (struct {}{})
-                                break Outer
+                                os.Exit(1)
                         }
                 }
@@ -79 +74 @@
                 if i != me {
                         // debug!( "Leader waking {}", i);
-                        defer func() {
-                                if err := recover(); err != nil {
-                                        fmt.Fprintf(os.Stderr, "Panic occurred: %s\n", err)
-                                }
-                        }()
                         threads[i].sem <- (struct {}{})
                 }
@@ -94 +84 @@
         atomic.StoreUint64(&leader.idx, nidx);
 
-        if nidx > stop_count || atomic.LoadUint64(&leader.estop) != 0 {
+        if nidx > stop_count {
                 // debug!( "Leader {} done", this.id);
                 main_sem <- (struct {}{})
@@ -102 +92 @@
         // debug!( "====================\nLeader no {} : {}", nidx, this.id);
 
-        waitgroup(leader, nidx, threads, main_sem);
+        waitgroup(nidx, threads);
 
         leader.next( uint64(len(threads)) );
@@ -156 +146 @@
                         waitleader( exhaust, leader, &threads[me], &r )
                 }
-                if atomic.LoadUint64(&leader.idx) > stop_count || atomic.LoadUint64(&leader.estop) != 0 { break; }
+                if atomic.LoadUint64(&leader.idx) > stop_count { break; }
         }
 
@@ -165 +155 @@
 func main() {
         // Benchmark specific command line arguments
-        exhaustOpt := flag.String("e", "no", "Whether or not threads that have seen the new epoch should park instead of yielding.")
+        exhaustOpt := flag.Bool("e", false, "Whether or not threads that have seen the new epoch should park instead of yielding.")
 
         // General benchmark initialization and deinitialization
-        bench_init()
-
-        exhaustVal := *exhaustOpt;
-
-        var exhaust bool
-        re_yes := regexp.MustCompile("[Yy]|[Yy][Ee][Ss]")
-        re_no  := regexp.MustCompile("[Nn]|[Nn][Oo]")
-        if re_yes.Match([]byte(exhaustVal)) {
-                exhaust = true
-        } else if re_no.Match([]byte(exhaustVal)) {
-                exhaust = false
-        } else {
-                fmt.Fprintf(os.Stderr, "Unrecognized exhaust(-e) option '%s'\n", exhaustVal)
-                os.Exit(1)
-        }
-
+        defer bench_init()()
+
+        exhaust := *exhaustOpt;
         if clock_mode {
-                fmt.Fprintf(os.Stderr, "Programs does not support fixed duration mode\n")
+                fmt.Fprintf(os.Stderr, "Programs does not support fixed duration mode")
                 os.Exit(1)
         }
@@ -238 +215 @@
                 ws = "no"
         }
-        p.Printf("Duration (ms)           : %d\n", delta.Milliseconds() )
+        p.Printf("Duration (ms)           : %f\n", delta.Milliseconds() )
         p.Printf("Number of processors    : %d\n", nprocs )
         p.Printf("Number of threads       : %d\n", nthreads )
-        p.Printf("Total Operations(ops)   : %15d\n", (leader.idx - 1) )
+        p.Printf("Total Operations(ops)   : %15d\n", stop_count )
         p.Printf("Threads parking on wait : %s\n", ws)
         p.Printf("Rechecking              : %d\n", rechecks )
-        p.Printf("ns per transfer         : %f\n", float64(delta.Nanoseconds()) / float64(leader.idx) )
-}
+}