locker

bloom/mem_store.go

@@ -2,22 +2,21 @@ package bloom
 
 import (
 	"context"
+	"sync"
 
 	"github.com/bits-and-blooms/bitset"
-	"github.com/charlienet/go-mixed/locker"
 )
 
 type memStore struct {
 	size uint
-	set  *bitset.BitSet  // 内存位图
+	set  *bitset.BitSet // 内存位图
-	lock locker.RWLocker // 同步锁
+	lock sync.RWMutex   // 同步锁
 }
 
 func newMemStore(size uint) *memStore {
 	return &memStore{
 		size: size,
 		set:  bitset.New(size),
-		lock: locker.RWLocker{},
 	}
 }
 

locker/empty_locker.go

@@ -1,14 +1,9 @@
 package locker
 
-var _ RWLocker = &emptyLocker{}
+var _ rwLocker = &emptyLocker{}
-var _ Locker = &emptyLocker{}
+var _ locker = &emptyLocker{}
 
-var EmptyLocker = &emptyLocker{}
+type emptyLocker struct {
-
-type emptyLocker struct{}
-
-func NewEmptyLocker() *emptyLocker {
-	return &emptyLocker{}
 }
 
 func (l *emptyLocker) RLock() {}

locker/locker.go

@@ -2,14 +2,16 @@ package locker
 
 import "sync"
 
-type Locker interface {
+type locker interface {
 	Lock()
 	Unlock()
 	TryLock() bool
 }
 
-type RWLocker interface {
+type rwLocker interface {
-	Locker
+	Lock()
+	Unlock()
+	TryLock() bool
 	RLock()
 	RUnlock()
 	TryRLock() bool
@@ -18,3 +20,7 @@ type RWLocker interface {
 func NewLocker() *sync.Mutex {
 	return &sync.Mutex{}
 }
+
+func NewRWLocker() *sync.RWMutex {
+	return &sync.RWMutex{}
+}

locker/rw_locker.go

@@ -1,7 +0,0 @@
-package locker
-
-import "sync"
-
-func NewRWLocker() *sync.RWMutex {
-	return &sync.RWMutex{}
-}

locker/rw_locker_test.go

@@ -1,12 +0,0 @@
-package locker
-
-import "testing"
-
-func TestRWLokcer(t *testing.T) {
-	l := NewRWLocker()
-	l.RLock()
-
-	t.Log(l.TryRLock())
-
-	l.RUnlock()
-}