Skip to content

fix for issue11 #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

Open
cryptom-dev wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix for issue11 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98f4de2
fix Start() reset nonblocking
cryptom-dev Mar 26, 2019
89e5573
fix poller reset blocking of connection
cryptom-dev Mar 26, 2019
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
4 changes: 3 additions & 1 deletion netpoll/netpoll_epoll.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type poller struct {

// Start implements Poller.Start() method.
func (ep poller) Start(desc *Desc, cb CallbackFn) error {
return ep.Add(desc.fd(), toEpollEvent(desc.event),
err := ep.Add(desc.fd(), toEpollEvent(desc.event),
func(ep EpollEvent) {
var event Event

Expand All @@ -49,6 +49,8 @@ func (ep poller) Start(desc *Desc, cb CallbackFn) error {
cb(event)
},
)
setNonblock(desc.fd(), true)
return err
}

// Stop implements Poller.Stop() method.
Expand Down
4 changes: 3 additions & 1 deletion netpoll/netpoll_kqueue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type poller struct {

func (p poller) Start(desc *Desc, cb CallbackFn) error {
n, events := toKevents(desc.event, true)
return p.Add(desc.fd(), events, n, func(kev Kevent) {
err := p.Add(desc.fd(), events, n, func(kev Kevent) {
var (
event Event

Expand Down Expand Up @@ -57,6 +57,8 @@ func (p poller) Start(desc *Desc, cb CallbackFn) error {

cb(event)
})
setNonblock(desc.fd(), true)
return err
}

func (p poller) Stop(desc *Desc) error {
Expand Down