From 34f1fe088cca4621422757dbc9828f86bd83b234 Mon Sep 17 00:00:00 2001 From: Weiyi Wang Date: Tue, 23 Oct 2018 09:57:59 -0400 Subject: [PATCH 1/7] kernel/thread: add ThreadManager --- src/core/hle/kernel/kernel.cpp | 9 +++++++++ src/core/hle/kernel/kernel.h | 6 ++++++ src/core/hle/kernel/thread.cpp | 4 +++- src/core/hle/kernel/thread.h | 6 ++++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index afe6af1957..0811fa6994 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -21,6 +21,7 @@ KernelSystem::KernelSystem(u32 system_mode) { Kernel::MemoryInit(system_mode); resource_limits = std::make_unique(*this); + thread_manager = std::make_unique(); Kernel::ThreadingInit(); Kernel::TimersInit(); } @@ -53,4 +54,12 @@ void KernelSystem::SetCurrentProcess(SharedPtr process) { current_process = std::move(process); } +ThreadManager& KernelSystem::GetThreadManager() { + return *thread_manager; +} + +const ThreadManager& KernelSystem::GetThreadManager() const { + return *thread_manager; +} + } // namespace Kernel diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 344635c6a7..83f6226707 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -28,6 +28,7 @@ class ClientSession; class ServerSession; class ResourceLimitList; class SharedMemory; +class ThreadManager; enum class ResetType { OneShot, @@ -187,6 +188,9 @@ public: SharedPtr GetCurrentProcess() const; void SetCurrentProcess(SharedPtr process); + ThreadManager& GetThreadManager(); + const ThreadManager& GetThreadManager() const; + private: std::unique_ptr resource_limits; std::atomic next_object_id{0}; @@ -199,6 +203,8 @@ private: std::vector> process_list; SharedPtr current_process; + + std::unique_ptr thread_manager; }; } // namespace Kernel diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index a7b6eba1e1..1c835f601d 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -59,7 +59,9 @@ inline static u32 const NewThreadId() { return next_thread_id++; } -Thread::Thread(KernelSystem& kernel) : WaitObject(kernel), context(Core::CPU().NewContext()) {} +Thread::Thread(KernelSystem& kernel) + : WaitObject(kernel), context(Core::CPU().NewContext()), + thread_manager(kernel.GetThreadManager()) {} Thread::~Thread() {} Thread* GetCurrentThread() { diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index 9c7dd45cc8..6c9df27ff4 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -53,6 +53,10 @@ enum class ThreadWakeupReason { Timeout // The thread was woken up due to a wait timeout. }; +class ThreadManager { +public: +}; + class Thread final : public WaitObject { public: std::string GetName() const override { @@ -210,6 +214,8 @@ private: explicit Thread(KernelSystem&); ~Thread() override; + ThreadManager& thread_manager; + friend class KernelSystem; }; From 876729ab525a6298468bf7c4760c910309a0d5eb Mon Sep 17 00:00:00 2001 From: Weiyi Wang Date: Tue, 23 Oct 2018 10:32:23 -0400 Subject: [PATCH 2/7] kernel/thread: move next_thread_id into manager --- src/core/hle/kernel/thread.cpp | 12 ++---------- src/core/hle/kernel/thread.h | 8 ++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 1c835f601d..80cbe789a7 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -48,14 +48,7 @@ static Common::ThreadQueueList ready_queue; static SharedPtr current_thread; -// The first available thread id at startup -static u32 next_thread_id; - -/** - * Creates a new thread ID - * @return The new thread ID - */ -inline static u32 const NewThreadId() { +u32 ThreadManager::NewThreadId() { return next_thread_id++; } @@ -348,7 +341,7 @@ ResultVal> KernelSystem::CreateThread(std::string name, VAddr thread_list.push_back(thread); ready_queue.prepare(priority); - thread->thread_id = NewThreadId(); + thread->thread_id = thread_manager->NewThreadId(); thread->status = ThreadStatus::Dormant; thread->entry_point = entry_point; thread->stack_top = stack_top; @@ -504,7 +497,6 @@ void ThreadingInit() { ThreadWakeupEventType = CoreTiming::RegisterEvent("ThreadWakeupCallback", ThreadWakeupCallback); current_thread = nullptr; - next_thread_id = 1; } void ThreadingShutdown() { diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index 6c9df27ff4..759332254d 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -55,6 +55,14 @@ enum class ThreadWakeupReason { class ThreadManager { public: + /** + * Creates a new thread ID + * @return The new thread ID + */ + u32 NewThreadId(); + +private: + u32 next_thread_id = 1; }; class Thread final : public WaitObject { From 0478bc3dee06087b84106803cb13a45cda1daa7a Mon Sep 17 00:00:00 2001 From: Weiyi Wang Date: Tue, 23 Oct 2018 11:40:57 -0400 Subject: [PATCH 3/7] Kernel/Thread: move thread queue, current thread, and scheduling related function into the manager As we touched it, remove IPC::GetCommandBuffer --- src/core/arm/dynarmic/arm_dynarmic.cpp | 3 +- src/core/arm/skyeye_common/armstate.cpp | 3 +- src/core/core.cpp | 4 +- src/core/hle/ipc.h | 21 ------ src/core/hle/kernel/handle_table.cpp | 2 +- src/core/hle/kernel/hle_ipc.h | 3 +- src/core/hle/kernel/mutex.cpp | 2 +- src/core/hle/kernel/svc.cpp | 73 +++++++++++---------- src/core/hle/kernel/thread.cpp | 54 +++++----------- src/core/hle/kernel/thread.h | 85 ++++++++++++++----------- src/core/hle/service/fs/file.cpp | 3 +- src/core/hle/service/nwm/nwm_uds.cpp | 3 +- src/core/hle/service/service.cpp | 9 +-- src/core/hle/service/sm/srv.cpp | 4 +- 14 files changed, 123 insertions(+), 146 deletions(-) diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 3cfd2a6d66..b079afa9a9 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -134,7 +134,8 @@ public: if (GDBStub::IsConnected()) { parent.jit->HaltExecution(); parent.SetPC(pc); - Kernel::Thread* thread = Kernel::GetCurrentThread(); + Kernel::Thread* thread = + Core::System::GetInstance().Kernel().GetThreadManager().GetCurrentThread(); parent.SaveContext(thread->context); GDBStub::Break(); GDBStub::SendTrap(thread, 5); diff --git a/src/core/arm/skyeye_common/armstate.cpp b/src/core/arm/skyeye_common/armstate.cpp index 88ad7f5339..a28f5a87ff 100644 --- a/src/core/arm/skyeye_common/armstate.cpp +++ b/src/core/arm/skyeye_common/armstate.cpp @@ -604,7 +604,8 @@ void ARMul_State::ServeBreak() { if (last_bkpt_hit) { Reg[15] = last_bkpt.address; } - Kernel::Thread* thread = Kernel::GetCurrentThread(); + Kernel::Thread* thread = + Core::System::GetInstance().Kernel().GetThreadManager().GetCurrentThread(); Core::CPU().SaveContext(thread->context); if (last_bkpt_hit || GDBStub::GetCpuStepFlag()) { last_bkpt_hit = false; diff --git a/src/core/core.cpp b/src/core/core.cpp index 9100836448..695afef4fc 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -59,7 +59,7 @@ System::ResultStatus System::RunLoop(bool tight_loop) { // If we don't have a currently active thread then don't execute instructions, // instead advance to the next event and try to yield to the next thread - if (Kernel::GetCurrentThread() == nullptr) { + if (Kernel().GetThreadManager().GetCurrentThread() == nullptr) { LOG_TRACE(Core_ARM11, "Idling"); CoreTiming::Idle(); CoreTiming::Advance(); @@ -164,7 +164,7 @@ void System::Reschedule() { } reschedule_pending = false; - Kernel::Reschedule(); + kernel->GetThreadManager().Reschedule(); } System::ResultStatus System::Init(EmuWindow& emu_window, u32 system_mode) { diff --git a/src/core/hle/ipc.h b/src/core/hle/ipc.h index e9c7d1b0f6..7736f5fca3 100644 --- a/src/core/hle/ipc.h +++ b/src/core/hle/ipc.h @@ -9,27 +9,6 @@ #include "core/hle/kernel/thread.h" #include "core/memory.h" -namespace Kernel { - -/// Offset into command buffer of header -static const int kCommandHeaderOffset = 0x80; - -/** - * Returns a pointer to the command buffer in the current thread's TLS - * TODO(Subv): This is not entirely correct, the command buffer should be copied from - * the thread's TLS to an intermediate buffer in kernel memory, and then copied again to - * the service handler process' memory. - * @param offset Optional offset into command buffer - * @param offset Optional offset into command buffer (in bytes) - * @return Pointer to command buffer - */ -inline u32* GetCommandBuffer(const int offset = 0) { - return (u32*)Memory::GetPointer(GetCurrentThread()->GetTLSAddress() + kCommandHeaderOffset + - offset); -} - -} // namespace Kernel - namespace IPC { /// Size of the command buffer area, in 32-bit words. diff --git a/src/core/hle/kernel/handle_table.cpp b/src/core/hle/kernel/handle_table.cpp index 87ba03f361..15dcc45834 100644 --- a/src/core/hle/kernel/handle_table.cpp +++ b/src/core/hle/kernel/handle_table.cpp @@ -72,7 +72,7 @@ bool HandleTable::IsValid(Handle handle) const { SharedPtr HandleTable::GetGeneric(Handle handle) const { if (handle == CurrentThread) { - return GetCurrentThread(); + return kernel.GetThreadManager().GetCurrentThread(); } else if (handle == CurrentProcess) { return kernel.GetCurrentProcess(); } diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h index a412648341..4e0c31d985 100644 --- a/src/core/hle/kernel/hle_ipc.h +++ b/src/core/hle/kernel/hle_ipc.h @@ -124,8 +124,7 @@ private: /** * Class containing information about an in-flight IPC request being handled by an HLE service - * implementation. Services should avoid using old global APIs (e.g. Kernel::GetCommandBuffer()) and - * when possible use the APIs in this class to service the request. + * implementation. * * HLE handle protocol * =================== diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp index f31a2a5d75..88d03d8f2e 100644 --- a/src/core/hle/kernel/mutex.cpp +++ b/src/core/hle/kernel/mutex.cpp @@ -36,7 +36,7 @@ SharedPtr KernelSystem::CreateMutex(bool initial_locked, std::string name // Acquire mutex with current thread if initialized as locked if (initial_locked) - mutex->Acquire(GetCurrentThread()); + mutex->Acquire(thread_manager->GetCurrentThread()); return mutex; } diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 6a33736ba9..840a36ca71 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -145,7 +145,8 @@ static ResultCode ControlMemory(u32* out_addr, u32 operation, u32 addr0, u32 add } static void ExitProcess() { - SharedPtr current_process = Core::System::GetInstance().Kernel().GetCurrentProcess(); + KernelSystem& kernel = Core::System::GetInstance().Kernel(); + SharedPtr current_process = kernel.GetCurrentProcess(); LOG_INFO(Kernel_SVC, "Process {} exiting", current_process->process_id); ASSERT_MSG(current_process->status == ProcessStatus::Running, "Process has already exited"); @@ -158,7 +159,7 @@ static void ExitProcess() { if (thread->owner_process != current_process) continue; - if (thread == GetCurrentThread()) + if (thread == kernel.GetThreadManager().GetCurrentThread()) continue; // TODO(Subv): When are the other running/ready threads terminated? @@ -170,7 +171,7 @@ static void ExitProcess() { } // Kill the current thread - GetCurrentThread()->Stop(); + kernel.GetThreadManager().GetCurrentThread()->Stop(); Core::System::GetInstance().PrepareReschedule(); } @@ -254,9 +255,9 @@ static ResultCode ConnectToPort(Handle* out_handle, VAddr port_name_address) { /// Makes a blocking IPC call to an OS service. static ResultCode SendSyncRequest(Handle handle) { + KernelSystem& kernel = Core::System::GetInstance().Kernel(); SharedPtr session = - Core::System::GetInstance().Kernel().GetCurrentProcess()->handle_table.Get( - handle); + kernel.GetCurrentProcess()->handle_table.Get(handle); if (session == nullptr) { return ERR_INVALID_HANDLE; } @@ -265,7 +266,7 @@ static ResultCode SendSyncRequest(Handle handle) { Core::System::GetInstance().PrepareReschedule(); - return session->SendSyncRequest(GetCurrentThread()); + return session->SendSyncRequest(kernel.GetThreadManager().GetCurrentThread()); } /// Close a handle @@ -276,10 +277,9 @@ static ResultCode CloseHandle(Handle handle) { /// Wait for a handle to synchronize, timeout after the specified nanoseconds static ResultCode WaitSynchronization1(Handle handle, s64 nano_seconds) { - auto object = - Core::System::GetInstance().Kernel().GetCurrentProcess()->handle_table.Get( - handle); - Thread* thread = GetCurrentThread(); + KernelSystem& kernel = Core::System::GetInstance().Kernel(); + auto object = kernel.GetCurrentProcess()->handle_table.Get(handle); + Thread* thread = kernel.GetThreadManager().GetCurrentThread(); if (object == nullptr) return ERR_INVALID_HANDLE; @@ -331,7 +331,8 @@ static ResultCode WaitSynchronization1(Handle handle, s64 nano_seconds) { /// Wait for the given handles to synchronize, timeout after the specified nanoseconds static ResultCode WaitSynchronizationN(s32* out, VAddr handles_address, s32 handle_count, bool wait_all, s64 nano_seconds) { - Thread* thread = GetCurrentThread(); + KernelSystem& kernel = Core::System::GetInstance().Kernel(); + Thread* thread = kernel.GetThreadManager().GetCurrentThread(); if (!Memory::IsValidVirtualAddress(handles_address)) return ERR_INVALID_POINTER; @@ -349,9 +350,7 @@ static ResultCode WaitSynchronizationN(s32* out, VAddr handles_address, s32 hand for (int i = 0; i < handle_count; ++i) { Handle handle = Memory::Read32(handles_address + i * sizeof(Handle)); - auto object = - Core::System::GetInstance().Kernel().GetCurrentProcess()->handle_table.Get( - handle); + auto object = kernel.GetCurrentProcess()->handle_table.Get(handle); if (object == nullptr) return ERR_INVALID_HANDLE; objects[i] = object; @@ -515,7 +514,8 @@ static ResultCode ReplyAndReceive(s32* index, VAddr handles_address, s32 handle_ using ObjectPtr = SharedPtr; std::vector objects(handle_count); - SharedPtr current_process = Core::System::GetInstance().Kernel().GetCurrentProcess(); + KernelSystem& kernel = Core::System::GetInstance().Kernel(); + SharedPtr current_process = kernel.GetCurrentProcess(); for (int i = 0; i < handle_count; ++i) { Handle handle = Memory::Read32(handles_address + i * sizeof(Handle)); @@ -527,8 +527,9 @@ static ResultCode ReplyAndReceive(s32* index, VAddr handles_address, s32 handle_ // We are also sending a command reply. // Do not send a reply if the command id in the command buffer is 0xFFFF. - u32* cmd_buff = GetCommandBuffer(); - IPC::Header header{cmd_buff[0]}; + Thread* thread = kernel.GetThreadManager().GetCurrentThread(); + u32 cmd_buff_header = Memory::Read32(thread->GetCommandBufferAddress()); + IPC::Header header{cmd_buff_header}; if (reply_target != 0 && header.command_id != 0xFFFF) { auto session = current_process->handle_table.Get(reply_target); if (session == nullptr) @@ -546,11 +547,11 @@ static ResultCode ReplyAndReceive(s32* index, VAddr handles_address, s32 handle_ return ERR_SESSION_CLOSED_BY_REMOTE; } - VAddr source_address = GetCurrentThread()->GetCommandBufferAddress(); + VAddr source_address = thread->GetCommandBufferAddress(); VAddr target_address = request_thread->GetCommandBufferAddress(); - ResultCode translation_result = TranslateCommandBuffer( - Kernel::GetCurrentThread(), request_thread, source_address, target_address, true); + ResultCode translation_result = + TranslateCommandBuffer(thread, request_thread, source_address, target_address, true); // Note: The real kernel seems to always panic if the Server->Client buffer translation // fails for whatever reason. @@ -570,8 +571,6 @@ static ResultCode ReplyAndReceive(s32* index, VAddr handles_address, s32 handle_ return RESULT_SUCCESS; } - auto thread = GetCurrentThread(); - // Find the first object that is acquirable in the provided list of objects auto itr = std::find_if(objects.begin(), objects.end(), [thread](const ObjectPtr& object) { return !object->ShouldWait(thread); @@ -587,7 +586,7 @@ static ResultCode ReplyAndReceive(s32* index, VAddr handles_address, s32 handle_ return RESULT_SUCCESS; auto server_session = static_cast(object); - return ReceiveIPCRequest(server_session, GetCurrentThread()); + return ReceiveIPCRequest(server_session, thread); } // No objects were ready to be acquired, prepare to suspend the thread. @@ -644,14 +643,16 @@ static ResultCode ArbitrateAddress(Handle handle, u32 address, u32 type, u32 val LOG_TRACE(Kernel_SVC, "called handle=0x{:08X}, address=0x{:08X}, type=0x{:08X}, value=0x{:08X}", handle, address, type, value); + KernelSystem& kernel = Core::System::GetInstance().Kernel(); + SharedPtr arbiter = - Core::System::GetInstance().Kernel().GetCurrentProcess()->handle_table.Get( - handle); + kernel.GetCurrentProcess()->handle_table.Get(handle); if (arbiter == nullptr) return ERR_INVALID_HANDLE; - auto res = arbiter->ArbitrateAddress(GetCurrentThread(), static_cast(type), - address, value, nanoseconds); + auto res = + arbiter->ArbitrateAddress(kernel.GetThreadManager().GetCurrentThread(), + static_cast(type), address, value, nanoseconds); // TODO(Subv): Identify in which specific cases this call should cause a reschedule. Core::System::GetInstance().PrepareReschedule(); @@ -808,7 +809,7 @@ static ResultCode CreateThread(Handle* out_handle, u32 priority, u32 entry_point static void ExitThread() { LOG_TRACE(Kernel_SVC, "called, pc=0x{:08X}", Core::CPU().GetPC()); - ExitCurrentThread(); + Core::System::GetInstance().Kernel().GetThreadManager().ExitCurrentThread(); Core::System::GetInstance().PrepareReschedule(); } @@ -870,12 +871,13 @@ static ResultCode CreateMutex(Handle* out_handle, u32 initial_locked) { static ResultCode ReleaseMutex(Handle handle) { LOG_TRACE(Kernel_SVC, "called handle=0x{:08X}", handle); - SharedPtr mutex = - Core::System::GetInstance().Kernel().GetCurrentProcess()->handle_table.Get(handle); + KernelSystem& kernel = Core::System::GetInstance().Kernel(); + + SharedPtr mutex = kernel.GetCurrentProcess()->handle_table.Get(handle); if (mutex == nullptr) return ERR_INVALID_HANDLE; - return mutex->Release(GetCurrentThread()); + return mutex->Release(kernel.GetThreadManager().GetCurrentThread()); } /// Get the ID of the specified process @@ -1090,16 +1092,19 @@ static ResultCode CancelTimer(Handle handle) { static void SleepThread(s64 nanoseconds) { LOG_TRACE(Kernel_SVC, "called nanoseconds={}", nanoseconds); + KernelSystem& kernel = Core::System::GetInstance().Kernel(); + ThreadManager& thread_manager = kernel.GetThreadManager(); + // Don't attempt to yield execution if there are no available threads to run, // this way we avoid a useless reschedule to the idle thread. - if (nanoseconds == 0 && !HaveReadyThreads()) + if (nanoseconds == 0 && !thread_manager.HaveReadyThreads()) return; // Sleep current thread and check for next thread to schedule - WaitCurrentThread_Sleep(); + thread_manager.WaitCurrentThread_Sleep(); // Create an event to wake the thread up after the specified nanosecond delay has passed - GetCurrentThread()->WakeAfterDelay(nanoseconds); + thread_manager.GetCurrentThread()->WakeAfterDelay(nanoseconds); Core::System::GetInstance().PrepareReschedule(); } diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 80cbe789a7..71817675d6 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -10,7 +10,6 @@ #include "common/common_types.h" #include "common/logging/log.h" #include "common/math_util.h" -#include "common/thread_queue_list.h" #include "core/arm/arm_interface.h" #include "core/arm/skyeye_common/armstate.h" #include "core/core.h" @@ -43,11 +42,6 @@ static std::unordered_map wakeup_callback_table; // Lists all thread ids that aren't deleted/etc. static std::vector> thread_list; -// Lists only ready thread ids. -static Common::ThreadQueueList ready_queue; - -static SharedPtr current_thread; - u32 ThreadManager::NewThreadId() { return next_thread_id++; } @@ -57,7 +51,7 @@ Thread::Thread(KernelSystem& kernel) thread_manager(kernel.GetThreadManager()) {} Thread::~Thread() {} -Thread* GetCurrentThread() { +Thread* ThreadManager::GetCurrentThread() const { return current_thread.get(); } @@ -69,7 +63,7 @@ void Thread::Stop() { // Clean up thread from ready queue // This is only needed when the thread is termintated forcefully (SVC TerminateProcess) if (status == ThreadStatus::Ready) { - ready_queue.remove(current_priority, this); + thread_manager.ready_queue.remove(current_priority, this); } status = ThreadStatus::Dead; @@ -92,11 +86,7 @@ void Thread::Stop() { owner_process->tls_slots[tls_page].reset(tls_slot); } -/** - * Switches the CPU's active thread context to that of the specified thread - * @param new_thread The thread to switch to - */ -static void SwitchContext(Thread* new_thread) { +void ThreadManager::SwitchContext(Thread* new_thread) { Thread* previous_thread = GetCurrentThread(); // Save context for previous thread @@ -141,11 +131,7 @@ static void SwitchContext(Thread* new_thread) { } } -/** - * Pops and returns the next thread from the thread queue - * @return A pointer to the next ready thread - */ -static Thread* PopNextReadyThread() { +Thread* ThreadManager::PopNextReadyThread() { Thread* next; Thread* thread = GetCurrentThread(); @@ -164,12 +150,12 @@ static Thread* PopNextReadyThread() { return next; } -void WaitCurrentThread_Sleep() { +void ThreadManager::WaitCurrentThread_Sleep() { Thread* thread = GetCurrentThread(); thread->status = ThreadStatus::WaitSleep; } -void ExitCurrentThread() { +void ThreadManager::ExitCurrentThread() { Thread* thread = GetCurrentThread(); thread->Stop(); thread_list.erase(std::remove(thread_list.begin(), thread_list.end(), thread), @@ -246,15 +232,12 @@ void Thread::ResumeFromWait() { wakeup_callback = nullptr; - ready_queue.push_back(current_priority, this); + thread_manager.ready_queue.push_back(current_priority, this); status = ThreadStatus::Ready; Core::System::GetInstance().PrepareReschedule(); } -/** - * Prints the thread queue for debugging purposes - */ -static void DebugThreadQueue() { +void ThreadManager::DebugThreadQueue() { Thread* thread = GetCurrentThread(); if (!thread) { LOG_DEBUG(Kernel, "Current: NO CURRENT THREAD"); @@ -339,7 +322,7 @@ ResultVal> KernelSystem::CreateThread(std::string name, VAddr SharedPtr thread(new Thread(*this)); thread_list.push_back(thread); - ready_queue.prepare(priority); + thread_manager->ready_queue.prepare(priority); thread->thread_id = thread_manager->NewThreadId(); thread->status = ThreadStatus::Dormant; @@ -400,7 +383,7 @@ ResultVal> KernelSystem::CreateThread(std::string name, VAddr // to initialize the context ResetThreadContext(thread->context, stack_top, entry_point, arg); - ready_queue.push_back(thread->current_priority, thread.get()); + thread_manager->ready_queue.push_back(thread->current_priority, thread.get()); thread->status = ThreadStatus::Ready; return MakeResult>(std::move(thread)); @@ -411,9 +394,9 @@ void Thread::SetPriority(u32 priority) { "Invalid priority value."); // If thread was ready, adjust queues if (status == ThreadStatus::Ready) - ready_queue.move(this, current_priority, priority); + thread_manager.ready_queue.move(this, current_priority, priority); else - ready_queue.prepare(priority); + thread_manager.ready_queue.prepare(priority); nominal_priority = current_priority = priority; } @@ -430,9 +413,9 @@ void Thread::UpdatePriority() { void Thread::BoostPriority(u32 priority) { // If thread was ready, adjust queues if (status == ThreadStatus::Ready) - ready_queue.move(this, current_priority, priority); + thread_manager.ready_queue.move(this, current_priority, priority); else - ready_queue.prepare(priority); + thread_manager.ready_queue.prepare(priority); current_priority = priority; } @@ -452,11 +435,11 @@ SharedPtr SetupMainThread(KernelSystem& kernel, u32 entry_point, u32 pri return thread; } -bool HaveReadyThreads() { +bool ThreadManager::HaveReadyThreads() { return ready_queue.get_first() != nullptr; } -void Reschedule() { +void ThreadManager::Reschedule() { Thread* cur = GetCurrentThread(); Thread* next = PopNextReadyThread(); @@ -495,18 +478,13 @@ VAddr Thread::GetCommandBufferAddress() const { void ThreadingInit() { ThreadWakeupEventType = CoreTiming::RegisterEvent("ThreadWakeupCallback", ThreadWakeupCallback); - - current_thread = nullptr; } void ThreadingShutdown() { - current_thread = nullptr; - for (auto& t : thread_list) { t->Stop(); } thread_list.clear(); - ready_queue.clear(); } const std::vector>& GetThreadList() { diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index 759332254d..4a9384bd87 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -10,6 +10,7 @@ #include #include #include "common/common_types.h" +#include "common/thread_queue_list.h" #include "core/arm/arm_interface.h" #include "core/hle/kernel/object.h" #include "core/hle/kernel/wait_object.h" @@ -61,8 +62,55 @@ public: */ u32 NewThreadId(); + /** + * Gets the current thread + */ + Thread* GetCurrentThread() const; + + /** + * Reschedules to the next available thread (call after current thread is suspended) + */ + void Reschedule(); + + /** + * Prints the thread queue for debugging purposes + */ + void DebugThreadQueue(); + + /** + * Returns whether there are any threads that are ready to run. + */ + bool HaveReadyThreads(); + + /** + * Waits the current thread on a sleep + */ + void WaitCurrentThread_Sleep(); + + /** + * Stops the current thread and removes it from the thread_list + */ + void ExitCurrentThread(); + private: + /** + * Switches the CPU's active thread context to that of the specified thread + * @param new_thread The thread to switch to + */ + void SwitchContext(Thread* new_thread); + + /** + * Pops and returns the next thread from the thread queue + * @return A pointer to the next ready thread + */ + Thread* PopNextReadyThread(); + u32 next_thread_id = 1; + SharedPtr current_thread; + Common::ThreadQueueList ready_queue; + + friend class Thread; + friend class KernelSystem; }; class Thread final : public WaitObject { @@ -238,43 +286,6 @@ private: SharedPtr SetupMainThread(KernelSystem& kernel, u32 entry_point, u32 priority, SharedPtr owner_process); -/** - * Returns whether there are any threads that are ready to run. - */ -bool HaveReadyThreads(); - -/** - * Reschedules to the next available thread (call after current thread is suspended) - */ -void Reschedule(); - -/** - * Arbitrate the highest priority thread that is waiting - * @param address The address for which waiting threads should be arbitrated - */ -Thread* ArbitrateHighestPriorityThread(u32 address); - -/** - * Arbitrate all threads currently waiting. - * @param address The address for which waiting threads should be arbitrated - */ -void ArbitrateAllThreads(u32 address); - -/** - * Gets the current thread - */ -Thread* GetCurrentThread(); - -/** - * Waits the current thread on a sleep - */ -void WaitCurrentThread_Sleep(); - -/** - * Stops the current thread and removes it from the thread_list - */ -void ExitCurrentThread(); - /** * Initialize threading */ diff --git a/src/core/hle/service/fs/file.cpp b/src/core/hle/service/fs/file.cpp index 59635cab88..d4beda2c43 100644 --- a/src/core/hle/service/fs/file.cpp +++ b/src/core/hle/service/fs/file.cpp @@ -71,7 +71,8 @@ void File::Read(Kernel::HLERequestContext& ctx) { rb.PushMappedBuffer(buffer); std::chrono::nanoseconds read_timeout_ns{backend->GetReadDelayNs(length)}; - ctx.SleepClientThread(Kernel::GetCurrentThread(), "file::read", read_timeout_ns, + ctx.SleepClientThread(system.Kernel().GetThreadManager().GetCurrentThread(), "file::read", + read_timeout_ns, [](Kernel::SharedPtr thread, Kernel::HLERequestContext& ctx, Kernel::ThreadWakeupReason reason) { // Nothing to do here diff --git a/src/core/hle/service/nwm/nwm_uds.cpp b/src/core/hle/service/nwm/nwm_uds.cpp index 4072aac091..735f485a83 100644 --- a/src/core/hle/service/nwm/nwm_uds.cpp +++ b/src/core/hle/service/nwm/nwm_uds.cpp @@ -1231,7 +1231,8 @@ void NWM_UDS::ConnectToNetwork(Kernel::HLERequestContext& ctx) { static constexpr std::chrono::nanoseconds UDSConnectionTimeout{300000000}; connection_event = ctx.SleepClientThread( - Kernel::GetCurrentThread(), "uds::ConnectToNetwork", UDSConnectionTimeout, + system.Kernel().GetThreadManager().GetCurrentThread(), "uds::ConnectToNetwork", + UDSConnectionTimeout, [](Kernel::SharedPtr thread, Kernel::HLERequestContext& ctx, Kernel::ThreadWakeupReason reason) { // TODO(B3N30): Add error handling for host full and timeout diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 1217376b10..2402a786d7 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -179,7 +179,10 @@ void ServiceFrameworkBase::ReportUnimplementedFunction(u32* cmd_buf, const Funct } void ServiceFrameworkBase::HandleSyncRequest(SharedPtr server_session) { - u32* cmd_buf = Kernel::GetCommandBuffer(); + Kernel::KernelSystem& kernel = Core::System::GetInstance().Kernel(); + auto thread = kernel.GetThreadManager().GetCurrentThread(); + // TODO(wwylele): avoid GetPointer + u32* cmd_buf = reinterpret_cast(Memory::GetPointer(thread->GetCommandBufferAddress())); u32 header_code = cmd_buf[0]; auto itr = handlers.find(header_code); @@ -188,8 +191,7 @@ void ServiceFrameworkBase::HandleSyncRequest(SharedPtr server_ses return ReportUnimplementedFunction(cmd_buf, info); } - Kernel::SharedPtr current_process = - Core::System::GetInstance().Kernel().GetCurrentProcess(); + Kernel::SharedPtr current_process = kernel.GetCurrentProcess(); // TODO(yuriks): The kernel should be the one handling this as part of translation after // everything else is migrated @@ -199,7 +201,6 @@ void ServiceFrameworkBase::HandleSyncRequest(SharedPtr server_ses LOG_TRACE(Service, "{}", MakeFunctionString(info->name, GetServiceName().c_str(), cmd_buf)); handler_invoker(this, info->handler_callback, context); - auto thread = Kernel::GetCurrentThread(); ASSERT(thread->status == Kernel::ThreadStatus::Running || thread->status == Kernel::ThreadStatus::WaitHleEvent); // Only write the response immediately if the thread is still running. If the HLE handler put diff --git a/src/core/hle/service/sm/srv.cpp b/src/core/hle/service/sm/srv.cpp index 07b47ea9bd..dc7e8297e8 100644 --- a/src/core/hle/service/sm/srv.cpp +++ b/src/core/hle/service/sm/srv.cpp @@ -128,8 +128,8 @@ void SRV::GetServiceHandle(Kernel::HLERequestContext& ctx) { if (wait_until_available && client_port.Code() == ERR_SERVICE_NOT_REGISTERED) { LOG_INFO(Service_SRV, "called service={} delayed", name); Kernel::SharedPtr get_service_handle_event = - ctx.SleepClientThread(Kernel::GetCurrentThread(), "GetServiceHandle", - std::chrono::nanoseconds(-1), get_handle); + ctx.SleepClientThread(system.Kernel().GetThreadManager().GetCurrentThread(), + "GetServiceHandle", std::chrono::nanoseconds(-1), get_handle); get_service_handle_delayed_map[name] = std::move(get_service_handle_event); return; } else { From 7fc61920cce7b12cfee8129a4a1ce22a97098c1d Mon Sep 17 00:00:00 2001 From: Weiyi Wang Date: Tue, 23 Oct 2018 11:57:59 -0400 Subject: [PATCH 4/7] kernel/Thread: move thread wake up table and callback handle into the manager --- src/core/hle/kernel/kernel.cpp | 1 - src/core/hle/kernel/thread.cpp | 29 +++++++++++------------------ src/core/hle/kernel/thread.h | 19 ++++++++++++++----- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 0811fa6994..ca68e036ad 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -22,7 +22,6 @@ KernelSystem::KernelSystem(u32 system_mode) { resource_limits = std::make_unique(*this); thread_manager = std::make_unique(); - Kernel::ThreadingInit(); Kernel::TimersInit(); } diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 71817675d6..ce035e5a6e 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -13,7 +13,6 @@ #include "core/arm/arm_interface.h" #include "core/arm/skyeye_common/armstate.h" #include "core/core.h" -#include "core/core_timing.h" #include "core/hle/kernel/errors.h" #include "core/hle/kernel/handle_table.h" #include "core/hle/kernel/kernel.h" @@ -26,9 +25,6 @@ namespace Kernel { -/// Event type for the thread wake up event -static CoreTiming::EventType* ThreadWakeupEventType = nullptr; - bool Thread::ShouldWait(Thread* thread) const { return status != ThreadStatus::Dead; } @@ -37,8 +33,6 @@ void Thread::Acquire(Thread* thread) { ASSERT_MSG(!ShouldWait(thread), "object unavailable!"); } -static std::unordered_map wakeup_callback_table; - // Lists all thread ids that aren't deleted/etc. static std::vector> thread_list; @@ -57,8 +51,8 @@ Thread* ThreadManager::GetCurrentThread() const { void Thread::Stop() { // Cancel any outstanding wakeup events for this thread - CoreTiming::UnscheduleEvent(ThreadWakeupEventType, thread_id); - wakeup_callback_table.erase(thread_id); + CoreTiming::UnscheduleEvent(thread_manager.ThreadWakeupEventType, thread_id); + thread_manager.wakeup_callback_table.erase(thread_id); // Clean up thread from ready queue // This is only needed when the thread is termintated forcefully (SVC TerminateProcess) @@ -162,12 +156,7 @@ void ThreadManager::ExitCurrentThread() { thread_list.end()); } -/** - * Callback that will wake up the thread it was scheduled for - * @param thread_id The ID of the thread that's been awoken - * @param cycles_late The number of CPU cycles that have passed since the desired wakeup time - */ -static void ThreadWakeupCallback(u64 thread_id, s64 cycles_late) { +void ThreadManager::ThreadWakeupCallback(u64 thread_id, s64 cycles_late) { SharedPtr thread = wakeup_callback_table.at(thread_id); if (thread == nullptr) { LOG_CRITICAL(Kernel, "Callback fired for invalid thread {:08X}", thread_id); @@ -196,7 +185,8 @@ void Thread::WakeAfterDelay(s64 nanoseconds) { if (nanoseconds == -1) return; - CoreTiming::ScheduleEvent(nsToCycles(nanoseconds), ThreadWakeupEventType, thread_id); + CoreTiming::ScheduleEvent(nsToCycles(nanoseconds), thread_manager.ThreadWakeupEventType, + thread_id); } void Thread::ResumeFromWait() { @@ -334,7 +324,7 @@ ResultVal> KernelSystem::CreateThread(std::string name, VAddr thread->wait_objects.clear(); thread->wait_address = 0; thread->name = std::move(name); - wakeup_callback_table[thread->thread_id] = thread.get(); + thread_manager->wakeup_callback_table[thread->thread_id] = thread.get(); thread->owner_process = &owner_process; // Find the next available TLS index, and mark it as used @@ -476,8 +466,11 @@ VAddr Thread::GetCommandBufferAddress() const { //////////////////////////////////////////////////////////////////////////////////////////////////// -void ThreadingInit() { - ThreadWakeupEventType = CoreTiming::RegisterEvent("ThreadWakeupCallback", ThreadWakeupCallback); +ThreadManager::ThreadManager() { + ThreadWakeupEventType = + CoreTiming::RegisterEvent("ThreadWakeupCallback", [this](u64 thread_id, s64 cycle_late) { + ThreadWakeupCallback(thread_id, cycle_late); + }); } void ThreadingShutdown() { diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index 4a9384bd87..cc229dc183 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -12,6 +12,7 @@ #include "common/common_types.h" #include "common/thread_queue_list.h" #include "core/arm/arm_interface.h" +#include "core/core_timing.h" #include "core/hle/kernel/object.h" #include "core/hle/kernel/wait_object.h" #include "core/hle/result.h" @@ -56,6 +57,8 @@ enum class ThreadWakeupReason { class ThreadManager { public: + ThreadManager(); + /** * Creates a new thread ID * @return The new thread ID @@ -105,9 +108,20 @@ private: */ Thread* PopNextReadyThread(); + /** + * Callback that will wake up the thread it was scheduled for + * @param thread_id The ID of the thread that's been awoken + * @param cycles_late The number of CPU cycles that have passed since the desired wakeup time + */ + void ThreadWakeupCallback(u64 thread_id, s64 cycles_late); + u32 next_thread_id = 1; SharedPtr current_thread; Common::ThreadQueueList ready_queue; + std::unordered_map wakeup_callback_table; + + /// Event type for the thread wake up event + CoreTiming::EventType* ThreadWakeupEventType = nullptr; friend class Thread; friend class KernelSystem; @@ -286,11 +300,6 @@ private: SharedPtr SetupMainThread(KernelSystem& kernel, u32 entry_point, u32 priority, SharedPtr owner_process); -/** - * Initialize threading - */ -void ThreadingInit(); - /** * Shutdown threading */ From 20ae37ba4f53bf44323d9812c3187174d4a7386a Mon Sep 17 00:00:00 2001 From: Weiyi Wang Date: Tue, 23 Oct 2018 12:18:35 -0400 Subject: [PATCH 5/7] kernel/Thread: move thread list into the manager --- src/citra_qt/debugger/wait_tree.cpp | 2 +- src/core/gdbstub/gdbstub.cpp | 8 +++++--- src/core/hle/kernel/kernel.cpp | 2 -- src/core/hle/kernel/svc.cpp | 2 +- src/core/hle/kernel/thread.cpp | 12 +++--------- src/core/hle/kernel/thread.h | 19 +++++++++---------- 6 files changed, 19 insertions(+), 26 deletions(-) diff --git a/src/citra_qt/debugger/wait_tree.cpp b/src/citra_qt/debugger/wait_tree.cpp index d006128e50..0758cc7926 100644 --- a/src/citra_qt/debugger/wait_tree.cpp +++ b/src/citra_qt/debugger/wait_tree.cpp @@ -51,7 +51,7 @@ std::size_t WaitTreeItem::Row() const { } std::vector> WaitTreeItem::MakeThreadItemList() { - const auto& threads = Kernel::GetThreadList(); + const auto& threads = Core::System::GetInstance().Kernel().GetThreadManager().GetThreadList(); std::vector> item_list; item_list.reserve(threads.size()); for (std::size_t i = 0; i < threads.size(); ++i) { diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp index f95b3c66ef..1296b71b4c 100644 --- a/src/core/gdbstub/gdbstub.cpp +++ b/src/core/gdbstub/gdbstub.cpp @@ -160,7 +160,7 @@ BreakpointMap breakpoints_write; } // Anonymous namespace static Kernel::Thread* FindThreadById(int id) { - const auto& threads = Kernel::GetThreadList(); + const auto& threads = Core::System::GetInstance().Kernel().GetThreadManager().GetThreadList(); for (auto& thread : threads) { if (thread->GetThreadId() == static_cast(id)) { return thread.get(); @@ -535,7 +535,8 @@ static void HandleQuery() { SendReply(target_xml); } else if (strncmp(query, "fThreadInfo", strlen("fThreadInfo")) == 0) { std::string val = "m"; - const auto& threads = Kernel::GetThreadList(); + const auto& threads = + Core::System::GetInstance().Kernel().GetThreadManager().GetThreadList(); for (const auto& thread : threads) { val += fmt::format("{:x},", thread->GetThreadId()); } @@ -547,7 +548,8 @@ static void HandleQuery() { std::string buffer; buffer += "l"; buffer += ""; - const auto& threads = Kernel::GetThreadList(); + const auto& threads = + Core::System::GetInstance().Kernel().GetThreadManager().GetThreadList(); for (const auto& thread : threads) { buffer += fmt::format(R"*()*", thread->GetThreadId(), thread->GetThreadId()); diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index ca68e036ad..1c324e247b 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -27,8 +27,6 @@ KernelSystem::KernelSystem(u32 system_mode) { /// Shutdown the kernel KernelSystem::~KernelSystem() { - Kernel::ThreadingShutdown(); - Kernel::TimersShutdown(); Kernel::MemoryShutdown(); } diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 840a36ca71..07079fc4d9 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -154,7 +154,7 @@ static void ExitProcess() { current_process->status = ProcessStatus::Exited; // Stop all the process threads that are currently waiting for objects. - auto& thread_list = GetThreadList(); + auto& thread_list = kernel.GetThreadManager().GetThreadList(); for (auto& thread : thread_list) { if (thread->owner_process != current_process) continue; diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index ce035e5a6e..236e1d7b0b 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -33,9 +33,6 @@ void Thread::Acquire(Thread* thread) { ASSERT_MSG(!ShouldWait(thread), "object unavailable!"); } -// Lists all thread ids that aren't deleted/etc. -static std::vector> thread_list; - u32 ThreadManager::NewThreadId() { return next_thread_id++; } @@ -311,7 +308,7 @@ ResultVal> KernelSystem::CreateThread(std::string name, VAddr SharedPtr thread(new Thread(*this)); - thread_list.push_back(thread); + thread_manager->thread_list.push_back(thread); thread_manager->ready_queue.prepare(priority); thread->thread_id = thread_manager->NewThreadId(); @@ -464,8 +461,6 @@ VAddr Thread::GetCommandBufferAddress() const { return GetTLSAddress() + CommandHeaderOffset; } -//////////////////////////////////////////////////////////////////////////////////////////////////// - ThreadManager::ThreadManager() { ThreadWakeupEventType = CoreTiming::RegisterEvent("ThreadWakeupCallback", [this](u64 thread_id, s64 cycle_late) { @@ -473,14 +468,13 @@ ThreadManager::ThreadManager() { }); } -void ThreadingShutdown() { +ThreadManager::~ThreadManager() { for (auto& t : thread_list) { t->Stop(); } - thread_list.clear(); } -const std::vector>& GetThreadList() { +const std::vector>& ThreadManager::GetThreadList() { return thread_list; } diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index cc229dc183..06a7c5f4fc 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -58,6 +58,7 @@ enum class ThreadWakeupReason { class ThreadManager { public: ThreadManager(); + ~ThreadManager(); /** * Creates a new thread ID @@ -95,6 +96,11 @@ public: */ void ExitCurrentThread(); + /** + * Get a const reference to the thread list for debug use + */ + const std::vector>& GetThreadList(); + private: /** * Switches the CPU's active thread context to that of the specified thread @@ -123,6 +129,9 @@ private: /// Event type for the thread wake up event CoreTiming::EventType* ThreadWakeupEventType = nullptr; + // Lists all threadsthat aren't deleted. + std::vector> thread_list; + friend class Thread; friend class KernelSystem; }; @@ -300,14 +309,4 @@ private: SharedPtr SetupMainThread(KernelSystem& kernel, u32 entry_point, u32 priority, SharedPtr owner_process); -/** - * Shutdown threading - */ -void ThreadingShutdown(); - -/** - * Get a const reference to the thread list for debug use - */ -const std::vector>& GetThreadList(); - } // namespace Kernel From e5b93741d36d3a432abc64887833544220162b66 Mon Sep 17 00:00:00 2001 From: Weiyi Wang Date: Tue, 23 Oct 2018 14:17:30 -0400 Subject: [PATCH 6/7] kernel/timer: add TimerManager for timer system states --- src/core/hle/kernel/kernel.cpp | 11 +++++++++-- src/core/hle/kernel/kernel.h | 5 +++++ src/core/hle/kernel/timer.cpp | 35 ++++++++++++++-------------------- src/core/hle/kernel/timer.h | 26 ++++++++++++++++++++----- 4 files changed, 49 insertions(+), 28 deletions(-) diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 1c324e247b..c43029c379 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -22,12 +22,11 @@ KernelSystem::KernelSystem(u32 system_mode) { resource_limits = std::make_unique(*this); thread_manager = std::make_unique(); - Kernel::TimersInit(); + timer_manager = std::make_unique(); } /// Shutdown the kernel KernelSystem::~KernelSystem() { - Kernel::TimersShutdown(); Kernel::MemoryShutdown(); } @@ -59,4 +58,12 @@ const ThreadManager& KernelSystem::GetThreadManager() const { return *thread_manager; } +TimerManager& KernelSystem::GetTimerManager() { + return *timer_manager; +} + +const TimerManager& KernelSystem::GetTimerManager() const { + return *timer_manager; +} + } // namespace Kernel diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 83f6226707..5d27b2df71 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -29,6 +29,7 @@ class ServerSession; class ResourceLimitList; class SharedMemory; class ThreadManager; +class TimerManager; enum class ResetType { OneShot, @@ -191,6 +192,9 @@ public: ThreadManager& GetThreadManager(); const ThreadManager& GetThreadManager() const; + TimerManager& GetTimerManager(); + const TimerManager& GetTimerManager() const; + private: std::unique_ptr resource_limits; std::atomic next_object_id{0}; @@ -205,6 +209,7 @@ private: SharedPtr current_process; std::unique_ptr thread_manager; + std::unique_ptr timer_manager; }; } // namespace Kernel diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index d9d89abd0f..07a98a659c 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp @@ -6,7 +6,6 @@ #include #include "common/assert.h" #include "common/logging/log.h" -#include "core/core_timing.h" #include "core/hle/kernel/handle_table.h" #include "core/hle/kernel/object.h" #include "core/hle/kernel/thread.h" @@ -14,16 +13,10 @@ namespace Kernel { -/// The event type of the generic timer callback event -static CoreTiming::EventType* timer_callback_event_type = nullptr; - -static u64 next_timer_callback_id; -static std::unordered_map timer_callback_table; - -Timer::Timer(KernelSystem& kernel) : WaitObject(kernel) {} +Timer::Timer(KernelSystem& kernel) : WaitObject(kernel), timer_manager(kernel.GetTimerManager()) {} Timer::~Timer() { Cancel(); - timer_callback_table.erase(callback_id); + timer_manager.timer_callback_table.erase(callback_id); } SharedPtr KernelSystem::CreateTimer(ResetType reset_type, std::string name) { @@ -34,8 +27,8 @@ SharedPtr KernelSystem::CreateTimer(ResetType reset_type, std::string nam timer->name = std::move(name); timer->initial_delay = 0; timer->interval_delay = 0; - timer->callback_id = ++next_timer_callback_id; - timer_callback_table[timer->callback_id] = timer.get(); + timer->callback_id = ++timer_manager->next_timer_callback_id; + timer_manager->timer_callback_table[timer->callback_id] = timer.get(); return timer; } @@ -62,12 +55,13 @@ void Timer::Set(s64 initial, s64 interval) { // Immediately invoke the callback Signal(0); } else { - CoreTiming::ScheduleEvent(nsToCycles(initial), timer_callback_event_type, callback_id); + CoreTiming::ScheduleEvent(nsToCycles(initial), timer_manager.timer_callback_event_type, + callback_id); } } void Timer::Cancel() { - CoreTiming::UnscheduleEvent(timer_callback_event_type, callback_id); + CoreTiming::UnscheduleEvent(timer_manager.timer_callback_event_type, callback_id); } void Timer::Clear() { @@ -92,12 +86,12 @@ void Timer::Signal(s64 cycles_late) { if (interval_delay != 0) { // Reschedule the timer with the interval delay CoreTiming::ScheduleEvent(nsToCycles(interval_delay) - cycles_late, - timer_callback_event_type, callback_id); + timer_manager.timer_callback_event_type, callback_id); } } /// The timer callback event, called when a timer is fired -static void TimerCallback(u64 callback_id, s64 cycles_late) { +void TimerManager::TimerCallback(u64 callback_id, s64 cycles_late) { SharedPtr timer = timer_callback_table.at(callback_id); if (timer == nullptr) { @@ -108,12 +102,11 @@ static void TimerCallback(u64 callback_id, s64 cycles_late) { timer->Signal(cycles_late); } -void TimersInit() { - next_timer_callback_id = 0; - timer_callback_table.clear(); - timer_callback_event_type = CoreTiming::RegisterEvent("TimerCallback", TimerCallback); +TimerManager::TimerManager() { + timer_callback_event_type = + CoreTiming::RegisterEvent("TimerCallback", [this](u64 thread_id, s64 cycle_late) { + TimerCallback(thread_id, cycle_late); + }); } -void TimersShutdown() {} - } // namespace Kernel diff --git a/src/core/hle/kernel/timer.h b/src/core/hle/kernel/timer.h index 653dacb5b8..e0eccaa334 100644 --- a/src/core/hle/kernel/timer.h +++ b/src/core/hle/kernel/timer.h @@ -5,11 +5,30 @@ #pragma once #include "common/common_types.h" +#include "core/core_timing.h" #include "core/hle/kernel/object.h" #include "core/hle/kernel/wait_object.h" namespace Kernel { +class TimerManager { +public: + TimerManager(); + +private: + /// The timer callback event, called when a timer is fired + void TimerCallback(u64 callback_id, s64 cycles_late); + + /// The event type of the generic timer callback event + CoreTiming::EventType* timer_callback_event_type = nullptr; + + u64 next_timer_callback_id = 0; + std::unordered_map timer_callback_table; + + friend class Timer; + friend class KernelSystem; +}; + class Timer final : public WaitObject { public: std::string GetTypeName() const override { @@ -74,12 +93,9 @@ private: /// ID used as userdata to reference this object when inserting into the CoreTiming queue. u64 callback_id; + TimerManager& timer_manager; + friend class KernelSystem; }; -/// Initializes the required variables for timers -void TimersInit(); -/// Tears down the timer variables -void TimersShutdown(); - } // namespace Kernel From 2183d0d6be0caa2a82ed2fed24f97b82a8c63ad0 Mon Sep 17 00:00:00 2001 From: Weiyi Wang Date: Tue, 30 Oct 2018 00:35:37 -0400 Subject: [PATCH 7/7] core: use internal kernel pointer directly --- src/core/core.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/core.cpp b/src/core/core.cpp index 695afef4fc..be9796aeb2 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -59,7 +59,7 @@ System::ResultStatus System::RunLoop(bool tight_loop) { // If we don't have a currently active thread then don't execute instructions, // instead advance to the next event and try to yield to the next thread - if (Kernel().GetThreadManager().GetCurrentThread() == nullptr) { + if (kernel->GetThreadManager().GetCurrentThread() == nullptr) { LOG_TRACE(Core_ARM11, "Idling"); CoreTiming::Idle(); CoreTiming::Advance();