micropelago/isle
4
1
Fork 0
Code Issues 1 Pull Requests Projects Releases 5 Activity

Use atomic.Uint64 type rather than atomic.AddUint64 (see Bugs section of atomic package)

Browse Source
This commit is contained in:
Brian Picciano 2024-11-19 12:55:56 +01:00
parent 9545f77cce
commit 8e1dd2b2e9
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
go/daemon/network/network_it_util_test.go
View File

@ -30,15 +30,19 @@ var (
return filepath.Join(appDirPath, "bin") return filepath.Join(appDirPath, "bin")
}) })
ipNetCounter uint64 = 0 ipNetCounter = new(atomic.Uint64)
publicAddrPortCounter uint64 = 1024 publicAddrPortCounter = func() *atomic.Uint64 {
i := new(atomic.Uint64)
i.Store(1024)
return i
}()
) )
func newIPNet() nebula.IPNet { func newIPNet() nebula.IPNet {
var ( var (
ipNet nebula.IPNet ipNet nebula.IPNet
ipNetStr = fmt.Sprintf( ipNetStr = fmt.Sprintf(
"172.16.%d.0/24", atomic.AddUint64(&ipNetCounter, 1), "172.16.%d.0/24", ipNetCounter.Add(1)-1,
) )
) )
@ -51,7 +55,7 @@ func newIPNet() nebula.IPNet {
func newPublicAddr() string { func newPublicAddr() string {
return fmt.Sprintf( return fmt.Sprintf(
"127.0.0.200:%d", atomic.AddUint64(&publicAddrPortCounter, 1), "127.0.0.200:%d", publicAddrPortCounter.Add(1)-1,
) )
} }
@ -59,7 +63,7 @@ type integrationHarness struct {
ctx context.Context ctx context.Context
logger *mlog.Logger logger *mlog.Logger
rootDir toolkit.Dir rootDir toolkit.Dir
dirCounter uint64 dirCounter atomic.Uint64
} }
func newIntegrationHarness(t *testing.T) *integrationHarness { func newIntegrationHarness(t *testing.T) *integrationHarness {
@ -89,7 +93,7 @@ func newIntegrationHarness(t *testing.T) *integrationHarness {
} }
func (h *integrationHarness) mkDir(t *testing.T, name string) toolkit.Dir { func (h *integrationHarness) mkDir(t *testing.T, name string) toolkit.Dir {
fullName := fmt.Sprintf("%s-%d", name, atomic.AddUint64(&h.dirCounter, 1)) fullName := fmt.Sprintf("%s-%d", name, h.dirCounter.Add(1)-1)
t.Logf("Creating directory %q", fullName) t.Logf("Creating directory %q", fullName)
d, err := h.rootDir.MkChildDir(fullName, false) d, err := h.rootDir.MkChildDir(fullName, false)