fix(atomic): migrate more atomic useage

elysia-best · elysia-best · commit 1fe4f6d9be6e · 2026-06-20T00:34:18.000+08:00
diff --git a/drivers/115_open/types.go b/drivers/115_open/types.go
@@ -3,9 +3,9 @@ package _115_open
 import (
 	"time"
 
+	sdk "github.com/OpenListTeam/115-sdk-go"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
-	sdk "github.com/OpenListTeam/115-sdk-go"
 )
 
 type Obj sdk.GetFilesResp_File
diff --git a/drivers/189pc/torrent.go b/drivers/189pc/torrent.go
@@ -89,7 +89,6 @@ func (y *Cloud189PC) RapidUploadFromTorrent(ctx context.Context, dstDir model.Ob
 		sliceMd5Hex = strings.ToUpper(utils.GetMD5EncodeStr(strings.Join(upperSliceMD5s, "\n")))
 	}
 
-
 	// 使用与 Web 端一致的三步秒传流程
 	fullUrl := "https://upload.cloud.189.cn"
 	if isFamily {
@@ -110,7 +109,6 @@ func (y *Cloud189PC) RapidUploadFromTorrent(ctx context.Context, dstDir model.Ob
 		initParams.Set("familyId", y.FamilyID)
 	}
 
-
 	var uploadInfo InitMultiUploadResp
 	_, err = y.request(fullUrl+"/initMultiUpload", "GET", func(req *resty.Request) {
 		req.SetContext(ctx)
@@ -119,7 +117,6 @@ func (y *Cloud189PC) RapidUploadFromTorrent(ctx context.Context, dstDir model.Ob
 		return nil, fmt.Errorf("initMultiUpload 失败: %w", err)
 	}
 
-
 	uploadFileId := uploadInfo.Data.UploadFileID
 
 	// Step 2: checkTransSecond（用 fileMd5 + sliceMd5 + uploadFileId 检查秒传）
@@ -129,7 +126,6 @@ func (y *Cloud189PC) RapidUploadFromTorrent(ctx context.Context, dstDir model.Ob
 		"uploadFileId": uploadFileId,
 	}
 
-
 	var checkResp struct {
 		Data struct {
 			FileDataExists int `json:"fileDataExists"`
@@ -143,7 +139,6 @@ func (y *Cloud189PC) RapidUploadFromTorrent(ctx context.Context, dstDir model.Ob
 		return nil, fmt.Errorf("秒传检查失败: %w", err)
 	}
 
-
 	if checkResp.Data.FileDataExists != 1 {
 		return nil, fmt.Errorf("秒传失败：云端不存在该文件（fileMD5=%s, sliceMD5=%s, size=%d）", fileMD5Upper, sliceMd5Hex, fileSize)
 	}
diff --git a/drivers/lanzou/driver.go b/drivers/lanzou/driver.go
@@ -3,6 +3,7 @@ package lanzou
 import (
 	"context"
 	"net/http"
+	"sync/atomic"
 
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
@@ -18,7 +19,7 @@ type LanZou struct {
 	uid string
 	vei string
 
-	flag int32
+	flag atomic.Int32
 }
 
 func (d *LanZou) Config() driver.Config {
diff --git a/drivers/lanzou/util.go b/drivers/lanzou/util.go
@@ -10,7 +10,6 @@ import (
 	"strconv"
 	"strings"
 	"sync"
-	"sync/atomic"
 	"time"
 
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
@@ -43,17 +42,17 @@ func (d *LanZou) get(url string, callback base.ReqCallback) ([]byte, error) {
 func (d *LanZou) post(url string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
 	data, err := d._post(url, callback, resp, false)
 	if err == ErrCookieExpiration && d.IsAccount() {
-		if atomic.CompareAndSwapInt32(&d.flag, 0, 1) {
+		if d.flag.CompareAndSwap(0, 1) {
 			_, err2 := d.Login()
-			atomic.SwapInt32(&d.flag, 0)
+			d.flag.Swap(0)
 			if err2 != nil {
 				err = errors.Join(err, err2)
 				d.Status = err.Error()
 				op.MustSaveDriverStorage(d)
 				return data, err
 			}
 		}
-		for atomic.LoadInt32(&d.flag) != 0 {
+		for d.flag.Load() != 0 {
 			runtime.Gosched()
 		}
 		return d._post(url, callback, resp, false)
diff --git a/drivers/mediafire/meta.go b/drivers/mediafire/meta.go
@@ -58,4 +58,3 @@ func init() {
 		}
 	})
 }
-
diff --git a/drivers/mediafire/types.go b/drivers/mediafire/types.go
@@ -244,4 +244,3 @@ type MediafireUserInfoResponse struct {
 		CurrentAPIVersion string `json:"current_api_version"`
 	} `json:"response"`
 }
-
diff --git a/drivers/mediafire/util.go b/drivers/mediafire/util.go
@@ -732,4 +732,3 @@ func (d *Mediafire) getFileByHash(ctx context.Context, hash string) (*model.ObjT
 	file := resp.Response.FileInfo[0]
 	return d.fileToObj(file), nil
 }
-
diff --git a/drivers/smb/driver.go b/drivers/smb/driver.go
@@ -6,6 +6,7 @@ import (
 	"path"
 	"path/filepath"
 	"strings"
+	"sync/atomic"
 
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
@@ -16,7 +17,7 @@ import (
 )
 
 type SMB struct {
-	lastConnTime int64
+	lastConnTime atomic.Int64
 	model.Storage
 	Addition
 	fs *smb2.Share
diff --git a/drivers/smb/util.go b/drivers/smb/util.go
@@ -6,7 +6,6 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
-	"sync/atomic"
 	"time"
 
 	"github.com/OpenListTeam/OpenList/v4/pkg/singleflight"
@@ -16,15 +15,15 @@ import (
 )
 
 func (d *SMB) updateLastConnTime() {
-	atomic.StoreInt64(&d.lastConnTime, time.Now().Unix())
+	d.lastConnTime.Store(time.Now().Unix())
 }
 
 func (d *SMB) cleanLastConnTime() {
-	atomic.StoreInt64(&d.lastConnTime, 0)
+	d.lastConnTime.Store(0)
 }
 
 func (d *SMB) getLastConnTime() time.Time {
-	return time.Unix(atomic.LoadInt64(&d.lastConnTime), 0)
+	return time.Unix(d.lastConnTime.Load(), 0)
 }
 
 func (d *SMB) initFS(ctx context.Context) error {
diff --git a/drivers/webdav/driver_test.go b/drivers/webdav/driver_test.go
@@ -23,10 +23,10 @@ func TestGetMapsMissingPathToObjectNotFound(t *testing.T) {
 }
 
 func TestMakeDirAfterMissingWebDAVStat(t *testing.T) {
-	var mkcolCount int32
+	var mkcolCount atomic.Int32
 	d, cleanup := newTestDriver(t, func(w http.ResponseWriter, r *http.Request) bool {
 		if r.Method == "MKCOL" && (r.URL.Path == "/new" || r.URL.Path == "/new/") {
-			atomic.AddInt32(&mkcolCount, 1)
+			mkcolCount.Add(1)
 			w.WriteHeader(http.StatusCreated)
 			return true
 		}
@@ -37,7 +37,7 @@ func TestMakeDirAfterMissingWebDAVStat(t *testing.T) {
 	if err := op.MakeDir(context.Background(), d, "/new"); err != nil {
 		t.Fatalf("MakeDir failed: %v", err)
 	}
-	if got := atomic.LoadInt32(&mkcolCount); got != 1 {
+	if got := mkcolCount.Load(); got != 1 {
 		t.Fatalf("expected one MKCOL request, got %d", got)
 	}
 }
diff --git a/internal/fs/list_test.go b/internal/fs/list_test.go
@@ -23,8 +23,8 @@ func TestWhetherHide(t *testing.T) {
 				Hide: "secret",
 				HSub: true,
 			},
-			path: "/folder",
-			want: false,
+			path:   "/folder",
+			want:   false,
 			reason: "nil user (treated as admin) should not hide",
 		},
 		{
@@ -38,18 +38,18 @@ func TestWhetherHide(t *testing.T) {
 				Hide: "secret",
 				HSub: true,
 			},
-			path: "/folder",
-			want: false,
+			path:   "/folder",
+			want:   false,
 			reason: "user with can_see_hides permission should not hide",
 		},
 		{
 			name: "nil meta",
 			user: &model.User{
 				Role: model.GUEST,
 			},
-			meta: nil,
-			path: "/folder",
-			want: false,
+			meta:   nil,
+			path:   "/folder",
+			want:   false,
 			reason: "nil meta should not hide",
 		},
 		{
@@ -62,8 +62,8 @@ func TestWhetherHide(t *testing.T) {
 				Hide: "",
 				HSub: true,
 			},
-			path: "/folder",
-			want: false,
+			path:   "/folder",
+			want:   false,
 			reason: "empty hide string should not hide",
 		},
 		{
@@ -76,8 +76,8 @@ func TestWhetherHide(t *testing.T) {
 				Hide: "secret",
 				HSub: false,
 			},
-			path: "/folder",
-			want: true,
+			path:   "/folder",
+			want:   true,
 			reason: "exact path match should hide for guest",
 		},
 		{
@@ -90,8 +90,8 @@ func TestWhetherHide(t *testing.T) {
 				Hide: "secret",
 				HSub: true,
 			},
-			path: "/folder/subfolder",
-			want: true,
+			path:   "/folder/subfolder",
+			want:   true,
 			reason: "sub path with HSub=true should hide for guest",
 		},
 		{
@@ -104,8 +104,8 @@ func TestWhetherHide(t *testing.T) {
 				Hide: "secret",
 				HSub: false,
 			},
-			path: "/folder/subfolder",
-			want: false,
+			path:   "/folder/subfolder",
+			want:   false,
 			reason: "sub path with HSub=false should not hide",
 		},
 		{
@@ -118,8 +118,8 @@ func TestWhetherHide(t *testing.T) {
 				Hide: "secret",
 				HSub: true,
 			},
-			path: "/other",
-			want: false,
+			path:   "/other",
+			want:   false,
 			reason: "non-sub path should not hide even with HSub=true",
 		},
 		{
@@ -133,8 +133,8 @@ func TestWhetherHide(t *testing.T) {
 				Hide: "secret",
 				HSub: true,
 			},
-			path: "/folder",
-			want: true,
+			path:   "/folder",
+			want:   true,
 			reason: "user without can_see_hides permission should hide",
 		},
 	}
diff --git a/internal/mem/utils.go b/internal/mem/utils.go
@@ -13,30 +13,39 @@ import (
 
 var ErrNotEnoughMemory = errors.New("not enough memory")
 
+// memoryReservation holds an owned available-memory counter used as a
+// reservation budget across concurrent callers. It avoids atomic operations
+// on the plain uint64 field of the external gopsutil struct.
+type memoryReservation struct {
+	available atomic.Uint64
+}
+
 func MemoryGrowCheck(growSize uint64) error {
 	if conf.MinFreeMemory == 0 {
 		return ErrNotEnoughMemory
 	}
-	m, err, _ := singleflight.AnyGroup.Do("MemoryGrowCheck", func() (any, error) {
+	r, err, _ := singleflight.AnyGroup.Do("MemoryGrowCheck", func() (any, error) {
 		m, err := mem.VirtualMemory()
 		if err != nil {
 			return nil, err
 		}
 		if m.Available < conf.MinFreeMemory {
 			return nil, ErrNotEnoughMemory
 		}
-		return m, nil
+		r := &memoryReservation{}
+		r.available.Store(m.Available)
+		return r, nil
 	})
 	if err != nil {
 		return err
 	}
-	memStat := m.(*mem.VirtualMemoryStat)
+	res := r.(*memoryReservation)
 	for {
-		available := atomic.LoadUint64(&memStat.Available)
+		available := res.available.Load()
 		if available < growSize || available-growSize < conf.MinFreeMemory {
 			return ErrNotEnoughMemory
 		}
-		if atomic.CompareAndSwapUint64(&memStat.Available, available, available-growSize) {
+		if res.available.CompareAndSwap(available, available-growSize) {
 			return nil
 		}
 	}
diff --git a/pkg/aria2/rpc/call.go b/pkg/aria2/rpc/call.go
@@ -262,8 +262,9 @@ type sendRequest struct {
 }
 
 var reqid = func() func() uint64 {
-	var id = uint64(time.Now().UnixNano())
+	var id atomic.Uint64
+	id.Store(uint64(time.Now().UnixNano()))
 	return func() uint64 {
-		return atomic.AddUint64(&id, 1)
+		return id.Add(1)
 	}
 }()
diff --git a/pkg/errgroup/errgroup.go b/pkg/errgroup/errgroup.go
@@ -15,7 +15,7 @@ type Group struct {
 	ctx    context.Context
 	opts   []retry.Option
 
-	success uint64
+	success atomic.Uint64
 
 	wg  sync.WaitGroup
 	sem chan token
@@ -41,7 +41,7 @@ func (g *Group) done() {
 		<-g.sem
 	}
 	g.wg.Done()
-	atomic.AddUint64(&g.success, 1)
+	g.success.Add(1)
 }
 
 func (g *Group) Wait() error {
@@ -140,7 +140,7 @@ func (g *Group) SetLimit(n int) *Group {
 }
 
 func (g *Group) Success() uint64 {
-	return atomic.LoadUint64(&g.success)
+	return g.success.Load()
 }
 
 func (g *Group) Err() error {
diff --git a/pkg/generic_sync/map.go b/pkg/generic_sync/map.go
diff --git a/pkg/singleflight/signleflight_test.go b/pkg/singleflight/signleflight_test.go
diff --git a/pkg/task/task.go b/pkg/task/task.go
diff --git a/pkg/task/task_test.go b/pkg/task/task_test.go
diff --git a/pkg/utils/io.go b/pkg/utils/io.go
diff --git a/server/static/static.go b/server/static/static.go

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@ package _115_open`
`3`	`3`	`import (`
`4`	`4`	`"time"`
`5`	`5`
	`6`	`+ sdk "github.com/OpenListTeam/115-sdk-go"`
`6`	`7`	`"github.com/OpenListTeam/OpenList/v4/internal/model"`
`7`	`8`	`"github.com/OpenListTeam/OpenList/v4/pkg/utils"`
`8`		`- sdk "github.com/OpenListTeam/115-sdk-go"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type Obj sdk.GetFilesResp_File`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ func (y *Cloud189PC) RapidUploadFromTorrent(ctx context.Context, dstDir model.Ob`
`89`	`89`	`sliceMd5Hex = strings.ToUpper(utils.GetMD5EncodeStr(strings.Join(upperSliceMD5s, "\n")))`
`90`	`90`	`}`
`91`	`91`
`92`		`-`
`93`	`92`	`// 使用与 Web 端一致的三步秒传流程`
`94`	`93`	`fullUrl := "https://upload.cloud.189.cn"`
`95`	`94`	`if isFamily {`
`@@ -110,7 +109,6 @@ func (y *Cloud189PC) RapidUploadFromTorrent(ctx context.Context, dstDir model.Ob`
`110`	`109`	`initParams.Set("familyId", y.FamilyID)`
`111`	`110`	`}`
`112`	`111`
`113`		`-`
`114`	`112`	`var uploadInfo InitMultiUploadResp`
`115`	`113`	`_, err = y.request(fullUrl+"/initMultiUpload", "GET", func(req *resty.Request) {`
`116`	`114`	`req.SetContext(ctx)`
`@@ -119,7 +117,6 @@ func (y *Cloud189PC) RapidUploadFromTorrent(ctx context.Context, dstDir model.Ob`
`119`	`117`	`return nil, fmt.Errorf("initMultiUpload 失败: %w", err)`
`120`	`118`	`}`
`121`	`119`
`122`		`-`
`123`	`120`	`uploadFileId := uploadInfo.Data.UploadFileID`
`124`	`121`
`125`	`122`	`// Step 2: checkTransSecond（用 fileMd5 + sliceMd5 + uploadFileId 检查秒传）`
`@@ -129,7 +126,6 @@ func (y *Cloud189PC) RapidUploadFromTorrent(ctx context.Context, dstDir model.Ob`
`129`	`126`	`"uploadFileId": uploadFileId,`
`130`	`127`	`}`
`131`	`128`
`132`		`-`
`133`	`129`	`var checkResp struct {`
`134`	`130`	`Data struct {`
`135`	`131`	FileDataExists int `json:"fileDataExists"`
`@@ -143,7 +139,6 @@ func (y *Cloud189PC) RapidUploadFromTorrent(ctx context.Context, dstDir model.Ob`
`143`	`139`	`return nil, fmt.Errorf("秒传检查失败: %w", err)`
`144`	`140`	`}`
`145`	`141`
`146`		`-`
`147`	`142`	`if checkResp.Data.FileDataExists != 1 {`
`148`	`143`	`return nil, fmt.Errorf("秒传失败：云端不存在该文件（fileMD5=%s, sliceMD5=%s, size=%d）", fileMD5Upper, sliceMd5Hex, fileSize)`
`149`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,4 +58,3 @@ func init() {`
`58`	`58`	`}`
`59`	`59`	`})`
`60`	`60`	`}`
`61`		`-`
Original file line number	Diff line number	Diff line change
`@@ -244,4 +244,3 @@ type MediafireUserInfoResponse struct {`
`244`	`244`	CurrentAPIVersion string `json:"current_api_version"`
`245`	`245`	} `json:"response"`
`246`	`246`	`}`
`247`		`-`
Original file line number	Diff line number	Diff line change
`@@ -732,4 +732,3 @@ func (d Mediafire) getFileByHash(ctx context.Context, hash string) (model.ObjT`
`732`	`732`	`file := resp.Response.FileInfo[0]`
`733`	`733`	`return d.fileToObj(file), nil`
`734`	`734`	`}`
`735`		`-`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ import (`
`6`	`6`	`"io/fs"`
`7`	`7`	`"os"`
`8`	`8`	`"path/filepath"`
`9`		`- "sync/atomic"`
`10`	`9`	`"time"`
`11`	`10`
`12`	`11`	`"github.com/OpenListTeam/OpenList/v4/pkg/singleflight"`
`@@ -16,15 +15,15 @@ import (`
`16`	`15`	`)`
`17`	`16`
`18`	`17`	`func (d *SMB) updateLastConnTime() {`
`19`		`- atomic.StoreInt64(&d.lastConnTime, time.Now().Unix())`
	`18`	`+ d.lastConnTime.Store(time.Now().Unix())`
`20`	`19`	`}`
`21`	`20`
`22`	`21`	`func (d *SMB) cleanLastConnTime() {`
`23`		`- atomic.StoreInt64(&d.lastConnTime, 0)`
	`22`	`+ d.lastConnTime.Store(0)`
`24`	`23`	`}`
`25`	`24`
`26`	`25`	`func (d *SMB) getLastConnTime() time.Time {`
`27`		`- return time.Unix(atomic.LoadInt64(&d.lastConnTime), 0)`
	`26`	`+ return time.Unix(d.lastConnTime.Load(), 0)`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`func (d *SMB) initFS(ctx context.Context) error {`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,10 @@ func TestGetMapsMissingPathToObjectNotFound(t *testing.T) {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`func TestMakeDirAfterMissingWebDAVStat(t *testing.T) {`
`26`		`- var mkcolCount int32`
	`26`	`+ var mkcolCount atomic.Int32`
`27`	`27`	`d, cleanup := newTestDriver(t, func(w http.ResponseWriter, r *http.Request) bool {`
`28`	`28`	`if r.Method == "MKCOL" && (r.URL.Path == "/new" \|\| r.URL.Path == "/new/") {`
`29`		`- atomic.AddInt32(&mkcolCount, 1)`
	`29`	`+ mkcolCount.Add(1)`
`30`	`30`	`w.WriteHeader(http.StatusCreated)`
`31`	`31`	`return true`
`32`	`32`	`}`
`@@ -37,7 +37,7 @@ func TestMakeDirAfterMissingWebDAVStat(t *testing.T) {`
`37`	`37`	`if err := op.MakeDir(context.Background(), d, "/new"); err != nil {`
`38`	`38`	`t.Fatalf("MakeDir failed: %v", err)`
`39`	`39`	`}`
`40`		`- if got := atomic.LoadInt32(&mkcolCount); got != 1 {`
	`40`	`+ if got := mkcolCount.Load(); got != 1 {`
`41`	`41`	`t.Fatalf("expected one MKCOL request, got %d", got)`
`42`	`42`	`}`
`43`	`43`	`}`