Skip to content

avoid timer leak #1995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 27, 2024
Merged

avoid timer leak #1995

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions ctxc/downloader/downloader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,12 @@ func (d *Downloader) fetchHeaders(p *peerConnection, from uint64) error {
ancestor := from
getHeaders(from)

//mode := d.getMode()
headerCheckTimer := time.NewTimer(fsHeaderContCheck)
defer headerCheckTimer.Stop()

headerDelayedTimer := time.NewTimer(fsHeaderContCheck)
defer headerDelayedTimer.Stop()

for {
select {
case <-d.cancelCh:
Expand Down Expand Up @@ -1025,8 +1030,9 @@ func (d *Downloader) fetchHeaders(p *peerConnection, from uint64) error {
// Don't abort header fetches while the pivot is downloading
if !d.committed.Load() && pivot <= from {
p.log.Debug("No headers, waiting for pivot commit")
headerCheckTimer.Reset(fsHeaderContCheck)
select {
case <-time.After(fsHeaderContCheck):
case <-headerCheckTimer.C:
getHeaders(from)
continue
case <-d.cancelCh:
Expand Down Expand Up @@ -1097,8 +1103,9 @@ func (d *Downloader) fetchHeaders(p *peerConnection, from uint64) error {
} else {
// No headers delivered, or all of them being delayed, sleep a bit and retry
p.log.Trace("All headers delayed, waiting")
headerDelayedTimer.Reset(fsHeaderContCheck)
select {
case <-time.After(fsHeaderContCheck):
case <-headerDelayedTimer.C:
getHeaders(from)
continue
case <-d.cancelCh:
Expand Down