HTTP load generator, ApacheBench (ab) replacement
Go
fix printing race between the report and the progress
Jaana Burcu Dogan74c4ca31d819
diff --git a/requester/print.go b/requester/print.goindex e37f0f4..a9456ca 100644--- a/requester/print.go+++ b/requester/print.go@@ -136,7 +136,7 @@ func (r *report) print() {sort.Float64s(r.lats)r.fastest = r.lats[0]r.slowest = r.lats[len(r.lats)-1]- fmt.Printf("Summary:\n")+ fmt.Printf("\nSummary:\n")fmt.Printf(" Total:\t%4.4f secs\n", r.total.Seconds())fmt.Printf(" Slowest:\t%4.4f secs\n", r.slowest)fmt.Printf(" Fastest:\t%4.4f secs\n", r.fastest)diff --git a/requester/requester.go b/requester/requester.goindex 2053609..21e95a3 100644--- a/requester/requester.go+++ b/requester/requester.go@@ -88,23 +88,22 @@ type Work struct {}// displayProgress outputs the displays until stopCh returns a value.-func (b *Work) displayProgress(stopCh chan string) {+func (b *Work) displayProgress(stopCh chan struct{}) {if b.Output != "" {return}- prev := 0+ var prev intfor {select {- case msg := <-stopCh:- fmt.Printf("%v\n\n", msg)+ case <-stopCh:returncase <-time.Tick(time.Millisecond * 500):- }- n := len(b.results)- if prev < n {- prev = n- fmt.Printf("%d requests done.\n", n)+ n := len(b.results)+ if prev < n {+ prev = n+ fmt.Printf("%d requests done.\n", n)+ }}}}@@ -122,7 +121,7 @@ func (b *Work) Run() {b.results = make(chan *result, b.N)- stopCh := make(chan string)+ stopCh := make(chan struct{})go b.displayProgress(stopCh)start := time.Now()@@ -130,13 +129,17 @@ func (b *Work) Run() {signal.Notify(c, os.Interrupt)go func() {<-c- stopCh <- "Aborting."+ stopCh <- struct{}{}newReport(b.N, b.results, b.Output, time.Now().Sub(start), b.EnableTrace).finalize()os.Exit(1)}()b.runWorkers()- stopCh <- "All requests done."+ stopCh <- struct{}{}+ if b.Output == "" {+ fmt.Println("All requests done.")+ }+newReport(b.N, b.results, b.Output, time.Now().Sub(start), b.EnableTrace).finalize()close(b.results)}