4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Add mutex for writing to the log file

Browse source 
fstream is not thread-safe and the act of writing the string and the
newline are two separate operations which could execute concurrently in
multiple threads, resulting in lines joining together followed by two
newlines. Due to the presence of a static mutex, this also removes
inline on the function.
This commit is contained in:
Richard Stanway 2023-02-27 23:37:22 +01:00 • committed by Jim
commit bb7ca3c2c3
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
UI/obs-app.cpp
View file

@ -277,14 +277,17 @@ string CurrentDateTimeString()
return buf;
}
static inline void LogString(fstream &logFile, const char *timeString,
char *str, int log_level)
static void LogString(fstream &logFile, const char *timeString, char *str,
int log_level)
{
static mutex logfile_mutex;
string msg;
msg += timeString;
msg += str;
logfile_mutex.lock();
logFile << msg << endl;
logfile_mutex.unlock();
if (!!obsLogViewer)
QMetaObject::invokeMethod(obsLogViewer.data(), "AddLine",