From a31e054a70fd1d35efd9095b3f3145b9080905cb Mon Sep 17 00:00:00 2001 From: charlie <3140647@qq.com> Date: Thu, 26 May 2022 14:12:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locker/empty_locker.go | 5 +---- locker/locker.go | 9 ++------- locker/rw_locker.go | 10 +++------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/locker/empty_locker.go b/locker/empty_locker.go index ca4a26b..e54d4ee 100644 --- a/locker/empty_locker.go +++ b/locker/empty_locker.go @@ -1,9 +1,6 @@ package locker -// 空锁 - -var _ Locker = &emptyLocker{} -var _ RWLocker = &emptyLocker{} +var EmptyLocker = &emptyLocker{} type emptyLocker struct{} diff --git a/locker/locker.go b/locker/locker.go index ed63ea4..2e8215e 100644 --- a/locker/locker.go +++ b/locker/locker.go @@ -15,11 +15,6 @@ type RWLocker interface { TryRLock() bool } -type locker struct { - *sync.Mutex +func NewLocker() *sync.Mutex { + return &sync.Mutex{} } - -func NewLocker() *locker { - return &locker{Mutex: &sync.Mutex{}} -} - diff --git a/locker/rw_locker.go b/locker/rw_locker.go index ed7d0c5..7370b64 100644 --- a/locker/rw_locker.go +++ b/locker/rw_locker.go @@ -2,12 +2,8 @@ package locker import "sync" -var _ RWLocker = &rwLocker{} +var _ RWLocker = &sync.RWMutex{} -type rwLocker struct { - *sync.RWMutex -} - -func NewRWLocker() *rwLocker { - return &rwLocker{RWMutex: &sync.RWMutex{}} +func NewRWLocker() *sync.RWMutex { + return &sync.RWMutex{} }