diff options
| -rw-r--r-- | test/bench/chameneosredux.go | 18 | ||||
| -rwxr-xr-x | test/bench/timing.sh | 4 |
2 files changed, 13 insertions, 9 deletions
diff --git a/test/bench/chameneosredux.go b/test/bench/chameneosredux.go index e957309f7..6fa89e49c 100644 --- a/test/bench/chameneosredux.go +++ b/test/bench/chameneosredux.go @@ -35,8 +35,11 @@ POSSIBILITY OF SUCH DAMAGE. package main -import "fmt" -import "flag" +import ( + "flag"; + "fmt"; + "strconv"; +) const ( blue = iota; @@ -85,12 +88,13 @@ type result struct { same int; } -var np = flag.Int("n", 600, "count") -var N int +var n = 600 func main() { flag.Parse(); - N = *np; + if flag.NArg() > 0 { + n, _ = strconv.Atoi(flag.Arg(0)) + } for c0 := 0; c0 < ncol; c0++ { for c1 := 0; c1 < ncol; c1++ { @@ -137,8 +141,8 @@ func creature(info0 info, meetingplace chan rendez, ended chan result) { var othername int; // get access to rendez data and decide what to do. switch r := <-meetingplace; { - case r.n >= N: - // if more than N meetings, then send our result data and exit. + case r.n >= n: + // if no more meetings left, then send our result data and exit. meetingplace <- rendez{n: r.n}; ended <- result{met, same}; return; diff --git a/test/bench/timing.sh b/test/bench/timing.sh index 1bb14d3ba..2227fbf0f 100755 --- a/test/bench/timing.sh +++ b/test/bench/timing.sh @@ -176,8 +176,8 @@ threadring() { chameneos() { runonly echo 'chameneos 6000000' run 'gcc -O2 chameneosredux.c -lpthread' a.out 6000000 -# run 'gccgo -O2 chameneosredux.go' a.out -n 6000000 # doesn't support the non-forward-decl variant - run 'gc chameneosredux' $O.out -n 6000000 +# run 'gccgo -O2 chameneosredux.go' a.out 6000000 # doesn't support the non-forward-decl variant + run 'gc chameneosredux' $O.out 6000000 } case $# in |