Merge pull request mailru#13 from branelmoro/master

Fix added for issue 11 [setting os.File in nonblocking mode]

Author: rvasily

netpoll/netpoll_epoll.go

@@ -2,6 +2,10 @@
 
 package netpoll
 
+import (
+	"os"
+)
+
 // New creates new epoll-based Poller instance with given config.
 func New(c *Config) (Poller, error) {
 	cfg := c.withDefaults()
@@ -23,7 +27,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
 
@@ -49,6 +53,12 @@ func (ep poller) Start(desc *Desc, cb CallbackFn) error {
 			cb(event)
 		},
 	)
+	if err == nil {
+		if err = setNonblock(desc.fd(), true); err != nil {
+			return os.NewSyscallError("setnonblock", err)
+		}
+	}
+	return err
 }
 
 // Stop implements Poller.Stop() method.

netpoll/netpoll_kqueue.go

@@ -2,6 +2,10 @@
 
 package netpoll
 
+import (
+	"os"
+)
+
 // New creates new kqueue-based Poller instance with given config.
 func New(c *Config) (Poller, error) {
 	cfg := c.withDefaults()
@@ -22,7 +26,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
 
@@ -57,6 +61,12 @@ func (p poller) Start(desc *Desc, cb CallbackFn) error {
 
 		cb(event)
 	})
+	if err == nil {
+		if err = setNonblock(desc.fd(), true); err != nil {
+			return os.NewSyscallError("setnonblock", err)
+		}
+	}
+	return err
 }
 
 func (p poller) Stop(desc *Desc) error {