eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 03:09:18 +02:00
Code Issues 121 Wiki Activity

Add stack acces mutex for logging service

Browse Source
This commit is contained in:
Hirek
2025-07-20 20:19:30 +02:00
parent 13f7551b5f
commit d36995aeff
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Logs.cpp
View File

@@ -23,8 +23,6 @@ char logbuffer[ 256 ];
char endstring[10] = "\n"; char endstring[10] = "\n";
std::mutex logMutex;
std::deque<std::string> log_scrollback; std::deque<std::string> log_scrollback;
std::string filename_date() { std::string filename_date() {
@@ -75,19 +73,22 @@ std::string filename_scenery() {
std::deque<std::string> InfoStack; std::deque<std::string> InfoStack;
std::deque<std::string> ErrorStack; std::deque<std::string> ErrorStack;
// lock for log stacks
std::mutex logMutex;
void LogService() void LogService()
{ {
while (!Global.applicationQuitOrder) while (!Global.applicationQuitOrder)
{ {
{ {
std::lock_guard<std::mutex> lock(logMutex);
// --- Obsługa InfoStack --- // --- Obsługa InfoStack ---
while (!InfoStack.empty()) while (!InfoStack.empty())
{ {
logMutex.lock();
std::string msg = InfoStack.front(); std::string msg = InfoStack.front();
InfoStack.pop_front(); InfoStack.pop_front();
logMutex.unlock();
if (Global.iWriteLogEnabled & 1) if (Global.iWriteLogEnabled & 1)
{ {
@@ -120,8 +121,10 @@ void LogService()
// --- Obsługa ErrorStack --- // --- Obsługa ErrorStack ---
while (!ErrorStack.empty()) while (!ErrorStack.empty())
{ {
logMutex.lock();
std::string msg = ErrorStack.front(); std::string msg = ErrorStack.front();
ErrorStack.pop_front(); ErrorStack.pop_front();
logMutex.unlock();
if (!(Global.iWriteLogEnabled & 1)) if (!(Global.iWriteLogEnabled & 1))
continue; continue;
@@ -149,8 +152,9 @@ void WriteLog(const char *str, logtype const Type)
return; return;
if (TestFlag(Global.DisabledLogTypes, static_cast<unsigned int>(Type))) if (TestFlag(Global.DisabledLogTypes, static_cast<unsigned int>(Type)))
return; return;
logMutex.lock();
InfoStack.emplace_back(str); InfoStack.emplace_back(str);
logMutex.unlock();
} }
void ErrorLog(const char *str, logtype const Type) void ErrorLog(const char *str, logtype const Type)
@@ -159,8 +163,9 @@ void ErrorLog(const char *str, logtype const Type)
return; return;
if (TestFlag(Global.DisabledLogTypes, static_cast<unsigned int>(Type))) if (TestFlag(Global.DisabledLogTypes, static_cast<unsigned int>(Type)))
return; return;
logMutex.lock();
ErrorStack.emplace_back(str); ErrorStack.emplace_back(str);
logMutex.unlock();
} }