X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=56ac89975f65e97c47d4f28a2de96142b4f6316d;hp=dd78f4a176088ebb69cc5089558b4d310a7d4415;hb=ff4bf6bd8141b9e7518b7bf431e45beff671e764;hpb=ffe001198ecb5ea2e44c2947868c258afe948f20 diff --git a/pv/session.cpp b/pv/session.cpp index dd78f4a1..56ac8997 100644 --- a/pv/session.cpp +++ b/pv/session.cpp @@ -60,6 +60,7 @@ using std::lock_guard; using std::list; using std::map; using std::mutex; +using std::recursive_mutex; using std::set; using std::shared_ptr; using std::string; @@ -89,7 +90,6 @@ Session::Session(DeviceManager &device_manager) : capture_state_(Stopped), cur_samplerate_(0) { - set_default_device(); } Session::~Session() @@ -168,17 +168,21 @@ void Session::start_capture(function error_handler) // Check that at least one channel is enabled assert(device_); - const std::shared_ptr device = device_->device(); - assert(device); - auto channels = device->channels(); - bool enabled = std::any_of(channels.begin(), channels.end(), - [](shared_ptr channel) { return channel->enabled(); }); - - if (!enabled) { - error_handler(tr("No channels enabled.")); - return; + const shared_ptr sr_dev = device_->device(); + if (sr_dev) { + const auto channels = sr_dev->channels(); + if (!std::any_of(channels.begin(), channels.end(), + [](shared_ptr channel) { + return channel->enabled(); })) { + error_handler(tr("No channels enabled.")); + return; + } } + // Clear signal data + for (const shared_ptr d : get_data()) + d->clear(); + // Begin the session sampling_thread_ = std::thread( &Session::sample_thread_proc, this, device_, @@ -233,9 +237,9 @@ bool Session::add_decoder(srd_decoder *const dec) // Make a list of all the channels std::vector all_channels; - for(const GSList *i = dec->channels; i; i = i->next) + for (const GSList *i = dec->channels; i; i = i->next) all_channels.push_back((const srd_channel*)i->data); - for(const GSList *i = dec->opt_channels; i; i = i->next) + for (const GSList *i = dec->opt_channels; i; i = i->next) all_channels.push_back((const srd_channel*)i->data); // Auto select the initial channels @@ -297,14 +301,15 @@ void Session::set_capture_state(capture_state state) lock_guard lock(sampling_mutex_); const bool changed = capture_state_ != state; capture_state_ = state; - if(changed) + if (changed) capture_state_changed(state); } void Session::update_signals() { assert(device_); - assert(capture_state_ == Stopped); + + lock_guard lock(data_mutex_); const shared_ptr sr_dev = device_->device(); if (!sr_dev) { @@ -322,7 +327,7 @@ void Session::update_signals() // Create data containers for the logic data segments { - lock_guard data_lock(data_mutex_); + lock_guard data_lock(data_mutex_); if (logic_channel_count == 0) { logic_data_.reset(); @@ -404,34 +409,18 @@ shared_ptr Session::signal_from_channel( return shared_ptr(); } -void Session::read_sample_rate(shared_ptr device) -{ - assert(device); - map< const ConfigKey*, set > keys; - - try { - keys = device->config_keys(ConfigKey::DEVICE_OPTIONS); - } catch (const Error) {} - - const auto iter = keys.find(ConfigKey::SAMPLERATE); - cur_samplerate_ = (iter != keys.end() && - (*iter).second.find(sigrok::GET) != (*iter).second.end()) ? - VariantBase::cast_dynamic>( - device->config_get(ConfigKey::SAMPLERATE)).get() : 0; -} - void Session::sample_thread_proc(shared_ptr device, function error_handler) { assert(device); assert(error_handler); - const std::shared_ptr sr_dev = device->device(); - assert(sr_dev); - read_sample_rate(sr_dev); + (void)device; + + cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE); try { - device_->session()->start(); + device_->start(); } catch(Error e) { error_handler(e.what()); return; @@ -453,7 +442,7 @@ void Session::sample_thread_proc(shared_ptr device, void Session::feed_in_header() { - read_sample_rate(device_->device()); + cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE); } void Session::feed_in_meta(shared_ptr meta) @@ -480,12 +469,16 @@ void Session::feed_in_frame_begin() void Session::feed_in_logic(shared_ptr logic) { - lock_guard lock(data_mutex_); + lock_guard lock(data_mutex_); + + const size_t sample_count = logic->data_length() / logic->unit_size(); if (!logic_data_) { - qDebug() << "Unexpected logic packet"; - return; + // The only reason logic_data_ would not have been created is + // if it was not possible to determine the signals when the + // device was created. + update_signals(); } if (!cur_logic_segment_) @@ -493,24 +486,10 @@ void Session::feed_in_logic(shared_ptr logic) // This could be the first packet after a trigger set_capture_state(Running); - // Get sample limit. - assert(device_); - const std::shared_ptr device = - device_->device(); - assert(device); - const auto keys = device->config_keys( - ConfigKey::DEVICE_OPTIONS); - const auto iter = keys.find(ConfigKey::LIMIT_SAMPLES); - const uint64_t sample_limit = (iter != keys.end() && - (*iter).second.find(sigrok::GET) != - (*iter).second.end()) ? - VariantBase::cast_dynamic>( - device->config_get(ConfigKey::LIMIT_SAMPLES)).get() : 0; - // Create a new data segment cur_logic_segment_ = shared_ptr( new data::LogicSegment( - logic, cur_samplerate_, sample_limit)); + logic, cur_samplerate_, sample_count)); logic_data_->push_segment(cur_logic_segment_); // @todo Putting this here means that only listeners querying @@ -530,7 +509,7 @@ void Session::feed_in_logic(shared_ptr logic) void Session::feed_in_analog(shared_ptr analog) { - lock_guard lock(data_mutex_); + lock_guard lock(data_mutex_); const vector> channels = analog->channels(); const unsigned int channel_count = channels.size(); @@ -554,26 +533,13 @@ void Session::feed_in_analog(shared_ptr analog) // in the sweep containing this segment. sweep_beginning = true; - // Get sample limit. - uint64_t sample_limit; - try { - assert(device_); - const std::shared_ptr device = - device_->device(); - assert(device); - sample_limit = VariantBase::cast_dynamic>( - device->config_get(ConfigKey::LIMIT_SAMPLES)).get(); - } catch (Error) { - sample_limit = 0; - } - // Create a segment, keep it in the maps of channels segment = shared_ptr( new data::AnalogSegment( - cur_samplerate_, sample_limit)); + cur_samplerate_, sample_count)); cur_analog_segments_[channel] = segment; - // Find the annalog data associated with the channel + // Find the analog data associated with the channel shared_ptr sig = dynamic_pointer_cast( signal_from_channel(channel)); @@ -634,7 +600,7 @@ void Session::data_feed_in(shared_ptr device, case SR_DF_END: { { - lock_guard lock(data_mutex_); + lock_guard lock(data_mutex_); cur_logic_segment_.reset(); cur_analog_segments_.clear(); }