projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manual: Various minor fixes.
[pulseview.git]
/
pv
/
logging.hpp
diff --git
a/pv/logging.hpp
b/pv/logging.hpp
index 699576271a2d68f19f9fe400433a9545bca14295..28f2107437ec966cd2e6545dca9ade9aea469d5c 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
@@
-40,6
+44,7
@@
public:
LogSource_srd
};
LogSource_srd
};
+ static const int MIN_BUFFER_SIZE;
static const int MAX_BUFFER_SIZE;
public:
static const int MAX_BUFFER_SIZE;
public:
@@
-55,10
+60,10
@@
public:
static void log_pv(QtMsgType type, const QMessageLogContext &context, const QString &msg);
static void log_pv(QtMsgType type, const QMessageLogContext &context, const QString &msg);
- static int log_
libsigrok
(void *cb_data, int loglevel, const char *format, va_list args);
+ static int log_
sr
(void *cb_data, int loglevel, const char *format, va_list args);
#ifdef ENABLE_DECODE
#ifdef ENABLE_DECODE
- static int log_
lib
srd(void *cb_data, int loglevel, const char *format, va_list args);
+ static int log_srd(void *cb_data, int loglevel, const char *format, va_list args);
#endif
private:
#endif
private:
@@
-70,6
+75,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;