expose EvET

cheng-zhongliang · Aug 16, 2023 · dd5867f · dd5867f
1 parent 5f03d2a
commit dd5867f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/epoll.go b/epoll.go
@@ -200,14 +200,19 @@ func (ep *epoll) polling(cb func(ev *Event, res uint32), timeout int) error {
 			}
 		}
 
+		ET := uint32(0)
+		if es.epEvents&(syscall.EPOLLET&0xFFFFFFFF) != 0 {
+			ET = EvET
+		}
+
 		if evRead != nil {
-			cb(evRead, EvRead|EvET)
+			cb(evRead, EvRead|ET)
 		}
 		if evWrite != nil {
-			cb(evWrite, EvWrite|EvET)
+			cb(evWrite, EvWrite|ET)
 		}
 		if evClosed != nil {
-			cb(evClosed, EvClosed|EvET)
+			cb(evClosed, EvClosed|ET)
 		}
 	}
 

diff --git a/event.go b/event.go
@@ -261,7 +261,7 @@ func (bs *EventBase) handleActiveEvents() {
 				bs.AddEvent(ev, ev.timeout)
 			}
 
-			ev.cb(ev.fd, ev.res&ev.events, ev.arg)
+			ev.cb(ev.fd, ev.res, ev.arg)
 		}
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -261,7 +261,7 @@ func (bs *EventBase) handleActiveEvents() { @@
     				bs.AddEvent(ev, ev.timeout)
     			}
-    			ev.cb(ev.fd, ev.res&ev.events, ev.arg)
+    			ev.cb(ev.fd, ev.res, ev.arg)
     		}
     	}
     }
@@ Expand Down @@