Skip to content

fix blocking Depth() call on the closed queue #12

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 2 commits into from
Feb 28, 2020
Merged

fix blocking Depth() call on the closed queue #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0331982
fix blocking Depth() call on the closed queue
mgurevin Feb 19, 2020
ada0c8a
make Depth() return last cached depth after diskQueue closed
ploxiln Feb 28, 2020
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
9 changes: 8 additions & 1 deletion diskqueue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,12 @@ func New(name string, dataPath string, maxBytesPerFile int64,

// Depth returns the depth of the queue
func (d *diskQueue) Depth() int64 {
return <-d.depthChan
depth, ok := <-d.depthChan
if !ok {
// ioLoop exited
depth = d.depth
}
return depth
}

// ReadChan returns the receive-only []byte channel for reading data
Expand Down Expand Up @@ -188,6 +193,8 @@ func (d *diskQueue) exit(deleted bool) error {
// ensure that ioLoop has exited
<-d.exitSyncChan

close(d.depthChan)

if d.readFile != nil {
d.readFile.Close()
d.readFile = nil
Expand Down