🪛 clientgroups, probe: cleanup

database64128 · Feb 21, 2025 · 5971795 · 5971795
1 parent feb0f41
commit 5971795
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/clientgroups/probe.go b/clientgroups/probe.go
@@ -512,9 +512,9 @@ type latencyProbeJob[C any] struct {
 
 func (j *latencyProbeJob[C]) Run(ctx context.Context) {
 	defer j.wg.Done()
-	ctx, cancel := context.WithTimeout(ctx, j.timeout)
-	defer cancel()
 	start := time.Now()
+	ctx, cancel := context.WithDeadline(ctx, start.Add(j.timeout))
+	defer cancel()
 	if err := j.probe(ctx, j.client); err == nil {
 		j.result[j.count%32] = time.Since(start)
 	} else {

diff --git a/probe/tcp.go b/probe/tcp.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net"
 	"net/http"
-	"time"
 
 	"github.com/database64128/shadowsocks-go/conn"
 	"github.com/database64128/shadowsocks-go/zerocopy"
@@ -74,10 +73,3 @@ func (p TCPProbe) Probe(ctx context.Context, client zerocopy.TCPClient) error {
 
 	return nil
 }
-
-// ProbeRTT runs the connectivity test and returns the round-trip time.
-func (p TCPProbe) ProbeRTT(ctx context.Context, client zerocopy.TCPClient) (rtt time.Duration, err error) {
-	start := time.Now()
-	err = p.Probe(ctx, client)
-	return time.Since(start), err
-}
diff --git a/probe/udp.go b/probe/udp.go
@@ -7,7 +7,6 @@ import (
 	"math/rand/v2"
 	"os"
 	"slices"
-	"time"
 
 	"github.com/database64128/shadowsocks-go/conn"
 	"github.com/database64128/shadowsocks-go/zerocopy"
@@ -243,10 +242,3 @@ func (p UDPProbe) Probe(ctx context.Context, client zerocopy.UDPClient) error {
 		return nil
 	}
 }
-
-// ProbeRTT runs the connectivity test and returns the round-trip time.
-func (p UDPProbe) ProbeRTT(ctx context.Context, client zerocopy.UDPClient) (rtt time.Duration, err error) {
-	start := time.Now()
-	err = p.Probe(ctx, client)
-	return time.Since(start), err
-}