wip: refactor

README.md

@@ -1,4 +1,9 @@
-# versus
+# Versus
 
-versus takes a stream of requests and runs them against N endpoints
+Versus takes a stream of requests and runs them against N endpoints
 simultaneously, comparing the output and timing.
+
+
+## Design
+
+

client.go

@@ -7,13 +7,28 @@ import (
 	"golang.org/x/sync/errgroup"
 )
 
+type clientStats struct {
+	NumTotal  int           // Number of requests
+	NumErrors int           // Number of errors
+	TimeTotal time.Duration // Total duration of requests
+}
+
+func (stats *clientStats) Add(err error, elapsed time.Duration) {
+	stats.NumTotal += 1
+	if err != nil {
+		stats.NumErrors += 1
+	}
+	stats.TimeTotal += elapsed
+}
+
 const chanBuffer = 20
 
 type Client struct {
 	Endpoint    string
 	Concurrency int // Number of goroutines to make requests with. Must be >=1.
 	In          chan Request
-	Report      report
+	Out         chan Response
+	Stats       clientStats
 }
 
 // Serve starts the async request and response goroutine consumers.
@@ -22,13 +37,13 @@ func (client *Client) Serve(ctx context.Context) error {
 
 	g, ctx := errgroup.WithContext(ctx)
 
-	go func() {
-		// Consume responses
-		rep := report{}
+	g.Go(func() error {
 		for resp := range respCh {
-			rep.Add(resp.Err, resp.Elapsed)
+			client.Stats.Add(resp.Err, resp.Elapsed)
+			// TODO: Relay response to client.Out
 		}
-	}()
+		return nil
+	})
 
 	if client.Concurrency < 1 {
 		client.Concurrency = 1
@@ -53,6 +68,7 @@ func (client *Client) Serve(ctx context.Context) error {
 	}
 
 	err := g.Wait()
+
 	close(respCh)
 	return err
 }

main.go

@@ -79,6 +79,7 @@ func main() {
 			Endpoint:    endpoint,
 			Concurrency: options.Concurrency,
 			In:          make(chan Request, chanBuffer),
+			Out:         make(chan Response, chanBuffer),
 		}
 		clients = append(clients, c)
 		g.Go(func() error {
@@ -94,12 +95,10 @@ func main() {
 		exit(3, "failed: %s", err)
 	}
 
-	// TODO: Combine reports
-	finalReport := report{}
+	// TODO: Make a report
 	for _, client := range clients {
-		client.Report.MergeInto(&finalReport)
+		fmt.Println(client.Stats)
 	}
-	fmt.Println(finalReport)
 }
 
 // pump takes lines from a reader and pumps them into the clients

report.go

@@ -3,9 +3,8 @@ package main
 import "time"
 
 type report struct {
-	numTotal  int // Number of requests
-	numErrors int // Number of errors
-
+	numTotal  int           // Number of requests
+	numErrors int           // Number of errors
 	timeTotal time.Duration // Total duration of requests
 }
 
@@ -27,3 +26,11 @@ func (r *report) MergeInto(into *report) *report {
 	into.timeTotal += r.timeTotal
 	return into
 }
+
+// TODO: Need a separate service to compare returned bodies
+func (r *report) Serve(out <-chan Response) error {
+	for resp := range out {
+		r.Add(resp.Err, resp.Elapsed)
+	}
+	return nil
+}