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

make protocol methods threadsafe

Browse Source
This commit is contained in:
Jeromy 2016-08-19 14:51:59 -07:00
parent d02feb985c
commit df3e34df4b
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
peerstore.go
View File

@ -68,7 +68,7 @@ type AddrBook interface {
// This is used when we receive the best estimate of the validity of an address. // This is used when we receive the best estimate of the validity of an address.
SetAddrs(p peer.ID, addrs []ma.Multiaddr, ttl time.Duration) SetAddrs(p peer.ID, addrs []ma.Multiaddr, ttl time.Duration)
// Addresses returns all known (and valid) addresses for a given // Addresses returns all known (and valid) addresses for a given peer
Addrs(p peer.ID) []ma.Multiaddr Addrs(p peer.ID) []ma.Multiaddr
// AddrStream returns a channel that gets all addresses for a given // AddrStream returns a channel that gets all addresses for a given
@ -172,6 +172,9 @@ type peerstore struct {
// TODO: use a datastore for this // TODO: use a datastore for this
ds map[string]interface{} ds map[string]interface{}
dslock sync.Mutex dslock sync.Mutex
// lock for protocol information, separate from datastore lock
protolock sync.Mutex
} }
// NewPeerstore creates a threadsafe collection of peers. // NewPeerstore creates a threadsafe collection of peers.
@ -233,6 +236,8 @@ func (ps *peerstore) PeerInfo(p peer.ID) PeerInfo {
} }
func (ps *peerstore) AddProtocols(p peer.ID, protos ...string) error { func (ps *peerstore) AddProtocols(p peer.ID, protos ...string) error {
ps.protolock.Lock()
defer ps.protolock.Unlock()
protomap, err := ps.getProtocolMap(p) protomap, err := ps.getProtocolMap(p)
if err != nil { if err != nil {
return err return err
@ -263,6 +268,8 @@ func (ps *peerstore) getProtocolMap(p peer.ID) (map[string]struct{}, error) {
} }
func (ps *peerstore) GetProtocols(p peer.ID) ([]string, error) { func (ps *peerstore) GetProtocols(p peer.ID) ([]string, error) {
ps.protolock.Lock()
defer ps.protolock.Unlock()
pmap, err := ps.getProtocolMap(p) pmap, err := ps.getProtocolMap(p)
if err != nil { if err != nil {
return nil, err return nil, err
@ -277,6 +284,8 @@ func (ps *peerstore) GetProtocols(p peer.ID) ([]string, error) {
} }
func (ps *peerstore) SupportsProtocols(p peer.ID, protos ...string) ([]string, error) { func (ps *peerstore) SupportsProtocols(p peer.ID, protos ...string) ([]string, error) {
ps.protolock.Lock()
defer ps.protolock.Unlock()
pmap, err := ps.getProtocolMap(p) pmap, err := ps.getProtocolMap(p)
if err != nil { if err != nil {
return nil, err return nil, err