Renamed pv::SigSession::_state_mutex to pv::SigSession::_sampling_mutex

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index c8444c7dee8d4ea2e1b00e69e80f33862c1430d2..adad2c5ee0cc51304f928e92445471d7ef88c2d8 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -64,7 +64,7 @@ void SigSession::load_file(const string &name)
 
 SigSession::capture_state SigSession::get_capture_state() const
 {
-       lock_guard<mutex> lock(_state_mutex);
+       lock_guard<mutex> lock(_sampling_mutex);
        return _capture_state;
 }
 
@@ -105,7 +105,7 @@ boost::shared_ptr<LogicData> SigSession::get_data()
 
 void SigSession::set_capture_state(capture_state state)
 {
-       lock_guard<mutex> lock(_state_mutex);
+       lock_guard<mutex> lock(_sampling_mutex);
        _capture_state = state;
        capture_state_changed(state);
 }
@@ -171,84 +171,85 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
        set_capture_state(Stopped);
 }
 
-void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
-       struct sr_datafeed_packet *packet)
+void SigSession::feed_in_meta_logic(const struct sr_dev_inst *sdi,
+       const sr_datafeed_meta_logic &meta_logic)
 {
        using view::LogicSignal;
 
-       assert(sdi);
-       assert(packet);
-
-       switch (packet->type) {
-       case SR_DF_HEADER:
-       {
-               lock_guard<mutex> lock(_signals_mutex);
-               _signals.clear();
-               break;
-       }
-
-       case SR_DF_META_LOGIC:
-       {
-               assert(packet->payload);
-               const sr_datafeed_meta_logic &meta_logic =
-                       *(sr_datafeed_meta_logic*)packet->payload;
-
        {
                lock_guard<mutex> lock(_data_mutex);
 
-               // Create an empty LogiData for coming data snapshots
+               // Create an empty LogicData for coming data snapshots
                _logic_data.reset(new LogicData(meta_logic));
                assert(_logic_data);
                if (!_logic_data)
-                       break;
+                       return;
        }
 
        {
                lock_guard<mutex> lock(_signals_mutex);
 
                // Add the signals
-               for (int i = 0; i < meta_logic.num_probes; i++)
-               {
+               for (int i = 0; i < meta_logic.num_probes; i++) {
                        const sr_probe *const probe =
                                (const sr_probe*)g_slist_nth_data(
                                        sdi->probes, i);
-                       if (probe->enabled)
-                       {
+                       if (probe->enabled) {
                                shared_ptr<LogicSignal> signal(
                                        new LogicSignal(probe->name,
-                                               _logic_data,
-                                               probe->index));
+                                               _logic_data, probe->index));
                                _signals.push_back(signal);
                        }
                }
 
                signals_changed();
-               break;
        }
+}
+
+void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
+{
+       lock_guard<mutex> lock(_data_mutex);
+       if (!_cur_logic_snapshot)
+       {
+               // Create a new data snapshot
+               _cur_logic_snapshot = shared_ptr<LogicDataSnapshot>(
+                       new LogicDataSnapshot(logic));
+               _logic_data->push_snapshot(_cur_logic_snapshot);
+       }
+       else
+       {
+               // Append to the existing data snapshot
+               _cur_logic_snapshot->append_payload(logic);
        }
 
-       case SR_DF_LOGIC:
+       data_updated();
+}
+
+
+void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
+       const struct sr_datafeed_packet *packet)
+{
+       assert(sdi);
+       assert(packet);
+
+       switch (packet->type) {
+       case SR_DF_HEADER:
        {
-               lock_guard<mutex> lock(_data_mutex);
+               lock_guard<mutex> lock(_signals_mutex);
+               _signals.clear();
+               break;
+       }
+
+       case SR_DF_META_LOGIC:
                assert(packet->payload);
-               if (!_cur_logic_snapshot)
-               {
-                       // Create a new data snapshot
-                       _cur_logic_snapshot = shared_ptr<LogicDataSnapshot>(
-                               new LogicDataSnapshot(
-                               *(sr_datafeed_logic*)packet->payload));
-                       _logic_data->push_snapshot(_cur_logic_snapshot);
-               }
-               else
-               {
-                       // Append to the existing data snapshot
-                       _cur_logic_snapshot->append_payload(
-                               *(sr_datafeed_logic*)packet->payload);
-               }
+               feed_in_meta_logic(sdi,
+                       *(const sr_datafeed_meta_logic*)packet->payload);
+               break;
 
-               data_updated();
+       case SR_DF_LOGIC:
+               assert(packet->payload);
+               feed_in_logic(*(const sr_datafeed_logic*)packet->payload);
                break;
-       }
 
        case SR_DF_END:
        {
@@ -263,7 +264,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
 }
 
 void SigSession::data_feed_in_proc(const struct sr_dev_inst *sdi,
-       struct sr_datafeed_packet *packet)
+       const struct sr_datafeed_packet *packet)
 {
        assert(_session);
        _session->data_feed_in(sdi, packet);