diff options
author | bunnei <bunneidev@gmail.com> | 2018-08-16 00:25:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-16 00:25:30 +0200 |
commit | 1dd27aff476f4831aab571442b0cc882a8bb0b95 (patch) | |
tree | 1571009dc837518fcd3497ea54fe9e4bd5c66494 | |
parent | Merge pull request #1080 from lioncash/ret (diff) | |
parent | Core::CoreTiming: add UnscheduleEventThreadsafe (diff) | |
download | yuzu-1dd27aff476f4831aab571442b0cc882a8bb0b95.tar yuzu-1dd27aff476f4831aab571442b0cc882a8bb0b95.tar.gz yuzu-1dd27aff476f4831aab571442b0cc882a8bb0b95.tar.bz2 yuzu-1dd27aff476f4831aab571442b0cc882a8bb0b95.tar.lz yuzu-1dd27aff476f4831aab571442b0cc882a8bb0b95.tar.xz yuzu-1dd27aff476f4831aab571442b0cc882a8bb0b95.tar.zst yuzu-1dd27aff476f4831aab571442b0cc882a8bb0b95.zip |
-rw-r--r-- | src/core/core_timing.cpp | 10 | ||||
-rw-r--r-- | src/core/core_timing.h | 1 | ||||
-rw-r--r-- | src/core/hle/kernel/thread.cpp | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index f977d1b32..7953c8720 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -56,6 +56,9 @@ static u64 event_fifo_id; // to the event_queue by the emu thread static Common::MPSCQueue<Event, false> ts_queue; +// the queue for unscheduling the events from other threads threadsafe +static Common::MPSCQueue<std::pair<const EventType*, u64>, false> unschedule_queue; + constexpr int MAX_SLICE_LENGTH = 20000; static s64 idled_cycles; @@ -158,6 +161,10 @@ void UnscheduleEvent(const EventType* event_type, u64 userdata) { } } +void UnscheduleEventThreadsafe(const EventType* event_type, u64 userdata) { + unschedule_queue.Push(std::make_pair(event_type, userdata)); +} + void RemoveEvent(const EventType* event_type) { auto itr = std::remove_if(event_queue.begin(), event_queue.end(), [&](const Event& e) { return e.type == event_type; }); @@ -194,6 +201,9 @@ void MoveEvents() { void Advance() { MoveEvents(); + for (std::pair<const EventType*, u64> ev; unschedule_queue.Pop(ev);) { + UnscheduleEvent(ev.first, ev.second); + } int cycles_executed = slice_length - downcount; global_timer += cycles_executed; diff --git a/src/core/core_timing.h b/src/core/core_timing.h index dfa161c0d..9ed757bd7 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h @@ -65,6 +65,7 @@ void ScheduleEvent(s64 cycles_into_future, const EventType* event_type, u64 user void ScheduleEventThreadsafe(s64 cycles_into_future, const EventType* event_type, u64 userdata); void UnscheduleEvent(const EventType* event_type, u64 userdata); +void UnscheduleEventThreadsafe(const EventType* event_type, u64 userdata); /// We only permit one event of each type in the queue at a time. void RemoveEvent(const EventType* event_type); diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index a1a7867ce..cf4f94822 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -167,7 +167,7 @@ void Thread::WakeAfterDelay(s64 nanoseconds) { } void Thread::CancelWakeupTimer() { - CoreTiming::UnscheduleEvent(ThreadWakeupEventType, callback_handle); + CoreTiming::UnscheduleEventThreadsafe(ThreadWakeupEventType, callback_handle); } static boost::optional<s32> GetNextProcessorId(u64 mask) { |