Merge pull request #454 from Subv/signal_processwide
Kernel/SVC: Signal the highest priority threads first in svcSignalProcessWideKey
This commit is contained in:
commit
3825b703fa
|
@ -145,36 +145,6 @@ static bool DefaultThreadWakeupCallback(ThreadWakeupReason reason, SharedPtr<Thr
|
||||||
return true;
|
return true;
|
||||||
};
|
};
|
||||||
|
|
||||||
/// Wait for a kernel object to synchronize, timeout after the specified nanoseconds
|
|
||||||
static ResultCode WaitSynchronization1(
|
|
||||||
SharedPtr<WaitObject> object, Thread* thread, s64 nano_seconds = -1,
|
|
||||||
std::function<Thread::WakeupCallback> wakeup_callback = DefaultThreadWakeupCallback) {
|
|
||||||
|
|
||||||
if (!object) {
|
|
||||||
return ERR_INVALID_HANDLE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (object->ShouldWait(thread)) {
|
|
||||||
if (nano_seconds == 0) {
|
|
||||||
return RESULT_TIMEOUT;
|
|
||||||
}
|
|
||||||
|
|
||||||
thread->wait_objects = {object};
|
|
||||||
object->AddWaitingThread(thread);
|
|
||||||
thread->status = THREADSTATUS_WAIT_SYNCH_ANY;
|
|
||||||
|
|
||||||
// Create an event to wake the thread up after the specified nanosecond delay has passed
|
|
||||||
thread->WakeAfterDelay(nano_seconds);
|
|
||||||
thread->wakeup_callback = wakeup_callback;
|
|
||||||
|
|
||||||
Core::System::GetInstance().PrepareReschedule();
|
|
||||||
} else {
|
|
||||||
object->Acquire(thread);
|
|
||||||
}
|
|
||||||
|
|
||||||
return RESULT_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Wait for the given handles to synchronize, timeout after the specified nanoseconds
|
/// Wait for the given handles to synchronize, timeout after the specified nanoseconds
|
||||||
static ResultCode WaitSynchronization(Handle* index, VAddr handles_address, u64 handle_count,
|
static ResultCode WaitSynchronization(Handle* index, VAddr handles_address, u64 handle_count,
|
||||||
s64 nano_seconds) {
|
s64 nano_seconds) {
|
||||||
|
@ -232,7 +202,7 @@ static ResultCode WaitSynchronization(Handle* index, VAddr handles_address, u64
|
||||||
thread->WakeAfterDelay(nano_seconds);
|
thread->WakeAfterDelay(nano_seconds);
|
||||||
thread->wakeup_callback = DefaultThreadWakeupCallback;
|
thread->wakeup_callback = DefaultThreadWakeupCallback;
|
||||||
|
|
||||||
Core::System::GetInstance().PrepareReschedule();
|
Core::System::GetInstance().CpuCore(thread->processor_id).PrepareReschedule();
|
||||||
|
|
||||||
return RESULT_TIMEOUT;
|
return RESULT_TIMEOUT;
|
||||||
}
|
}
|
||||||
|
@ -395,7 +365,7 @@ static ResultCode SetThreadPriority(Handle handle, u32 priority) {
|
||||||
|
|
||||||
thread->SetPriority(priority);
|
thread->SetPriority(priority);
|
||||||
|
|
||||||
Core::System::GetInstance().PrepareReschedule();
|
Core::System::GetInstance().CpuCore(thread->processor_id).PrepareReschedule();
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -552,6 +522,7 @@ static ResultCode CreateThread(Handle* out_handle, VAddr entry_point, u64 arg, V
|
||||||
*out_handle = thread->guest_handle;
|
*out_handle = thread->guest_handle;
|
||||||
|
|
||||||
Core::System::GetInstance().PrepareReschedule();
|
Core::System::GetInstance().PrepareReschedule();
|
||||||
|
Core::System::GetInstance().CpuCore(thread->processor_id).PrepareReschedule();
|
||||||
|
|
||||||
NGLOG_TRACE(Kernel_SVC,
|
NGLOG_TRACE(Kernel_SVC,
|
||||||
"called entrypoint=0x{:08X} ({}), arg=0x{:08X}, stacktop=0x{:08X}, "
|
"called entrypoint=0x{:08X} ({}), arg=0x{:08X}, stacktop=0x{:08X}, "
|
||||||
|
@ -570,7 +541,10 @@ static ResultCode StartThread(Handle thread_handle) {
|
||||||
return ERR_INVALID_HANDLE;
|
return ERR_INVALID_HANDLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ASSERT(thread->status == THREADSTATUS_DORMANT);
|
||||||
|
|
||||||
thread->ResumeFromWait();
|
thread->ResumeFromWait();
|
||||||
|
Core::System::GetInstance().CpuCore(thread->processor_id).PrepareReschedule();
|
||||||
|
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
@ -634,18 +608,43 @@ static ResultCode SignalProcessWideKey(VAddr condition_variable_addr, s32 target
|
||||||
NGLOG_TRACE(Kernel_SVC, "called, condition_variable_addr=0x{:X}, target=0x{:08X}",
|
NGLOG_TRACE(Kernel_SVC, "called, condition_variable_addr=0x{:X}, target=0x{:08X}",
|
||||||
condition_variable_addr, target);
|
condition_variable_addr, target);
|
||||||
|
|
||||||
u32 processed = 0;
|
auto RetrieveWaitingThreads =
|
||||||
|
[](size_t core_index, std::vector<SharedPtr<Thread>>& waiting_threads, VAddr condvar_addr) {
|
||||||
auto signal_process_wide_key = [&](size_t core_index) {
|
|
||||||
const auto& scheduler = Core::System::GetInstance().Scheduler(core_index);
|
const auto& scheduler = Core::System::GetInstance().Scheduler(core_index);
|
||||||
for (auto& thread : scheduler->GetThreadList()) {
|
auto& thread_list = scheduler->GetThreadList();
|
||||||
if (thread->condvar_wait_address != condition_variable_addr)
|
|
||||||
continue;
|
for (auto& thread : thread_list) {
|
||||||
|
if (thread->condvar_wait_address == condvar_addr)
|
||||||
|
waiting_threads.push_back(thread);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Retrieve a list of all threads that are waiting for this condition variable.
|
||||||
|
std::vector<SharedPtr<Thread>> waiting_threads;
|
||||||
|
RetrieveWaitingThreads(0, waiting_threads, condition_variable_addr);
|
||||||
|
RetrieveWaitingThreads(1, waiting_threads, condition_variable_addr);
|
||||||
|
RetrieveWaitingThreads(2, waiting_threads, condition_variable_addr);
|
||||||
|
RetrieveWaitingThreads(3, waiting_threads, condition_variable_addr);
|
||||||
|
// Sort them by priority, such that the highest priority ones come first.
|
||||||
|
std::sort(waiting_threads.begin(), waiting_threads.end(),
|
||||||
|
[](const SharedPtr<Thread>& lhs, const SharedPtr<Thread>& rhs) {
|
||||||
|
return lhs->current_priority < rhs->current_priority;
|
||||||
|
});
|
||||||
|
|
||||||
// Only process up to 'target' threads, unless 'target' is -1, in which case process
|
// Only process up to 'target' threads, unless 'target' is -1, in which case process
|
||||||
// them all.
|
// them all.
|
||||||
if (target != -1 && processed >= target)
|
size_t last = waiting_threads.size();
|
||||||
break;
|
if (target != -1)
|
||||||
|
last = target;
|
||||||
|
|
||||||
|
// If there are no threads waiting on this condition variable, just exit
|
||||||
|
if (last > waiting_threads.size())
|
||||||
|
return RESULT_SUCCESS;
|
||||||
|
|
||||||
|
for (size_t index = 0; index < last; ++index) {
|
||||||
|
auto& thread = waiting_threads[index];
|
||||||
|
|
||||||
|
ASSERT(thread->condvar_wait_address == condition_variable_addr);
|
||||||
|
|
||||||
// If the mutex is not yet acquired, acquire it.
|
// If the mutex is not yet acquired, acquire it.
|
||||||
u32 mutex_val = Memory::Read32(thread->mutex_wait_address);
|
u32 mutex_val = Memory::Read32(thread->mutex_wait_address);
|
||||||
|
@ -680,15 +679,7 @@ static ResultCode SignalProcessWideKey(VAddr condition_variable_addr, s32 target
|
||||||
|
|
||||||
Core::System::GetInstance().CpuCore(thread->processor_id).PrepareReschedule();
|
Core::System::GetInstance().CpuCore(thread->processor_id).PrepareReschedule();
|
||||||
}
|
}
|
||||||
|
|
||||||
++processed;
|
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
signal_process_wide_key(0);
|
|
||||||
signal_process_wide_key(1);
|
|
||||||
signal_process_wide_key(2);
|
|
||||||
signal_process_wide_key(3);
|
|
||||||
|
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue