gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eth/fetcher: fix timer reset bug, add initial tests

Browse Source
This commit is contained in:
Péter Szilágyi
2015-06-16 14:02:43 +03:00
parent 7c2af1c117
commit 2a1b722d04
3 changed files with 212 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eth/fetcher/fetcher.go
View File

@ -149,7 +149,8 @@ func (f *Fetcher) loop() {
break
}
if len(announced) == 0 {
fetch.Reset(arriveTimeout)
glog.V(logger.Detail).Infof("Scheduling fetch in %v, at %v", arriveTimeout-time.Since(notification.time), notification.time.Add(arriveTimeout))
fetch.Reset(arriveTimeout - time.Since(notification.time))
}
announced[notification.hash] = append(announced[notification.hash], notification)
@ -181,11 +182,12 @@ func (f *Fetcher) loop() {
if len(announced) > 0 {
nearest := time.Now()
for _, announces := range announced {
if nearest.Before(announces[0].time) {
if nearest.After(announces[0].time) {
nearest = announces[0].time
}
}
fetch.Reset(arriveTimeout + time.Since(nearest))
glog.V(logger.Detail).Infof("Rescheduling fetch in %v, at %v", arriveTimeout-time.Since(nearest), nearest.Add(arriveTimeout))
fetch.Reset(arriveTimeout - time.Since(nearest))
}
case filter := <-f.filter: