Implemented a global decode lock to prevent concurrent decode

diff --git a/pv/data/decoder.cpp b/pv/data/decoder.cpp
index 8a84fd4d8f4e9032a3876eaeb9ee405587fa9602..133fcd19d44b1f9a0c9fec43b94283a418628cf9 100644 (file)
--- a/pv/data/decoder.cpp
+++ b/pv/data/decoder.cpp
@@ -43,6 +43,8 @@ const double Decoder::DecodeMargin = 1.0;
 const double Decoder::DecodeThreshold = 0.2;
 const int64_t Decoder::DecodeChunkLength = 4096;
 
+mutex Decoder::_global_decode_mutex;
+
 Decoder::Decoder(const srd_decoder *const dec,
        std::map<const srd_probe*,
                boost::shared_ptr<pv::view::LogicSignal> > probes,
@@ -191,6 +193,8 @@ void Decoder::decode_proc(shared_ptr<data::Logic> data)
                !this_thread::interruption_requested() && i < sample_count;
                i += DecodeChunkLength)
        {
+               lock_guard<mutex> decode_lock(_global_decode_mutex);
+
                const int64_t chunk_end = min(
                        i + DecodeChunkLength, sample_count);
                snapshot->get_samples(chunk, i, chunk_end);

diff --git a/pv/data/decoder.h b/pv/data/decoder.h
index 09002ac911153ed06901af6ab1ba3e0927b1f4c7..b8608d2cc4290ed712722ba1e677e6383e96fb03 100644 (file)
--- a/pv/data/decoder.h
+++ b/pv/data/decoder.h
@@ -96,6 +96,15 @@ signals:
        void new_decode_data();
 
 private:
+
+       /**
+        * This mutex prevents more than one decode operation occuring
+        * concurrently.
+        * @todo A proper solution should be implemented to allow multiple
+        * decode operations.
+        */
+       static boost::mutex _global_decode_mutex;
+
        const srd_decoder *const _decoder;
        std::map<const srd_probe*, boost::shared_ptr<view::LogicSignal> >
                _probes;