yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

core_timing: use static typing for no-wait unschedule

This commit is contained in:
Liam 2023-12-23 14:06:41 -05:00
parent f34d3d7e84
commit 575db04172
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/core_timing.cpp
View File

@ -143,7 +143,8 @@ void CoreTiming::ScheduleLoopingEvent(std::chrono::nanoseconds start_time,
event.Set();
}
void CoreTiming::UnscheduleEvent(const std::shared_ptr<EventType>& event_type, bool wait) {
void CoreTiming::UnscheduleEvent(const std::shared_ptr<EventType>& event_type,
UnscheduleEventType type) {
{
std::scoped_lock lk{basic_lock};
@ -161,7 +162,7 @@ void CoreTiming::UnscheduleEvent(const std::shared_ptr<EventType>& event_type, b
}
// Force any in-progress events to finish
if (wait) {
if (type == UnscheduleEventType::Wait) {
std::scoped_lock lk{advance_lock};
}
}

12
src/core/core_timing.h
View File

@ -35,6 +35,11 @@ struct EventType {
const std::string name;
};
enum class UnscheduleEventType {
Wait,
NoWait,
};
/**
* This is a system to schedule events into the emulated machine's future. Time is measured
* in main CPU clock cycles.
@ -98,11 +103,8 @@ public:
const std::shared_ptr<EventType>& event_type,
bool absolute_time = false);
void UnscheduleEvent(const std::shared_ptr<EventType>& event_type, bool wait = true);
void UnscheduleEventWithoutWait(const std::shared_ptr<EventType>& event_type) {
UnscheduleEvent(event_type, false);
}
void UnscheduleEvent(const std::shared_ptr<EventType>& event_type,
UnscheduleEventType type = UnscheduleEventType::Wait);
void AddTicks(u64 ticks_to_add);

3
src/core/hle/kernel/k_hardware_timer.cpp
View File

@ -61,7 +61,8 @@ void KHardwareTimer::EnableInterrupt(s64 wakeup_time) {
}
void KHardwareTimer::DisableInterrupt() {
m_kernel.System().CoreTiming().UnscheduleEventWithoutWait(m_event_type);
m_kernel.System().CoreTiming().UnscheduleEvent(m_event_type,
Core::Timing::UnscheduleEventType::NoWait);
m_wakeup_time = std::numeric_limits<s64>::max();
}