octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: Refactor resource limits

Browse Source
This commit is contained in:
GPUCode
2023-11-30 12:11:14 +02:00
parent 9da78f6126
commit a8d869c347
23 changed files with 365 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,8 @@
#include "core/core.h"
#include "core/hle/kernel/handle_table.h"
#include "core/hle/kernel/object.h"
#include "core/hle/kernel/process.h"
#include "core/hle/kernel/resource_limit.h"
#include "core/hle/kernel/thread.h"
#include "core/hle/kernel/timer.h"
@ -17,14 +19,18 @@ namespace Kernel {
Timer::Timer(KernelSystem& kernel)
: WaitObject(kernel), kernel(kernel), timer_manager(kernel.GetTimerManager()) {}
Timer::~Timer() {
Cancel();
timer_manager.timer_callback_table.erase(callback_id);
if (resource_limit) {
resource_limit->Release(ResourceLimitType::Timer, 1);
}
}
std::shared_ptr<Timer> KernelSystem::CreateTimer(ResetType reset_type, std::string name) {
auto timer{std::make_shared<Timer>(*this)};
auto timer = std::make_shared<Timer>(*this);
timer->resource_limit = resource_limit;
timer->reset_type = reset_type;
timer->signaled = false;
timer->name = std::move(name);
@ -32,7 +38,6 @@ std::shared_ptr<Timer> KernelSystem::CreateTimer(ResetType reset_type, std::stri
timer->interval_delay = 0;
timer->callback_id = ++timer_manager->next_timer_callback_id;
timer_manager->timer_callback_table[timer->callback_id] = timer.get();
return timer;
}