From: qydysky <32743305+qydysky@users.noreply.github.com>
Date: Wed, 18 Jan 2023 17:29:33 +0000 (+0800)
Subject: fix
X-Git-Tag: v0.21.8
X-Git-Url: http://127.0.0.1:8081/?a=commitdiff_plain;h=15fb35b2b829173bd63033c94c459f6e6e82cccc;p=part%2F.git

fix
---

diff --git a/sync/Map.go b/sync/Map.go
index 09d1a2b..b6b8a1c 100644
--- a/sync/Map.go
+++ b/sync/Map.go
@@ -1,156 +1,77 @@
 package part
 
 import (
-	"unsafe"
 	"runtime"
+	"sync"
 	"sync/atomic"
+	"unsafe"
 )
 
 type Map struct {
-	lock pLock //sync
-	num int
-	m map[interface{}]*ptr
-	readOnly atomic.Value //sync
+	size *atomic.Int64
+	m    sync.Map
 }
 
-func (t *Map) Store(k,v interface{}) {
-
-	m,_ := t.readOnly.Load().(map[interface{}]*ptr)
-	if p,ok := m[k];ok{
-		p.tryStore(&v)
-		return
-	}
-
-	t.lock.Lock()
-
-	m,_ = t.readOnly.Load().(map[interface{}]*ptr)
-	if p,ok := m[k];ok{
-		p.tryStore(&v)
-	} else if p,ok := t.m[k];ok{
-		p.tryStore(&v)
-	} else {
-		if t.m == nil {t.mapFrom(&m)}
-		t.m[k] = &ptr{p:unsafe.Pointer(&v)}
-		t.num += 1
-	}
-
-	t.lock.Unlock()
+func (t *Map) Store(k, v any) {
+	t.size.Add(1)
+	t.m.Store(k, v)
 }
 
-func (t *Map) Load(k interface{}) (interface{},bool) {
-
-	m,_ := t.readOnly.Load().(map[interface{}]*ptr)
-	p,ok := m[k]
-	if !ok && t.num != 0{
-		t.lock.Lock()
-
-		m,_ = t.readOnly.Load().(map[interface{}]*ptr)
-		p,ok = m[k]
-		if !ok && t.num != 0{
-			if t.m == nil {t.mapFrom(&m)}
-			p,ok = t.m[k]
-			if ok && t.num > 1e3{
-				t.readOnly.Store(t.m)
-				t.m = nil
-				t.num = 0
-			}
-		}
-	
-		t.lock.Unlock()
-	}
-
-	if !ok{
-		return nil,false
-	}
-
-	return p.tryLoad()
+func (t *Map) Load(k any) (any, bool) {
+	return t.m.Load(k)
 }
 
-func (t *Map) LoadV(k interface{}) (v interface{}) {
-	v,_ = t.Load(k)
+func (t *Map) LoadV(k any) (v any) {
+	v, _ = t.m.Load(k)
 	return
 }
 
-func (t *Map) Range(f func(key, value interface{})(bool)) {
-	t.lock.Lock()
-
-	m,_ := t.readOnly.Load().(map[interface{}]*ptr)
-	if t.m == nil {t.mapFrom(&m)}
-	t.readOnly.Store(t.m)
-	t.m = nil
-	t.num = 0
-
-	t.lock.Unlock()
-
-	m,_ = t.readOnly.Load().(map[interface{}]*ptr)//reload
-	for k,p := range m{
-		v,ok := p.tryLoad()
-		if !ok {continue} 
-		if !f(k,v) {return}
-	}
-
-	return
+func (t *Map) Range(f func(key, value any) bool) {
+	t.m.Range(f)
 }
 
-func (t *Map) Delete(k interface{}) {
-	m,_ := t.readOnly.Load().(map[interface{}]*ptr)
-	
-	if p,ok := m[k];ok && p != nil{
-		delete(m, k)
-		return
+func (t *Map) Delete(k any) {
+	if _, ok := t.m.LoadAndDelete(k); ok {
+		t.size.Add(-1)
 	}
-
-	t.lock.Lock()
-
-	delete(t.m, k)
-	t.num -= 1
-	
-	t.lock.Unlock()
 }
 
 func (t *Map) Len() int {
-	m,_ := t.readOnly.Load().(map[interface{}]*ptr)
-	return len(m) + t.num
-}
-
-func (t *Map) mapFrom(from *map[interface{}]*ptr) {
-	if t.m == nil {t.m = make(map[interface{}]*ptr)}
-	for k,v := range *from{
-		if v == nil {continue}
-		t.m[k] = v
-	}
+	return int(t.size.Load())
 }
 
 type ptr struct {
 	p unsafe.Pointer
 }
 
-func (t *ptr) tryStore(v *interface{}) {
+func (t *ptr) tryStore(v *any) {
 	t.p = unsafe.Pointer(v)
 	// atomic.StorePointer(&t.p, unsafe.Pointer(v))
 }
 
-func (t *ptr) tryLoad() (interface{},bool) {
+func (t *ptr) tryLoad() (any, bool) {
 	// p := atomic.LoadPointer(&t.p)
-	if t.p == nil{
-		return nil,false
+	if t.p == nil {
+		return nil, false
 	}
-	return *(*interface{})(t.p),true
+	return *(*any)(t.p), true
 }
 
-type pLock struct{
-	i unsafe.Pointer
+type pLock struct {
+	i    unsafe.Pointer
 	busy unsafe.Pointer
 }
 
 func (l *pLock) Lock() {
-	if l.busy == nil{l.busy = unsafe.Pointer(&struct{}{})}
+	if l.busy == nil {
+		l.busy = unsafe.Pointer(&struct{}{})
+	}
 	for !atomic.CompareAndSwapPointer(&l.i, nil, l.busy) {
 		runtime.Gosched()
 	}
 }
 
-func (l *pLock) Locking() (bool) {
+func (l *pLock) Locking() bool {
 	return atomic.LoadPointer(&l.i) != nil
 }