mirror of
https://github.com/skyline-emu/skyline.git
synced 2024-12-28 06:25:29 +03:00
Rename ConditionalVariable
-> ConditionVariable
"Conditional Variable" is a typo which was propagated through the codebase, it has been corrected to "Condition Variable".
This commit is contained in:
parent
f487d81769
commit
91bb8d231a
@ -791,7 +791,7 @@ namespace skyline::kernel::svc {
|
||||
i64 timeout{static_cast<i64>(state.ctx->gpr.x3)};
|
||||
Logger::Debug("Waiting on 0x{:X} with 0x{:X} for {}ns", conditional, mutex, timeout);
|
||||
|
||||
auto result{state.process->ConditionalVariableWait(conditional, mutex, requesterHandle, timeout)};
|
||||
auto result{state.process->ConditionVariableWait(conditional, mutex, requesterHandle, timeout)};
|
||||
if (result == Result{})
|
||||
Logger::Debug("Waited for 0x{:X} and reacquired 0x{:X}", conditional, mutex);
|
||||
else if (result == result::TimedOut)
|
||||
@ -804,7 +804,7 @@ namespace skyline::kernel::svc {
|
||||
i32 count{static_cast<i32>(state.ctx->gpr.w1)};
|
||||
|
||||
Logger::Debug("Signalling 0x{:X} for {} waiters", conditional, count);
|
||||
state.process->ConditionalVariableSignal(conditional, count);
|
||||
state.process->ConditionVariableSignal(conditional, count);
|
||||
state.ctx->gpr.w0 = Result{};
|
||||
}
|
||||
|
||||
|
@ -215,8 +215,8 @@ namespace skyline::kernel::type {
|
||||
}
|
||||
}
|
||||
|
||||
Result KProcess::ConditionalVariableWait(u32 *key, u32 *mutex, KHandle tag, i64 timeout) {
|
||||
TRACE_EVENT_FMT("kernel", "ConditionalVariableWait 0x{:X} (0x{:X})", key, mutex);
|
||||
Result KProcess::ConditionVariableWait(u32 *key, u32 *mutex, KHandle tag, i64 timeout) {
|
||||
TRACE_EVENT_FMT("kernel", "ConditionVariableWait 0x{:X} (0x{:X})", key, mutex);
|
||||
|
||||
{
|
||||
// Update all waiter information
|
||||
@ -317,8 +317,8 @@ namespace skyline::kernel::type {
|
||||
return state.thread->waitResult;
|
||||
}
|
||||
|
||||
void KProcess::ConditionalVariableSignal(u32 *key, i32 amount) {
|
||||
TRACE_EVENT_FMT("kernel", "ConditionalVariableSignal 0x{:X}", key);
|
||||
void KProcess::ConditionVariableSignal(u32 *key, i32 amount) {
|
||||
TRACE_EVENT_FMT("kernel", "ConditionVariableSignal 0x{:X}", key);
|
||||
|
||||
i32 waiterCount{amount};
|
||||
while (amount <= 0 || waiterCount) {
|
||||
|
@ -225,12 +225,12 @@ namespace skyline {
|
||||
/**
|
||||
* @brief Waits on the conditional variable at the specified address
|
||||
*/
|
||||
Result ConditionalVariableWait(u32 *key, u32 *mutex, KHandle tag, i64 timeout);
|
||||
Result ConditionVariableWait(u32 *key, u32 *mutex, KHandle tag, i64 timeout);
|
||||
|
||||
/**
|
||||
* @brief Signals the conditional variable at the specified address
|
||||
*/
|
||||
void ConditionalVariableSignal(u32 *key, i32 amount);
|
||||
void ConditionVariableSignal(u32 *key, i32 amount);
|
||||
|
||||
enum class ArbitrationType : u32 {
|
||||
WaitIfLessThan = 0,
|
||||
|
Loading…
Reference in New Issue
Block a user