* 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 <http://www.gnu.org/licenses/>.
*/
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-#include <boost/thread/locks.hpp>
-#include <boost/thread/shared_mutex.hpp>
-
#include <QFileInfo>
#include <cassert>
+#include <memory>
#include <mutex>
#include <stdexcept>
#include <sys/stat.h>
-#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"
-#include "view/analogsignal.hpp"
-#include "view/decodetrace.hpp"
-#include "view/logicsignal.hpp"
-#include "view/signal.hpp"
-#include "view/view.hpp"
+#include "views/trace/analogsignal.hpp"
+#include "views/trace/decodetrace.hpp"
+#include "views/trace/logicsignal.hpp"
+#include "views/trace/signal.hpp"
+#include "views/trace/view.hpp"
#include <libsigrokcxx/libsigrokcxx.hpp>
#include <libsigrokdecode/libsigrokdecode.h>
#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) :
default_name_(name),
name_(name),
capture_state_(Stopped),
- cur_samplerate_(0)
+ cur_samplerate_(0),
+ data_saved_(true)
{
}
name_changed();
}
-const std::list< std::shared_ptr<views::ViewBase> > Session::views() const
+const list< shared_ptr<views::ViewBase> > Session::views() const
{
return views_;
}
-std::shared_ptr<views::ViewBase> Session::main_view() const
+shared_ptr<views::ViewBase> Session::main_view() const
{
return main_view_;
}
-void Session::set_main_bar(s
td::shared_ptr<pv::toolbars::MainBar> main_bar)
+void Session::set_main_bar(shared_ptr<pv::toolbars::MainBar> main_bar)
{
main_bar_ = main_bar;
}
return main_bar_;
}
+bool Session::data_saved() const
+{
+ return data_saved_;
+}
+
void Session::save_settings(QSettings &settings) const
{
map<string, string> dev_info;
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_);
if (base->is_decode_signal()) {
shared_ptr<pv::data::DecoderStack> decoder_stack =
base->decoder_stack();
- std::shared_ptr<data::decode::Decoder> top_decoder =
+ shared_ptr<data::decode::Decoder> top_decoder =
decoder_stack->stack().front();
settings.beginGroup("decoder_stack" + QString::number(stacks++));
// 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);
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)
settings.endGroup();
if (QFileInfo(filename).isReadable()) {
- device = std::make_shared<devices::SessionFile>(device_manager_.context(),
+ device = make_shared<devices::SessionFile>(device_manager_.context(),
filename.toStdString());
set_device(device);
}
}
+void Session::select_device(shared_ptr<devices::Device> 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<devices::Device> device)
{
assert(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<views::ViewBase> view : views_) {
+ for (shared_ptr<views::ViewBase> view : views_) {
view->clear_signals();
#ifdef ENABLE_DECODE
view->clear_decode_signals();
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<sigrok::Device> device, shared_ptr<Packet> packet) {
- data_feed_in(device, packet);
- });
+ if (device_) {
+ device_->session()->add_datafeed_callback([=]
+ (shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
+ data_feed_in(device, packet);
+ });
+
+ update_signals();
+ }
- update_signals();
device_changed();
}
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<devices::HardwareDevice> &d) {
- return d->hardware_device()->driver()->name() ==
- "demo"; });
+ return d->hardware_device()->driver()->name() == "demo"; });
set_device((iter == devices.end()) ? devices.front() : *iter);
}
+/**
+ * Convert generic options to data types that are specific to InputFormat.
+ *
+ * @param[in] user_spec vector of tokenized words, string format
+ * @param[in] fmt_opts input format's options, result of InputFormat::options()
+ *
+ * @return map of options suitable for InputFormat::create_input()
+ */
+map<string, Glib::VariantBase>
+Session::input_format_options(vector<string> user_spec,
+ map<string, shared_ptr<Option>> fmt_opts)
+{
+ map<string, Glib::VariantBase> result;
+
+ for (auto entry : user_spec) {
+ /*
+ * Split key=value specs. Accept entries without separator
+ * (for simplified boolean specifications).
+ */
+ string key, val;
+ size_t pos = entry.find("=");
+ if (pos == std::string::npos) {
+ key = entry;
+ val = "";
+ } else {
+ key = entry.substr(0, pos);
+ val = entry.substr(pos + 1);
+ }
+
+ /*
+ * Skip user specifications that are not a member of the
+ * format's set of supported options. Have the text input
+ * spec converted to the required input format specific
+ * data type.
+ */
+ auto found = fmt_opts.find(key);
+ if (found == fmt_opts.end())
+ continue;
+ shared_ptr<Option> opt = found->second;
+ result[key] = opt->parse_string(val);
+ }
+
+ return result;
+}
+
+void Session::load_init_file(const string &file_name, const string &format)
+{
+ shared_ptr<InputFormat> input_format;
+ map<string, Glib::VariantBase> input_opts;
+
+ if (!format.empty()) {
+ const map<string, shared_ptr<InputFormat> > formats =
+ device_manager_.context()->input_formats();
+ auto user_opts = pv::util::split_string(format, ":");
+ string user_name = user_opts.front();
+ user_opts.erase(user_opts.begin());
+ const auto iter = find_if(formats.begin(), formats.end(),
+ [&](const pair<string, shared_ptr<InputFormat> > f) {
+ return f.first == user_name; });
+ if (iter == formats.end()) {
+ main_bar_->session_error(tr("Error"),
+ tr("Unexpected input format: %s").arg(QString::fromStdString(format)));
+ return;
+ }
+ input_format = (*iter).second;
+ input_opts = input_format_options(user_opts,
+ input_format->options());
+ }
+
+ load_file(QString::fromStdString(file_name), input_format, input_opts);
+}
+
+void Session::load_file(QString file_name,
+ shared_ptr<sigrok::InputFormat> format,
+ const map<string, Glib::VariantBase> &options)
+{
+ const QString errorMessage(
+ QString("Failed to load file %1").arg(file_name));
+
+ try {
+ if (format)
+ set_device(shared_ptr<devices::Device>(
+ new devices::InputFile(
+ device_manager_.context(),
+ file_name.toStdString(),
+ format, options)));
+ else
+ set_device(shared_ptr<devices::Device>(
+ 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<mutex> lock(sampling_mutex_);
const shared_ptr<sigrok::Device> 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> channel) {
return channel->enabled(); })) {
error_handler(tr("No channels enabled."));
for (const shared_ptr<data::SignalData> 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<devices::HardwareDevice> hw_device =
+ dynamic_pointer_cast< devices::HardwareDevice >(device_);
+
+ if (hw_device) {
+ name_ = default_name_;
+ name_changed();
+ }
// Begin the session
sampling_thread_ = std::thread(
sampling_thread_.join();
}
-void Session::register_view(std::shared_ptr<views::ViewBase> view)
+void Session::register_view(shared_ptr<views::ViewBase> view)
{
if (views_.empty()) {
main_view_ = view;
update_signals();
}
-void Session::deregister_view(std::shared_ptr<views::ViewBase> view)
+void Session::deregister_view(shared_ptr<views::ViewBase> view)
{
- views_.remove_if([&](std::shared_ptr<views::ViewBase> v) {
- return v == view; });
+ views_.remove_if([&](shared_ptr<views::ViewBase> v) { return v == view; });
if (views_.empty()) {
main_view_.reset();
}
}
-bool Session::has_view(std::shared_ptr<views::ViewBase> view)
+bool Session::has_view(shared_ptr<views::ViewBase> view)
{
- for (std::shared_ptr<views::ViewBase> v : views_)
+ for (shared_ptr<views::ViewBase> v : views_)
if (v == view)
return true;
const vector< shared_ptr<pv::data::Segment> > segments =
d->segments();
for (const shared_ptr<pv::data::Segment> &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)
return samplerate;
}
-const std::unordered_set< std::shared_ptr<data::SignalBase> >
- Session::signalbases() const
+const unordered_set< shared_ptr<data::SignalBase> > Session::signalbases() const
{
return signalbases_;
}
#ifdef ENABLE_DECODE
bool Session::add_decoder(srd_decoder *const dec)
{
+ if (!dec)
+ return false;
+
map<const srd_channel*, shared_ptr<data::SignalBase> > channels;
shared_ptr<data::DecoderStack> decoder_stack;
try {
// Create the decoder
- decoder_stack = shared_ptr<data::DecoderStack>(
- new data::DecoderStack(*this, dec));
+ decoder_stack = make_shared<data::DecoderStack>(*this, dec);
// Make a list of all the channels
- std::vector<const srd_channel*> all_channels;
+ vector<const srd_channel*> 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)
// Auto select the initial channels
for (const srd_channel *pdch : all_channels)
for (shared_ptr<data::SignalBase> b : signalbases_) {
- if (b->type() == ChannelType::LOGIC) {
+ if (b->logic_data()) {
if (QString::fromUtf8(pdch->name).toLower().
contains(b->name().toLower()))
channels[pdch] = b;
// Create the decode signal
shared_ptr<data::SignalBase> signalbase =
- shared_ptr<data::SignalBase>(new data::SignalBase(nullptr));
+ make_shared<data::SignalBase>(nullptr, data::SignalBase::DecodeChannel);
signalbase->set_decoder_stack(decoder_stack);
signalbases_.insert(signalbase);
- for (std::shared_ptr<views::ViewBase> view : views_)
+ for (shared_ptr<views::ViewBase> view : views_)
view->add_decode_signal(signalbase);
- } catch (std::runtime_error e) {
+ } catch (runtime_error e) {
return false;
}
void Session::remove_decode_signal(shared_ptr<data::SignalBase> signalbase)
{
- for (std::shared_ptr<views::ViewBase> view : views_)
+ signalbases_.erase(signalbase);
+
+ for (shared_ptr<views::ViewBase> view : views_)
view->remove_decode_signal(signalbase);
+
+ signals_changed();
}
#endif
if (!device_) {
signalbases_.clear();
logic_data_.reset();
- for (std::shared_ptr<views::ViewBase> view : views_) {
+ for (shared_ptr<views::ViewBase> view : views_) {
view->clear_signals();
#ifdef ENABLE_DECODE
view->clear_decode_signals();
if (!sr_dev) {
signalbases_.clear();
logic_data_.reset();
- for (std::shared_ptr<views::ViewBase> view : views_) {
+ for (shared_ptr<views::ViewBase> view : views_) {
view->clear_signals();
#ifdef ENABLE_DECODE
view->clear_decode_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> channel) {
- return channel->type() == ChannelType::LOGIC; });
+ return channel->type() == sigrok::ChannelType::LOGIC; });
// Create data containers for the logic data segments
{
}
// Make the signals list
- for (std::shared_ptr<views::ViewBase> viewbase : views_) {
- views::TraceView::View *trace_view =
- qobject_cast<views::TraceView::View*>(viewbase.get());
+ for (shared_ptr<views::ViewBase> viewbase : views_) {
+ views::trace::View *trace_view =
+ qobject_cast<views::trace::View*>(viewbase.get());
if (trace_view) {
- unordered_set< shared_ptr<views::TraceView::Signal> >
+ unordered_set< shared_ptr<views::trace::Signal> >
prev_sigs(trace_view->signals());
trace_view->clear_signals();
for (auto channel : sr_dev->channels()) {
shared_ptr<data::SignalBase> signalbase;
- shared_ptr<views::TraceView::Signal> signal;
+ shared_ptr<views::trace::Signal> 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<views::TraceView::Signal> &s) {
+ [&](const shared_ptr<views::trace::Signal> &s) {
return s->base()->channel() == channel;
});
if (iter != prev_sigs.end()) {
switch(channel->type()->id()) {
case SR_CHANNEL_LOGIC:
if (!signalbase) {
- signalbase = shared_ptr<data::SignalBase>(
- new data::SignalBase(channel));
+ signalbase = make_shared<data::SignalBase>(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<views::TraceView::Signal>(
- new views::TraceView::LogicSignal(*this,
+ signal = shared_ptr<views::trace::Signal>(
+ new views::trace::LogicSignal(*this,
device_, signalbase));
trace_view->add_signal(signal);
break;
case SR_CHANNEL_ANALOG:
{
if (!signalbase) {
- signalbase = shared_ptr<data::SignalBase>(
- new data::SignalBase(channel));
+ signalbase = make_shared<data::SignalBase>(channel,
+ data::SignalBase::AnalogChannel);
signalbases_.insert(signalbase);
shared_ptr<data::Analog> 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<views::TraceView::Signal>(
- new views::TraceView::AnalogSignal(
+ signal = shared_ptr<views::trace::Signal>(
+ new views::trace::AnalogSignal(
*this, signalbase));
trace_view->add_signal(signal);
break;
}
default:
- assert(0);
+ assert(false);
break;
}
}
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<devices::File> file_device =
+ dynamic_pointer_cast<devices::File>(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::SignalData> data : all_signal_data_) {
+ const vector< shared_ptr<data::Segment> > segments = data->segments();
+
+ for (shared_ptr<data::Segment> segment : segments) {
+ segment->free_unused_memory();
+ }
+ }
+}
+
void Session::feed_in_header()
{
cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
{
lock_guard<recursive_mutex> 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
set_capture_state(Running);
// Create a new data segment
- cur_logic_segment_ = shared_ptr<data::LogicSegment>(
- new data::LogicSegment(
- logic, cur_samplerate_, sample_count));
+ cur_logic_segment_ = make_shared<data::LogicSegment>(
+ *logic_data_, logic->unit_size(), cur_samplerate_);
logic_data_->push_segment(cur_logic_segment_);
// @todo Putting this here means that only listeners querying
// 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();
}
const vector<shared_ptr<Channel>> 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<const float *>(analog->data_pointer());
bool sweep_beginning = false;
+ unique_ptr<float> 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<data::AnalogSegment> segment;
// in the sweep containing this segment.
sweep_beginning = true;
- // Create a segment, keep it in the maps of channels
- segment = shared_ptr<data::AnalogSegment>(
- new data::AnalogSegment(
- cur_samplerate_, sample_count));
- cur_analog_segments_[channel] = segment;
-
// Find the analog data associated with the channel
shared_ptr<data::SignalBase> base = signalbase_from_channel(channel);
assert(base);
shared_ptr<data::Analog> data(base->analog_data());
assert(data);
+ // Create a segment, keep it in the maps of channels
+ segment = make_shared<data::AnalogSegment>(
+ *data, cur_samplerate_);
+ cur_analog_segments_[channel] = segment;
+
// Push the segment into the analog data.
data->push_segment(segment);
}
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);
}
void Session::data_feed_in(shared_ptr<sigrok::Device> device,
shared_ptr<Packet> packet)
{
+ static bool frame_began = false;
+
(void)device;
assert(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<Logic>(packet->payload()));
- } catch (std::bad_alloc) {
+ } catch (bad_alloc) {
out_of_memory_ = true;
device_->stop();
}
case SR_DF_ANALOG:
try {
feed_in_analog(dynamic_pointer_cast<Analog>(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:
{
{
cur_logic_segment_.reset();
cur_analog_segments_.clear();
}
- frame_ended();
+ if (frame_began) {
+ frame_began = false;
+ frame_ended();
+ }
break;
}
default:
}
}
+void Session::on_data_saved()
+{
+ data_saved_ = true;
+}
+
} // namespace pv
projects / pulseview.git / blobdiff