mirror of
https://github.com/citra-emu/citra-canary.git
synced 2024-12-23 04:55:34 +00:00
Kernel: Move reschedules from SVCs to actual mechanisms that reschedule.
This commit is contained in:
parent
1c3cda5d7e
commit
0b7d2941cf
|
@ -79,6 +79,9 @@ ResultCode AddressArbiter::ArbitrateAddress(ArbitrationType type, VAddr address,
|
||||||
LOG_ERROR(Kernel, "unknown type=%d", type);
|
LOG_ERROR(Kernel, "unknown type=%d", type);
|
||||||
return ResultCode(ErrorDescription::InvalidEnumValue, ErrorModule::Kernel, ErrorSummary::WrongArgument, ErrorLevel::Usage);
|
return ResultCode(ErrorDescription::InvalidEnumValue, ErrorModule::Kernel, ErrorSummary::WrongArgument, ErrorLevel::Usage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HLE::Reschedule(__func__);
|
||||||
|
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,10 @@ void Event::Acquire() {
|
||||||
|
|
||||||
void Event::Signal() {
|
void Event::Signal() {
|
||||||
signaled = true;
|
signaled = true;
|
||||||
|
|
||||||
WakeupAllWaitingThreads();
|
WakeupAllWaitingThreads();
|
||||||
|
|
||||||
|
HLE::Reschedule(__func__);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Event::Clear() {
|
void Event::Clear() {
|
||||||
|
|
|
@ -94,6 +94,8 @@ void Mutex::Release() {
|
||||||
ResumeWaitingThread(this);
|
ResumeWaitingThread(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HLE::Reschedule(__func__);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
|
@ -54,6 +54,8 @@ ResultVal<s32> Semaphore::Release(s32 release_count) {
|
||||||
Acquire();
|
Acquire();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HLE::Reschedule(__func__);
|
||||||
|
|
||||||
return MakeResult<s32>(previous_count);
|
return MakeResult<s32>(previous_count);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -109,6 +109,8 @@ void Thread::Stop() {
|
||||||
}
|
}
|
||||||
|
|
||||||
Kernel::g_current_process->used_tls_slots[tls_index] = false;
|
Kernel::g_current_process->used_tls_slots[tls_index] = false;
|
||||||
|
|
||||||
|
HLE::Reschedule(__func__);
|
||||||
}
|
}
|
||||||
|
|
||||||
Thread* ArbitrateHighestPriorityThread(u32 address) {
|
Thread* ArbitrateHighestPriorityThread(u32 address) {
|
||||||
|
@ -232,6 +234,8 @@ static Thread* PopNextReadyThread() {
|
||||||
void WaitCurrentThread_Sleep() {
|
void WaitCurrentThread_Sleep() {
|
||||||
Thread* thread = GetCurrentThread();
|
Thread* thread = GetCurrentThread();
|
||||||
thread->status = THREADSTATUS_WAIT_SLEEP;
|
thread->status = THREADSTATUS_WAIT_SLEEP;
|
||||||
|
|
||||||
|
HLE::Reschedule(__func__);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WaitCurrentThread_WaitSynchronization(std::vector<SharedPtr<WaitObject>> wait_objects, bool wait_set_output, bool wait_all) {
|
void WaitCurrentThread_WaitSynchronization(std::vector<SharedPtr<WaitObject>> wait_objects, bool wait_set_output, bool wait_all) {
|
||||||
|
@ -431,6 +435,8 @@ ResultVal<SharedPtr<Thread>> Thread::Create(std::string name, VAddr entry_point,
|
||||||
ready_queue.push_back(thread->current_priority, thread.get());
|
ready_queue.push_back(thread->current_priority, thread.get());
|
||||||
thread->status = THREADSTATUS_READY;
|
thread->status = THREADSTATUS_READY;
|
||||||
|
|
||||||
|
HLE::Reschedule(__func__);
|
||||||
|
|
||||||
return MakeResult<SharedPtr<Thread>>(std::move(thread));
|
return MakeResult<SharedPtr<Thread>>(std::move(thread));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -52,10 +52,14 @@ void Timer::Set(s64 initial, s64 interval) {
|
||||||
u64 initial_microseconds = initial / 1000;
|
u64 initial_microseconds = initial / 1000;
|
||||||
CoreTiming::ScheduleEvent(usToCycles(initial_microseconds),
|
CoreTiming::ScheduleEvent(usToCycles(initial_microseconds),
|
||||||
timer_callback_event_type, callback_handle);
|
timer_callback_event_type, callback_handle);
|
||||||
|
|
||||||
|
HLE::Reschedule(__func__);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Timer::Cancel() {
|
void Timer::Cancel() {
|
||||||
CoreTiming::UnscheduleEvent(timer_callback_event_type, callback_handle);
|
CoreTiming::UnscheduleEvent(timer_callback_event_type, callback_handle);
|
||||||
|
|
||||||
|
HLE::Reschedule(__func__);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Timer::Clear() {
|
void Timer::Clear() {
|
||||||
|
|
|
@ -290,9 +290,6 @@ static ResultCode ArbitrateAddress(Handle handle, u32 address, u32 type, u32 val
|
||||||
auto res = arbiter->ArbitrateAddress(static_cast<Kernel::ArbitrationType>(type),
|
auto res = arbiter->ArbitrateAddress(static_cast<Kernel::ArbitrationType>(type),
|
||||||
address, value, nanoseconds);
|
address, value, nanoseconds);
|
||||||
|
|
||||||
if (res == RESULT_SUCCESS)
|
|
||||||
HLE::Reschedule(__func__);
|
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -399,8 +396,6 @@ static ResultCode CreateThread(Handle* out_handle, s32 priority, u32 entry_point
|
||||||
"threadpriority=0x%08X, processorid=0x%08X : created handle=0x%08X", entry_point,
|
"threadpriority=0x%08X, processorid=0x%08X : created handle=0x%08X", entry_point,
|
||||||
name.c_str(), arg, stack_top, priority, processor_id, *out_handle);
|
name.c_str(), arg, stack_top, priority, processor_id, *out_handle);
|
||||||
|
|
||||||
HLE::Reschedule(__func__);
|
|
||||||
|
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -409,7 +404,6 @@ static void ExitThread() {
|
||||||
LOG_TRACE(Kernel_SVC, "called, pc=0x%08X", Core::g_app_core->GetPC());
|
LOG_TRACE(Kernel_SVC, "called, pc=0x%08X", Core::g_app_core->GetPC());
|
||||||
|
|
||||||
Kernel::GetCurrentThread()->Stop();
|
Kernel::GetCurrentThread()->Stop();
|
||||||
HLE::Reschedule(__func__);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Gets the priority for the specified thread
|
/// Gets the priority for the specified thread
|
||||||
|
@ -439,11 +433,9 @@ static ResultCode CreateMutex(Handle* out_handle, u32 initial_locked) {
|
||||||
SharedPtr<Mutex> mutex = Mutex::Create(initial_locked != 0);
|
SharedPtr<Mutex> mutex = Mutex::Create(initial_locked != 0);
|
||||||
CASCADE_RESULT(*out_handle, Kernel::g_handle_table.Create(std::move(mutex)));
|
CASCADE_RESULT(*out_handle, Kernel::g_handle_table.Create(std::move(mutex)));
|
||||||
|
|
||||||
HLE::Reschedule(__func__);
|
|
||||||
|
|
||||||
LOG_TRACE(Kernel_SVC, "called initial_locked=%s : created handle=0x%08X",
|
LOG_TRACE(Kernel_SVC, "called initial_locked=%s : created handle=0x%08X",
|
||||||
initial_locked ? "true" : "false", *out_handle);
|
initial_locked ? "true" : "false", *out_handle);
|
||||||
|
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -459,8 +451,6 @@ static ResultCode ReleaseMutex(Handle handle) {
|
||||||
|
|
||||||
mutex->Release();
|
mutex->Release();
|
||||||
|
|
||||||
HLE::Reschedule(__func__);
|
|
||||||
|
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -528,8 +518,6 @@ static ResultCode ReleaseSemaphore(s32* count, Handle handle, s32 release_count)
|
||||||
|
|
||||||
CASCADE_RESULT(*count, semaphore->Release(release_count));
|
CASCADE_RESULT(*count, semaphore->Release(release_count));
|
||||||
|
|
||||||
HLE::Reschedule(__func__);
|
|
||||||
|
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -568,7 +556,7 @@ static ResultCode SignalEvent(Handle handle) {
|
||||||
return ERR_INVALID_HANDLE;
|
return ERR_INVALID_HANDLE;
|
||||||
|
|
||||||
evt->Signal();
|
evt->Signal();
|
||||||
HLE::Reschedule(__func__);
|
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -623,8 +611,6 @@ static ResultCode SetTimer(Handle handle, s64 initial, s64 interval) {
|
||||||
|
|
||||||
timer->Set(initial, interval);
|
timer->Set(initial, interval);
|
||||||
|
|
||||||
HLE::Reschedule(__func__);
|
|
||||||
|
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -640,8 +626,6 @@ static ResultCode CancelTimer(Handle handle) {
|
||||||
|
|
||||||
timer->Cancel();
|
timer->Cancel();
|
||||||
|
|
||||||
HLE::Reschedule(__func__);
|
|
||||||
|
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -654,8 +638,6 @@ static void SleepThread(s64 nanoseconds) {
|
||||||
|
|
||||||
// Create an event to wake the thread up after the specified nanosecond delay has passed
|
// Create an event to wake the thread up after the specified nanosecond delay has passed
|
||||||
Kernel::GetCurrentThread()->WakeAfterDelay(nanoseconds);
|
Kernel::GetCurrentThread()->WakeAfterDelay(nanoseconds);
|
||||||
|
|
||||||
HLE::Reschedule(__func__);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// This returns the total CPU ticks elapsed since the CPU was powered-on
|
/// This returns the total CPU ticks elapsed since the CPU was powered-on
|
||||||
|
|
Loading…
Reference in a new issue