Use QHash for _timerFunctionMap instead of std::unordered_map

Ada committed 4 months ago

Commit 42bbbaf1 parent 461e32f2 files · +18 −14Browse files

Showing the changes to libraries/script-engine/src/ScriptManager.cpp (1 of 2 files). Show all

Unified · Split

libraries/script-engine/src/ScriptManager.cpp+17−13

 // NOTE: This is private because it must be called on the same thread that created the timers, which is why
 // we want to only call it in our own run "shutdown" processing.
 void ScriptManager::stopAllTimers() {
-    for (const auto& [handle, value] : _timerFunctionMap) {
+    for (const auto& pair : _timerFunctionMap) {
-        QTimer* timer = std::get<0>(value);
+        QTimer* timer = std::get<0>(pair);
         timer->stop();
         delete timer;
 }
 void ScriptManager::stopAllTimersForEntityScript(const EntityItemID& entityID) {
-    std::vector<int> toDelete;
+    std::vector<int> toDelete = {};
-    for (const auto& [handle, value] : _timerFunctionMap) {
+    for (
-        const auto& [timer, callbackData] = value;
+        auto i = _timerFunctionMap.constKeyValueBegin();
+        i != _timerFunctionMap.constKeyValueEnd();
+        ++i
+    ) {
+        const auto& handle = i->first;
+        const auto& [timer, callbackData] = i->second;
         if (callbackData.definingEntityIdentifier != entityID) { continue; }
     }
     for (auto handle : toDelete) {
-        _timerFunctionMap.erase(handle);
+        _timerFunctionMap.remove(handle);
     }
     // the timer map is potentially shared across multiple entity scripts,
         return;
     }
-    auto [timer, data] = _timerFunctionMap.at(handle);
+    auto [timer, data] = _timerFunctionMap.value(handle);
     if (!timer->isActive()) {
         // this timer is done, we can kill it
-        _timerFunctionMap.erase(handle);
+        _timerFunctionMap.remove(handle);
         delete timer;
     }
 }
 int ScriptManager::setupTimerWithInterval(const ScriptValue& function, int intervalMS, bool isSingleShot) {
-    int handle = _timerHandleCounter;
+    int handle = _timerHandleCounter++;
-    _timerHandleCounter += 1;
     // create the timer, add it to the map, and start it
     QTimer* newTimer = new QTimer(this);
     connect(this, &ScriptManager::scriptEnding, newTimer, &QTimer::stop);
     CallbackData timerData = { function, currentEntityIdentifier, currentSandboxURL };
-    _timerFunctionMap.insert({ handle, { newTimer, timerData } });
+    _timerFunctionMap.insert(handle, { newTimer, timerData });
     if (intervalMS < 0) {
         int lineNumber = -1;
 void ScriptManager::stopTimer(int handle) {
     if (_timerFunctionMap.contains(handle)) {
-        auto [timer, callbackData] = _timerFunctionMap.at(handle);
+        auto [timer, callbackData] = _timerFunctionMap.value(handle);
         timer->stop();
-        _timerFunctionMap.erase(handle);
+        _timerFunctionMap.remove(handle);
         delete timer;
     } else {
         qCDebug(scriptengine) << "stopTimer -- not in _timerFunctionMap" << handle;