fluencelabs/go-libp2p-kad-dht
1
0
Fork 0
mirror of https://github.com/fluencelabs/go-libp2p-kad-dht synced 2025-04-25 06:42:13 +00:00
Code Issues Projects Releases Wiki Activity

starting to move important events over to EventBegin/Done

Browse Source
This commit is contained in:
Jeromy 2015-01-15 04:17:17 +00:00
parent 93e4b73b1a
commit 074439d419
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dht.go
View File

@ -196,6 +196,8 @@ func (dht *IpfsDHT) getValueOrPeers(ctx context.Context, p peer.ID,
// getValueSingle simply performs the get value RPC with the given parameters // getValueSingle simply performs the get value RPC with the given parameters
func (dht *IpfsDHT) getValueSingle(ctx context.Context, p peer.ID, func (dht *IpfsDHT) getValueSingle(ctx context.Context, p peer.ID,
key u.Key) (*pb.Message, error) { key u.Key) (*pb.Message, error) {
e := log.EventBegin(ctx, "getValueSingle", p, &key)
defer e.Done()
pmes := pb.NewMessage(pb.Message_GET_VALUE, string(key), 0) pmes := pb.NewMessage(pb.Message_GET_VALUE, string(key), 0)
return dht.sendRequest(ctx, p, pmes) return dht.sendRequest(ctx, p, pmes)
@ -265,11 +267,17 @@ func (dht *IpfsDHT) FindLocal(id peer.ID) peer.PeerInfo {
// findPeerSingle asks peer 'p' if they know where the peer with id 'id' is // findPeerSingle asks peer 'p' if they know where the peer with id 'id' is
func (dht *IpfsDHT) findPeerSingle(ctx context.Context, p peer.ID, id peer.ID) (*pb.Message, error) { func (dht *IpfsDHT) findPeerSingle(ctx context.Context, p peer.ID, id peer.ID) (*pb.Message, error) {
e := log.EventBegin(ctx, "findPeerSingle", p, id)
defer e.Done()
pmes := pb.NewMessage(pb.Message_FIND_NODE, string(id), 0) pmes := pb.NewMessage(pb.Message_FIND_NODE, string(id), 0)
return dht.sendRequest(ctx, p, pmes) return dht.sendRequest(ctx, p, pmes)
} }
func (dht *IpfsDHT) findProvidersSingle(ctx context.Context, p peer.ID, key u.Key) (*pb.Message, error) { func (dht *IpfsDHT) findProvidersSingle(ctx context.Context, p peer.ID, key u.Key) (*pb.Message, error) {
e := log.EventBegin(ctx, "findProvidersSingle", p, &key)
defer e.Done()
pmes := pb.NewMessage(pb.Message_GET_PROVIDERS, string(key), 0) pmes := pb.NewMessage(pb.Message_GET_PROVIDERS, string(key), 0)
return dht.sendRequest(ctx, p, pmes) return dht.sendRequest(ctx, p, pmes)
} }

15
routing.go
View File

@ -122,10 +122,12 @@ func (dht *IpfsDHT) GetValue(ctx context.Context, key u.Key) ([]byte, error) {
// Provide makes this node announce that it can provide a value for the given key // Provide makes this node announce that it can provide a value for the given key
func (dht *IpfsDHT) Provide(ctx context.Context, key u.Key) error { func (dht *IpfsDHT) Provide(ctx context.Context, key u.Key) error {
log := dht.log().Prefix("Provide(%s)", key) log := dht.log().Prefix("Provide(%s)", key)
log.Debugf("start", key) log.Debugf("start", key)
log.Event(ctx, "provideBegin", &key)
defer log.Debugf("end", key) defer log.Debugf("end", key)
defer log.Event(ctx, "provideEnd", &key)
e := log.EventBegin(ctx, "provide", &key)
defer e.Done()
// add self locally // add self locally
dht.providers.AddProvider(key, dht.self) dht.providers.AddProvider(key, dht.self)
@ -163,6 +165,7 @@ func (dht *IpfsDHT) FindProviders(ctx context.Context, key u.Key) ([]peer.PeerIn
// Kademlia 'node lookup' operation. Returns a channel of the K closest peers // Kademlia 'node lookup' operation. Returns a channel of the K closest peers
// to the given key // to the given key
func (dht *IpfsDHT) getClosestPeers(ctx context.Context, key u.Key) (<-chan peer.ID, error) { func (dht *IpfsDHT) getClosestPeers(ctx context.Context, key u.Key) (<-chan peer.ID, error) {
e := log.EventBegin(ctx, "getClosestPeers", &key)
tablepeers := dht.routingTable.NearestPeers(kb.ConvertKey(key), AlphaValue) tablepeers := dht.routingTable.NearestPeers(kb.ConvertKey(key), AlphaValue)
if len(tablepeers) == 0 { if len(tablepeers) == 0 {
return nil, errors.Wrap(kb.ErrLookupFailure) return nil, errors.Wrap(kb.ErrLookupFailure)
@ -204,6 +207,7 @@ func (dht *IpfsDHT) getClosestPeers(ctx context.Context, key u.Key) (<-chan peer
go func() { go func() {
defer close(out) defer close(out)
defer e.Done()
// run it! // run it!
_, err := query.Run(ctx, tablepeers) _, err := query.Run(ctx, tablepeers)
if err != nil { if err != nil {
@ -242,10 +246,9 @@ func (dht *IpfsDHT) FindProvidersAsync(ctx context.Context, key u.Key, count int
func (dht *IpfsDHT) findProvidersAsyncRoutine(ctx context.Context, key u.Key, count int, peerOut chan peer.PeerInfo) { func (dht *IpfsDHT) findProvidersAsyncRoutine(ctx context.Context, key u.Key, count int, peerOut chan peer.PeerInfo) {
log := dht.log().Prefix("FindProviders(%s)", key) log := dht.log().Prefix("FindProviders(%s)", key)
e := log.EventBegin(ctx, "findProvidersAsync", &key)
defer e.Done()
defer close(peerOut) defer close(peerOut)
defer log.Event(ctx, "findProviders end", &key)
log.Debug("begin")
defer log.Debug("begin")
ps := pset.NewLimited(count) ps := pset.NewLimited(count)
provs := dht.providers.GetProviders(ctx, key) provs := dht.providers.GetProviders(ctx, key)
@ -314,6 +317,8 @@ func (dht *IpfsDHT) findProvidersAsyncRoutine(ctx context.Context, key u.Key, co
// FindPeer searches for a peer with given ID. // FindPeer searches for a peer with given ID.
func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (peer.PeerInfo, error) { func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (peer.PeerInfo, error) {
e := log.EventBegin(ctx, "FindPeer", id)
defer e.Done()
// Check if were already connected to them // Check if were already connected to them
if pi := dht.FindLocal(id); pi.ID != "" { if pi := dht.FindLocal(id); pi.ID != "" {