forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 01:43:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

debug

Browse source
This commit is contained in:
zelig 2018-01-25 12:18:39 +01:00
parent 288a5b09c9
commit 6bf67decd2
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
swarm/network/stream/delivery.go
View file

@ -173,10 +173,12 @@ func (d *Delivery) handleRetrieveRequestMsg(sp *Peer, req *RetrieveRequestMsg) e
type ChunkDeliveryMsg struct { type ChunkDeliveryMsg struct {
Key storage.Key Key storage.Key
SData []byte // the stored chunk Data (incl size) SData []byte // the stored chunk Data (incl size)
peer *Peer
} }
func (d *Delivery) handleChunkDeliveryMsg(sp *Peer, req *ChunkDeliveryMsg) error { func (d *Delivery) handleChunkDeliveryMsg(sp *Peer, req *ChunkDeliveryMsg) error {
d.counterIn++ d.counterIn++
req.peer = sp
log.Error("push to receiveC", "hash", storage.Key(req.Key).Hex()) log.Error("push to receiveC", "hash", storage.Key(req.Key).Hex())
d.receiveC <- req d.receiveC <- req
return nil return nil
@ -188,15 +190,16 @@ func (d *Delivery) processReceivedChunks() {
defer timer.Stop() defer timer.Stop()
// R: // R:
for req := range d.receiveC { for req := range d.receiveC {
log.Error("pop from receiveC", "hash", storage.Key(req.Key).Hex()) log.Error("pop from receiveC", "peer", req.peer.ID(), "hash", storage.Key(req.Key).Hex())
timer.Reset(1 * time.Second) timer.Reset(1 * time.Second)
go func(req *ChunkDeliveryMsg) { go func(req *ChunkDeliveryMsg) {
defer func() { done <- struct{}{} }() defer func() { done <- struct{}{} }()
// this should be has locally // this should be has locally
log.Error("before db.Get", "peer", req.peer.ID(), "hash", storage.Key(req.Key).Hex())
chunk, err := d.db.Get(req.Key) chunk, err := d.db.Get(req.Key)
log.Error("after db.Get", "chunk", chunk.Key.Hex(), "reqC", chunk.ReqC, "err", err) log.Error("after db.Get", "peer", req.peer.ID(), "chunk", chunk.Key.Hex(), "reqC", chunk.ReqC, "err", err)
if err == nil { if err == nil {
log.Error("found existing?", "hash", chunk.Key.Hex()) log.Error("found existing?", "peer", req.peer.ID(), "hash", chunk.Key.Hex())
// continue R // continue R
return return
} }
@ -212,20 +215,21 @@ func (d *Delivery) processReceivedChunks() {
} }
// go func() { // go func() {
chunk.SData = req.SData chunk.SData = req.SData
log.Error("received delivery", "hash", chunk.Key.Hex()) log.Error("received delivery", "peer", req.peer.ID(), "hash", chunk.Key.Hex())
d.db.Put(chunk) d.db.Put(chunk)
log.Error("put to db", "hash", chunk.Key.Hex()) log.Error("put to db", "peer", req.peer.ID(), "hash", chunk.Key.Hex())
chunk.WaitToStore() chunk.WaitToStore()
close(chunk.ReqC) close(chunk.ReqC)
//log.Warn("received delivery stored", "hash", chunk.Key) //log.Warn("received delivery stored", "hash", chunk.Key)
log.Error("requesters notified", "hash", chunk.Key.Hex()) log.Error("requesters notified", "peer", req.peer.ID(), "hash", chunk.Key.Hex())
d.counterDone++ d.counterDone++
// }() // }()
}(req) }(req)
select { select {
case <-timer.C: case <-timer.C:
log.Error("!!!unable to process", "hash", req.Key.Hex()) log.Error("!!!unable to process delivery", "peer", req.peer.ID(), "hash", req.Key.Hex())
case <-done: case <-done:
log.Error("done processing delivery", "peer", req.peer.ID(), "hash", req.Key.Hex())
} }
} }
} }