forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

swarm/network: Address review comments

Browse source
This commit is contained in:
Balint Gabor 2018-09-13 10:24:37 +02:00
parent db917b75bd
commit 448a17ce60
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
swarm/network/fetcher.go
View file

@ -175,7 +175,7 @@ func (f *Fetcher) run(ctx context.Context, peers *sync.Map) {
// incoming offer // incoming offer
case source := <-f.offerC: case source := <-f.offerC:
log.Debug("new source", "peer addr", source, "request addr", f.addr) log.Trace("new source", "peer addr", source, "request addr", f.addr)
// 1) the chunk is offered by a syncing peer // 1) the chunk is offered by a syncing peer
// add to known sources // add to known sources
sources = append(sources, source) sources = append(sources, source)
@ -184,7 +184,7 @@ func (f *Fetcher) run(ctx context.Context, peers *sync.Map) {
// incoming request // incoming request
case <-f.requestC: case <-f.requestC:
log.Debug("new request", "request addr", f.addr) log.Trace("new request", "request addr", f.addr)
// 2) chunk is requested, set requested flag // 2) chunk is requested, set requested flag
// launch a request iff none been launched yet // launch a request iff none been launched yet
doRequest = !requested doRequest = !requested
@ -193,19 +193,19 @@ func (f *Fetcher) run(ctx context.Context, peers *sync.Map) {
// peer we requested from is gone. fall back to another // peer we requested from is gone. fall back to another
// and remove the peer from the peers map // and remove the peer from the peers map
case id := <-gone: case id := <-gone:
log.Debug("peer gone", "peer id", id.String(), "request addr", f.addr) log.Trace("peer gone", "peer id", id.String(), "request addr", f.addr)
peers.Delete(id.String()) peers.Delete(id.String())
doRequest = requested doRequest = requested
// search timeout: too much time passed since the last request, // search timeout: too much time passed since the last request,
// extend the search to a new peer if we can find one // extend the search to a new peer if we can find one
case <-waitC: case <-waitC:
log.Debug("search timed out: rerequesting", "request addr", f.addr) log.Trace("search timed out: rerequesting", "request addr", f.addr)
doRequest = requested doRequest = requested
// all Fetcher context closed, can quit // all Fetcher context closed, can quit
case <-ctx.Done(): case <-ctx.Done():
log.Debug("terminate fetcher", "request addr", f.addr) log.Trace("terminate fetcher", "request addr", f.addr)
// TODO: send cancelations to all peers left over in peers map (i.e., those we requested from) // TODO: send cancelations to all peers left over in peers map (i.e., those we requested from)
return return
} }

2
swarm/network/stream/syncer.go
View file

@ -28,7 +28,7 @@ import (
) )
const ( const (
BatchSize = 8 BatchSize = 128
) )
// SwarmSyncerServer implements an Server for history syncing on bins // SwarmSyncerServer implements an Server for history syncing on bins