Merge pull request #45 from sasile/master

fix multi file support for performance worker

.gitignore

@@ -7,4 +7,4 @@ http_blaster
 #ignore iml
 http_blaster.iml
 BlasterDump-*
-*results*
+*results

httpblaster/request_generators/performance_generator.go

@@ -77,16 +77,15 @@ func (self *PerformanceGenerator) clone_request(req *fasthttp.Request) *Request
 }
 
 func (self *PerformanceGenerator) single_file_submitter(ch_req chan *Request, req *fasthttp.Request, done chan struct{}) {
-
 	var generated int = 0
-	request := self.clone_request(req)
-	request.Request.SetHost(self.Host)
 LOOP:
 	for {
 		select {
 		case <-done:
 			break LOOP
 		default:
+			request := self.clone_request(req)
+			request.Request.SetHost(self.Host)
 			if self.workload.Count == 0 {
 				ch_req <- request
 				generated += 1

httpblaster/worker/perf_worker.go

@@ -42,9 +42,6 @@ func (w *PerfWorker) RunWorker(ch_resp chan *request_generators.Response, ch_req
 	dump_requests bool,
 	dump_location string) {
 	defer wg.Done()
-	var oncePrepare sync.Once
-	var request *request_generators.Request
-	submit_request := request_generators.AcquireRequest()
 	var req_type sync.Once
 
 	do_once.Do(func() {
@@ -57,23 +54,15 @@ func (w *PerfWorker) RunWorker(ch_resp chan *request_generators.Response, ch_req
 		req_type.Do(func() {
 			w.Results.Method = string(req.Request.Header.Method())
 		})
-
-		oncePrepare.Do(func() {
-			request = req
-			request.Request.Header.CopyTo(&submit_request.Request.Header)
-			submit_request.Request.AppendBody(request.Request.Body())
-			submit_request.Request.SetHost(w.host)
-		})
-
-		err, d := w.send_request(submit_request, response)
+		err, d := w.send_request(req, response)
 
 		if err != nil{
 			log.Errorf("send request failed %s", err.Error())
 		}
 
 		ch_statuses <- response.Response.StatusCode()
 		ch_latency <- d
-
+		request_generators.ReleaseRequest(req)
 		response.Response.Reset()
 	}