register waker only if poll will wait for it

hermit-os · Feb 27, 2024 · 8c2d400 · 8c2d400
1 parent 661faa9
commit 8c2d400
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/fd/socket/tcp.rs b/src/fd/socket/tcp.rs
@@ -213,8 +213,14 @@ impl ObjectInterface for Socket {
 					let ret = event & available;
 
 					if ret.is_empty() {
-						socket.register_recv_waker(cx.waker());
-						socket.register_send_waker(cx.waker());
+						if event.intersects(PollEvent::POLLIN | PollEvent::POLLRDNORM | PollEvent::POLLRDBAND) {
+							socket.register_recv_waker(cx.waker());
+						}
+
+						if event.intersects(PollEvent::POLLOUT | PollEvent::POLLWRNORM | PollEvent::POLLWRBAND) {
+							socket.register_send_waker(cx.waker());
+						}
+
 						Poll::Pending
 					} else {
 						Poll::Ready(Ok(ret))

diff --git a/src/fd/socket/udp.rs b/src/fd/socket/udp.rs
@@ -142,8 +142,14 @@ impl ObjectInterface for Socket {
 				};
 
 				if ret.is_empty() {
-					socket.register_recv_waker(cx.waker());
-					socket.register_send_waker(cx.waker());
+					if event.intersects(PollEvent::POLLIN | PollEvent::POLLRDNORM | PollEvent::POLLRDBAND) {
+						socket.register_recv_waker(cx.waker());
+					}
+
+					if event.intersects(PollEvent::POLLOUT | PollEvent::POLLWRNORM | PollEvent::POLLWRBAND) {
+						socket.register_send_waker(cx.waker());
+					}
+
 					Poll::Pending
 				} else {
 					Poll::Ready(Ok(ret))