Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #1048:wait_listNameChange #1049

Open
wants to merge 2 commits into
base: rust-next
Choose a base branch
from
Open

Fixes #1048:wait_listNameChange #1049

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a156c2b
Fixes:#1048 / Update condvar.rs
AdilDyer Dec 13, 2023
e842765
Merge pull request #1 from AdilDyer/Fix/wait_listNamechange
AdilDyer Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions rust/kernel/sync/condvar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ macro_rules! new_condvar {
#[pin_data]
pub struct CondVar {
#[pin]
pub(crate) wait_list: Opaque<bindings::wait_queue_head>,
pub(crate) wait_queue_head: Opaque<bindings::wait_queue_head>,

/// A condvar needs to be pinned because it contains a [`struct list_head`] that is
/// self-referential, so it cannot be safely moved once it is initialised.
Expand All @@ -96,7 +96,7 @@ impl CondVar {
_pin: PhantomPinned,
// SAFETY: `slot` is valid while the closure is called and both `name` and `key` have
// static lifetimes so they live indefinitely.
wait_list <- Opaque::ffi_init(|slot| unsafe {
wait_queue_head <- Opaque::ffi_init(|slot| unsafe {
bindings::__init_waitqueue_head(slot, name.as_char_ptr(), key.as_ptr())
}),
})
Expand All @@ -108,16 +108,16 @@ impl CondVar {
// SAFETY: `wait` points to valid memory.
unsafe { bindings::init_wait(wait.get()) };

// SAFETY: Both `wait` and `wait_list` point to valid memory.
// SAFETY: Both `wait` and `wait_queue_head` point to valid memory.
unsafe {
bindings::prepare_to_wait_exclusive(self.wait_list.get(), wait.get(), wait_state as _)
bindings::prepare_to_wait_exclusive(self.wait_queue_head.get(), wait.get(), wait_state as _)
};

// SAFETY: No arguments, switches to another thread.
guard.do_unlocked(|| unsafe { bindings::schedule() });

// SAFETY: Both `wait` and `wait_list` point to valid memory.
unsafe { bindings::finish_wait(self.wait_list.get(), wait.get()) };
// SAFETY: Both `wait` and `wait_queue_head` point to valid memory.
unsafe { bindings::finish_wait(self.wait_queue_head.get(), wait.get()) };
}

/// Releases the lock and waits for a notification in interruptible mode.
Expand All @@ -144,10 +144,10 @@ impl CondVar {

/// Calls the kernel function to notify the appropriate number of threads with the given flags.
fn notify(&self, count: i32, flags: u32) {
// SAFETY: `wait_list` points to valid memory.
// SAFETY: `wait_queue_head` points to valid memory.
unsafe {
bindings::__wake_up(
self.wait_list.get(),
self.wait_queue_head.get(),
bindings::TASK_NORMAL,
count,
flags as _,
Expand Down