opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-01 10:49:24 +08:00
Code Issues Projects Releases Wiki Activity

make the providers manager respect contexts

Browse Source
This commit is contained in:
Jeromy
2015-02-26 16:44:36 -08:00
parent cb6d161b05
commit 3b2bd9bf6a
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
routing/dht/handlers.go
View File

@ -223,7 +223,7 @@ func (dht *IpfsDHT) handleAddProvider(ctx context.Context, p peer.ID, pmes *pb.M
// add the received addresses to our peerstore. // add the received addresses to our peerstore.
dht.peerstore.AddAddrs(pi.ID, pi.Addrs, peer.ProviderAddrTTL) dht.peerstore.AddAddrs(pi.ID, pi.Addrs, peer.ProviderAddrTTL)
} }
dht.providers.AddProvider(key, p) dht.providers.AddProvider(ctx, key, p)
} }
return pmes, nil // send back same msg as confirmation. return pmes, nil // send back same msg as confirmation.

8
routing/dht/providers.go
View File

@ -99,11 +99,15 @@ func (pm *ProviderManager) run() {
} }
} }
func (pm *ProviderManager) AddProvider(k u.Key, val peer.ID) { func (pm *ProviderManager) AddProvider(ctx context.Context, k u.Key, val peer.ID) {
pm.newprovs <- &addProv{ prov := &addProv{
k: k, k: k,
val: val, val: val,
} }
select {
case pm.newprovs <- prov:
case <-ctx.Done():
}
} }
func (pm *ProviderManager) GetProviders(ctx context.Context, k u.Key) []peer.ID { func (pm *ProviderManager) GetProviders(ctx context.Context, k u.Key) []peer.ID {

2
routing/dht/providers_test.go
View File

@ -14,7 +14,7 @@ func TestProviderManager(t *testing.T) {
mid := peer.ID("testing") mid := peer.ID("testing")
p := NewProviderManager(ctx, mid) p := NewProviderManager(ctx, mid)
a := u.Key("test") a := u.Key("test")
p.AddProvider(a, peer.ID("testingprovider")) p.AddProvider(ctx, a, peer.ID("testingprovider"))
resp := p.GetProviders(ctx, a) resp := p.GetProviders(ctx, a)
if len(resp) != 1 { if len(resp) != 1 {
t.Fatal("Could not retrieve provider.") t.Fatal("Could not retrieve provider.")

2
routing/dht/routing.go
View File

@ -141,7 +141,7 @@ func (dht *IpfsDHT) Provide(ctx context.Context, key u.Key) error {
defer log.EventBegin(ctx, "provide", &key).Done() defer log.EventBegin(ctx, "provide", &key).Done()
// add self locally // add self locally
dht.providers.AddProvider(key, dht.self) dht.providers.AddProvider(ctx, key, dht.self)
peers, err := dht.GetClosestPeers(ctx, key) peers, err := dht.GetClosestPeers(ctx, key)
if err != nil { if err != nil {