[BUGFIX] Use one std mutex (defined in term_util)

hasherezade · Jun 9, 2024 · 3962e29 · 3962e29
1 parent 35ecefa
commit 3962e29
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/etw_listener.cpp b/etw_listener.cpp
@@ -6,6 +6,7 @@
 #include <mutex>
 
 #include "util/process_util.h"
+#include "term_util.h"
 
 #if (_MSC_VER >= 1900)
 
@@ -59,7 +60,6 @@ struct ProceesStat
 };
 
 ProceesStat procStats[MAX_PROCESSES] = { 0 };
-std::mutex g_stdOutMutex;
 
 // ETW Handler
 // To filter our events, we want to compare against the

diff --git a/term_util.cpp b/term_util.cpp
@@ -6,6 +6,8 @@
 #include <string>
 #include <mutex>
 
+std::mutex g_stdOutMutex;
+
 bool get_current_color(int descriptor, WORD &color)
 {
     CONSOLE_SCREEN_BUFFER_INFO info;
@@ -30,8 +32,7 @@ WORD set_color(WORD color)
 
 void print_in_color(WORD color, const std::string &text)
 {
-    static std::mutex colorOutMtx;
-    const std::lock_guard<std::mutex> stdOutLock(colorOutMtx);
+    const std::lock_guard<std::mutex> stdOutLock(g_stdOutMutex);
     WORD old_color = set_color(color);
     std::cout << text;
     std::cout.flush();

diff --git a/term_util.h b/term_util.h
@@ -2,6 +2,9 @@
 
 #include <iostream>
 #include <windows.h>
+#include <mutex>
+
+extern std::mutex g_stdOutMutex;
 
 #define BLACK 0
 #define DARK_BLUE 1