xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: upgrade xsync to v3

Browse source
This commit is contained in:
wwqgtxx 2023-11-23 10:24:01 +08:00
parent 96f0254a48
commit 37791acb59
9 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adapter/adapter.go
View file

@ -19,7 +19,7 @@ import (
C "github.com/metacubex/mihomo/constant" C "github.com/metacubex/mihomo/constant"
"github.com/metacubex/mihomo/log" "github.com/metacubex/mihomo/log"
"github.com/puzpuzpuz/xsync/v2" "github.com/puzpuzpuz/xsync/v3"
) )
var UnifiedDelay = atomic.NewBool(false) var UnifiedDelay = atomic.NewBool(false)
@ -316,7 +316,7 @@ func NewProxy(adapter C.ProxyAdapter) *Proxy {
history: queue.New[C.DelayHistory](defaultHistoriesNum), history: queue.New[C.DelayHistory](defaultHistoriesNum),
alive: atomic.NewBool(true), alive: atomic.NewBool(true),
url: "", url: "",
extra: xsync.NewMapOf[*extraProxyState]()} extra: xsync.NewMapOf[string, *extraProxyState]()}
} }
func urlToMetadata(rawURL string) (addr C.Metadata, err error) { func urlToMetadata(rawURL string) (addr C.Metadata, err error) {

10
component/nat/table.go
View file

@ -6,7 +6,7 @@ import (
C "github.com/metacubex/mihomo/constant" C "github.com/metacubex/mihomo/constant"
"github.com/puzpuzpuz/xsync/v2" "github.com/puzpuzpuz/xsync/v3"
) )
type Table struct { type Table struct {
@ -25,8 +25,8 @@ func (t *Table) Set(key string, e C.PacketConn, w C.WriteBackProxy) {
t.mapping.Store(key, &Entry{ t.mapping.Store(key, &Entry{
PacketConn: e, PacketConn: e,
WriteBackProxy: w, WriteBackProxy: w,
LocalUDPConnMap: xsync.NewMapOf[*net.UDPConn](), LocalUDPConnMap: xsync.NewMapOf[string, *net.UDPConn](),
LocalLockMap: xsync.NewMapOf[*sync.Cond](), LocalLockMap: xsync.NewMapOf[string, *sync.Cond](),
}) })
} }
@ -116,7 +116,7 @@ func makeLock() *sync.Cond {
// New return *Cache // New return *Cache
func New() *Table { func New() *Table {
return &Table{ return &Table{
mapping: xsync.NewMapOf[*Entry](), mapping: xsync.NewMapOf[string, *Entry](),
lockMap: xsync.NewMapOf[*sync.Cond](), lockMap: xsync.NewMapOf[string, *sync.Cond](),
} }
} }

2
go.mod
View file

@ -31,7 +31,7 @@ require (
github.com/mroth/weightedrand/v2 v2.1.0 github.com/mroth/weightedrand/v2 v2.1.0
github.com/openacid/low v0.1.21 github.com/openacid/low v0.1.21
github.com/oschwald/maxminddb-golang v1.12.0 github.com/oschwald/maxminddb-golang v1.12.0
github.com/puzpuzpuz/xsync/v2 v2.5.1 github.com/puzpuzpuz/xsync/v3 v3.0.2
github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a
github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97
github.com/sagernet/sing v0.2.18-0.20231108041402-4fbbd193203c github.com/sagernet/sing v0.2.18-0.20231108041402-4fbbd193203c

4
go.sum
View file

@ -145,8 +145,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
github.com/puzpuzpuz/xsync/v2 v2.5.1 h1:mVGYAvzDSu52+zaGyNjC+24Xw2bQi3kTr4QJ6N9pIIU= github.com/puzpuzpuz/xsync/v3 v3.0.2 h1:3yESHrRFYr6xzkz61LLkvNiPFXxJEAABanTQpKbAaew=
github.com/puzpuzpuz/xsync/v2 v2.5.1/go.mod h1:gD2H2krq/w52MfPLE+Uy64TzJDVY7lP2znR9qmR35kU= github.com/puzpuzpuz/xsync/v3 v3.0.2/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
github.com/quic-go/qtls-go1-20 v0.3.4 h1:MfFAPULvst4yoMgY9QmtpYmfij/em7O8UUi+bNVm7Cg= github.com/quic-go/qtls-go1-20 v0.3.4 h1:MfFAPULvst4yoMgY9QmtpYmfij/em7O8UUi+bNVm7Cg=

4
transport/tuic/v4/client.go
View file

@ -22,7 +22,7 @@ import (
"github.com/metacubex/mihomo/transport/tuic/common" "github.com/metacubex/mihomo/transport/tuic/common"
"github.com/metacubex/quic-go" "github.com/metacubex/quic-go"
"github.com/puzpuzpuz/xsync/v2" "github.com/puzpuzpuz/xsync/v3"
"github.com/zhangyunhao116/fastrand" "github.com/zhangyunhao116/fastrand"
) )
@ -469,7 +469,7 @@ func NewClient(clientOption *ClientOption, udp bool, dialerRef C.Dialer) *Client
ClientOption: clientOption, ClientOption: clientOption,
udp: udp, udp: udp,
dialerRef: dialerRef, dialerRef: dialerRef,
udpInputMap: xsync.NewIntegerMapOf[uint32, net.Conn](), udpInputMap: xsync.NewMapOf[uint32, net.Conn](),
} }
c := &Client{ci} c := &Client{ci}
runtime.SetFinalizer(c, closeClient) runtime.SetFinalizer(c, closeClient)

4
transport/tuic/v4/server.go
View file

@ -17,7 +17,7 @@ import (
"github.com/gofrs/uuid/v5" "github.com/gofrs/uuid/v5"
"github.com/metacubex/quic-go" "github.com/metacubex/quic-go"
"github.com/puzpuzpuz/xsync/v2" "github.com/puzpuzpuz/xsync/v3"
) )
type ServerOption struct { type ServerOption struct {
@ -34,7 +34,7 @@ func NewServerHandler(option *ServerOption, quicConn quic.EarlyConnection, uuid
quicConn: quicConn, quicConn: quicConn,
uuid: uuid, uuid: uuid,
authCh: make(chan struct{}), authCh: make(chan struct{}),
udpInputMap: xsync.NewIntegerMapOf[uint32, *atomic.Bool](), udpInputMap: xsync.NewMapOf[uint32, *atomic.Bool](),
} }
} }

4
transport/tuic/v5/client.go
View file

@ -20,7 +20,7 @@ import (
"github.com/metacubex/mihomo/transport/tuic/common" "github.com/metacubex/mihomo/transport/tuic/common"
"github.com/metacubex/quic-go" "github.com/metacubex/quic-go"
"github.com/puzpuzpuz/xsync/v2" "github.com/puzpuzpuz/xsync/v3"
"github.com/zhangyunhao116/fastrand" "github.com/zhangyunhao116/fastrand"
) )
@ -406,7 +406,7 @@ func NewClient(clientOption *ClientOption, udp bool, dialerRef C.Dialer) *Client
ClientOption: clientOption, ClientOption: clientOption,
udp: udp, udp: udp,
dialerRef: dialerRef, dialerRef: dialerRef,
udpInputMap: *xsync.NewIntegerMapOf[uint16, net.Conn](), udpInputMap: *xsync.NewMapOf[uint16, net.Conn](),
} }
c := &Client{ci} c := &Client{ci}
runtime.SetFinalizer(c, closeClient) runtime.SetFinalizer(c, closeClient)

4
transport/tuic/v5/server.go
View file

@ -16,7 +16,7 @@ import (
"github.com/gofrs/uuid/v5" "github.com/gofrs/uuid/v5"
"github.com/metacubex/quic-go" "github.com/metacubex/quic-go"
"github.com/puzpuzpuz/xsync/v2" "github.com/puzpuzpuz/xsync/v3"
) )
type ServerOption struct { type ServerOption struct {
@ -33,7 +33,7 @@ func NewServerHandler(option *ServerOption, quicConn quic.EarlyConnection, uuid
quicConn: quicConn, quicConn: quicConn,
uuid: uuid, uuid: uuid,
authCh: make(chan struct{}), authCh: make(chan struct{}),
udpInputMap: xsync.NewIntegerMapOf[uint16, *serverUDPInput](), udpInputMap: xsync.NewMapOf[uint16, *serverUDPInput](),
} }
} }

4
tunnel/statistic/manager.go
View file

@ -6,7 +6,7 @@ import (
"github.com/metacubex/mihomo/common/atomic" "github.com/metacubex/mihomo/common/atomic"
"github.com/puzpuzpuz/xsync/v2" "github.com/puzpuzpuz/xsync/v3"
"github.com/shirou/gopsutil/v3/process" "github.com/shirou/gopsutil/v3/process"
) )
@ -14,7 +14,7 @@ var DefaultManager *Manager
func init() { func init() {
DefaultManager = &Manager{ DefaultManager = &Manager{
connections: xsync.NewMapOf[Tracker](), connections: xsync.NewMapOf[string, Tracker](),
uploadTemp: atomic.NewInt64(0), uploadTemp: atomic.NewInt64(0),
downloadTemp: atomic.NewInt64(0), downloadTemp: atomic.NewInt64(0),
uploadBlip: atomic.NewInt64(0), uploadBlip: atomic.NewInt64(0),