X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=adad2c5ee0cc51304f928e92445471d7ef88c2d8;hp=137998bdb57760a336ab558c7c9b9591c65a1503;hb=949f80503dff6502f9624aae8fa1ba26f2ea6b6c;hpb=2e2946fe1bbb043d1c0c8a824bc753db0920469d diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp index 137998bd..adad2c5e 100644 --- a/pv/sigsession.cpp +++ b/pv/sigsession.cpp @@ -36,7 +36,8 @@ namespace pv { // TODO: This should not be necessary SigSession* SigSession::_session = NULL; -SigSession::SigSession() +SigSession::SigSession() : + _capture_state(Stopped) { // TODO: This should not be necessary _session = this; @@ -44,7 +45,9 @@ SigSession::SigSession() SigSession::~SigSession() { - if(_sampling_thread.get()) + stop_capture(); + + if (_sampling_thread.get()) _sampling_thread->join(); _sampling_thread.reset(); @@ -52,31 +55,46 @@ SigSession::~SigSession() _session = NULL; } -void SigSession::load_file(const std::string &name) +void SigSession::load_file(const string &name) { - if (sr_session_load(name.c_str()) == SR_OK) { - /* sigrok session file */ - sr_session_datafeed_callback_add(data_feed_in_proc); - sr_session_start(); - sr_session_run(); - sr_session_stop(); - } + stop_capture(); + _sampling_thread.reset(new boost::thread( + &SigSession::load_thread_proc, this, name)); +} + +SigSession::capture_state SigSession::get_capture_state() const +{ + lock_guard lock(_sampling_mutex); + return _capture_state; } void SigSession::start_capture(struct sr_dev_inst *sdi, uint64_t record_length, uint64_t sample_rate) { - // Check sampling isn't already active - if(_sampling_thread.get()) - _sampling_thread->join(); + stop_capture(); + _sampling_thread.reset(new boost::thread( &SigSession::sample_thread_proc, this, sdi, record_length, sample_rate)); } -vector< shared_ptr >& SigSession::get_signals() +void SigSession::stop_capture() { + if (get_capture_state() == Stopped) + return; + + sr_session_stop(); + + // Check that sampling stopped + if (_sampling_thread.get()) + _sampling_thread->join(); + _sampling_thread.reset(); +} + +vector< shared_ptr > SigSession::get_signals() +{ + lock_guard lock(_signals_mutex); return _signals; } @@ -85,6 +103,35 @@ boost::shared_ptr SigSession::get_data() return _logic_data; } +void SigSession::set_capture_state(capture_state state) +{ + lock_guard lock(_sampling_mutex); + _capture_state = state; + capture_state_changed(state); +} + +void SigSession::load_thread_proc(const string name) +{ + if (sr_session_load(name.c_str()) != SR_OK) { + qDebug() << "Failed to load file."; + return; + } + + sr_session_datafeed_callback_add(data_feed_in_proc); + + if (sr_session_start() != SR_OK) { + qDebug() << "Failed to start session."; + return; + } + + set_capture_state(Running); + + sr_session_run(); + sr_session_stop(); + + set_capture_state(Stopped); +} + void SigSession::sample_thread_proc(struct sr_dev_inst *sdi, uint64_t record_length, uint64_t sample_rate) { @@ -116,82 +163,94 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi, return; } + set_capture_state(Running); + sr_session_run(); sr_session_destroy(); + + 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 lock(_data_mutex); - _signals.clear(); - break; - } - - case SR_DF_META_LOGIC: { - assert(packet->payload); - lock_guard lock(_data_mutex); - const sr_datafeed_meta_logic &meta_logic = - *(sr_datafeed_meta_logic*)packet->payload; - - // 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; + if (!_logic_data) + return; + } + + { + lock_guard 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 signal( new LogicSignal(probe->name, - _logic_data, - probe->index)); + _logic_data, probe->index)); _signals.push_back(signal); } } - break; + signals_changed(); } +} - case SR_DF_LOGIC: +void SigSession::feed_in_logic(const sr_datafeed_logic &logic) +{ + lock_guard lock(_data_mutex); + if (!_cur_logic_snapshot) { - lock_guard lock(_data_mutex); - assert(packet->payload); - if(!_cur_logic_snapshot) - { - // Create a new data snapshot - _cur_logic_snapshot = shared_ptr( - 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); - } + // Create a new data snapshot + _cur_logic_snapshot = shared_ptr( + new LogicDataSnapshot(logic)); + _logic_data->push_snapshot(_cur_logic_snapshot); + } + else + { + // Append to the existing data snapshot + _cur_logic_snapshot->append_payload(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 lock(_signals_mutex); + _signals.clear(); break; } + case SR_DF_META_LOGIC: + assert(packet->payload); + feed_in_meta_logic(sdi, + *(const sr_datafeed_meta_logic*)packet->payload); + break; + + case SR_DF_LOGIC: + assert(packet->payload); + feed_in_logic(*(const sr_datafeed_logic*)packet->payload); + break; + case SR_DF_END: { { @@ -205,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);