libp2p/go-libp2p-peerstore
1
0
Fork 0
mirror of https://github.com/libp2p/go-libp2p-peerstore.git synced 2025-01-27 04:40:07 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41 from libp2p/fix/smaller-addr-book

Browse Source 
store expiring addrs by pointer
This commit is contained in:
Raúl Kripalani 2018-10-16 09:47:39 +01:00 committed by GitHub
commit 4c151480e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pstoremem/addr_book.go
View File

@ -31,7 +31,10 @@ var _ pstore.AddrBook = (*memoryAddrBook)(nil)
// memoryAddrBook manages addresses. // memoryAddrBook manages addresses.
type memoryAddrBook struct { type memoryAddrBook struct {
addrmu sync.Mutex addrmu sync.Mutex
addrs map[peer.ID]map[string]expiringAddr // Use pointers to save memory. Maps always leave some fraction of their
// space unused. storing the *values* directly in the map will
// drastically increase the space waste. In our case, by 6x.
addrs map[peer.ID]map[string]*expiringAddr
nextGC time.Time nextGC time.Time
@ -40,7 +43,7 @@ type memoryAddrBook struct {
func NewAddrBook() pstore.AddrBook { func NewAddrBook() pstore.AddrBook {
return &memoryAddrBook{ return &memoryAddrBook{
addrs: make(map[peer.ID]map[string]expiringAddr), addrs: make(map[peer.ID]map[string]*expiringAddr),
subManager: NewAddrSubManager(), subManager: NewAddrSubManager(),
} }
} }
@ -94,7 +97,7 @@ func (mab *memoryAddrBook) AddAddrs(p peer.ID, addrs []ma.Multiaddr, ttl time.Du
amap := mab.addrs[p] amap := mab.addrs[p]
if amap == nil { if amap == nil {
amap = make(map[string]expiringAddr, len(addrs)) amap = make(map[string]*expiringAddr, len(addrs))
mab.addrs[p] = amap mab.addrs[p] = amap
} }
exp := time.Now().Add(ttl) exp := time.Now().Add(ttl)
@ -106,7 +109,7 @@ func (mab *memoryAddrBook) AddAddrs(p peer.ID, addrs []ma.Multiaddr, ttl time.Du
addrstr := string(addr.Bytes()) addrstr := string(addr.Bytes())
a, found := amap[addrstr] a, found := amap[addrstr]
if !found || exp.After(a.Expires) { if !found || exp.After(a.Expires) {
amap[addrstr] = expiringAddr{Addr: addr, Expires: exp, TTL: ttl} amap[addrstr] = &expiringAddr{Addr: addr, Expires: exp, TTL: ttl}
mab.subManager.BroadcastAddr(p, addr) mab.subManager.BroadcastAddr(p, addr)
} }
@ -127,7 +130,7 @@ func (mab *memoryAddrBook) SetAddrs(p peer.ID, addrs []ma.Multiaddr, ttl time.Du
amap := mab.addrs[p] amap := mab.addrs[p]
if amap == nil { if amap == nil {
amap = make(map[string]expiringAddr, len(addrs)) amap = make(map[string]*expiringAddr, len(addrs))
mab.addrs[p] = amap mab.addrs[p] = amap
} }
@ -141,7 +144,7 @@ func (mab *memoryAddrBook) SetAddrs(p peer.ID, addrs []ma.Multiaddr, ttl time.Du
addrstr := string(addr.Bytes()) addrstr := string(addr.Bytes())
if ttl > 0 { if ttl > 0 {
amap[addrstr] = expiringAddr{Addr: addr, Expires: exp, TTL: ttl} amap[addrstr] = &expiringAddr{Addr: addr, Expires: exp, TTL: ttl}
mab.subManager.BroadcastAddr(p, addr) mab.subManager.BroadcastAddr(p, addr)
} else { } else {