Moved all srd commands into decode thread, implemented error messages

Ported decode tests to modified interface.

diff --git a/pv/data/decoder.cpp b/pv/data/decoder.cpp
index 923140397ef528d02b9bb2ea84f2849f2d8573d0..8a84fd4d8f4e9032a3876eaeb9ee405587fa9602 100644 (file)
--- a/pv/data/decoder.cpp
+++ b/pv/data/decoder.cpp
@@ -49,12 +49,9 @@ Decoder::Decoder(const srd_decoder *const dec,
        GHashTable *options) :
        _decoder(dec),
        _probes(probes),
-       _options(options),
-       _session(NULL),
-       _decoder_inst(NULL)
+       _options(options)
 {
-       if (!init_decoder())
-               throw runtime_error("Failed to initialise decoder.");
+       init_decoder();
 
        begin_decode();
 }
@@ -65,9 +62,6 @@ Decoder::~Decoder()
        _decode_thread.join();
 
        g_hash_table_destroy(_options);
-
-       if (_session)
-               srd_session_destroy(_session);
 }
 
 const srd_decoder* Decoder::get_decoder() const
@@ -78,10 +72,16 @@ const srd_decoder* Decoder::get_decoder() const
 const vector< shared_ptr<view::decode::Annotation> >
        Decoder::annotations() const
 {
-       lock_guard<mutex> lock(_annotations_mutex);
+       lock_guard<mutex> lock(_mutex);
        return _annotations;
 }
 
+QString Decoder::error_message()
+{
+       lock_guard<mutex> lock(_mutex);
+       return _error_message;
+}
+
 void Decoder::begin_decode()
 {
        _decode_thread.interrupt();
@@ -105,7 +105,7 @@ void Decoder::clear_snapshots()
 {
 }
 
-bool Decoder::init_decoder()
+void Decoder::init_decoder()
 {
        if (!_probes.empty())
        {
@@ -116,44 +116,18 @@ bool Decoder::init_decoder()
                        shared_ptr<pv::data::Logic> data(
                                logic_signal->data());
                        if (data) {
-                               _samplerate = data->get_samplerate();
                                _start_time = data->get_start_time();
+                               _samplerate = data->get_samplerate();
+                               if (_samplerate == 0.0)
+                                       _samplerate = 1.0;
                        }
                }
        }
-
-       srd_session_new(&_session);
-       assert(_session);
-
-       _decoder_inst = srd_inst_new(_session, _decoder->id, _options);
-       if(!_decoder_inst) {
-               qDebug() << "Failed to initialise decoder";
-               return false;
-       }
-
-       _decoder_inst->data_samplerate = _samplerate;
-
-       GHashTable *probes = g_hash_table_new_full(g_str_hash,
-               g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
-
-       for(map<const srd_probe*, shared_ptr<view::LogicSignal> >::
-               const_iterator i = _probes.begin();
-               i != _probes.end(); i++)
-       {
-               shared_ptr<view::Signal> signal((*i).second);
-               GVariant *const gvar = g_variant_new_int32(
-                       signal->probe()->index);
-               g_variant_ref_sink(gvar);
-               g_hash_table_insert(probes, (*i).first->id, gvar);
-       }
-
-       srd_inst_probe_set_all(_decoder_inst, probes);
-
-       return true;
 }
 
 void Decoder::decode_proc(shared_ptr<data::Logic> data)
 {
+       srd_session *session;
        uint8_t chunk[DecodeChunkLength];
 
        assert(data);
@@ -168,24 +142,51 @@ void Decoder::decode_proc(shared_ptr<data::Logic> data)
        const shared_ptr<pv::data::LogicSnapshot> &snapshot =
                snapshots.front();
        const int64_t sample_count = snapshot->get_sample_count() - 1;
-       double samplerate = data->get_samplerate();
 
-       // Show sample rate as 1Hz when it is unknown
-       if (samplerate == 0.0)
-               samplerate = 1.0;
+       // Create the session
+       srd_session_new(&session);
+       assert(session);
 
-       srd_session_config_set(_session, SRD_CONF_NUM_PROBES,
+       srd_session_config_set(session, SRD_CONF_NUM_PROBES,
                g_variant_new_uint64(_probes.size()));
-       srd_session_config_set(_session, SRD_CONF_UNITSIZE,
+       srd_session_config_set(session, SRD_CONF_UNITSIZE,
                g_variant_new_uint64(snapshot->unit_size()));
-       srd_session_config_set(_session, SRD_CONF_SAMPLERATE,
-               g_variant_new_uint64((uint64_t)samplerate));
-
-       srd_session_start(_session);
+       srd_session_config_set(session, SRD_CONF_SAMPLERATE,
+               g_variant_new_uint64((uint64_t)_samplerate));
 
-       srd_pd_output_callback_add(_session, SRD_OUTPUT_ANN,
+       srd_pd_output_callback_add(session, SRD_OUTPUT_ANN,
                Decoder::annotation_callback, this);
 
+       // Create the decoder instance
+       srd_decoder_inst *const decoder_inst = srd_inst_new(
+               session, _decoder->id, _options);
+       if(!decoder_inst) {
+               _error_message = tr("Failed to initialise decoder");
+               return;
+       }
+
+       decoder_inst->data_samplerate = _samplerate;
+
+       // Setup the probes
+       GHashTable *const probes = g_hash_table_new_full(g_str_hash,
+               g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
+
+       for(map<const srd_probe*, shared_ptr<view::LogicSignal> >::
+               const_iterator i = _probes.begin();
+               i != _probes.end(); i++)
+       {
+               shared_ptr<view::Signal> signal((*i).second);
+               GVariant *const gvar = g_variant_new_int32(
+                       signal->probe()->index);
+               g_variant_ref_sink(gvar);
+               g_hash_table_insert(probes, (*i).first->id, gvar);
+       }
+
+       srd_inst_probe_set_all(decoder_inst, probes);
+
+       // Start the session
+       srd_session_start(session);
+
        for (int64_t i = 0;
                !this_thread::interruption_requested() && i < sample_count;
                i += DecodeChunkLength)
@@ -194,10 +195,15 @@ void Decoder::decode_proc(shared_ptr<data::Logic> data)
                        i + DecodeChunkLength, sample_count);
                snapshot->get_samples(chunk, i, chunk_end);
 
-               if (srd_session_send(_session, i, chunk, chunk_end - i) !=
-                       SRD_OK)
+               if (srd_session_send(session, i, chunk, chunk_end - i) !=
+                       SRD_OK) {
+                       _error_message = tr("Failed to initialise decoder");
                        break;
+               }
        }
+
+       // Destroy the session
+       srd_session_destroy(session);
 }
 
 void Decoder::annotation_callback(srd_proto_data *pdata, void *decoder)
@@ -210,7 +216,7 @@ void Decoder::annotation_callback(srd_proto_data *pdata, void *decoder)
        Decoder *const d = (Decoder*)decoder;
 
        shared_ptr<Annotation> a(new Annotation(pdata));
-       lock_guard<mutex> lock(d->_annotations_mutex);
+       lock_guard<mutex> lock(d->_mutex);
        d->_annotations.push_back(a);
 
        d->new_decode_data();

diff --git a/pv/data/decoder.h b/pv/data/decoder.h
index cdeb7e7a59adc0a449937a7df5ec51a02d73f601..09002ac911153ed06901af6ab1ba3e0927b1f4c7 100644 (file)
--- a/pv/data/decoder.h
+++ b/pv/data/decoder.h
@@ -29,14 +29,17 @@
 #include <boost/thread.hpp>
 
 #include <QObject>
+#include <QString>
 
 #include <glib.h>
 
 struct srd_decoder;
-struct srd_decoder_inst;
 struct srd_probe;
 struct srd_proto_data;
-struct srd_session;
+
+namespace DecoderTest {
+class TwoDecoder;
+}
 
 namespace pv {
 
@@ -75,12 +78,14 @@ public:
        const std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
                annotations() const;
 
+       QString error_message();
+
        void clear_snapshots();
 
 private:
        void begin_decode();
 
-       bool init_decoder();
+       void init_decoder();
 
        void decode_proc(boost::shared_ptr<data::Logic> data);
 
@@ -96,14 +101,14 @@ private:
                _probes;
        GHashTable *_options;
 
-       srd_session *_session;
-       srd_decoder_inst *_decoder_inst;
-
-       mutable boost::mutex _annotations_mutex;
+       mutable boost::mutex _mutex;
        std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
                _annotations;
+       QString _error_message;
 
        boost::thread _decode_thread;
+
+       friend class DecoderTest::TwoDecoder;
 };
 
 } // namespace data

diff --git a/pv/view/decodesignal.cpp b/pv/view/decodesignal.cpp
index 32307e9c99dcf5d739205df177d904af5bf05ff0..885312088c2ba11db0d6170687c294b837c06553 100644 (file)
--- a/pv/view/decodesignal.cpp
+++ b/pv/view/decodesignal.cpp
@@ -67,6 +67,11 @@ bool DecodeSignal::enabled() const
        return true;
 }
 
+const boost::shared_ptr<pv::data::Decoder>& DecodeSignal::decoder() const
+{
+       return _decoder;
+}
+
 void DecodeSignal::set_view(pv::view::View *view)
 {
        assert(view);

diff --git a/pv/view/decodesignal.h b/pv/view/decodesignal.h
index f9113f5bee99298ef5951aafc97657d59d0d7c58..e95c982225f92e9e126d0c40b0850f5dbeaed1fd 100644 (file)
--- a/pv/view/decodesignal.h
+++ b/pv/view/decodesignal.h
@@ -46,6 +46,8 @@ public:
 
        bool enabled() const;
 
+       const boost::shared_ptr<pv::data::Decoder>& decoder() const;
+
        void set_view(pv::view::View *view);
 
        /**

diff --git a/test/data/decoder.cpp b/test/data/decoder.cpp
index 641064da23f56dd8786f40a3c853a54bc9f6f33b..4ea4b10ff50f6231313c9aa8f9f341c13f2d7dd7 100644 (file)
--- a/test/data/decoder.cpp
+++ b/test/data/decoder.cpp
@@ -23,9 +23,10 @@
 
 #include <libsigrok/libsigrok.h>
 
+#include "../../pv/data/decoder.h"
 #include "../../pv/devicemanager.h"
 #include "../../pv/sigsession.h"
-#include "../../pv/view/signal.h"
+#include "../../pv/view/decodesignal.h"
 
 using namespace boost;
 using namespace std;
@@ -34,6 +35,8 @@ BOOST_AUTO_TEST_SUITE(DecoderTest)
 
 BOOST_AUTO_TEST_CASE(TwoDecoder)
 {
+       using namespace pv;
+
        sr_context *ctx = NULL;
 
        BOOST_REQUIRE(sr_init(&ctx) == SR_OK);
@@ -52,14 +55,32 @@ BOOST_AUTO_TEST_CASE(TwoDecoder)
                srd_decoder *const dec = (struct srd_decoder*)l->data;
                BOOST_REQUIRE(dec);
 
-               map<const srd_probe*, shared_ptr<pv::view::LogicSignal> > probes;
-               BOOST_CHECK (ss.add_decoder(dec, probes,
+               map<const srd_probe*, shared_ptr<view::LogicSignal> > probes;
+               ss.add_decoder(dec, probes,
                        g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
-                               (GDestroyNotify)g_variant_unref)));
-
-               BOOST_CHECK (ss.add_decoder(dec, probes,
+                               (GDestroyNotify)g_variant_unref));
+               
+               ss.add_decoder(dec, probes,
                        g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
-                               (GDestroyNotify)g_variant_unref)));
+                               (GDestroyNotify)g_variant_unref));
+
+               // Check the signals were created
+               const vector< shared_ptr<view::DecodeSignal> > sigs =
+                       ss.get_decode_signals();
+
+               shared_ptr<data::Decoder> dec0 = sigs[0]->decoder();
+               BOOST_REQUIRE(dec0);
+
+               shared_ptr<data::Decoder> dec1 = sigs[0]->decoder();
+               BOOST_REQUIRE(dec1);
+
+               // Wait for the decode threads to complete
+               dec0->_decode_thread.join();
+               dec1->_decode_thread.join();
+
+               // Check there were no errors
+               BOOST_CHECK_EQUAL(dec0->error_message().isEmpty(), true);
+               BOOST_CHECK_EQUAL(dec1->error_message().isEmpty(), true);
        }