update:use atomic.Int64

zeromicro · me-cs · May 22, 2025 · May 22, 2025 · May 22, 2025 · May 22, 2025
commit 56c390e750714bb133f237677b4cc044acfc4457
diff --git a/core/breaker/googlebreaker.go b/core/breaker/googlebreaker.go
@@ -26,7 +26,7 @@ type (
 		k        float64
 		stat     *collection.RollingWindow[int64, *bucket]
 		proba    *mathx.Proba
-		lastPass *syncx.AtomicDuration
+		lastPass syncx.AtomicDuration
 	}
 
 	windowResult struct {

diff --git a/core/discov/subscriber.go b/core/discov/subscriber.go
@@ -103,7 +103,7 @@ func newContainer(exclusive bool) *container {
 		exclusive: exclusive,
 		values:    make(map[string][]string),
 		mapping:   make(map[string]string),
-		dirty:     syncx.ForAtomicBool(true),
+		dirty:     syncx.AtomicBoolFromVal(true),
 	}
 }
 

diff --git a/core/executors/lessexecutor.go b/core/executors/lessexecutor.go
@@ -10,7 +10,7 @@ import (
 // A LessExecutor is an executor to limit execution once within given time interval.
 type LessExecutor struct {
 	threshold time.Duration
-	lastTime  *syncx.AtomicDuration
+	lastTime  syncx.AtomicDuration
 }
 
 // NewLessExecutor returns a LessExecutor with given threshold as time interval.

diff --git a/core/load/adaptiveshedder.go b/core/load/adaptiveshedder.go
@@ -34,9 +34,9 @@ var (
 	ErrServiceOverloaded = errors.New("service overloaded")
 
 	// default to be enabled
-	enabled = syncx.ForAtomicBool(true)
+	enabled = syncx.AtomicBoolFromVal(true)
 	// default to be enabled
-	logEnabled = syncx.ForAtomicBool(true)
+	logEnabled = syncx.AtomicBoolFromVal(true)
 	// make it a variable for unit test
 	systemOverloadChecker = func(cpuThreshold int64) bool {
 		return stat.CpuUsage() >= cpuThreshold
@@ -74,7 +74,7 @@ type (
 		flying          int64
 		avgFlying       float64
 		avgFlyingLock   syncx.SpinLock
-		overloadTime    *syncx.AtomicDuration
+		overloadTime    syncx.AtomicDuration
 		droppedRecently atomic.Bool
 		passCounter     *collection.RollingWindow[int64, *collection.Bucket[int64]]
 		rtCounter       *collection.RollingWindow[int64, *collection.Bucket[int64]]

diff --git a/core/logx/limitedexecutor.go b/core/logx/limitedexecutor.go
@@ -10,7 +10,7 @@ import (
 
 type limitedExecutor struct {
 	threshold time.Duration
-	lastTime  *syncx.AtomicDuration
+	lastTime  syncx.AtomicDuration
 	discarded uint32
 }
 

diff --git a/core/logx/vars.go b/core/logx/vars.go
@@ -69,7 +69,7 @@ var (
 	// ErrLogServiceNameNotSet is an error that indicates that the service name is not set.
 	ErrLogServiceNameNotSet = errors.New("log service name must be set")
 	// ExitOnFatal defines whether to exit on fatal errors, defined here to make it easier to test.
-	ExitOnFatal = syncx.ForAtomicBool(true)
+	ExitOnFatal = syncx.AtomicBoolFromVal(true)
 
 	truncatedField = Field(truncatedKey, true)
 )
diff --git a/core/stat/metrics.go b/core/stat/metrics.go
@@ -14,7 +14,7 @@ var (
 	logInterval  = time.Minute
 	writerLock   sync.Mutex
 	reportWriter Writer = nil
-	logEnabled          = syncx.ForAtomicBool(true)
+	logEnabled          = syncx.AtomicBoolFromVal(true)
 )
 
 type (

diff --git a/core/stores/mon/options.go b/core/stores/mon/options.go
@@ -14,8 +14,8 @@ const defaultTimeout = time.Second * 3
 
 var (
 	slowThreshold = syncx.ForAtomicDuration(defaultSlowThreshold)
-	logMon        = syncx.ForAtomicBool(true)
-	logSlowMon    = syncx.ForAtomicBool(true)
+	logMon        = syncx.AtomicBoolFromVal(true)
+	logSlowMon    = syncx.AtomicBoolFromVal(true)
 )
 
 type (

diff --git a/core/stores/sqlx/stmt.go b/core/stores/sqlx/stmt.go
@@ -16,8 +16,8 @@ const defaultSlowThreshold = time.Millisecond * 500
 
 var (
 	slowThreshold = syncx.ForAtomicDuration(defaultSlowThreshold)
-	logSql        = syncx.ForAtomicBool(true)
-	logSlowSql    = syncx.ForAtomicBool(true)
+	logSql        = syncx.AtomicBoolFromVal(true)
+	logSlowSql    = syncx.AtomicBoolFromVal(true)
 )
 
 type (

diff --git a/core/syncx/atomicbool.go b/core/syncx/atomicbool.go
@@ -9,13 +9,14 @@ type AtomicBool atomic.Bool
 
 // NewAtomicBool returns an AtomicBool.
 // Deprecated: use atomic.Bool instead.
-func NewAtomicBool() AtomicBool {
-	return AtomicBool(ForAtomicBool(false))
+func NewAtomicBool() (d AtomicBool) {
+	return
 }
 
 // ForAtomicBool returns an atomic.Bool with given val.
-func ForAtomicBool(val bool) (b atomic.Bool) {
-	b.Store(val)
+// Deprecated: use atomic.Bool instead.
+func ForAtomicBool(val bool) (b AtomicBool) {
+	b.Set(val)
 	return
 }
 
@@ -33,3 +34,9 @@ func (b *AtomicBool) Set(v bool) {
 func (b *AtomicBool) True() bool {
 	return (*atomic.Bool)(b).Load()
 }
+
+// AtomicBoolFromVal returns an atomic.Bool with given val.
+func AtomicBoolFromVal(val bool) (b atomic.Bool) {
+	b.Store(val)
+	return
+}
diff --git a/core/syncx/atomicbool_test.go b/core/syncx/atomicbool_test.go
@@ -7,7 +7,7 @@ import (
 )
 
 func TestAtomicBool(t *testing.T) {
-	val := AtomicBool(ForAtomicBool(true))
+	val := ForAtomicBool(true)
 	assert.True(t, val.True())
 	val.Set(false)
 	assert.False(t, val.True())

diff --git a/core/syncx/atomicduration.go b/core/syncx/atomicduration.go
@@ -6,31 +6,31 @@ import (
 )
 
 // An AtomicDuration is an implementation of atomic duration.
-type AtomicDuration int64
+type AtomicDuration atomic.Int64
 
 // NewAtomicDuration returns an AtomicDuration.
-func NewAtomicDuration() *AtomicDuration {
-	return new(AtomicDuration)
+func NewAtomicDuration() (d AtomicDuration) {
+	d.Set(0)
+	return
 }
 
 // ForAtomicDuration returns an AtomicDuration with given value.
-func ForAtomicDuration(val time.Duration) *AtomicDuration {
-	d := NewAtomicDuration()
-	d.Set(val)
-	return d
+func ForAtomicDuration(val time.Duration) (i AtomicDuration) {
+	i.Set(val)
+	return
 }
 
 // CompareAndSwap compares current value with old, if equals, set the value to val.
 func (d *AtomicDuration) CompareAndSwap(old, val time.Duration) bool {
-	return atomic.CompareAndSwapInt64((*int64)(d), int64(old), int64(val))
+	return (*atomic.Int64)(d).CompareAndSwap(int64(old), int64(val))
 }
 
 // Load loads the current duration.
 func (d *AtomicDuration) Load() time.Duration {
-	return time.Duration(atomic.LoadInt64((*int64)(d)))
+	return time.Duration((*atomic.Int64)(d).Load())
 }
 
 // Set sets the value to val.
 func (d *AtomicDuration) Set(val time.Duration) {
-	atomic.StoreInt64((*int64)(d), int64(val))
+	(*atomic.Int64)(d).Store(int64(val))
 }
diff --git a/core/syncx/immutableresource.go b/core/syncx/immutableresource.go
@@ -20,7 +20,7 @@ type (
 		err             error
 		lock            sync.RWMutex
 		refreshInterval time.Duration
-		lastTime        *AtomicDuration
+		lastTime        AtomicDuration
 	}
 )
 

diff --git a/zrpc/internal/balancer/p2c/p2c.go b/zrpc/internal/balancer/p2c/p2c.go
@@ -75,7 +75,7 @@ func newBuilder() balancer.Builder {
 type p2cPicker struct {
 	conns []*subConn
 	r     *rand.Rand
-	stamp *syncx.AtomicDuration
+	stamp syncx.AtomicDuration
 	lock  sync.Mutex
 }