Add a deadline for epollwait

tidwall · tidwall · commit 399d9384491b · 2020-01-15T15:33:41.000-07:00
diff --git a/internal/internal_linux.go b/internal/internal_linux.go
@@ -54,7 +54,7 @@ func (p *Poll) Trigger(note interface{}) error {
 func (p *Poll) Wait(iter func(fd int, note interface{}) error) error {
 	events := make([]syscall.EpollEvent, 64)
 	for {
-		n, err := syscall.EpollWait(p.fd, events, -1)
+		n, err := syscall.EpollWait(p.fd, events, 100)
 		if err != nil && err != syscall.EINTR {
 			return err
 		}
@@ -69,7 +69,7 @@ func (p *Poll) Wait(iter func(fd int, note interface{}) error) error {
 					return err
 				}
 			} else if fd == p.wfd {
-				var data [16]byte
+				var data [8]byte
 				syscall.Read(p.wfd, data[:])
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func (p *Poll) Trigger(note interface{}) error {`
`54`	`54`	`func (p *Poll) Wait(iter func(fd int, note interface{}) error) error {`
`55`	`55`	`events := make([]syscall.EpollEvent, 64)`
`56`	`56`	`for {`
`57`		`- n, err := syscall.EpollWait(p.fd, events, -1)`
	`57`	`+ n, err := syscall.EpollWait(p.fd, events, 100)`
`58`	`58`	`if err != nil && err != syscall.EINTR {`
`59`	`59`	`return err`
`60`	`60`	`}`
`@@ -69,7 +69,7 @@ func (p *Poll) Wait(iter func(fd int, note interface{}) error) error {`
`69`	`69`	`return err`
`70`	`70`	`}`
`71`	`71`	`} else if fd == p.wfd {`
`72`		`- var data [16]byte`
	`72`	`+ var data [8]byte`
`73`	`73`	`syscall.Read(p.wfd, data[:])`
`74`	`74`	`}`
`75`	`75`	`}`