certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Lock mutex on getting element from cache (#8767)

This commit is contained in:
Robert Zaremba 2021-03-03 16:52:38 +01:00 committed by GitHub
parent 91affb5167
commit 0b6833c333
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
types/address.go
View File

@ -268,11 +268,12 @@ func (aa AccAddress) String() string {
} }
var key = conv.UnsafeBytesToStr(aa) var key = conv.UnsafeBytesToStr(aa)
accAddrMu.Lock()
defer accAddrMu.Unlock()
if addr, ok := accAddrCache.Get(key); ok { if addr, ok := accAddrCache.Get(key); ok {
return addr.(string) return addr.(string)
} }
return cacheBech32Addr(GetConfig().GetBech32AccountAddrPrefix(), return cacheBech32Addr(GetConfig().GetBech32AccountAddrPrefix(), aa, accAddrCache, key)
aa, &accAddrMu, accAddrCache, key)
} }
// Format implements the fmt.Formatter interface. // Format implements the fmt.Formatter interface.
@ -416,11 +417,12 @@ func (va ValAddress) String() string {
} }
var key = conv.UnsafeBytesToStr(va) var key = conv.UnsafeBytesToStr(va)
valAddrMu.Lock()
defer valAddrMu.Unlock()
if addr, ok := valAddrCache.Get(key); ok { if addr, ok := valAddrCache.Get(key); ok {
return addr.(string) return addr.(string)
} }
return cacheBech32Addr(GetConfig().GetBech32ValidatorAddrPrefix(), return cacheBech32Addr(GetConfig().GetBech32ValidatorAddrPrefix(), va, valAddrCache, key)
va, &valAddrMu, valAddrCache, key)
} }
// Format implements the fmt.Formatter interface. // Format implements the fmt.Formatter interface.
@ -569,11 +571,12 @@ func (ca ConsAddress) String() string {
} }
var key = conv.UnsafeBytesToStr(ca) var key = conv.UnsafeBytesToStr(ca)
consAddrMu.Lock()
defer consAddrMu.Unlock()
if addr, ok := consAddrCache.Get(key); ok { if addr, ok := consAddrCache.Get(key); ok {
return addr.(string) return addr.(string)
} }
return cacheBech32Addr(GetConfig().GetBech32ConsensusAddrPrefix(), return cacheBech32Addr(GetConfig().GetBech32ConsensusAddrPrefix(), ca, consAddrCache, key)
ca, &consAddrMu, consAddrCache, key)
} }
// Bech32ifyAddressBytes returns a bech32 representation of address bytes. // Bech32ifyAddressBytes returns a bech32 representation of address bytes.
@ -719,13 +722,11 @@ func addressBytesFromHexString(address string) ([]byte, error) {
return hex.DecodeString(address) return hex.DecodeString(address)
} }
func cacheBech32Addr(prefix string, addr []byte, m sync.Locker, cache *simplelru.LRU, cacheKey string) string { func cacheBech32Addr(prefix string, addr []byte, cache *simplelru.LRU, cacheKey string) string {
bech32Addr, err := bech32.ConvertAndEncode(prefix, addr) bech32Addr, err := bech32.ConvertAndEncode(prefix, addr)
if err != nil { if err != nil {
panic(err) panic(err)
} }
m.Lock()
cache.Add(cacheKey, bech32Addr) cache.Add(cacheKey, bech32Addr)
m.Unlock()
return bech32Addr return bech32Addr
} }