citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Kernel/Timer: use unordered_map for callback recording

This commit is contained in:
Weiyi Wang 2018-10-18 21:40:22 -04:00
parent 8fb3d8ff38
commit 5b45a3e1b5
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/core/hle/kernel/timer.cpp
View File

@ -3,6 +3,7 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <cinttypes> #include <cinttypes>
#include <unordered_map>
#include "common/assert.h" #include "common/assert.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "core/core_timing.h" #include "core/core_timing.h"
@ -15,12 +16,15 @@ namespace Kernel {
/// The event type of the generic timer callback event /// The event type of the generic timer callback event
static CoreTiming::EventType* timer_callback_event_type = nullptr; static CoreTiming::EventType* timer_callback_event_type = nullptr;
// TODO(yuriks): This can be removed if Timer objects are explicitly pooled in the future, allowing
// us to simply use a pool index or similar. static u64 next_timer_callback_id;
static Kernel::HandleTable timer_callback_handle_table; static std::unordered_map<u64, Timer*> timer_callback_table;
Timer::Timer(KernelSystem& kernel) : WaitObject(kernel) {} Timer::Timer(KernelSystem& kernel) : WaitObject(kernel) {}
Timer::~Timer() {} Timer::~Timer() {
Cancel();
timer_callback_table.erase(callback_id);
}
SharedPtr<Timer> KernelSystem::CreateTimer(ResetType reset_type, std::string name) { SharedPtr<Timer> KernelSystem::CreateTimer(ResetType reset_type, std::string name) {
SharedPtr<Timer> timer(new Timer(*this)); SharedPtr<Timer> timer(new Timer(*this));
@ -30,7 +34,8 @@ SharedPtr<Timer> KernelSystem::CreateTimer(ResetType reset_type, std::string nam
timer->name = std::move(name); timer->name = std::move(name);
timer->initial_delay = 0; timer->initial_delay = 0;
timer->interval_delay = 0; timer->interval_delay = 0;
timer->callback_handle = timer_callback_handle_table.Create(timer).Unwrap(); timer->callback_id = ++next_timer_callback_id;
timer_callback_table[timer->callback_id] = timer.get();
return timer; return timer;
} }
@ -57,12 +62,12 @@ void Timer::Set(s64 initial, s64 interval) {
// Immediately invoke the callback // Immediately invoke the callback
Signal(0); Signal(0);
} else { } else {
CoreTiming::ScheduleEvent(nsToCycles(initial), timer_callback_event_type, callback_handle); CoreTiming::ScheduleEvent(nsToCycles(initial), timer_callback_event_type, callback_id);
} }
} }
void Timer::Cancel() { void Timer::Cancel() {
CoreTiming::UnscheduleEvent(timer_callback_event_type, callback_handle); CoreTiming::UnscheduleEvent(timer_callback_event_type, callback_id);
} }
void Timer::Clear() { void Timer::Clear() {
@ -87,17 +92,16 @@ void Timer::Signal(s64 cycles_late) {
if (interval_delay != 0) { if (interval_delay != 0) {
// Reschedule the timer with the interval delay // Reschedule the timer with the interval delay
CoreTiming::ScheduleEvent(nsToCycles(interval_delay) - cycles_late, CoreTiming::ScheduleEvent(nsToCycles(interval_delay) - cycles_late,
timer_callback_event_type, callback_handle); timer_callback_event_type, callback_id);
} }
} }
/// The timer callback event, called when a timer is fired /// The timer callback event, called when a timer is fired
static void TimerCallback(u64 timer_handle, s64 cycles_late) { static void TimerCallback(u64 callback_id, s64 cycles_late) {
SharedPtr<Timer> timer = SharedPtr<Timer> timer = timer_callback_table.at(callback_id);
timer_callback_handle_table.Get<Timer>(static_cast<Handle>(timer_handle));
if (timer == nullptr) { if (timer == nullptr) {
LOG_CRITICAL(Kernel, "Callback fired for invalid timer {:08x}", timer_handle); LOG_CRITICAL(Kernel, "Callback fired for invalid timer {:016x}", callback_id);
return; return;
} }
@ -105,7 +109,8 @@ static void TimerCallback(u64 timer_handle, s64 cycles_late) {
} }
void TimersInit() { void TimersInit() {
timer_callback_handle_table.Clear(); next_timer_callback_id = 0;
timer_callback_table.clear();
timer_callback_event_type = CoreTiming::RegisterEvent("TimerCallback", TimerCallback); timer_callback_event_type = CoreTiming::RegisterEvent("TimerCallback", TimerCallback);
} }

4
src/core/hle/kernel/timer.h
View File

@ -71,8 +71,8 @@ private:
bool signaled; ///< Whether the timer has been signaled or not bool signaled; ///< Whether the timer has been signaled or not
std::string name; ///< Name of timer (optional) std::string name; ///< Name of timer (optional)
/// Handle used as userdata to reference this object when inserting into the CoreTiming queue. /// ID used as userdata to reference this object when inserting into the CoreTiming queue.
Handle callback_handle; u64 callback_id;
friend class KernelSystem; friend class KernelSystem;
}; };