Deprecate common/atomic

nekohasekai · nekohasekai · commit 2aeec120ce28 · 2025-08-25T19:47:12.000+08:00
diff --git a/common/atomic/typed.go b/common/atomic/typed.go
@@ -6,6 +6,7 @@ import (
 	"github.com/sagernet/sing/common"
 )
 
+// Deprecated: moved to common.TypedValue
 type TypedValue[T any] atomic.Pointer[T]
 
 func (t *TypedValue[T]) Load() T {
diff --git a/common/atomic/types.go b/common/atomic/types.go
@@ -1,20 +1,25 @@
-//go:build go1.24
-
 package atomic
 
 import "sync/atomic"
 
 type (
-	Bool           = atomic.Bool
-	Int32          = atomic.Int32
-	Int64          = atomic.Int64
-	Uint32         = atomic.Uint32
-	Uint64         = atomic.Uint64
-	Uintptr        = atomic.Uintptr
-	Value          = atomic.Value
-	Pointer[T any] = atomic.Pointer[T]
+	// Deprecated: use sync/atomic instead
+	Bool = atomic.Bool
+	// Deprecated: use sync/atomic instead
+	Int32 = atomic.Int32
+	// Deprecated: use sync/atomic instead
+	Int64 = atomic.Int64
+	// Deprecated: use sync/atomic instead
+	Uint32 = atomic.Uint32
+	// Deprecated: use sync/atomic instead
+	Uint64 = atomic.Uint64
+	// Deprecated: use sync/atomic instead
+	Uintptr = atomic.Uintptr
+	// Deprecated: use sync/atomic instead
+	Value = atomic.Value
 )
 
-func PointerForm[T any](p *atomic.Pointer[T]) *Pointer[T] {
-	return p
+// Deprecated: use sync/atomic instead
+type Pointer[T any] struct {
+	atomic.Pointer[T]
 }
diff --git a/common/atomic/types_compat.go b/common/atomic/types_compat.go
diff --git a/common/buf/buffer.go b/common/buf/buffer.go
@@ -4,9 +4,9 @@ import (
 	"crypto/rand"
 	"io"
 	"net"
+	"sync/atomic"
 
 	"github.com/sagernet/sing/common"
-	"github.com/sagernet/sing/common/atomic"
 	"github.com/sagernet/sing/common/debug"
 	E "github.com/sagernet/sing/common/exceptions"
 	F "github.com/sagernet/sing/common/format"
diff --git a/common/bufio/counter_conn.go b/common/bufio/counter_conn.go
@@ -3,9 +3,9 @@ package bufio
 import (
 	"io"
 	"net"
+	"sync/atomic"
 
 	"github.com/sagernet/sing/common"
-	"github.com/sagernet/sing/common/atomic"
 	"github.com/sagernet/sing/common/buf"
 	N "github.com/sagernet/sing/common/network"
 )
diff --git a/common/bufio/counter_packet_conn.go b/common/bufio/counter_packet_conn.go
@@ -1,8 +1,9 @@
 package bufio
 
 import (
+	"sync/atomic"
+
 	"github.com/sagernet/sing/common"
-	"github.com/sagernet/sing/common/atomic"
 	"github.com/sagernet/sing/common/buf"
 	M "github.com/sagernet/sing/common/metadata"
 	N "github.com/sagernet/sing/common/network"
diff --git a/common/bufio/deadline/packet_reader.go b/common/bufio/deadline/packet_reader.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/sagernet/sing/common/atomic"
+	"github.com/sagernet/sing/common"
 	"github.com/sagernet/sing/common/buf"
 	M "github.com/sagernet/sing/common/metadata"
 	N "github.com/sagernet/sing/common/network"
@@ -24,7 +24,7 @@ type PacketReader interface {
 
 type packetReader struct {
 	TimeoutPacketReader
-	deadline     atomic.TypedValue[time.Time]
+	deadline     common.TypedValue[time.Time]
 	pipeDeadline pipeDeadline
 	result       chan *packetReadResult
 	done         chan struct{}
diff --git a/common/bufio/deadline/packet_reader_fallback.go b/common/bufio/deadline/packet_reader_fallback.go
@@ -3,9 +3,9 @@ package deadline
 import (
 	"net"
 	"os"
+	"sync/atomic"
 	"time"
 
-	"github.com/sagernet/sing/common/atomic"
 	"github.com/sagernet/sing/common/buf"
 	M "github.com/sagernet/sing/common/metadata"
 )
diff --git a/common/bufio/deadline/reader.go b/common/bufio/deadline/reader.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/sagernet/sing/common/atomic"
+	"github.com/sagernet/sing/common"
 	"github.com/sagernet/sing/common/buf"
 	"github.com/sagernet/sing/common/bufio"
 	N "github.com/sagernet/sing/common/network"
@@ -26,7 +26,7 @@ type Reader interface {
 type reader struct {
 	N.ExtendedReader
 	timeoutReader TimeoutReader
-	deadline      atomic.TypedValue[time.Time]
+	deadline      common.TypedValue[time.Time]
 	pipeDeadline  pipeDeadline
 	result        chan *readResult
 	done          chan struct{}
diff --git a/common/bufio/deadline/reader_fallback.go b/common/bufio/deadline/reader_fallback.go
@@ -2,9 +2,9 @@ package deadline
 
 import (
 	"os"
+	"sync/atomic"
 	"time"
 
-	"github.com/sagernet/sing/common/atomic"
 	"github.com/sagernet/sing/common/buf"
 )
 
diff --git a/common/control/bind_linux.go b/common/control/bind_linux.go
@@ -2,9 +2,9 @@ package control
 
 import (
 	"os"
+	"sync/atomic"
 	"syscall"
 
-	"github.com/sagernet/sing/common/atomic"
 	E "github.com/sagernet/sing/common/exceptions"
 
 	"golang.org/x/sys/unix"
diff --git a/common/typed.go b/common/typed.go
@@ -0,0 +1,44 @@
+package common
+
+import (
+	"sync/atomic"
+)
+
+type TypedValue[T any] atomic.Pointer[T]
+
+func (t *TypedValue[T]) Load() T {
+	value := (*atomic.Pointer[T])(t).Load()
+	if value == nil {
+		return DefaultValue[T]()
+	}
+	return *value
+}
+
+func (t *TypedValue[T]) Store(value T) {
+	(*atomic.Pointer[T])(t).Store(&value)
+}
+
+func (t *TypedValue[T]) Swap(new T) T {
+	old := (*atomic.Pointer[T])(t).Swap(&new)
+	if old == nil {
+		return DefaultValue[T]()
+	}
+	return *old
+}
+
+func (t *TypedValue[T]) CompareAndSwap(old, new T) bool {
+	for {
+		currentP := (*atomic.Pointer[T])(t).Load()
+		currentValue := DefaultValue[T]()
+		if currentP != nil {
+			currentValue = *currentP
+		}
+		// Compare old and current via runtime equality check.
+		if any(currentValue) != any(old) {
+			return false
+		}
+		if (*atomic.Pointer[T])(t).CompareAndSwap(currentP, &new) {
+			return true
+		}
+	}
+}
diff --git a/protocol/http/handshake.go b/protocol/http/handshake.go
@@ -10,7 +10,6 @@ import (
 	"strings"
 
 	"github.com/sagernet/sing/common"
-	"github.com/sagernet/sing/common/atomic"
 	"github.com/sagernet/sing/common/auth"
 	"github.com/sagernet/sing/common/buf"
 	"github.com/sagernet/sing/common/bufio"
@@ -164,7 +163,7 @@ func handleHTTPConnection(
 		return responseWith(request, http.StatusBadRequest).Write(conn)
 	}
 
-	var innerErr atomic.TypedValue[error]
+	var innerErr common.TypedValue[error]
 	httpClient := &http.Client{
 		Transport: &http.Transport{
 			DisableCompression: true,
diff --git a/service/pause/default.go b/service/pause/default.go
@@ -3,8 +3,8 @@ package pause
 import (
 	"context"
 	"sync"
+	"sync/atomic"
 
-	"github.com/sagernet/sing/common/atomic"
 	"github.com/sagernet/sing/common/x/list"
 	"github.com/sagernet/sing/service"
 )

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`	`"github.com/sagernet/sing/common"`
`7`	`7`	`)`
`8`	`8`
	`9`	`+// Deprecated: moved to common.TypedValue`
`9`	`10`	`type TypedValue[T any] atomic.Pointer[T]`
`10`	`11`
`11`	`12`	`func (t *TypedValue[T]) Load() T {`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@ package deadline`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"os"`
	`5`	`+ "sync/atomic"`
`5`	`6`	`"time"`
`6`	`7`
`7`		`- "github.com/sagernet/sing/common/atomic"`
`8`	`8`	`"github.com/sagernet/sing/common/buf"`
`9`	`9`	`)`
`10`	`10`