diff --git a/kernel/src/net/socket/ip/datagram/mod.rs b/kernel/src/net/socket/ip/datagram/mod.rs index ed05c934c..18b827970 100644 --- a/kernel/src/net/socket/ip/datagram/mod.rs +++ b/kernel/src/net/socket/ip/datagram/mod.rs @@ -50,7 +50,7 @@ impl OptionSet { pub struct DatagramSocket { options: RwLock, inner: RwLock, PreemptDisabled>, - nonblocking: AtomicBool, + is_nonblocking: AtomicBool, pollee: Pollee, } @@ -98,22 +98,22 @@ impl Inner { } impl DatagramSocket { - pub fn new(nonblocking: bool) -> Arc { + pub fn new(is_nonblocking: bool) -> Arc { let unbound_datagram = UnboundDatagram::new(); Arc::new(Self { inner: RwLock::new(Takeable::new(Inner::Unbound(unbound_datagram))), - nonblocking: AtomicBool::new(nonblocking), + is_nonblocking: AtomicBool::new(is_nonblocking), pollee: Pollee::new(), options: RwLock::new(OptionSet::new()), }) } pub fn is_nonblocking(&self) -> bool { - self.nonblocking.load(Ordering::SeqCst) + self.is_nonblocking.load(Ordering::Relaxed) } - pub fn set_nonblocking(&self, nonblocking: bool) { - self.nonblocking.store(nonblocking, Ordering::SeqCst); + pub fn set_nonblocking(&self, is_nonblocking: bool) { + self.is_nonblocking.store(is_nonblocking, Ordering::Relaxed); } fn remote_endpoint(&self) -> Option { diff --git a/kernel/src/net/socket/ip/stream/mod.rs b/kernel/src/net/socket/ip/stream/mod.rs index 95086c674..9015bd1d8 100644 --- a/kernel/src/net/socket/ip/stream/mod.rs +++ b/kernel/src/net/socket/ip/stream/mod.rs @@ -77,12 +77,12 @@ impl OptionSet { } impl StreamSocket { - pub fn new(nonblocking: bool) -> Arc { + pub fn new(is_nonblocking: bool) -> Arc { let init_stream = InitStream::new(); Arc::new(Self { options: RwLock::new(OptionSet::new()), state: RwLock::new(Takeable::new(State::Init(init_stream))), - is_nonblocking: AtomicBool::new(nonblocking), + is_nonblocking: AtomicBool::new(is_nonblocking), pollee: Pollee::new(), }) }