Fix race condition in debug build printing

include/Logger.h

@@ -2,8 +2,10 @@
 /// Created by Anonymous275 on 4/2/2020.
 ///
 #pragma once
-#include <string>
 #include <iostream>
+#include <mutex>
+#include <string>
+extern std::mutex MLock;
 void InitLog();
 #define DebugPrintTID() DebugPrintTIDInternal(__func__)
 void DebugPrintTIDInternal(const std::string& func); // prints the current thread id in debug mode, to make tracing of crashes and asserts easier

src/Console.cpp

@@ -4,8 +4,8 @@
 
 #include "Lua/LuaSystem.hpp"
 #ifdef WIN32
-#include <windows.h>
 #include <conio.h>
+#include <windows.h>
 #else // *nix
 typedef unsigned long DWORD, *PDWORD, *LPDWORD;
 #include <termios.h>
@@ -13,9 +13,9 @@ typedef unsigned long DWORD, *PDWORD, *LPDWORD;
 #endif // WIN32
 #include "Logger.h"
 #include <iostream>
+#include <mutex>
 #include <string>
 #include <thread>
-#include <mutex>
 
 std::vector<std::string> QConsoleOut;
 std::string CInputBuff;
@@ -25,15 +25,18 @@ void HandleInput(const std::string& cmd){
     std::cout << std::endl;
     if (cmd == "exit") {
         exit(0);
-    }else LuaConsole->Execute(cmd);
+    } else
+        LuaConsole->Execute(cmd);
 }
 
 void ProcessOut() {
     static size_t len = 2;
-    if(QConsoleOut.empty() && len == CInputBuff.length())return;
+    if (QConsoleOut.empty() && len == CInputBuff.length())
+        return;
     printf("%c[2K\r", 27);
     for (const std::string& msg : QConsoleOut)
-        if(!msg.empty())std::cout << msg;
+        if (!msg.empty())
+            std::cout << msg;
     MLock.lock();
     QConsoleOut.clear();
     MLock.unlock();
@@ -56,8 +59,7 @@ void ConsoleOut(const std::string& msg){
 }
 
 #ifndef WIN32
-static int _getch()
+static int _getch() {
-{
     char buf = 0;
     struct termios old;
     fflush(stdout);
@@ -115,7 +117,8 @@ void SetupConsole(){
                 CInputBuff.clear();
             }
         } else if (In == 8) {
-            if(!CInputBuff.empty())CInputBuff.pop_back();
+            if (!CInputBuff.empty())
+                CInputBuff.pop_back();
         } else if (In == 4) {
             CInputBuff = "exit";
             HandleInput(CInputBuff);

src/logger.cpp

@@ -1,20 +1,23 @@
 ///
 /// Created by Anonymous275 on 7/17/2020
 ///
+#include "Logger.h"
 #include "Security/Enc.h"
 #include "Settings.h"
-#include "Logger.h"
-#include <fstream>
-#include <sstream>
 #include <chrono>
+#include <fstream>
 #include <mutex>
+#include <sstream>
 #include <thread>
 
 void DebugPrintTIDInternal(const std::string& func) {
     // we need to print to cout here as we might crash before all console output is handled,
     // due to segfaults or asserts.
 #ifdef DEBUG
+    MLock.lock();
+    printf("%c[2K\r", 27);
     std::cout << "(debug build) Thread '" << std::this_thread::get_id() << "' is " << func << std::endl;
+    MLock.unlock();
 #endif // DEBUG
 }
 
@@ -22,10 +25,14 @@ std::string getDate() {
     typedef std::chrono::duration<int, std::ratio_multiply<std::chrono::hours::period, std::ratio<24>>::type> days;
     std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
     std::chrono::system_clock::duration tp = now.time_since_epoch();
-    days d = std::chrono::duration_cast<days>(tp);tp -= d;
+    days d = std::chrono::duration_cast<days>(tp);
-    auto h = std::chrono::duration_cast<std::chrono::hours>(tp);tp -= h;
+    tp -= d;
-    auto m = std::chrono::duration_cast<std::chrono::minutes>(tp);tp -= m;
+    auto h = std::chrono::duration_cast<std::chrono::hours>(tp);
-    auto s = std::chrono::duration_cast<std::chrono::seconds>(tp);tp -= s;
+    tp -= h;
+    auto m = std::chrono::duration_cast<std::chrono::minutes>(tp);
+    tp -= m;
+    auto s = std::chrono::duration_cast<std::chrono::seconds>(tp);
+    tp -= s;
     time_t tt = std::chrono::system_clock::to_time_t(now);
     tm local_tm {};
 #ifdef WIN32
@@ -56,7 +63,8 @@ void InitLog(){
     LFS.open(Sec("Server.log"));
     if (!LFS.is_open()) {
         error(Sec("logger file init failed!"));
-    }else LFS.close();
+    } else
+        LFS.close();
 }
 std::mutex LogLock;
 void addToLog(const std::string& Line) {
@@ -73,7 +81,8 @@ void info(const std::string& toPrint) {
     LogLock.unlock();
 }
 void debug(const std::string& toPrint) {
-    if(!Debug)return;
+    if (!Debug)
+        return;
     LogLock.lock();
     std::string Print = getDate() + Sec("[DEBUG] ") + toPrint + "\n";
     ConsoleOut(Print);
@@ -93,7 +102,8 @@ void error(const std::string& toPrint) {
     std::string Print = getDate() + Sec("[ERROR] ") + toPrint + "\n";
     ConsoleOut(Print);
     addToLog(Print);
-    if(ECounter > 10)exit(7);
+    if (ECounter > 10)
+        exit(7);
     ECounter++;
     LogLock.unlock();
 }