Core/EventMap: Refactor and modernize EventMap (#29183)

1 files changed, 61 insertions, 35 deletions

diff --git a/src/common/Utilities/EventMap.cpp b/src/common/Utilities/EventMap.cpp
index 8e09d21ed6d..559792e941a 100644
--- a/src/common/Utilities/EventMap.cpp
+++ b/src/common/Utilities/EventMap.cpp
@@ -22,40 +22,40 @@ void EventMap::Reset()
 {
     _eventMap.clear();
     _time = TimePoint::min();
-    _phase = 0;
+    _phaseMask = 0;
 }
 
-void EventMap::SetPhase(uint8 phase)
+void EventMap::SetPhase(PhaseIndex phase)
 {
     if (!phase)
-        _phase = 0;
-    else if (phase <= 8)
-        _phase = uint8(1 << (phase - 1));
+        _phaseMask = 0;
+    else if (phase <= sizeof(PhaseMask) * 8)
+        _phaseMask = PhaseMask(1u << (phase - 1u));
 }
 
-void EventMap::ScheduleEvent(uint32 eventId, Milliseconds time, uint32 group /*= 0*/, uint8 phase /*= 0*/)
+void EventMap::ScheduleEvent(EventId eventId, Milliseconds time, GroupIndex group /*= 0*/, PhaseIndex phase /*= 0*/)
 {
-    if (group && group <= 8)
-        eventId |= (1 << (group + 15));
+    if (group > sizeof(GroupMask) * 8)
+        return;
 
-    if (phase && phase <= 8)
-        eventId |= (1 << (phase + 23));
+    if (phase > sizeof(PhaseMask) * 8)
+        return;
 
-    _eventMap.insert(EventStore::value_type(_time + time, eventId));
+    _eventMap.insert(EventStore::value_type(_time + time, Event(eventId, group, phase)));
 }
 
-void EventMap::ScheduleEvent(uint32 eventId, Milliseconds minTime, Milliseconds maxTime, uint32 group /*= 0*/, uint32 phase /*= 0*/)
+void EventMap::ScheduleEvent(EventId eventId, Milliseconds minTime, Milliseconds maxTime, GroupIndex group /*= 0*/, PhaseIndex phase /*= 0*/)
 {
     ScheduleEvent(eventId, randtime(minTime, maxTime), group, phase);
 }
 
-void EventMap::RescheduleEvent(uint32 eventId, Milliseconds time, uint32 group /*= 0*/, uint8 phase /*= 0*/)
+void EventMap::RescheduleEvent(EventId eventId, Milliseconds time, GroupIndex group, PhaseIndex phase)
 {
     CancelEvent(eventId);
     ScheduleEvent(eventId, time, group, phase);
 }
 
-void EventMap::RescheduleEvent(uint32 eventId, Milliseconds minTime, Milliseconds maxTime, uint32 group /*= 0*/, uint32 phase /*= 0*/)
+void EventMap::RescheduleEvent(EventId eventId, Milliseconds minTime, Milliseconds maxTime, GroupIndex group /*= 0*/, PhaseIndex phase /*= 0*/)
 {
     RescheduleEvent(eventId, randtime(minTime, maxTime), group, phase);
 }
@@ -70,20 +70,20 @@ void EventMap::Repeat(Milliseconds minTime, Milliseconds maxTime)
     Repeat(randtime(minTime, maxTime));
 }
 
-uint32 EventMap::ExecuteEvent()
+EventMap::EventId EventMap::ExecuteEvent()
 {
     while (!Empty())
     {
-        EventStore::iterator itr = _eventMap.begin();
+        auto itr = _eventMap.begin();
 
         if (itr->first > _time)
             return 0;
-        else if (_phase && (itr->second & 0xFF000000) && !((itr->second >> 24) & _phase))
+        else if (_phaseMask && itr->second._phaseMask && !(itr->second._phaseMask & _phaseMask))
             _eventMap.erase(itr);
         else
         {
-            uint32 eventId = (itr->second & 0x0000FFFF);
-            _lastEvent = itr->second; // include phase/group
+            auto eventId = itr->second._id;
+            _lastEvent = itr->second;
             _eventMap.erase(itr);
             return eventId;
         }
@@ -98,7 +98,7 @@ void EventMap::DelayEvents(Milliseconds delay)
         return;
 
     EventStore delayed = std::move(_eventMap);
-    for (EventStore::iterator itr = delayed.begin(); itr != delayed.end();)
+    for (auto itr = delayed.begin(); itr != delayed.end();)
     {
         EventStore::node_type node = delayed.extract(itr++);
         node.key() = node.key() + delay;
@@ -106,16 +106,16 @@ void EventMap::DelayEvents(Milliseconds delay)
     }
 }
 
-void EventMap::DelayEvents(Milliseconds delay, uint32 group)
+void EventMap::DelayEvents(Milliseconds delay, GroupIndex group)
 {
-    if (!group || group > 8 || Empty())
+    if (!group || group > sizeof(GroupMask) * 8 || Empty())
         return;
 
     EventStore delayed;
 
-    for (EventStore::iterator itr = _eventMap.begin(); itr != _eventMap.end();)
+    for (auto itr = _eventMap.begin(); itr != _eventMap.end();)
     {
-        if (itr->second & (1 << (group + 15)))
+        if (itr->second._groupMask & GroupMask(1u << (group - 1u)))
         {
             delayed.insert(EventStore::value_type(itr->first + delay, itr->second));
             _eventMap.erase(itr++);
@@ -127,39 +127,65 @@ void EventMap::DelayEvents(Milliseconds delay, uint32 group)
     _eventMap.insert(delayed.begin(), delayed.end());
 }
 
-void EventMap::CancelEvent(uint32 eventId)
+void EventMap::SetMinimalDelay(EventId eventId, Milliseconds delay)
+{
+    if (Empty())
+        return;
+
+    for (auto itr = _eventMap.begin(); itr != _eventMap.end();)
+    {
+        if (eventId == itr->second._id)
+        {
+            if (itr->first < (_time + delay))
+            {
+                _eventMap.insert(EventStore::value_type(_time + delay, itr->second));
+                itr = _eventMap.erase(itr);
+                continue;
+            }
+
+        }
+        ++itr;
+    }
+}
+
+void EventMap::CancelEvent(EventId eventId)
 {
     if (Empty())
         return;
 
-    for (EventStore::iterator itr = _eventMap.begin(); itr != _eventMap.end();)
+    for (auto itr = _eventMap.begin(); itr != _eventMap.end();)
     {
-        if (eventId == (itr->second & 0x0000FFFF))
+        if (eventId == itr->second._id)
             _eventMap.erase(itr++);
         else
             ++itr;
     }
 }
 
-void EventMap::CancelEventGroup(uint32 group)
+void EventMap::CancelEventGroup(GroupIndex group)
 {
-    if (!group || group > 8 || Empty())
+    if (!group || group > sizeof(GroupMask) * 8 || Empty())
         return;
 
-    for (EventStore::iterator itr = _eventMap.begin(); itr != _eventMap.end();)
+    for (auto itr = _eventMap.begin(); itr != _eventMap.end();)
     {
-        if (itr->second & (1 << (group + 15)))
+        if (itr->second._groupMask & GroupMask(1u << (group - 1u)))
             _eventMap.erase(itr++);
         else
             ++itr;
     }
 }
 
-Milliseconds EventMap::GetTimeUntilEvent(uint32 eventId) const
+Milliseconds EventMap::GetTimeUntilEvent(EventId eventId) const
 {
-    for (std::pair<TimePoint const, uint32> const& itr : _eventMap)
-        if (eventId == (itr.second & 0x0000FFFF))
-            return std::chrono::duration_cast<Milliseconds>(itr.first - _time);
+    for (auto const& [time, event] : _eventMap)
+        if (eventId == event._id)
+            return std::chrono::duration_cast<Milliseconds>(time - _time);
 
     return Milliseconds::max();
 }
+
+bool EventMap::HasEventScheduled(EventId eventId) const
+{
+    return GetTimeUntilEvent(eventId) != Milliseconds::max();
+}