qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 20:20:01 -07:00
Code Releases Activity

net/http: close HTTP response bodies in benchmark

Browse Source 
This should fix the race builders.

Change-Id: I9c9e7393d5e29d64ab797e346b34b1fa1dfe6d96
Reviewed-on: https://go-review.googlesource.com/3441
Reviewed-by: Dmitry Vyukov <dvyukov@google.com>
This commit is contained in:
Brad Fitzpatrick 2015-01-28 12:44:54 -06:00
parent 690db9c89f
commit f3857f5748
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/http/main_test.go
View File

@ -75,7 +75,7 @@ func goroutineLeaked() bool {
return true return true
} }
func afterTest(t *testing.T) { func afterTest(t testing.TB) {
http.DefaultTransport.(*http.Transport).CloseIdleConnections() http.DefaultTransport.(*http.Transport).CloseIdleConnections()
if testing.Short() { if testing.Short() {
return return

19
src/net/http/serve_test.go
View File

@ -2902,11 +2902,23 @@ func BenchmarkServer(b *testing.B) {
} }
} }
// getNoBody wraps Get but closes any Response.Body before returning the response.
func getNoBody(urlStr string) (*Response, error) {
res, err := Get(urlStr)
if err != nil {
return nil, err
}
res.Body.Close()
return res, nil
}
// A benchmark for profiling the client without the HTTP server code. // A benchmark for profiling the client without the HTTP server code.
// The server code runs in a subprocess. // The server code runs in a subprocess.
func BenchmarkClient(b *testing.B) { func BenchmarkClient(b *testing.B) {
b.ReportAllocs() b.ReportAllocs()
b.StopTimer() b.StopTimer()
defer afterTest(b)
port := os.Getenv("TEST_BENCH_SERVER_PORT") // can be set by user port := os.Getenv("TEST_BENCH_SERVER_PORT") // can be set by user
if port == "" { if port == "" {
port = "39207" port = "39207"
@ -2922,7 +2934,7 @@ func BenchmarkClient(b *testing.B) {
w.Header().Set("Content-Type", "text/html; charset=utf-8") w.Header().Set("Content-Type", "text/html; charset=utf-8")
w.Write(data) w.Write(data)
}) })
log.Fatal(ListenAndServe(":"+port, nil)) log.Fatal(ListenAndServe("localhost:"+port, nil))
} }
// Start server process. // Start server process.
@ -2941,7 +2953,7 @@ func BenchmarkClient(b *testing.B) {
url := "http://localhost:" + port + "/" url := "http://localhost:" + port + "/"
for i := 0; i < 100; i++ { for i := 0; i < 100; i++ {
time.Sleep(50 * time.Millisecond) time.Sleep(50 * time.Millisecond)
if _, err := Get(url); err == nil { if _, err := getNoBody(url); err == nil {
break break
} }
if i == 99 { if i == 99 {
@ -2968,7 +2980,7 @@ func BenchmarkClient(b *testing.B) {
b.StopTimer() b.StopTimer()
// Instruct server process to stop. // Instruct server process to stop.
Get(url + "?stop=yes") getNoBody(url + "?stop=yes")
select { select {
case err := <-done: case err := <-done:
if err != nil { if err != nil {
@ -2977,7 +2989,6 @@ func BenchmarkClient(b *testing.B) {
case <-time.After(5 * time.Second): case <-time.After(5 * time.Second):
b.Fatalf("subprocess did not stop") b.Fatalf("subprocess did not stop")
} }
DefaultTransport.(*Transport).CloseIdleConnections()
} }
func BenchmarkServerFakeConnNoKeepAlive(b *testing.B) { func BenchmarkServerFakeConnNoKeepAlive(b *testing.B) {