Logging: Make logging thread-safe

Otherwise, we crash when two threads try to add entries to the log
at the same time.

diff --git a/pv/logging.cpp b/pv/logging.cpp
index 49b7d5828359962dcc0f4fbdc274865c783c826d..ab0594c342e5b58a0d7bf63ec91693640adbba50 100644 (file)
--- a/pv/logging.cpp
+++ b/pv/logging.cpp
@@ -28,6 +28,8 @@
 
 #include <QApplication>
 
 
 #include <QApplication>
 

+using std::lock_guard;
+

 namespace pv {
 
 Logging logging;
 namespace pv {
 
 Logging logging;


@@ -84,6 +86,8 @@ QString Logging::get_log() const
 
 void Logging::log(const QString &text, int source)
 {
 
 void Logging::log(const QString &text, int source)
 {

+       lock_guard<mutex> log_lock(log_mutex_);
+

        if (buffer_.size() >= buffer_size_)
                buffer_.removeFirst();
 
        if (buffer_.size() >= buffer_size_)
                buffer_.removeFirst();
 

diff --git a/pv/logging.hpp b/pv/logging.hpp
index 0be270d488d4506cbc82db3fabbc9cfb81458585..fe05c5439ecf52d30c663614c08948d1c2b9ef53 100644 (file)
--- a/pv/logging.hpp
+++ b/pv/logging.hpp
@@ -22,11 +22,15 @@
 
 #include "globalsettings.hpp"
 
 
 #include "globalsettings.hpp"
 

+#include <mutex>
+

 #include <QtGlobal>
 #include <QObject>
 #include <QString>
 #include <QStringList>
 
 #include <QtGlobal>
 #include <QObject>
 #include <QString>
 #include <QStringList>
 

+using std::mutex;
+

 namespace pv {
 
 class Logging : public QObject, public GlobalSettingsInterface
 namespace pv {
 
 class Logging : public QObject, public GlobalSettingsInterface


@@ -70,6 +74,7 @@ Q_SIGNALS:
 private:
        int buffer_size_;
        QStringList buffer_;
 private:
        int buffer_size_;
        QStringList buffer_;

+       mutable mutex log_mutex_;

 };
 
 extern Logging logging;
 };
 
 extern Logging logging;