Merge pull request #7 from easyops-cn/jax/time_sleep

chore(): 优化sleep config
easyops-cn · Jul 22, 2024 · f04b221 · f04b221
2 parents 338a45b + d7ac496
commit f04b221
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/net/net_linux.go b/net/net_linux.go
@@ -9,6 +9,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"github.com/shirou/gopsutil/v3/net/sleepconfig"
 	"io"
 	"io/ioutil"
 	"net"
@@ -672,7 +673,7 @@ func getProcInodesAllWithContext(ctx context.Context, root string, max int) (map
 	ret := make(map[string][]inodeMap)
 
 	for i, pid := range pids {
-		TimeSleep(i)
+		sleepconfig.TimeSleep(i)
 		t, err := getProcInodes(root, pid, max)
 		if err != nil {
 			// skip if permission error or no longer exists

diff --git a/net/net_windows.go b/net/net_windows.go
@@ -6,6 +6,7 @@ package net
 import (
 	"context"
 	"fmt"
+	"github.com/shirou/gopsutil/v3/net/sleepconfig"
 	"net"
 	"os"
 	"syscall"
@@ -413,8 +414,7 @@ func getTCPConnections(family uint32) ([]ConnectionStat, error) {
 		return nil, fmt.Errorf("faimly must be required")
 	}
 
-	for i := 0; ; i++ {
-		TimeSleep(i)
+	for {
 		switch family {
 		case kindTCP4.family:
 			if len(buf) > 0 {
@@ -465,7 +465,7 @@ func getTCPConnections(family uint32) ([]ConnectionStat, error) {
 	}
 
 	for i := 0; i < length; i++ {
-		TimeSleep(i)
+		sleepconfig.TimeSleep(i)
 		switch family {
 		case kindTCP4.family:
 			mibs := (*mibTCPRowOwnerPid)(unsafe.Pointer(&buf[index]))

diff --git a/net/netlink/inetdiag.go b/net/netlink/inetdiag.go
@@ -12,6 +12,7 @@ package netlink
 import (
 	"bytes"
 	"encoding/binary"
+	"github.com/shirou/gopsutil/v3/net/sleepconfig"
 	"hash/fnv"
 	"io"
 	"net"
@@ -162,8 +163,8 @@ done:
 			return nil, err
 		}
 
-		for _, m := range msgs {
-
+		for i, m := range msgs {
+			sleepconfig.TimeSleep(i)
 			if m.Header.Type == syscall.NLMSG_DONE {
 				break done
 			}

diff --git a/net/sleep.go → net/sleepconfig/sleepconfig.go b/net/sleep.go → net/sleepconfig/sleepconfig.go
@@ -1,4 +1,4 @@
-package net
+package sleepconfig
 
 import (
 	"go.easyops.local/slog"
@@ -9,19 +9,24 @@ import (
 var config SleepConfig
 
 type SleepConfig struct {
+	enable          bool
 	sleepMs         atomic.Int64
 	loopBeforeSleep atomic.Int32
 	logger          slog.Logger
 }
 
 func InitSleepConfig(ms int, loop int, logger slog.Logger) {
 	config = SleepConfig{}
+	config.enable = true
 	config.sleepMs.Store(int64(ms))
 	config.loopBeforeSleep.Store(int32(loop))
 	config.logger = logger
 }
 
 func TimeSleep(i int) {
+	if !config.enable {
+		return
+	}
 	j := int(config.loopBeforeSleep.Load())
 	if j == 0 || (i+1)%j != 0 {
 		return