From 196ab8be89977707f3e45f1e13ca63f33e4acdca Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 5 Aug 2018 21:15:13 -0400 Subject: [PATCH 1/2] core_timing: Use transparent functors where applicable Gets rid of the need to hardcode the type in multiple places. This will now be deduced automatically, based off the elements in the container being provided to the algorithm. --- src/core/core_timing.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 260a8f4d5..751922980 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -142,7 +142,7 @@ void ScheduleEvent(s64 cycles_into_future, const EventType* event_type, u64 user ForceExceptionCheck(cycles_into_future); event_queue.emplace_back(Event{timeout, event_fifo_id++, userdata, event_type}); - std::push_heap(event_queue.begin(), event_queue.end(), std::greater()); + std::push_heap(event_queue.begin(), event_queue.end(), std::greater<>()); } void ScheduleEventThreadsafe(s64 cycles_into_future, const EventType* event_type, u64 userdata) { @@ -157,7 +157,7 @@ void UnscheduleEvent(const EventType* event_type, u64 userdata) { // Removing random items breaks the invariant so we have to re-establish it. if (itr != event_queue.end()) { event_queue.erase(itr, event_queue.end()); - std::make_heap(event_queue.begin(), event_queue.end(), std::greater()); + std::make_heap(event_queue.begin(), event_queue.end(), std::greater<>()); } } @@ -168,7 +168,7 @@ void RemoveEvent(const EventType* event_type) { // Removing random items breaks the invariant so we have to re-establish it. if (itr != event_queue.end()) { event_queue.erase(itr, event_queue.end()); - std::make_heap(event_queue.begin(), event_queue.end(), std::greater()); + std::make_heap(event_queue.begin(), event_queue.end(), std::greater<>()); } } @@ -189,7 +189,7 @@ void MoveEvents() { for (Event ev; ts_queue.Pop(ev);) { ev.fifo_order = event_fifo_id++; event_queue.emplace_back(std::move(ev)); - std::push_heap(event_queue.begin(), event_queue.end(), std::greater()); + std::push_heap(event_queue.begin(), event_queue.end(), std::greater<>()); } } @@ -204,7 +204,7 @@ void Advance() { while (!event_queue.empty() && event_queue.front().time <= global_timer) { Event evt = std::move(event_queue.front()); - std::pop_heap(event_queue.begin(), event_queue.end(), std::greater()); + std::pop_heap(event_queue.begin(), event_queue.end(), std::greater<>()); event_queue.pop_back(); evt.type->callback(evt.userdata, global_timer - evt.time); } From a431c85b6b068c248d55317ac1fa8a5ce0d6a527 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 5 Aug 2018 21:27:11 -0400 Subject: [PATCH 2/2] core_timing: Convert typedef into a type alias Makes the alias a little more readable from left-to-right. --- src/core/core_timing.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/core_timing.h b/src/core/core_timing.h index ca663a1ed..060d263e9 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h @@ -121,6 +121,10 @@ inline u64 cyclesToMs(s64 cycles) { namespace CoreTiming { +struct EventType; + +using TimedCallback = std::function; + /** * CoreTiming begins at the boundary of timing slice -1. An initial call to Advance() is * required to end slice -1 and start slice 0 before the first cycle of code is executed. @@ -128,8 +132,6 @@ namespace CoreTiming { void Init(); void Shutdown(); -typedef std::function TimedCallback; - /** * This should only be called from the emu thread, if you are calling it any other thread, you are * doing something evil @@ -138,8 +140,6 @@ u64 GetTicks(); u64 GetIdleTicks(); void AddTicks(u64 ticks); -struct EventType; - /** * Returns the event_type identifier. if name is not unique, it will assert. */