From 5fb4e2d43dfbf120b46d32fb56e06470d3177f90 Mon Sep 17 00:00:00 2001
From: krisjczhang <krisjczhang@tencent.com>
Date: Sun, 25 Sep 2022 21:44:34 +0800
Subject: [PATCH] test

---
 stats.go |  9 ++++-----
 trace.go | 27 ++++++++++++++-------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/stats.go b/stats.go
index 3ace2d7..0e3cabf 100644
--- a/stats.go
+++ b/stats.go
@@ -3,13 +3,11 @@ package ztrace
 import (
 	"bytes"
 	"fmt"
+	"github.com/eaglesunshine/trace/stats/describe"
+	"github.com/eaglesunshine/trace/stats/quantile"
 	"net"
 	"strings"
 	"sync"
-	"time"
-
-	"github.com/eaglesunshine/trace/stats/describe"
-	"github.com/eaglesunshine/trace/stats/quantile"
 )
 
 type ServerRecord struct {
@@ -84,7 +82,8 @@ func (t *TraceRoute) RecordRecv(v *RecvMetric) bool {
 	server := t.NewServerRecord(v.RespAddr, uint8(sendInfo.TTL), sendInfo.FlowKey)
 
 	server.RecvCnt++
-	latency := float64(v.TimeStamp.Sub(sendInfo.TimeStamp) / time.Microsecond)
+	//latency := float64(v.TimeStamp.Sub(sendInfo.TimeStamp) / time.Microsecond)
+	latency := float64(v.TimeStamp.Sub(sendInfo.TimeStamp).Microseconds())
 
 	server.LatencyDescribe.Append(latency, 2)
 	server.Quantile.Insert(latency)
diff --git a/trace.go b/trace.go
index 33b6c82..1377529 100644
--- a/trace.go
+++ b/trace.go
@@ -132,7 +132,7 @@ func New(protocol string, dest string, src string, af string, maxPath int64, max
 	defer func() {
 		if e := recover(); e != nil {
 			logrus.Error(e)
-			buf := make([]byte, 64<<10)		//64*2^10, 64KB
+			buf := make([]byte, 64<<10) //64*2^10, 64KB
 			buf = buf[:runtime.Stack(buf, false)]
 			err = fmt.Errorf("panic recovered: %s\n %s", e, buf)
 		}
@@ -172,12 +172,12 @@ func (t *TraceRoute) TraceUDP() (err error) {
 	var handlers []func() error
 
 	for i := 0; i < t.MaxPath; i++ {
-		handlers=append(handlers, func() error {
+		handlers = append(handlers, func() error {
 			return t.SendIPv4UDP()
 		})
 	}
 
-	handlers=append(handlers, func() error {
+	handlers = append(handlers, func() error {
 		return t.ListenIPv4ICMP()
 	})
 
@@ -188,12 +188,12 @@ func (t *TraceRoute) TraceTCP() (err error) {
 	var handlers []func() error
 
 	for i := 0; i < t.MaxPath; i++ {
-		handlers=append(handlers, func() error {
+		handlers = append(handlers, func() error {
 			return t.SendIPv4TCP()
 		})
 	}
 
-	handlers=append(handlers, func() error {
+	handlers = append(handlers, func() error {
 		return t.ListenIPv4ICMP()
 	})
 
@@ -203,13 +203,14 @@ func (t *TraceRoute) TraceTCP() (err error) {
 func (t *TraceRoute) TraceICMP() (err error) {
 	var handlers []func() error
 
-	for i := 0; i < t.MaxPath; i++ {
-		handlers=append(handlers, func() error {
-			return t.SendIPv4ICMP()
-		})
-	}
+	handlers = append(handlers, t.SendIPv4ICMP)
+	//for i := 0; i < t.MaxPath; i++ {
+	//	handlers=append(handlers, func() error {
+	//		return t.SendIPv4ICMP()
+	//	})
+	//}
 
-	handlers=append(handlers, func() error {
+	handlers = append(handlers, func() error {
 		return t.ListenIPv4ICMP()
 	})
 
@@ -246,7 +247,7 @@ func GoroutineNotPanic(handlers ...func() error) (err error) {
 			defer func() {
 				if e := recover(); e != nil {
 					logrus.Error(e)
-					buf := make([]byte, 64<<10)		//64*2^10, 64KB
+					buf := make([]byte, 64<<10) //64*2^10, 64KB
 					buf = buf[:runtime.Stack(buf, false)]
 					err = fmt.Errorf("panic recovered: %s\n %s", e, buf)
 				}
@@ -263,4 +264,4 @@ func GoroutineNotPanic(handlers ...func() error) (err error) {
 	wg.Wait()
 
 	return
-}
\ No newline at end of file
+}