Skip to content

Improve invalid fd error messages for epoll #13

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

Open
erikgeiser wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve invalid fd error messages for epoll #13

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
10 changes: 8 additions & 2 deletions cancelreader_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ func NewReader(reader io.Reader) (CancelReader, error) {
return newFallbackCancelReader(reader)
}

if int(file.Fd()) == -1 {
return nil, fmt.Errorf("file is closed")
}

epoll, err := unix.EpollCreate1(0)
if err != nil {
return nil, fmt.Errorf("create epoll: %w", err)
Expand All @@ -47,7 +51,8 @@ func NewReader(reader io.Reader) (CancelReader, error) {
})
if err != nil {
_ = unix.Close(epoll)
return nil, fmt.Errorf("add reader to epoll interest list")
return nil, fmt.Errorf("add reader with descriptor %d to epoll interest list: %w",
int(file.Fd()), err)
}

err = unix.EpollCtl(epoll, unix.EPOLL_CTL_ADD, int(r.cancelSignalReader.Fd()), &unix.EpollEvent{
Expand All @@ -56,7 +61,8 @@ func NewReader(reader io.Reader) (CancelReader, error) {
})
if err != nil {
_ = unix.Close(epoll)
return nil, fmt.Errorf("add reader to epoll interest list")
return nil, fmt.Errorf("add cancel signal with descriptor %d to epoll interest list: %w",
int(r.cancelSignalReader.Fd()), err)
}

return r, nil
Expand Down