From 173c4d31514fe53918517248831f7c8635b8b76a Mon Sep 17 00:00:00 2001 From: matst80 Date: Wed, 13 Nov 2024 09:59:29 +0100 Subject: [PATCH] remove locks --- data/1.prot | Bin 624 -> 1064 bytes grain-pool.go | 4 ++-- synced-pool.go | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/data/1.prot b/data/1.prot index 9557f27ff339cc2b3cac69df24056b4057c73b2e..f8153e3a10543190fd54697cbf0adc4d67f65944 100644 GIT binary patch literal 1064 zcmZQ%U}6ZZ(@SRnf({S?1Oki_M|QF(v6@(#nwe^81SJ+1B&8M=RVoBzDwrtv=BK3Q zC^#wPW@Z=VrzDo-7b$3%D7ZUm8u{yI<|d}6>Zg>&m!~GhyBJy+7#J8D7#JCuSz4MJ z=!4DEFM=7TTac-1qMHjcPB%#xVH{8}JxMRCAe|BDw(wE6kri&A2XVL^OECebw=Iz5 z21;);rtvGWnVACMFdbUxLu}D623b-JwnR4(Xo+q? yQNAw15?zobx=5DjrsWsuLhOK~O-6>}P=9bi{lUQ~1oZ diff --git a/grain-pool.go b/grain-pool.go index ffeb779..114fba0 100644 --- a/grain-pool.go +++ b/grain-pool.go @@ -115,8 +115,8 @@ func (p *GrainLocalPool) GetGrains() map[CartId]*CartGrain { func (p *GrainLocalPool) GetGrain(id CartId) (*CartGrain, error) { var err error - p.mu.RLock() - defer p.mu.RUnlock() + // p.mu.RLock() + // defer p.mu.RUnlock() grain, ok := p.grains[id] grainLookups.Inc() if grain == nil || !ok { diff --git a/synced-pool.go b/synced-pool.go index 03c84d2..163dada 100644 --- a/synced-pool.go +++ b/synced-pool.go @@ -320,8 +320,8 @@ func (p *SyncedPool) Negotiate() { } func (p *SyncedPool) GetHealthyRemotes() []*RemoteHost { - p.mu.RLock() - defer p.mu.RUnlock() + // p.mu.RLock() + // defer p.mu.RUnlock() remotes := make([]*RemoteHost, 0, len(p.remotes)) for _, r := range p.remotes { if r.IsHealthy() { @@ -422,12 +422,14 @@ func (p *SyncedPool) AddRemote(host string) error { func (p *SyncedPool) getGrain(id CartId) (Grain, error) { var err error + p.mu.RLock() + defer p.mu.RUnlock() localGrain, ok := p.local.grains[id] if !ok { // check if remote grain exists - p.mu.RLock() + remoteGrain, ok := p.remoteIndex[id] - p.mu.RUnlock() + if ok { remoteLookupCount.Inc() return remoteGrain, nil