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

Remove redundant channel from ttlmanager

Browse Source
This commit is contained in:
Cole Brown 2018-06-15 17:35:18 -04:00
parent 785b890ecb
commit 7e3363eeb4
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addr_manager_ds.go
View File

@ -34,7 +34,7 @@ func NewDatastoreAddrManager(ctx context.Context, ds ds.Batching, ttlInterval ti
// Stop will signal the TTL manager to stop and block until it returns. // Stop will signal the TTL manager to stop and block until it returns.
func (mgr *DatastoreAddrManager) Stop() { func (mgr *DatastoreAddrManager) Stop() {
mgr.ttlManager.stop() mgr.ttlManager.cancel()
} }
func peerAddressKey(p *peer.ID, addr *ma.Multiaddr) (ds.Key, error) { func peerAddressKey(p *peer.ID, addr *ma.Multiaddr) (ds.Key, error) {
@ -210,7 +210,6 @@ type ttlmanager struct {
ctx context.Context ctx context.Context
cancel context.CancelFunc cancel context.CancelFunc
ticker *time.Ticker ticker *time.Ticker
done chan struct{}
ds ds.Datastore ds ds.Datastore
} }
@ -222,7 +221,6 @@ func newTTLManager(parent context.Context, d ds.Datastore, tick time.Duration) *
cancel: cancel, cancel: cancel,
ticker: time.NewTicker(tick), ticker: time.NewTicker(tick),
ds: d, ds: d,
done: make(chan struct{}),
} }
go func() { go func() {
@ -230,7 +228,6 @@ func newTTLManager(parent context.Context, d ds.Datastore, tick time.Duration) *
select { select {
case <-mgr.ctx.Done(): case <-mgr.ctx.Done():
mgr.ticker.Stop() mgr.ticker.Stop()
mgr.done <- struct{}{}
return return
case <-mgr.ticker.C: case <-mgr.ticker.C:
mgr.tick() mgr.tick()
@ -241,11 +238,6 @@ func newTTLManager(parent context.Context, d ds.Datastore, tick time.Duration) *
return mgr return mgr
} }
func (mgr *ttlmanager) stop() {
mgr.cancel()
<-mgr.done
}
// To be called by TTL manager's coroutine only. // To be called by TTL manager's coroutine only.
func (mgr *ttlmanager) tick() { func (mgr *ttlmanager) tick() {
mgr.RLock() mgr.RLock()