From 246d8521f2c1045233f0cb66fdfec95a388793d7 Mon Sep 17 00:00:00 2001 From: Ruihan Li Date: Sat, 18 Nov 2023 11:30:50 +0800 Subject: [PATCH] Rename the `nonblocking` method to `is_nonblocking` We used to use `is_nonblocking()` in TCP streams, but use `nonblocking()` in UDP datagrams. Since `is_nonblocking()` is generally preferred, this commit renames `nonblocking()` to `is_nonblocking()` in UDP datagrams. --- services/libs/jinux-std/src/net/socket/ip/datagram.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/libs/jinux-std/src/net/socket/ip/datagram.rs b/services/libs/jinux-std/src/net/socket/ip/datagram.rs index f393fe858..939743ab8 100644 --- a/services/libs/jinux-std/src/net/socket/ip/datagram.rs +++ b/services/libs/jinux-std/src/net/socket/ip/datagram.rs @@ -157,7 +157,7 @@ impl DatagramSocket { )) } - pub fn nonblocking(&self) -> bool { + pub fn is_nonblocking(&self) -> bool { self.nonblocking.load(Ordering::SeqCst) } @@ -189,7 +189,7 @@ impl FileLike for DatagramSocket { } fn status_flags(&self) -> StatusFlags { - if self.nonblocking() { + if self.is_nonblocking() { StatusFlags::O_NONBLOCK } else { StatusFlags::empty() @@ -254,7 +254,7 @@ impl Socket for DatagramSocket { } let events = self.inner.read().poll(IoEvents::IN, Some(&poller)); if !events.contains(IoEvents::IN) { - if self.nonblocking() { + if self.is_nonblocking() { return_errno_with_message!(Errno::EAGAIN, "try to receive again"); } // FIXME: deal with recvfrom timeout