w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-23 18:02:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix a thread safety issue in diagnostic trace to file code

Browse Source
This commit is contained in:
Bill Somerville 2019-03-05 22:46:04 +00:00
parent d4aa208b15
commit 4f57cc7fdb
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
TraceFile.cpp
View File

@ -3,6 +3,8 @@
#include <stdexcept> #include <stdexcept>
#include <QDebug> #include <QDebug>
#include <QMutex>
#include <QMutexLocker>
#include <QString> #include <QString>
#include <QFile> #include <QFile>
#include <QTextStream> #include <QTextStream>
@ -28,10 +30,11 @@ private:
QTextStream * original_stream_; QTextStream * original_stream_;
QtMessageHandler original_handler_; QtMessageHandler original_handler_;
static QTextStream * current_stream_; static QTextStream * current_stream_;
static QMutex mutex_;
}; };
QTextStream * TraceFile::impl::current_stream_; QTextStream * TraceFile::impl::current_stream_;
QMutex TraceFile::impl::mutex_;
// delegate to implementation class // delegate to implementation class
TraceFile::TraceFile (QString const& trace_file_path) TraceFile::TraceFile (QString const& trace_file_path)
@ -73,7 +76,10 @@ TraceFile::impl::~impl ()
void TraceFile::impl::message_handler (QtMsgType type, QMessageLogContext const& context, QString const& msg) void TraceFile::impl::message_handler (QtMsgType type, QMessageLogContext const& context, QString const& msg)
{ {
Q_ASSERT_X (current_stream_, "TraceFile:message_handler", "no stream to write to"); Q_ASSERT_X (current_stream_, "TraceFile:message_handler", "no stream to write to");
*current_stream_ << qFormatLogMessage (type, context, msg) << endl; {
QMutexLocker lock {&mutex_}; // thread safety - serialize writes to the trace file
*current_stream_ << qFormatLogMessage (type, context, msg) << endl;
}
if (QtFatalMsg == type) if (QtFatalMsg == type)
{ {