fix(resmon): Calls

Author: skuzzis

src/core/commands.cpp

@@ -557,12 +557,12 @@ void SwiftlyResourceMonitorManagerViewPlugin(CPlayerSlot slot, CCommandContext c
     usagesTable.add(" avg/max ");
     usagesTable.endOfRow();
 
-    std::map<std::string, std::map<std::string, std::set<float>>> data = g_ResourceMonitor->GetResmonTimeTables();
+    std::map<std::string, std::map<std::string, std::list<float>>> data = g_ResourceMonitor->GetResmonTimeTables();
     if (data.count(plugin_id) > 0)
     {
-        std::map<std::string, std::set<float>> pluginData = data.at(plugin_id);
+        std::map<std::string, std::list<float>> pluginData = data.at(plugin_id);
         uint64_t idx = 0;
-        for (std::map<std::string, std::set<float>>::iterator it = pluginData.begin(); it != pluginData.end(); ++it)
+        for (std::map<std::string, std::list<float>>::iterator it = pluginData.begin(); it != pluginData.end(); ++it)
         {
             ++idx;
             usagesTable.add(string_format(" %02d. ", idx));
@@ -579,7 +579,7 @@ void SwiftlyResourceMonitorManagerViewPlugin(CPlayerSlot slot, CCommandContext c
 
                 float avg = 0;
                 uint64_t avgCount = 0;
-                for (std::set<float>::iterator ii = it->second.begin(); ii != it->second.end(); ++ii)
+                for (std::list<float>::iterator ii = it->second.begin(); ii != it->second.end(); ++ii)
                 {
                     avg += *(ii);
                     ++avgCount;
@@ -620,7 +620,7 @@ void SwiftlyResourceMonitorManagerView(CPlayerSlot slot, CCommandContext context
 
     PLUGIN_PRINTF("Resource Monitor", "Plugin Resource Viewer\n");
 
-    std::map<std::string, std::map<std::string, std::set<float>>> data = g_ResourceMonitor->GetResmonTimeTables();
+    std::map<std::string, std::map<std::string, std::list<float>>> data = g_ResourceMonitor->GetResmonTimeTables();
 
     pluginsTable.add(" core ");
     pluginsTable.add(" [Swiftly] Core ");
@@ -635,8 +635,8 @@ void SwiftlyResourceMonitorManagerView(CPlayerSlot slot, CCommandContext context
         float avg = 0;
         uint64_t avgCount = 0;
 
-        std::map<std::string, std::set<float>> pluginData = data.at("core");
-        for (std::map<std::string, std::set<float>>::iterator it = pluginData.begin(); it != pluginData.end(); ++it)
+        std::map<std::string, std::list<float>> pluginData = data.at("core");
+        for (std::map<std::string, std::list<float>>::iterator it = pluginData.begin(); it != pluginData.end(); ++it)
         {
             if (it->second.size() == 0)
                 continue;
@@ -646,7 +646,7 @@ void SwiftlyResourceMonitorManagerView(CPlayerSlot slot, CCommandContext context
             max += *(maxend);
             ++maxCount;
 
-            for (std::set<float>::iterator it2 = it->second.begin(); it2 != it->second.end(); ++it2)
+            for (std::list<float>::iterator it2 = it->second.begin(); it2 != it->second.end(); ++it2)
             {
                 avg += *(it2);
                 ++avgCount;
@@ -686,8 +686,8 @@ void SwiftlyResourceMonitorManagerView(CPlayerSlot slot, CCommandContext context
             float avg = 0;
             uint64_t avgCount = 0;
 
-            std::map<std::string, std::set<float>> pluginData = data.at(plugin->GetName());
-            for (std::map<std::string, std::set<float>>::iterator it = pluginData.begin(); it != pluginData.end(); ++it)
+            std::map<std::string, std::list<float>> pluginData = data.at(plugin->GetName());
+            for (std::map<std::string, std::list<float>>::iterator it = pluginData.begin(); it != pluginData.end(); ++it)
             {
                 if (it->second.size() == 0)
                     continue;
@@ -697,7 +697,7 @@ void SwiftlyResourceMonitorManagerView(CPlayerSlot slot, CCommandContext context
                 max += *(maxend);
                 ++maxCount;
 
-                for (std::set<float>::iterator it2 = it->second.begin(); it2 != it->second.end(); ++it2)
+                for (std::list<float>::iterator it2 = it->second.begin(); it2 != it->second.end(); ++it2)
                 {
                     avg += *(it2);
                     ++avgCount;

src/resourcemonitor/ResourceMonitor.cpp

@@ -1,5 +1,6 @@
 #include "ResourceMonitor.h"
 #include <thread>
+#include "../common.h"
 
 void ResourceMonitor::Enable()
 {
@@ -26,5 +27,5 @@ void ResourceMonitor::RecordTime(std::string plugin_id, std::string key, float v
     if (this->resmonTimesTable[plugin_id].find(key) == this->resmonTimesTable[plugin_id].end())
         this->resmonTimesTable[plugin_id].insert({key, {}});
 
-    this->resmonTimesTable[plugin_id][key].insert(value);
+    this->resmonTimesTable[plugin_id][key].push_back(value);
 }

src/resourcemonitor/ResourceMonitor.h

@@ -2,7 +2,7 @@
 #define _resourcemonitor_h
 
 #include <map>
-#include <set>
+#include <list>
 #include <string>
 #include <chrono>
 
@@ -14,7 +14,7 @@ class ResourceMonitor
 {
 private:
     bool m_enabled = false;
-    std::map<std::string, std::map<std::string, std::set<float>>> resmonTimesTable;
+    std::map<std::string, std::map<std::string, std::list<float>>> resmonTimesTable;
 
 public:
     ResourceMonitor() {}
@@ -24,7 +24,7 @@ class ResourceMonitor
     bool IsEnabled() { return this->m_enabled; }
     void RecordTime(std::string plugin_id, std::string key, float value);
 
-    std::map<std::string, std::map<std::string, std::set<float>>> GetResmonTimeTables() { return this->resmonTimesTable; }
+    std::map<std::string, std::map<std::string, std::list<float>>> GetResmonTimeTables() { return this->resmonTimesTable; }
 };
 
 extern ResourceMonitor *g_ResourceMonitor;