Added Concurrency parameter to Server

1 files changed, 8 insertions, 16 deletions

diff --git a/server_timing_test.go b/server_timing_test.go
index 9151182..82e3521 100644
--- a/server_timing_test.go
+++ b/server_timing_test.go
@@ -121,9 +121,10 @@ func BenchmarkServerMaxConnsPerIP(b *testing.B) {
 			registerServedRequest(b, ch)
 		},
 		MaxConnsPerIP: clientsCount * 2,
+		Concurrency:   16 * clientsCount,
 	}
 	req := "GET /foo HTTP/1.1\r\nHost: google.com\r\n\r\n"
-	benchmarkServer(b, &testServer{s, clientsCount}, clientsCount, requestsPerConn, req)
+	benchmarkServer(b, s, clientsCount, requestsPerConn, req)
 	verifyRequestsServed(b, ch)
 }
 
@@ -144,9 +145,10 @@ func BenchmarkServerTimeoutError(b *testing.B) {
 			}
 			registerServedRequest(b, ch)
 		},
+		Concurrency: 16 * clientsCount,
 	}
 	req := "GET /foo HTTP/1.1\r\nHost: google.com\r\n\r\n"
-	benchmarkServer(b, &testServer{s, clientsCount}, clientsCount, requestsPerConn, req)
+	benchmarkServer(b, s, clientsCount, requestsPerConn, req)
 	verifyRequestsServed(b, ch)
 }
 
@@ -284,8 +286,9 @@ func benchmarkServerGet(b *testing.B, clientsCount, requestsPerConn int) {
 			}
 			registerServedRequest(b, ch)
 		},
+		Concurrency: 16 * clientsCount,
 	}
-	benchmarkServer(b, &testServer{s, clientsCount}, clientsCount, requestsPerConn, getRequest)
+	benchmarkServer(b, s, clientsCount, requestsPerConn, getRequest)
 	verifyRequestsServed(b, ch)
 }
 
@@ -326,8 +329,9 @@ func benchmarkServerPost(b *testing.B, clientsCount, requestsPerConn int) {
 			}
 			registerServedRequest(b, ch)
 		},
+		Concurrency: 16 * clientsCount,
 	}
-	benchmarkServer(b, &testServer{s, clientsCount}, clientsCount, requestsPerConn, postRequest)
+	benchmarkServer(b, s, clientsCount, requestsPerConn, postRequest)
 	verifyRequestsServed(b, ch)
 }
 
@@ -388,18 +392,6 @@ type realServer interface {
 	Serve(ln net.Listener) error
 }
 
-type testServer struct {
-	*Server
-	Concurrency int
-}
-
-func (s *testServer) Serve(ln net.Listener) error {
-	if s.Concurrency < runtime.NumCPU() {
-		s.Concurrency = runtime.NumCPU()
-	}
-	return s.Server.ServeConcurrency(ln, s.Concurrency*16)
-}
-
 func benchmarkServer(b *testing.B, s realServer, clientsCount, requestsPerConn int, request string) {
 	ln := newFakeListener(b.N, clientsCount, requestsPerConn, request)
 	ch := make(chan struct{})