Results: Extraction + Encoding, Decoding

lib/attack.go

@@ -4,29 +4,17 @@ import (
 	"errors"
 	"io/ioutil"
 	"net/http"
-	"sort"
 	"time"
 )
 
-// Result represents the metrics defined out of an http.Response
-// generated by each target hit
-type Result struct {
-	Code      uint16
-	Timestamp time.Time
-	Timing    time.Duration
-	BytesOut  uint64
-	BytesIn   uint64
-	Error     error
-}
-
 // Attack hits the passed Targets (http.Requests) at the rate specified for
 // duration time and then waits for all the requests to come back.
 // The results of the attack are put into a slice which is returned.
-func Attack(targets Targets, rate uint64, duration time.Duration) []Result {
+func Attack(targets Targets, rate uint64, duration time.Duration) Results {
 	total := rate * uint64(duration.Seconds())
 	hits := make(chan *http.Request, total)
 	res := make(chan Result, total)
-	results := make(results, total)
+	results := make(Results, total)
 	// Scatter
 	go drill(rate, hits, res)
 	for i := 0; i < cap(hits); i++ {
@@ -39,18 +27,9 @@ func Attack(targets Targets, rate uint64, duration time.Duration) []Result {
 	}
 	close(res)
 
-	sort.Sort(results)
-
-	return results
+	return results.Sort()
 }
 
-// results is a slice of Result defined only to be sortable with sort.Interface
-type results []Result
-
-func (r results) Len() int           { return len(r) }
-func (r results) Less(i, j int) bool { return r[i].Timestamp.Before(r[j].Timestamp) }
-func (r results) Swap(i, j int)      { r[i], r[j] = r[j], r[i] }
-
 // drill loops over the passed reqs channel and executes each request.
 // It is throttled to the rate specified.
 func drill(rate uint64, reqs chan *http.Request, res chan Result) {