mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
xous-ticktimer: add back in mutex unlocking
Add back in the ability to pre-unlock a Mutex. This is used for slow path unlocking without needing to wait for a response. Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
c7c5a56a7d
commit
18f3ac5507
1 changed files with 55 additions and 25 deletions
|
|
@ -73,6 +73,12 @@ fn main() -> ! {
|
||||||
// is currently at 900, the Request will be `1900`.
|
// is currently at 900, the Request will be `1900`.
|
||||||
let mut sleep_heap: BTreeMap<TimeoutExpiry, TimerRequest> = BTreeMap::new();
|
let mut sleep_heap: BTreeMap<TimeoutExpiry, TimerRequest> = BTreeMap::new();
|
||||||
|
|
||||||
|
// A list of mutexes that should be allowed to run immediately, because the
|
||||||
|
// thread they were waiting on has already unlocked the mutex. This occurs
|
||||||
|
// when a thread attempts to Lock a Mutex and fails, then gets preempted
|
||||||
|
// before it has a chance to send the `LockMutex` message to us.
|
||||||
|
let mut mutex_ready_table: HashMap<Option<xous::PID>, HashSet<usize>> = HashMap::new();
|
||||||
|
|
||||||
// A list of message IDs that are waiting to receive a Notification. This queue is drained
|
// A list of message IDs that are waiting to receive a Notification. This queue is drained
|
||||||
// by threads sending `NotifyCondition` to us, or by a condvar timing out.
|
// by threads sending `NotifyCondition` to us, or by a condvar timing out.
|
||||||
let mut notify_table: HashMap<
|
let mut notify_table: HashMap<
|
||||||
|
|
@ -239,15 +245,22 @@ fn main() -> ! {
|
||||||
};
|
};
|
||||||
|
|
||||||
let pid = msg.sender.pid();
|
let pid = msg.sender.pid();
|
||||||
|
let mutex_id = scalar.arg1;
|
||||||
|
|
||||||
// This item is not in the Ready list, so add our sender to the list of processes
|
// If this item is in the Ready list, then someone unlocked this Mutex after the
|
||||||
// to get called when UnlockMutex is invoked
|
// sender locked it but before they got a chance to send this message. Return
|
||||||
let awaiting = mutex_hash.entry(pid).or_default();
|
// immediately without blocking.
|
||||||
|
if mutex_ready_table.entry(pid).or_default().remove(&mutex_id) {
|
||||||
|
scalar.id = 0;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
// Add this to the end of the list of entries to call so that when `UnlockMutex` is sent
|
// Add this to the end of the list of entries to call so that when `UnlockMutex` is sent
|
||||||
// the message will get a response.
|
// the message will get a response.
|
||||||
awaiting
|
mutex_hash
|
||||||
.entry(scalar.arg1)
|
.entry(pid)
|
||||||
|
.or_default()
|
||||||
|
.entry(mutex_id)
|
||||||
.or_default()
|
.or_default()
|
||||||
.push_back(msg.sender);
|
.push_back(msg.sender);
|
||||||
|
|
||||||
|
|
@ -257,10 +270,10 @@ fn main() -> ! {
|
||||||
}
|
}
|
||||||
|
|
||||||
api::Opcode::UnlockMutex => {
|
api::Opcode::UnlockMutex => {
|
||||||
if msg.body.is_blocking() {
|
// if msg.body.is_blocking() {
|
||||||
log::error!("sender made UnlockMutex request that was blocking");
|
// log::error!("sender made UnlockMutex request that was blocking");
|
||||||
continue;
|
// continue;
|
||||||
}
|
// }
|
||||||
let Some(scalar) = msg.body.scalar_message() else {
|
let Some(scalar) = msg.body.scalar_message() else {
|
||||||
log::error!("made a call to UnlockMutex with a non-scalar message");
|
log::error!("made a call to UnlockMutex with a non-scalar message");
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -268,25 +281,34 @@ fn main() -> ! {
|
||||||
|
|
||||||
let pid = msg.sender.pid();
|
let pid = msg.sender.pid();
|
||||||
|
|
||||||
// Get a list of awaiting mutexes for this process
|
// If there's something waiting in the queue, respond to that message
|
||||||
let awaiting = mutex_hash
|
let mut returned = false;
|
||||||
|
if let Some(sender) = mutex_hash
|
||||||
.entry(pid)
|
.entry(pid)
|
||||||
.or_default()
|
.or_default()
|
||||||
.entry(scalar.arg1)
|
.entry(scalar.arg1)
|
||||||
.or_default();
|
.or_default()
|
||||||
|
.pop_front()
|
||||||
// Get the vector of awaiting mutex entries.
|
{
|
||||||
let mutex_entry = awaiting;
|
|
||||||
|
|
||||||
// If there's something waiting in the queue, respond to that message
|
|
||||||
if let Some(sender) = mutex_entry.pop_front() {
|
|
||||||
xous::return_scalar(sender, 0).unwrap();
|
xous::return_scalar(sender, 0).unwrap();
|
||||||
|
returned = true;
|
||||||
} else {
|
} else {
|
||||||
log::warn!(
|
log::warn!(
|
||||||
"Process {} Attempted to unlock a mutex {:08x} that has not yet been locked",
|
"Process {} Attempted to unlock a mutex {:08x} that has not yet been locked",
|
||||||
pid.map(|v| v.get()).unwrap_or_default(),
|
pid.map(|v| v.get()).unwrap_or_default(),
|
||||||
scalar.arg1
|
scalar.arg1
|
||||||
);
|
);
|
||||||
|
if !mutex_ready_table
|
||||||
|
.entry(pid)
|
||||||
|
.or_default()
|
||||||
|
.insert(scalar.arg1)
|
||||||
|
{
|
||||||
|
log::error!("attempted to ready mutex {:08x} for PID {:?}, but there was already one waiting", scalar.arg1, pid);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(scalar) = msg.body.scalar_message_mut() {
|
||||||
|
scalar.id = if returned { 1 } else { 0 };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -296,16 +318,25 @@ fn main() -> ! {
|
||||||
continue;
|
continue;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let pid = msg.sender.pid();
|
||||||
|
|
||||||
// Remove all instances of this mutex from the mutex hash
|
// Remove all instances of this mutex from the mutex hash
|
||||||
if let Some(responders) = mutex_hash
|
if let Some(responders) = mutex_hash.entry(pid).or_default().remove(&scalar.arg1) {
|
||||||
.entry(msg.sender.pid())
|
|
||||||
.or_default()
|
|
||||||
.remove(&scalar.arg1)
|
|
||||||
{
|
|
||||||
if responders.len() != 0 {
|
if responders.len() != 0 {
|
||||||
log::error!("When freeing mutex {:08x}, there were {} mutexes awaiting to be unlocked", scalar.arg1, responders.len());
|
log::error!("When freeing mutex {:08x}, there were {} mutexes awaiting to be unlocked", scalar.arg1, responders.len());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if mutex_ready_table
|
||||||
|
.entry(pid)
|
||||||
|
.or_default()
|
||||||
|
.remove(&scalar.arg1)
|
||||||
|
{
|
||||||
|
log::error!(
|
||||||
|
"When freeing mutex {:08x}, there was one pending unlock request that hasn't been answered",
|
||||||
|
scalar.arg1,
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
api::Opcode::WaitForCondition => {
|
api::Opcode::WaitForCondition => {
|
||||||
|
|
@ -465,9 +496,8 @@ fn main() -> ! {
|
||||||
|
|
||||||
// Return the number of conditions that were notified
|
// Return the number of conditions that were notified
|
||||||
if let Some(return_value) = msg.body.scalar_message_mut() {
|
if let Some(return_value) = msg.body.scalar_message_mut() {
|
||||||
return_value.arg1 = notified_count;
|
return_value.id = notified_count;
|
||||||
}
|
}
|
||||||
return_type = 1; // Return a Scalar1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
api::Opcode::FreeCondition => {
|
api::Opcode::FreeCondition => {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue