microsoft/ethr
1
1
Fork 0
mirror of https://github.com/microsoft/ethr.git synced 2024-09-20 06:46:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix error handling in establishSession (#85)

Browse source
This commit is contained in:
Yoshiyuki Kurauchi 2019-06-05 16:47:51 +09:00 committed by Pankaj Garg
parent b1baba1892
commit 90c8f2467c
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
client.go
View file

@ -72,6 +72,7 @@ func establishSession(testParam EthrTestParam, server string) (test *ethrTest, e
err = fmt.Errorf("Unexpected control message received. %v", ethrMsg)
}
deleteTest(test)
return nil, err
}
gCert = ethrMsg.Ack.Cert
napDuration := ethrMsg.Ack.NapDuration
@ -302,7 +303,7 @@ ExitForLoop:
// server side latency measurements as well.
_, _ = conn.Write(buff)
calcLatency(test, rttCount, latencyNumbers)
calcLatency(test, rttCount, latencyNumbers)
}
}
}
@ -467,7 +468,7 @@ func runHTTPLatencyTest(test *ethrTest) {
for i := uint32(0); i < test.testParam.BufferSize; i++ {
buff[i] = 'x'
}
rttCount := test.testParam.RttCount
latencyNumbers := make([]time.Duration, rttCount)
tr := &http.Transport{DisableCompression: true}
@ -491,7 +492,7 @@ ExitForLoop:
contents, err := ioutil.ReadAll(response.Body)
response.Body.Close()
if err != nil {
break ExitSelect
break ExitSelect
}
ethrUnused(contents)
}
@ -499,13 +500,13 @@ ExitForLoop:
latencyNumbers[i] = e2
}
calcLatency(test, rttCount, latencyNumbers)
calcLatency(test, rttCount, latencyNumbers)
}
}
}
func calcLatency (test *ethrTest, rttCount uint32, latencyNumbers []time.Duration) {
sum := int64(0)
func calcLatency(test *ethrTest, rttCount uint32, latencyNumbers []time.Duration) {
sum := int64(0)
for _, d := range latencyNumbers {
sum += d.Nanoseconds()
}
@ -535,4 +536,4 @@ func calcLatency (test *ethrTest, rttCount uint32, latencyNumbers []time.Duratio
test.session.remoteAddr,
protoToString(test.testParam.TestID.Protocol),
avg, min, max, p50, p90, p95, p99, p999, p9999)
}
}