opt: improve event poll

fix: fix an issue in poll about handling errors
panjf2000 · Jan 27, 2021 · fc042cc · fc042cc
1 parent fee6aca
commit fc042cc
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/internal/netpoll/epoll.go b/internal/netpoll/epoll.go
@@ -25,6 +25,7 @@ package netpoll
 
 import (
 	"os"
+	"runtime"
 	"unsafe"
 
 	"github.com/panjf2000/gnet/errors"
@@ -93,12 +94,18 @@ func (p *Poller) Polling(callback func(fd int, ev uint32) error) error {
 	el := newEventList(InitEvents)
 	var wakenUp bool
 
+	var msec = -1
 	for {
-		n, err := unix.EpollWait(p.fd, el.events, -1)
-		if err != nil && err != unix.EINTR {
-			logging.DefaultLogger.Warnf("Error occurs in epoll: %v", os.NewSyscallError("epoll_wait", err))
+		n, err := unix.EpollWait(p.fd, el.events, msec)
+		if n == 0 || (n < 0 && err == unix.EINTR) {
+			msec = -1
+			runtime.Gosched()
 			continue
+		} else if err != nil {
+			logging.DefaultLogger.Warnf("Error occurs in epoll: %v", os.NewSyscallError("epoll_wait", err))
+			return err
 		}
+		msec = 0
 
 		for i := 0; i < n; i++ {
 			if fd := int(el.events[i].Fd); fd != p.wfd {

diff --git a/internal/netpoll/kqueue.go b/internal/netpoll/kqueue.go
@@ -25,6 +25,7 @@ package netpoll
 
 import (
 	"os"
+	"runtime"
 
 	"github.com/panjf2000/gnet/errors"
 	"github.com/panjf2000/gnet/internal"
@@ -84,12 +85,21 @@ func (p *Poller) Polling(callback func(fd int, filter int16) error) error {
 	el := newEventList(InitEvents)
 	var wakenUp bool
 
+	var (
+		ts  unix.Timespec
+		tsp *unix.Timespec
+	)
 	for {
-		n, err := unix.Kevent(p.fd, nil, el.events, nil)
-		if err != nil && err != unix.EINTR {
-			logging.DefaultLogger.Warnf("Error occurs in kqueue: %v", os.NewSyscallError("kevent wait", err))
+		n, err := unix.Kevent(p.fd, nil, el.events, tsp)
+		if n == 0 || (n < 0 && err == unix.EINTR) {
+			tsp = nil
+			runtime.Gosched()
 			continue
+		} else if err != nil {
+			logging.DefaultLogger.Warnf("Error occurs in kqueue: %v", os.NewSyscallError("kevent wait", err))
+			return err
 		}
+		tsp = &ts
 
 		var evFilter int16
 		for i := 0; i < n; i++ {

diff --git a/internal/netpoll/netpoll_posix.go b/internal/netpoll/netpoll_posix.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Andy Pan
+// Copyright (c) 2021 Andy Pan
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal