projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly handle decoder errors
[pulseview.git]
/
pv
/
logging.cpp
diff --git
a/pv/logging.cpp
b/pv/logging.cpp
index 49b7d5828359962dcc0f4fbdc274865c783c826d..dea333e534489b78bae632da28ccad90c56e35bd 100644
(file)
--- a/
pv/logging.cpp
+++ b/
pv/logging.cpp
@@
-28,10
+28,13
@@
#include <QApplication>
#include <QApplication>
+using std::lock_guard;
+
namespace pv {
Logging logging;
namespace pv {
Logging logging;
+const int Logging::MIN_BUFFER_SIZE = 10;
const int Logging::MAX_BUFFER_SIZE = 50000;
Logging::~Logging()
const int Logging::MAX_BUFFER_SIZE = 50000;
Logging::~Logging()
@@
-84,6
+87,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();