update

Author: wardlin

stats.go

@@ -12,8 +12,6 @@ import (
 	"github.com/eaglesunshine/trace/stats/quantile"
 )
 
-var recordLock sync.Mutex
-
 type ServerRecord struct {
 	TTL             uint8
 	Addr            string
@@ -96,11 +94,7 @@ func (t *TraceRoute) getServer(addr string, ttl uint8, key string, sendTimeStamp
 
 	server.RecvCnt++
 
-	server.Rtt = float64(receiveTimeStamp.Sub(sendTimeStamp) / time.Microsecond)
-
-	// latency := float64(receiveTimeStamp.Sub(sendTimeStamp) / time.Microsecond)
-	// server.LatencyDescribe.Append(latency, 2)
-	// server.Quantile.Insert(latency)
+	server.Rtt = float64(receiveTimeStamp.Sub(sendTimeStamp) / time.Nanosecond)
 
 	if server.Name == "" {
 		server.LookUPAddr()
@@ -110,8 +104,8 @@ func (t *TraceRoute) getServer(addr string, ttl uint8, key string, sendTimeStamp
 }
 
 func (t *TraceRoute) addLastHop(ttl uint8) {
-	recordLock.Lock()
-	defer recordLock.Unlock()
+	t.RecordLock.Lock()
+	defer t.RecordLock.Unlock()
 
 	t.LastArrived += 1
 	if t.LastArrived <= t.MaxPath {

trace.go

@@ -57,15 +57,17 @@ type TraceRoute struct {
 	LastArrived int
 	Hops        []HopData
 	StartTime   time.Time
+	RecordLock  sync.Mutex
+	SendMap     map[string]*SendMetric
 }
 type StatsDB struct {
 	Cache   *tsyncmap.Map
 	SendCnt *uint64
 }
 
 func NewStatsDB(key string) *StatsDB {
-	cacheTimeout := time.Duration(6 * time.Second)
-	checkFreq := time.Duration(1 * time.Second)
+	cacheTimeout := 6 * time.Second
+	checkFreq := 1 * time.Second
 	var cnt uint64
 	px := &StatsDB{
 		Cache:   tsyncmap.NewMap(key, cacheTimeout, checkFreq, false),