Kernel_Thread: Eliminate most global accessors.
This commit is contained in:
parent
0b72b34d89
commit
b3c1deba49
|
@ -41,8 +41,8 @@ Thread::~Thread() = default;
|
||||||
|
|
||||||
void Thread::Stop() {
|
void Thread::Stop() {
|
||||||
// Cancel any outstanding wakeup events for this thread
|
// Cancel any outstanding wakeup events for this thread
|
||||||
Core::System::GetInstance().CoreTiming().UnscheduleEvent(kernel.ThreadWakeupCallbackEventType(),
|
kernel.System().CoreTiming().UnscheduleEvent(kernel.ThreadWakeupCallbackEventType(),
|
||||||
callback_handle);
|
callback_handle);
|
||||||
kernel.ThreadWakeupCallbackHandleTable().Close(callback_handle);
|
kernel.ThreadWakeupCallbackHandleTable().Close(callback_handle);
|
||||||
callback_handle = 0;
|
callback_handle = 0;
|
||||||
SetStatus(ThreadStatus::Dead);
|
SetStatus(ThreadStatus::Dead);
|
||||||
|
@ -68,13 +68,13 @@ void Thread::WakeAfterDelay(s64 nanoseconds) {
|
||||||
// This function might be called from any thread so we have to be cautious and use the
|
// This function might be called from any thread so we have to be cautious and use the
|
||||||
// thread-safe version of ScheduleEvent.
|
// thread-safe version of ScheduleEvent.
|
||||||
const s64 cycles = Core::Timing::nsToCycles(std::chrono::nanoseconds{nanoseconds});
|
const s64 cycles = Core::Timing::nsToCycles(std::chrono::nanoseconds{nanoseconds});
|
||||||
Core::System::GetInstance().CoreTiming().ScheduleEvent(
|
kernel.System().CoreTiming().ScheduleEvent(cycles, kernel.ThreadWakeupCallbackEventType(),
|
||||||
cycles, kernel.ThreadWakeupCallbackEventType(), callback_handle);
|
callback_handle);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Thread::CancelWakeupTimer() {
|
void Thread::CancelWakeupTimer() {
|
||||||
Core::System::GetInstance().CoreTiming().UnscheduleEvent(kernel.ThreadWakeupCallbackEventType(),
|
kernel.System().CoreTiming().UnscheduleEvent(kernel.ThreadWakeupCallbackEventType(),
|
||||||
callback_handle);
|
callback_handle);
|
||||||
}
|
}
|
||||||
|
|
||||||
static std::optional<s32> GetNextProcessorId(u64 mask) {
|
static std::optional<s32> GetNextProcessorId(u64 mask) {
|
||||||
|
@ -176,7 +176,7 @@ ResultVal<SharedPtr<Thread>> Thread::Create(KernelCore& kernel, std::string name
|
||||||
return ResultCode(-1);
|
return ResultCode(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
auto& system = Core::System::GetInstance();
|
auto& system = kernel.System();
|
||||||
SharedPtr<Thread> thread(new Thread(kernel));
|
SharedPtr<Thread> thread(new Thread(kernel));
|
||||||
|
|
||||||
thread->thread_id = kernel.CreateNewThreadID();
|
thread->thread_id = kernel.CreateNewThreadID();
|
||||||
|
@ -258,7 +258,7 @@ void Thread::SetStatus(ThreadStatus new_status) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (status == ThreadStatus::Running) {
|
if (status == ThreadStatus::Running) {
|
||||||
last_running_ticks = Core::System::GetInstance().CoreTiming().GetTicks();
|
last_running_ticks = kernel.System().CoreTiming().GetTicks();
|
||||||
}
|
}
|
||||||
|
|
||||||
status = new_status;
|
status = new_status;
|
||||||
|
@ -356,7 +356,7 @@ void Thread::SetActivity(ThreadActivity value) {
|
||||||
// Set status if not waiting
|
// Set status if not waiting
|
||||||
if (status == ThreadStatus::Ready || status == ThreadStatus::Running) {
|
if (status == ThreadStatus::Ready || status == ThreadStatus::Running) {
|
||||||
SetStatus(ThreadStatus::Paused);
|
SetStatus(ThreadStatus::Paused);
|
||||||
Core::System::GetInstance().CpuCore(processor_id).PrepareReschedule();
|
kernel.System().CpuCore(processor_id).PrepareReschedule();
|
||||||
}
|
}
|
||||||
} else if (status == ThreadStatus::Paused) {
|
} else if (status == ThreadStatus::Paused) {
|
||||||
// Ready to reschedule
|
// Ready to reschedule
|
||||||
|
@ -476,7 +476,7 @@ void Thread::AdjustSchedulingOnPriority(u32 old_priority) {
|
||||||
if (GetSchedulingStatus() != ThreadSchedStatus::Runnable) {
|
if (GetSchedulingStatus() != ThreadSchedStatus::Runnable) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
auto& scheduler = Core::System::GetInstance().GlobalScheduler();
|
auto& scheduler = kernel.System().GlobalScheduler();
|
||||||
if (processor_id >= 0) {
|
if (processor_id >= 0) {
|
||||||
scheduler.Unschedule(old_priority, processor_id, this);
|
scheduler.Unschedule(old_priority, processor_id, this);
|
||||||
}
|
}
|
||||||
|
@ -508,7 +508,7 @@ void Thread::AdjustSchedulingOnPriority(u32 old_priority) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void Thread::AdjustSchedulingOnAffinity(u64 old_affinity_mask, s32 old_core) {
|
void Thread::AdjustSchedulingOnAffinity(u64 old_affinity_mask, s32 old_core) {
|
||||||
auto& scheduler = Core::System::GetInstance().GlobalScheduler();
|
auto& scheduler = kernel.System().GlobalScheduler();
|
||||||
if (GetSchedulingStatus() != ThreadSchedStatus::Runnable ||
|
if (GetSchedulingStatus() != ThreadSchedStatus::Runnable ||
|
||||||
current_priority >= THREADPRIO_COUNT) {
|
current_priority >= THREADPRIO_COUNT) {
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in a new issue