X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=da9c0e9bb4af998abf3a3303eb525536245b3ba9;hp=d5126660f56b140d2337d64b1df625a4ea44b148;hb=48257a69ffad409c9893605d99cd6e15161dff4f;hpb=3084ed4b15663dd717ff656745db305f377ab215 diff --git a/pv/session.cpp b/pv/session.cpp index d5126660..da9c0e9b 100644 --- a/pv/session.cpp +++ b/pv/session.cpp @@ -18,6 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef _WIN32 +// Windows: Avoid boost/thread namespace pollution (which includes windows.h). +#define NOGDI +#define NORESOURCE +#endif +#include +#include + #ifdef ENABLE_DECODE #include #endif @@ -60,6 +68,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 +98,6 @@ Session::Session(DeviceManager &device_manager) : capture_state_(Stopped), cur_samplerate_(0) { - set_default_device(); } Session::~Session() @@ -127,13 +135,16 @@ void Session::set_device(shared_ptr device) // Ensure we are not capturing before setting the device stop_capture(); + if (device_) + device_->close(); + device_ = std::move(device); - device_->create(); + device_->open(); device_->session()->add_datafeed_callback([=] (shared_ptr device, shared_ptr packet) { data_feed_in(device, packet); }); - update_signals(device_); + update_signals(); decode_traces_.clear(); @@ -168,17 +179,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_, @@ -207,13 +222,28 @@ set< shared_ptr > Session::get_data() const return data; } -boost::shared_mutex& Session::signals_mutex() const +double Session::get_samplerate() const { - return signals_mutex_; + double samplerate = 0.0; + + for (const shared_ptr d : get_data()) { + assert(d); + const vector< shared_ptr > segments = + d->segments(); + for (const shared_ptr &s : segments) + samplerate = std::max(samplerate, s->samplerate()); + } + + // If there is no sample rate given we use samples as unit + if (samplerate == 0.0) + samplerate = 1.0; + + return samplerate; } -const unordered_set< shared_ptr >& Session::signals() const +const unordered_set< shared_ptr > Session::signals() const { + shared_lock lock(signals_mutex_); return signals_; } @@ -233,9 +263,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,17 +327,25 @@ 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(shared_ptr device) +void Session::update_signals() { - assert(device); - assert(capture_state_ == Stopped); + assert(device_); + + lock_guard lock(data_mutex_); + + const shared_ptr sr_dev = device_->device(); + if (!sr_dev) { + signals_.clear(); + logic_data_.reset(); + return; + } // Detect what data types we will receive - auto channels = device->device()->channels(); + auto channels = sr_dev->channels(); unsigned int logic_channel_count = std::count_if( channels.begin(), channels.end(), [] (shared_ptr channel) { @@ -315,7 +353,7 @@ void Session::update_signals(shared_ptr device) // 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(); @@ -334,7 +372,7 @@ void Session::update_signals(shared_ptr device) unordered_set< shared_ptr > prev_sigs(signals_); signals_.clear(); - for (auto channel : device->device()->channels()) { + for (auto channel : sr_dev->channels()) { shared_ptr signal; // Find the channel in the old signals @@ -357,7 +395,7 @@ void Session::update_signals(shared_ptr device) case SR_CHANNEL_LOGIC: signal = shared_ptr( new view::LogicSignal(*this, - device, channel, + device_, channel, logic_data_)); break; @@ -397,29 +435,20 @@ shared_ptr Session::signal_from_channel( return shared_ptr(); } -void Session::read_sample_rate(shared_ptr device) -{ - assert(device); - const auto keys = device->config_keys(ConfigKey::DEVICE_OPTIONS); - 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); + + out_of_memory_ = false; try { - device_->session()->start(); + device_->start(); } catch(Error e) { error_handler(e.what()); return; @@ -437,11 +466,14 @@ void Session::sample_thread_proc(shared_ptr device, qDebug("SR_DF_END was not received."); assert(0); } + + if (out_of_memory_) + error_handler(tr("Out of memory, acquisition stopped.")); } 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) @@ -460,6 +492,27 @@ void Session::feed_in_meta(shared_ptr meta) signals_changed(); } +void Session::feed_in_trigger() +{ + // The channel containing most samples should be most accurate + uint64_t sample_count = 0; + + for (const shared_ptr d : get_data()) { + assert(d); + uint64_t temp_count = 0; + + const vector< shared_ptr > segments = + d->segments(); + for (const shared_ptr &s : segments) + temp_count += s->get_sample_count(); + + if (temp_count > sample_count) + sample_count = temp_count; + } + + trigger_event(sample_count / get_samplerate()); +} + void Session::feed_in_frame_begin() { if (cur_logic_segment_ || !cur_analog_segments_.empty()) @@ -468,12 +521,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_) @@ -481,24 +538,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 @@ -518,12 +561,12 @@ 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(); const size_t sample_count = analog->num_samples() / channel_count; - const float *data = analog->data_pointer(); + const float *data = static_cast(analog->data_pointer()); bool sweep_beginning = false; for (auto channel : channels) @@ -542,26 +585,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)); @@ -607,22 +637,36 @@ void Session::data_feed_in(shared_ptr device, feed_in_meta(dynamic_pointer_cast(packet->payload())); break; + case SR_DF_TRIGGER: + feed_in_trigger(); + break; + case SR_DF_FRAME_BEGIN: feed_in_frame_begin(); break; case SR_DF_LOGIC: - feed_in_logic(dynamic_pointer_cast(packet->payload())); + try { + feed_in_logic(dynamic_pointer_cast(packet->payload())); + } catch (std::bad_alloc) { + out_of_memory_ = true; + device_->stop(); + } break; case SR_DF_ANALOG: - feed_in_analog(dynamic_pointer_cast(packet->payload())); + try { + feed_in_analog(dynamic_pointer_cast(packet->payload())); + } catch (std::bad_alloc) { + out_of_memory_ = true; + device_->stop(); + } break; case SR_DF_END: { { - lock_guard lock(data_mutex_); + lock_guard lock(data_mutex_); cur_logic_segment_.reset(); cur_analog_segments_.clear(); }