Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-19 12:36:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct lock usages in UNIX sockets

Browse Source
This commit is contained in:
Ruihan Li
2024-09-23 10:22:28 +08:00
committed by Tate, Hongliang Tian
parent 14531cd99f
commit 1aa8b0abc6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/src/net/socket/unix/stream/listener.rs
View File

@ -160,7 +160,7 @@ pub(super) struct Backlog {
addr: UnixSocketAddrBound, addr: UnixSocketAddrBound,
pollee: Pollee, pollee: Pollee,
backlog: AtomicUsize, backlog: AtomicUsize,
incoming_conns: Mutex<Option<VecDeque<Connected>>>, incoming_conns: SpinLock<Option<VecDeque<Connected>>>,
wait_queue: WaitQueue, wait_queue: WaitQueue,
} }
@ -176,7 +176,7 @@ impl Backlog {
addr, addr,
pollee, pollee,
backlog: AtomicUsize::new(backlog), backlog: AtomicUsize::new(backlog),
incoming_conns: Mutex::new(incoming_sockets), incoming_conns: SpinLock::new(incoming_sockets),
wait_queue: WaitQueue::new(), wait_queue: WaitQueue::new(),
} }
} }

6
kernel/src/net/socket/unix/stream/socket.rs
View File

@ -24,21 +24,21 @@ use crate::{
}; };
pub struct UnixStreamSocket { pub struct UnixStreamSocket {
state: RwLock<Takeable<State>>, state: RwMutex<Takeable<State>>,
is_nonblocking: AtomicBool, is_nonblocking: AtomicBool,
} }
impl UnixStreamSocket { impl UnixStreamSocket {
pub(super) fn new_init(init: Init, is_nonblocking: bool) -> Arc<Self> { pub(super) fn new_init(init: Init, is_nonblocking: bool) -> Arc<Self> {
Arc::new(Self { Arc::new(Self {
state: RwLock::new(Takeable::new(State::Init(init))), state: RwMutex::new(Takeable::new(State::Init(init))),
is_nonblocking: AtomicBool::new(is_nonblocking), is_nonblocking: AtomicBool::new(is_nonblocking),
}) })
} }
pub(super) fn new_connected(connected: Connected, is_nonblocking: bool) -> Arc<Self> { pub(super) fn new_connected(connected: Connected, is_nonblocking: bool) -> Arc<Self> {
Arc::new(Self { Arc::new(Self {
state: RwLock::new(Takeable::new(State::Connected(connected))), state: RwMutex::new(Takeable::new(State::Connected(connected))),
is_nonblocking: AtomicBool::new(is_nonblocking), is_nonblocking: AtomicBool::new(is_nonblocking),
}) })
} }