fix(callstack): Crash

Author: skuzzis

.vscode/settings.json

@@ -79,6 +79,7 @@
         "typeindex": "cpp",
         "typeinfo": "cpp",
         "variant": "cpp",
-        "expected": "cpp"
+        "expected": "cpp",
+        "shared_mutex": "cpp"
     }
 }

src/crashreporter/CallStack.cpp

@@ -1,28 +1,30 @@
 #include "CallStack.h"
 #include "../utils/utils.h"
 
-std::string CallStack::RegisterPluginCallstack(std::string plugin_name, std::string stackMsg)
+uint64_t stackID = 0;
+
+uint64_t CallStack::RegisterPluginCallstack(std::string plugin_name, std::string stackMsg)
 {
-    std::string stackID = get_uuid();
     if (callStacks.find(plugin_name) == callStacks.end())
         callStacks.insert({ plugin_name, {} });
 
-    while (callStacks[plugin_name].find(stackID) != callStacks[plugin_name].end())
-        stackID = get_uuid();
-
-    callStacks[plugin_name].insert({ stackID, stackMsg });
+    ++stackID;
+    if (stackID % 2000000000 == 0)
+        stackID = 0;
 
+    callStacks[plugin_name].insert_or_assign(stackID, stackMsg);
     return stackID;
 }
-void CallStack::UnregisterPluginCallstack(std::string plugin_name, std::string stackID)
+
+void CallStack::UnregisterPluginCallstack(std::string plugin_name, uint64_t stackID)
 {
     if (callStacks.find(plugin_name) == callStacks.end()) return;
     if (callStacks[plugin_name].find(stackID) == callStacks[plugin_name].end()) return;
 
     callStacks[plugin_name].erase(stackID);
 }
 
-std::unordered_map<std::string, std::string> CallStack::GetPluginCallstack(std::string plugin_name)
+std::unordered_map<uint64_t, std::string> CallStack::GetPluginCallstack(std::string plugin_name)
 {
     if (callStacks.find(plugin_name) == callStacks.end()) return {};
 

src/crashreporter/CallStack.h

@@ -11,14 +11,14 @@
 class CallStack
 {
 private:
-    std::map<std::string, std::unordered_map<std::string, std::string>> callStacks;
+    std::map<std::string, std::unordered_map<uint64_t, std::string>> callStacks;
 public:
     CallStack() = default;
 
-    std::string RegisterPluginCallstack(std::string plugin_name, std::string stackMsg);
-    void UnregisterPluginCallstack(std::string plugin_name, std::string stackID);
+    uint64_t RegisterPluginCallstack(std::string plugin_name, std::string stackMsg);
+    void UnregisterPluginCallstack(std::string plugin_name, uint64_t stackID);
 
-    std::unordered_map<std::string, std::string> GetPluginCallstack(std::string plugin_name);
+    std::unordered_map<uint64_t, std::string> GetPluginCallstack(std::string plugin_name);
 };
 
 extern CallStack* g_callStack;

src/crashreporter/RegisterCallStack.h

@@ -7,7 +7,7 @@ class RegisterCallStack
 {
 private:
     std::string plugin_name;
-    std::string id;
+    uint64_t id;
 
 public:
     RegisterCallStack(std::string plugin_name, std::string stack_msg);

src/entrypoint.cpp

@@ -214,6 +214,8 @@ bool Swiftly::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool
 
     PRINT("Succesfully started.\n");
 
+    PRINTF("%s\n", get_uuid().c_str());
+
     return true;
 }
 

src/utils/utils.cpp

@@ -224,21 +224,12 @@ std::string str_toupper(std::string s)
 
 std::string get_uuid()
 {
-    static std::random_device dev;
-    static std::mt19937 rng(dev());
-
-    std::uniform_int_distribution<int> dist(0, 15);
-
-    const char* v = "0123456789abcdef";
-    const bool dash[] = { 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0 };
-
-    std::string res;
-    for (int i = 0; i < 16; i++)
-    {
-        if (dash[i])
-            res += "-";
-        res += v[dist(rng)];
-        res += v[dist(rng)];
-    }
-    return res;
+    std::srand(std::time(nullptr));
+    return string_format(
+        "%x%x-%x-%x-%x-%x%x%x",
+        (rand() & 0xFFFF), (rand() & 0xFFFF),
+        (rand() & 0xFFFF),
+        ((rand() & 0x0fff) | 0x4000),
+        (rand() % 0x3fff + 0x8000),
+        (rand() & 0xFFFF), (rand() & 0xFFFF), (rand() & 0xFFFF));
 }