Added error handling to SigSession::add_decoder

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 41e31a2802a0af68c2d0505e2f3e3384ca96a010..e81d36051fa068e361eafb01c18ef3aeee02caaa 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -21,15 +21,21 @@
 #include "sigsession.h"
 
 #include "devicemanager.h"
+
 #include "data/analog.h"
 #include "data/analogsnapshot.h"
+#include "data/decoder.h"
 #include "data/logic.h"
 #include "data/logicsnapshot.h"
+
 #include "view/analogsignal.h"
+#include "view/decodesignal.h"
 #include "view/logicsignal.h"
 
 #include <assert.h>
 
+#include <stdexcept>
+
 #include <sys/stat.h>
 
 #include <QDebug>
@@ -55,9 +61,7 @@ SigSession::~SigSession()
 {
        stop_capture();
 
-       if (_sampling_thread.get())
-               _sampling_thread->join();
-       _sampling_thread.reset();
+       _sampling_thread.join();
 
        if (_sdi)
                _device_manager.release_device(_sdi);
@@ -106,12 +110,15 @@ void SigSession::load_file(const string &name,
                        return;
                }
 
-               update_signals((sr_dev_inst*)devlist->data);
+               sr_dev_inst *const sdi = (sr_dev_inst*)devlist->data;
                g_slist_free(devlist);
 
-               _sampling_thread.reset(new boost::thread(
+               update_signals(sdi);
+               read_sample_rate(sdi);
+
+               _sampling_thread = boost::thread(
                        &SigSession::load_session_thread_proc, this,
-                       error_handler));
+                       error_handler);
 
        } else {
                sr_input *in = NULL;
@@ -121,12 +128,12 @@ void SigSession::load_file(const string &name,
                        return;
 
                update_signals(in->sdi);
+               read_sample_rate(in->sdi);
 
-               _sampling_thread.reset(new boost::thread(
+               _sampling_thread = boost::thread(
                        &SigSession::load_input_thread_proc, this,
-                       name, in, error_handler));
+                       name, in, error_handler);
        }
-
 }
 
 SigSession::capture_state SigSession::get_capture_state() const
@@ -161,9 +168,9 @@ void SigSession::start_capture(uint64_t record_length,
        }
 
        // Begin the session
-       _sampling_thread.reset(new boost::thread(
+       _sampling_thread = boost::thread(
                &SigSession::sample_thread_proc, this, _sdi,
-               record_length, error_handler));
+               record_length, error_handler);
 }
 
 void SigSession::stop_capture()
@@ -174,12 +181,10 @@ void SigSession::stop_capture()
        sr_session_stop();
 
        // Check that sampling stopped
-       if (_sampling_thread.get())
-               _sampling_thread->join();
-       _sampling_thread.reset();
+       _sampling_thread.join();
 }
 
-vector< shared_ptr<view::Signal> > SigSession::get_signals()
+vector< shared_ptr<view::Signal> > SigSession::get_signals() const
 {
        lock_guard<mutex> lock(_signals_mutex);
        return _signals;
@@ -190,6 +195,52 @@ boost::shared_ptr<data::Logic> SigSession::get_data()
        return _logic_data;
 }
 
+bool SigSession::add_decoder(srd_decoder *const dec,
+       std::map<const srd_probe*,
+               boost::shared_ptr<view::Signal> > probes,
+       GHashTable *options)
+{
+       try
+       {
+               lock_guard<mutex> lock(_signals_mutex);
+
+               shared_ptr<data::Decoder> decoder(
+                       new data::Decoder(dec, probes, options));
+               shared_ptr<view::DecodeSignal> d(
+                       new view::DecodeSignal(*this, decoder,
+                               _decode_traces.size()));
+               _decode_traces.push_back(d);
+       }
+       catch(std::runtime_error e)
+       {
+               return false;
+       }
+
+       signals_changed();
+
+       return true;
+}
+
+vector< shared_ptr<view::DecodeSignal> > SigSession::get_decode_signals() const
+{
+       lock_guard<mutex> lock(_signals_mutex);
+       return _decode_traces;
+}
+
+void SigSession::remove_decode_signal(view::DecodeSignal *signal)
+{
+       for (vector< shared_ptr<view::DecodeSignal> >::iterator i =
+               _decode_traces.begin();
+               i != _decode_traces.end();
+               i++)
+               if ((*i).get() == signal)
+               {
+                       _decode_traces.erase(i);
+                       signals_changed();
+                       return;
+               }
+}
+
 void SigSession::set_capture_state(capture_state state)
 {
        lock_guard<mutex> lock(_sampling_mutex);
@@ -283,6 +334,9 @@ void SigSession::update_signals(const sr_dev_inst *const sdi)
        unsigned int logic_probe_count = 0;
        unsigned int analog_probe_count = 0;
 
+       // Clear the decode traces
+       _decode_traces.clear();
+
        // Detect what data types we will receive
        if(sdi) {
                for (const GSList *l = sdi->probes; l; l = l->next) {
@@ -328,8 +382,7 @@ void SigSession::update_signals(const sr_dev_inst *const sdi)
 
                if(sdi) {
                        for (const GSList *l = sdi->probes; l; l = l->next) {
-                               const sr_probe *const probe =
-                                       (const sr_probe *)l->data;
+                               sr_probe *const probe = (sr_probe *)l->data;
                                assert(probe);
 
                                switch(probe->type) {
@@ -367,6 +420,31 @@ bool SigSession::is_trigger_enabled() const
        return false;
 }
 
+void SigSession::read_sample_rate(const sr_dev_inst *const sdi)
+{
+       GVariant *gvar;
+       uint64_t sample_rate = 0;
+
+       // Read out the sample rate
+       if(sdi->driver)
+       {
+               const int ret = sr_config_get(sdi->driver,
+                       SR_CONF_SAMPLERATE, &gvar, sdi);
+               if (ret != SR_OK) {
+                       qDebug("Failed to get samplerate\n");
+                       return;
+               }
+
+               sample_rate = g_variant_get_uint64(gvar);
+               g_variant_unref(gvar);
+       }
+
+       if(_analog_data)
+               _analog_data->set_samplerate(sample_rate);
+       if(_logic_data)
+               _logic_data->set_samplerate(sample_rate);
+}
+
 void SigSession::load_session_thread_proc(
        function<void (const QString)> error_handler)
 {
@@ -454,27 +532,7 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
 
 void SigSession::feed_in_header(const sr_dev_inst *sdi)
 {
-       GVariant *gvar;
-       uint64_t sample_rate = 0;
-
-       // Read out the sample rate
-       if(sdi->driver)
-       {
-               const int ret = sr_config_get(sdi->driver,
-                       SR_CONF_SAMPLERATE, &gvar, sdi);
-               if (ret != SR_OK) {
-                       qDebug("Failed to get samplerate\n");
-                       return;
-               }
-
-               sample_rate = g_variant_get_uint64(gvar);
-               g_variant_unref(gvar);
-       }
-
-       if(_analog_data)
-               _analog_data->set_samplerate(sample_rate);
-       if(_logic_data)
-               _logic_data->set_samplerate(sample_rate);
+       read_sample_rate(sdi);
 }
 
 void SigSession::feed_in_meta(const sr_dev_inst *sdi,
@@ -494,6 +552,8 @@ void SigSession::feed_in_meta(const sr_dev_inst *sdi,
                        break;
                }
        }
+
+       signals_changed();
 }
 
 void SigSession::feed_in_logic(const sr_datafeed_logic &logic)