X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=c18f809446a037475f4106e10576f3a89d5c1688;hp=3c5bcc426cd750fcca98ab1a56c9b97c70a86009;hb=dc4ada2bfd5d9f4386661ffbf7ff3ad000b6bfb5;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede diff --git a/pv/session.cpp b/pv/session.cpp index 3c5bcc42..c18f8094 100644 --- a/pv/session.cpp +++ b/pv/session.cpp @@ -14,38 +14,31 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ -#ifdef _WIN32 -// Windows: Avoid boost/thread namespace pollution (which includes windows.h). -#define NOGDI -#define NORESOURCE -#endif -#include -#include - #include #include +#include #include #include #include -#include "session.hpp" #include "devicemanager.hpp" +#include "session.hpp" #include "data/analog.hpp" #include "data/analogsegment.hpp" +#include "data/decode/decoder.hpp" #include "data/decoderstack.hpp" #include "data/logic.hpp" #include "data/logicsegment.hpp" #include "data/signalbase.hpp" -#include "data/decode/decoder.hpp" #include "devices/hardwaredevice.hpp" +#include "devices/inputfile.hpp" #include "devices/sessionfile.hpp" #include "toolbars/mainbar.hpp" @@ -62,39 +55,39 @@ #include #endif -using boost::shared_lock; -using boost::shared_mutex; -using boost::unique_lock; - +using std::bad_alloc; using std::dynamic_pointer_cast; +using std::find_if; using std::function; using std::lock_guard; using std::list; +using std::make_pair; +using std::make_shared; using std::map; +using std::max; +using std::move; using std::mutex; +using std::pair; using std::recursive_mutex; -using std::set; +using std::runtime_error; using std::shared_ptr; using std::string; +using std::unique_ptr; using std::unordered_set; using std::vector; using sigrok::Analog; using sigrok::Channel; -using sigrok::ChannelType; using sigrok::ConfigKey; using sigrok::DatafeedCallbackFunction; using sigrok::Error; -using sigrok::Header; +using sigrok::InputFormat; using sigrok::Logic; using sigrok::Meta; using sigrok::Packet; -using sigrok::PacketPayload; using sigrok::Session; -using sigrok::SessionDevice; using Glib::VariantBase; -using Glib::Variant; namespace pv { Session::Session(DeviceManager &device_manager, QString name) : @@ -102,7 +95,8 @@ Session::Session(DeviceManager &device_manager, QString name) : default_name_(name), name_(name), capture_state_(Stopped), - cur_samplerate_(0) + cur_samplerate_(0), + data_saved_(true) { } @@ -149,17 +143,17 @@ void Session::set_name(QString name) name_changed(); } -const std::list< std::shared_ptr > Session::views() const +const list< shared_ptr > Session::views() const { return views_; } -std::shared_ptr Session::main_view() const +shared_ptr Session::main_view() const { return main_view_; } -void Session::set_main_bar(std::shared_ptr main_bar) +void Session::set_main_bar(shared_ptr main_bar) { main_bar_ = main_bar; } @@ -169,6 +163,11 @@ shared_ptr Session::main_bar() const return main_bar_; } +bool Session::data_saved() const +{ + return data_saved_; +} + void Session::save_settings(QSettings &settings) const { map dev_info; @@ -183,11 +182,11 @@ void Session::save_settings(QSettings &settings) const settings.setValue("device_type", "hardware"); settings.beginGroup("device"); - key_list.push_back("vendor"); - key_list.push_back("model"); - key_list.push_back("version"); - key_list.push_back("serial_num"); - key_list.push_back("connection_id"); + key_list.emplace_back("vendor"); + key_list.emplace_back("model"); + key_list.emplace_back("version"); + key_list.emplace_back("serial_num"); + key_list.emplace_back("connection_id"); dev_info = device_manager_.get_device_info(device_); @@ -219,7 +218,7 @@ void Session::save_settings(QSettings &settings) const if (base->is_decode_signal()) { shared_ptr decoder_stack = base->decoder_stack(); - std::shared_ptr top_decoder = + shared_ptr top_decoder = decoder_stack->stack().front(); settings.beginGroup("decoder_stack" + QString::number(stacks++)); @@ -267,11 +266,11 @@ void Session::restore_settings(QSettings &settings) // Re-select last used device if possible but only if it's not demo settings.beginGroup("device"); - key_list.push_back("vendor"); - key_list.push_back("model"); - key_list.push_back("version"); - key_list.push_back("serial_num"); - key_list.push_back("connection_id"); + key_list.emplace_back("vendor"); + key_list.emplace_back("model"); + key_list.emplace_back("version"); + key_list.emplace_back("serial_num"); + key_list.emplace_back("connection_id"); for (string key : key_list) { const QString k = QString::fromStdString(key); @@ -280,7 +279,7 @@ void Session::restore_settings(QSettings &settings) const string value = settings.value(k).toString().toStdString(); if (!value.empty()) - dev_info.insert(std::make_pair(key, value)); + dev_info.insert(make_pair(key, value)); } if (dev_info.count("model") > 0) @@ -298,7 +297,7 @@ void Session::restore_settings(QSettings &settings) settings.endGroup(); if (QFileInfo(filename).isReadable()) { - device = std::make_shared(device_manager_.context(), + device = make_shared(device_manager_.context(), filename.toStdString()); set_device(device); @@ -349,6 +348,19 @@ void Session::restore_settings(QSettings &settings) } } +void Session::select_device(shared_ptr device) +{ + try { + if (device) + set_device(device); + else + set_default_device(); + } catch (const QString &e) { + main_bar_->session_error(tr("Failed to Select Device"), + tr("Failed to Select Device")); + } +} + void Session::set_device(shared_ptr device) { assert(device); @@ -361,12 +373,12 @@ void Session::set_device(shared_ptr device) device_.reset(); - // Revert name back to default name (e.g. "Untitled-1") as the data is gone + // Revert name back to default name (e.g. "Session 1") as the data is gone name_ = default_name_; name_changed(); // Remove all stored data - for (std::shared_ptr view : views_) { + for (shared_ptr view : views_) { view->clear_signals(); #ifdef ENABLE_DECODE view->clear_decode_signals(); @@ -387,22 +399,23 @@ void Session::set_device(shared_ptr device) signals_changed(); - device_ = std::move(device); + device_ = move(device); try { device_->open(); } catch (const QString &e) { device_.reset(); - device_changed(); - throw; } - device_->session()->add_datafeed_callback([=] - (shared_ptr device, shared_ptr packet) { - data_feed_in(device, packet); - }); + if (device_) { + device_->session()->add_datafeed_callback([=] + (shared_ptr device, shared_ptr packet) { + data_feed_in(device, packet); + }); + + update_signals(); + } - update_signals(); device_changed(); } @@ -415,13 +428,68 @@ void Session::set_default_device() return; // Try and find the demo device and select that by default - const auto iter = std::find_if(devices.begin(), devices.end(), + const auto iter = find_if(devices.begin(), devices.end(), [] (const shared_ptr &d) { - return d->hardware_device()->driver()->name() == - "demo"; }); + return d->hardware_device()->driver()->name() == "demo"; }); set_device((iter == devices.end()) ? devices.front() : *iter); } +void Session::load_init_file(const string &file_name, const string &format) +{ + shared_ptr input_format; + + if (!format.empty()) { + const map > formats = + device_manager_.context()->input_formats(); + const auto iter = find_if(formats.begin(), formats.end(), + [&](const pair > f) { + return f.first == format; }); + if (iter == formats.end()) { + main_bar_->session_error(tr("Error"), + tr("Unexpected input format: %s").arg(QString::fromStdString(format))); + return; + } + + input_format = (*iter).second; + } + + load_file(QString::fromStdString(file_name), input_format); +} + +void Session::load_file(QString file_name, + shared_ptr format, + const map &options) +{ + const QString errorMessage( + QString("Failed to load file %1").arg(file_name)); + + try { + if (format) + set_device(shared_ptr( + new devices::InputFile( + device_manager_.context(), + file_name.toStdString(), + format, options))); + else + set_device(shared_ptr( + new devices::SessionFile( + device_manager_.context(), + file_name.toStdString()))); + } catch (Error e) { + main_bar_->session_error(tr("Failed to load ") + file_name, e.what()); + set_default_device(); + main_bar_->update_device_list(); + return; + } + + main_bar_->update_device_list(); + + start_capture([&, errorMessage](QString infoMessage) { + main_bar_->session_error(errorMessage, infoMessage); }); + + set_name(QFileInfo(file_name).fileName()); +} + Session::capture_state Session::get_capture_state() const { lock_guard lock(sampling_mutex_); @@ -441,7 +509,7 @@ void Session::start_capture(function error_handler) const shared_ptr sr_dev = device_->device(); if (sr_dev) { const auto channels = sr_dev->channels(); - if (!std::any_of(channels.begin(), channels.end(), + if (!any_of(channels.begin(), channels.end(), [](shared_ptr channel) { return channel->enabled(); })) { error_handler(tr("No channels enabled.")); @@ -453,9 +521,15 @@ void Session::start_capture(function error_handler) for (const shared_ptr d : all_signal_data_) d->clear(); - // Revert name back to default name (e.g. "Untitled-1") as the data is gone - name_ = default_name_; - name_changed(); + // Revert name back to default name (e.g. "Session 1") for real devices + // as the (possibly saved) data is gone. File devices keep their name. + shared_ptr hw_device = + dynamic_pointer_cast< devices::HardwareDevice >(device_); + + if (hw_device) { + name_ = default_name_; + name_changed(); + } // Begin the session sampling_thread_ = std::thread( @@ -472,7 +546,7 @@ void Session::stop_capture() sampling_thread_.join(); } -void Session::register_view(std::shared_ptr view) +void Session::register_view(shared_ptr view) { if (views_.empty()) { main_view_ = view; @@ -483,10 +557,9 @@ void Session::register_view(std::shared_ptr view) update_signals(); } -void Session::deregister_view(std::shared_ptr view) +void Session::deregister_view(shared_ptr view) { - views_.remove_if([&](std::shared_ptr v) { - return v == view; }); + views_.remove_if([&](shared_ptr v) { return v == view; }); if (views_.empty()) { main_view_.reset(); @@ -496,9 +569,9 @@ void Session::deregister_view(std::shared_ptr view) } } -bool Session::has_view(std::shared_ptr view) +bool Session::has_view(shared_ptr view) { - for (std::shared_ptr v : views_) + for (shared_ptr v : views_) if (v == view) return true; @@ -514,7 +587,7 @@ double Session::get_samplerate() const const vector< shared_ptr > segments = d->segments(); for (const shared_ptr &s : segments) - samplerate = std::max(samplerate, s->samplerate()); + samplerate = max(samplerate, s->samplerate()); } // If there is no sample rate given we use samples as unit if (samplerate == 0.0) @@ -523,8 +596,7 @@ double Session::get_samplerate() const return samplerate; } -const std::unordered_set< std::shared_ptr > - Session::signalbases() const +const unordered_set< shared_ptr > Session::signalbases() const { return signalbases_; } @@ -532,16 +604,18 @@ const std::unordered_set< std::shared_ptr > #ifdef ENABLE_DECODE bool Session::add_decoder(srd_decoder *const dec) { + if (!dec) + return false; + map > channels; shared_ptr decoder_stack; try { // Create the decoder - decoder_stack = shared_ptr( - new data::DecoderStack(*this, dec)); + decoder_stack = make_shared(*this, dec); // Make a list of all the channels - std::vector all_channels; + vector all_channels; 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) @@ -550,7 +624,7 @@ bool Session::add_decoder(srd_decoder *const dec) // Auto select the initial channels for (const srd_channel *pdch : all_channels) for (shared_ptr b : signalbases_) { - if (b->type() == ChannelType::LOGIC) { + if (b->logic_data()) { if (QString::fromUtf8(pdch->name).toLower(). contains(b->name().toLower())) channels[pdch] = b; @@ -564,14 +638,14 @@ bool Session::add_decoder(srd_decoder *const dec) // Create the decode signal shared_ptr signalbase = - shared_ptr(new data::SignalBase(nullptr)); + make_shared(nullptr, data::SignalBase::DecodeChannel); signalbase->set_decoder_stack(decoder_stack); signalbases_.insert(signalbase); - for (std::shared_ptr view : views_) + for (shared_ptr view : views_) view->add_decode_signal(signalbase); - } catch (std::runtime_error e) { + } catch (runtime_error e) { return false; } @@ -585,8 +659,12 @@ bool Session::add_decoder(srd_decoder *const dec) void Session::remove_decode_signal(shared_ptr signalbase) { - for (std::shared_ptr view : views_) + signalbases_.erase(signalbase); + + for (shared_ptr view : views_) view->remove_decode_signal(signalbase); + + signals_changed(); } #endif @@ -609,7 +687,7 @@ void Session::update_signals() if (!device_) { signalbases_.clear(); logic_data_.reset(); - for (std::shared_ptr view : views_) { + for (shared_ptr view : views_) { view->clear_signals(); #ifdef ENABLE_DECODE view->clear_decode_signals(); @@ -624,7 +702,7 @@ void Session::update_signals() if (!sr_dev) { signalbases_.clear(); logic_data_.reset(); - for (std::shared_ptr view : views_) { + for (shared_ptr view : views_) { view->clear_signals(); #ifdef ENABLE_DECODE view->clear_decode_signals(); @@ -635,10 +713,10 @@ void Session::update_signals() // Detect what data types we will receive auto channels = sr_dev->channels(); - unsigned int logic_channel_count = std::count_if( + unsigned int logic_channel_count = count_if( channels.begin(), channels.end(), [] (shared_ptr channel) { - return channel->type() == ChannelType::LOGIC; }); + return channel->type() == sigrok::ChannelType::LOGIC; }); // Create data containers for the logic data segments { @@ -655,7 +733,7 @@ void Session::update_signals() } // Make the signals list - for (std::shared_ptr viewbase : views_) { + for (shared_ptr viewbase : views_) { views::TraceView::View *trace_view = qobject_cast(viewbase.get()); @@ -669,7 +747,7 @@ void Session::update_signals() shared_ptr signal; // Find the channel in the old signals - const auto iter = std::find_if( + const auto iter = find_if( prev_sigs.cbegin(), prev_sigs.cend(), [&](const shared_ptr &s) { return s->base()->channel() == channel; @@ -688,12 +766,15 @@ void Session::update_signals() switch(channel->type()->id()) { case SR_CHANNEL_LOGIC: if (!signalbase) { - signalbase = shared_ptr( - new data::SignalBase(channel)); + signalbase = make_shared(channel, + data::SignalBase::LogicChannel); signalbases_.insert(signalbase); all_signal_data_.insert(logic_data_); signalbase->set_data(logic_data_); + + connect(this, SIGNAL(capture_state_changed(int)), + signalbase.get(), SLOT(on_capture_state_changed(int))); } signal = shared_ptr( @@ -705,13 +786,16 @@ void Session::update_signals() case SR_CHANNEL_ANALOG: { if (!signalbase) { - signalbase = shared_ptr( - new data::SignalBase(channel)); + signalbase = make_shared(channel, + data::SignalBase::AnalogChannel); signalbases_.insert(signalbase); shared_ptr data(new data::Analog()); all_signal_data_.insert(data); signalbase->set_data(data); + + connect(this, SIGNAL(capture_state_changed(int)), + signalbase.get(), SLOT(on_capture_state_changed(int))); } signal = shared_ptr( @@ -722,7 +806,7 @@ void Session::update_signals() } default: - assert(0); + assert(false); break; } } @@ -765,19 +849,47 @@ void Session::sample_thread_proc(function error_handler) set_capture_state(device_->session()->trigger() ? AwaitingTrigger : Running); - device_->run(); + try { + device_->run(); + } catch (Error e) { + error_handler(e.what()); + set_capture_state(Stopped); + return; + } + set_capture_state(Stopped); // Confirm that SR_DF_END was received if (cur_logic_segment_) { qDebug("SR_DF_END was not received."); - assert(0); + assert(false); } + // Optimize memory usage + free_unused_memory(); + + // We now have unsaved data unless we just "captured" from a file + shared_ptr file_device = + dynamic_pointer_cast(device_); + + if (!file_device) + data_saved_ = false; + if (out_of_memory_) error_handler(tr("Out of memory, acquisition stopped.")); } +void Session::free_unused_memory() +{ + for (shared_ptr data : all_signal_data_) { + const vector< shared_ptr > segments = data->segments(); + + for (shared_ptr segment : segments) { + segment->free_unused_memory(); + } + } +} + void Session::feed_in_header() { cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE); @@ -837,8 +949,6 @@ void Session::feed_in_logic(shared_ptr logic) { lock_guard lock(data_mutex_); - const size_t sample_count = logic->data_length() / logic->unit_size(); - if (!logic_data_) { // The only reason logic_data_ would not have been created is // if it was not possible to determine the signals when the @@ -851,9 +961,8 @@ void Session::feed_in_logic(shared_ptr logic) set_capture_state(Running); // Create a new data segment - cur_logic_segment_ = shared_ptr( - new data::LogicSegment( - logic, cur_samplerate_, sample_count)); + cur_logic_segment_ = make_shared( + *logic_data_, logic->unit_size(), cur_samplerate_); logic_data_->push_segment(cur_logic_segment_); // @todo Putting this here means that only listeners querying @@ -861,11 +970,10 @@ void Session::feed_in_logic(shared_ptr logic) // frame_began is DecoderStack, but in future we need to signal // this after both analog and logic sweeps have begun. frame_began(); - } else { - // Append to the existing data segment - cur_logic_segment_->append_payload(logic); } + cur_logic_segment_->append_payload(logic); + data_received(); } @@ -876,12 +984,15 @@ void Session::feed_in_analog(shared_ptr analog) 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 = static_cast(analog->data_pointer()); bool sweep_beginning = false; + unique_ptr data(new float[analog->num_samples()]); + analog->get_data_as_float(data.get()); + if (signalbases_.empty()) update_signals(); + float *channel_data = data.get(); for (auto channel : channels) { shared_ptr segment; @@ -896,12 +1007,6 @@ void Session::feed_in_analog(shared_ptr analog) // in the sweep containing this segment. sweep_beginning = true; - // Create a segment, keep it in the maps of channels - segment = shared_ptr( - new data::AnalogSegment( - cur_samplerate_, sample_count)); - cur_analog_segments_[channel] = segment; - // Find the analog data associated with the channel shared_ptr base = signalbase_from_channel(channel); assert(base); @@ -909,6 +1014,11 @@ void Session::feed_in_analog(shared_ptr analog) shared_ptr data(base->analog_data()); assert(data); + // Create a segment, keep it in the maps of channels + segment = make_shared( + *data, cur_samplerate_); + cur_analog_segments_[channel] = segment; + // Push the segment into the analog data. data->push_segment(segment); } @@ -916,7 +1026,7 @@ void Session::feed_in_analog(shared_ptr analog) assert(segment); // Append the samples in the segment - segment->append_interleaved_samples(data++, sample_count, + segment->append_interleaved_samples(channel_data++, sample_count, channel_count); } @@ -931,6 +1041,8 @@ void Session::feed_in_analog(shared_ptr analog) void Session::data_feed_in(shared_ptr device, shared_ptr packet) { + static bool frame_began = false; + (void)device; assert(device); @@ -952,12 +1064,13 @@ void Session::data_feed_in(shared_ptr device, case SR_DF_FRAME_BEGIN: feed_in_frame_begin(); + frame_began = true; break; case SR_DF_LOGIC: try { feed_in_logic(dynamic_pointer_cast(packet->payload())); - } catch (std::bad_alloc) { + } catch (bad_alloc) { out_of_memory_ = true; device_->stop(); } @@ -966,12 +1079,13 @@ void Session::data_feed_in(shared_ptr device, case SR_DF_ANALOG: try { feed_in_analog(dynamic_pointer_cast(packet->payload())); - } catch (std::bad_alloc) { + } catch (bad_alloc) { out_of_memory_ = true; device_->stop(); } break; + case SR_DF_FRAME_END: case SR_DF_END: { { @@ -979,7 +1093,10 @@ void Session::data_feed_in(shared_ptr device, cur_logic_segment_.reset(); cur_analog_segments_.clear(); } - frame_ended(); + if (frame_began) { + frame_began = false; + frame_ended(); + } break; } default: @@ -987,4 +1104,9 @@ void Session::data_feed_in(shared_ptr device, } } +void Session::on_data_saved() +{ + data_saved_ = true; +} + } // namespace pv