#include <unordered_set>
#include <vector>
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-#include <boost/thread/shared_mutex.hpp>
-
#include <QObject>
#include <QSettings>
#include <QString>
#include "util.hpp"
#include "views/viewbase.hpp"
+using std::function;
+using std::list;
+using std::map;
+using std::mutex;
+using std::recursive_mutex;
+using std::shared_ptr;
+using std::string;
+using std::unordered_set;
+
struct srd_decoder;
struct srd_channel;
class InputFormat;
class Logic;
class Meta;
+class Option;
class OutputFormat;
class Packet;
class Session;
-}
+} // namespace sigrok
+
+using sigrok::Option;
namespace pv {
namespace data {
class Analog;
class AnalogSegment;
+class DecodeSignal;
class Logic;
class LogicSegment;
class SignalBase;
Running
};
+ static shared_ptr<sigrok::Context> sr_context;
+
public:
Session(DeviceManager &device_manager, QString name);
const DeviceManager& device_manager() const;
- std::shared_ptr<sigrok::Session> session() const;
+ shared_ptr<sigrok::Session> session() const;
- std::shared_ptr<devices::Device> device() const;
+ shared_ptr<devices::Device> device() const;
QString name() const;
void set_name(QString name);
- const std::list< std::shared_ptr<views::ViewBase> > views() const;
+ const list< shared_ptr<views::ViewBase> > views() const;
- std::shared_ptr<views::ViewBase> main_view() const;
+ shared_ptr<views::ViewBase> main_view() const;
- std::shared_ptr<pv::toolbars::MainBar> main_bar() const;
+ shared_ptr<pv::toolbars::MainBar> main_bar() const;
- void set_main_bar(std::shared_ptr<pv::toolbars::MainBar> main_bar);
+ void set_main_bar(shared_ptr<pv::toolbars::MainBar> main_bar);
/**
* Indicates whether the captured data was saved to disk already or not
/**
* Attempts to set device instance, may fall back to demo if needed
*/
- void select_device(std::shared_ptr<devices::Device> device);
+ void select_device(shared_ptr<devices::Device> device);
/**
* Sets device instance that will be used in the next capture session.
*/
- void set_device(std::shared_ptr<devices::Device> device);
+ void set_device(shared_ptr<devices::Device> device);
void set_default_device();
- void load_init_file(const std::string &file_name,
- const std::string &format);
+ void load_init_file(const string &file_name, const string &format);
void load_file(QString file_name,
- std::shared_ptr<sigrok::InputFormat> format = nullptr,
- const std::map<std::string, Glib::VariantBase> &options =
- std::map<std::string, Glib::VariantBase>());
+ shared_ptr<sigrok::InputFormat> format = nullptr,
+ const map<string, Glib::VariantBase> &options =
+ map<string, Glib::VariantBase>());
capture_state get_capture_state() const;
- void start_capture(std::function<void (const QString)> error_handler);
+ void start_capture(function<void (const QString)> error_handler);
void stop_capture();
double get_samplerate() const;
- void register_view(std::shared_ptr<views::ViewBase> view);
+ uint32_t get_segment_count() const;
+
+ vector<util::Timestamp> get_triggers(uint32_t segment_id) const;
- void deregister_view(std::shared_ptr<views::ViewBase> view);
+ void register_view(shared_ptr<views::ViewBase> view);
- bool has_view(std::shared_ptr<views::ViewBase> view);
+ void deregister_view(shared_ptr<views::ViewBase> view);
- const std::unordered_set< std::shared_ptr<data::SignalBase> >
- signalbases() const;
+ bool has_view(shared_ptr<views::ViewBase> view);
+
+ const unordered_set< shared_ptr<data::SignalBase> > signalbases() const;
+
+ bool all_segments_complete(uint32_t segment_id) const;
#ifdef ENABLE_DECODE
- bool add_decoder(srd_decoder *const dec);
+ shared_ptr<data::DecodeSignal> add_decode_signal();
- void remove_decode_signal(std::shared_ptr<data::SignalBase> signalbase);
+ void remove_decode_signal(shared_ptr<data::DecodeSignal> signal);
#endif
private:
void update_signals();
- std::shared_ptr<data::SignalBase> signalbase_from_channel(
- std::shared_ptr<sigrok::Channel> channel) const;
+ shared_ptr<data::SignalBase> signalbase_from_channel(
+ shared_ptr<sigrok::Channel> channel) const;
-private:
- void sample_thread_proc(std::function<void (const QString)> error_handler);
+ static map<string, Glib::VariantBase> input_format_options(
+ vector<string> user_spec,
+ map<string, shared_ptr<Option>> fmt_opts);
- void feed_in_header();
+ void sample_thread_proc(function<void (const QString)> error_handler);
- void feed_in_meta(std::shared_ptr<sigrok::Meta> meta);
+ void free_unused_memory();
- void feed_in_trigger();
+ void signal_new_segment();
+ void signal_segment_completed();
- void feed_in_frame_begin();
-
- void feed_in_logic(std::shared_ptr<sigrok::Logic> logic);
-
- void feed_in_analog(std::shared_ptr<sigrok::Analog> analog);
-
- void data_feed_in(std::shared_ptr<sigrok::Device> device,
- std::shared_ptr<sigrok::Packet> packet);
+ void feed_in_header();
-private:
- DeviceManager &device_manager_;
- std::shared_ptr<devices::Device> device_;
- QString default_name_, name_;
+ void feed_in_meta(shared_ptr<sigrok::Meta> meta);
- std::list< std::shared_ptr<views::ViewBase> > views_;
- std::shared_ptr<pv::views::ViewBase> main_view_;
+ void feed_in_trigger();
- std::shared_ptr<pv::toolbars::MainBar> main_bar_;
+ void feed_in_frame_begin();
+ void feed_in_frame_end();
- mutable std::mutex sampling_mutex_; //!< Protects access to capture_state_.
- capture_state capture_state_;
+ void feed_in_logic(shared_ptr<sigrok::Logic> logic);
- std::unordered_set< std::shared_ptr<data::SignalBase> > signalbases_;
- std::unordered_set< std::shared_ptr<data::SignalData> > all_signal_data_;
+ void feed_in_analog(shared_ptr<sigrok::Analog> analog);
- mutable std::recursive_mutex data_mutex_;
- std::shared_ptr<data::Logic> logic_data_;
- uint64_t cur_samplerate_;
- std::shared_ptr<data::LogicSegment> cur_logic_segment_;
- std::map< std::shared_ptr<sigrok::Channel>, std::shared_ptr<data::AnalogSegment> >
- cur_analog_segments_;
-
- std::thread sampling_thread_;
-
- bool out_of_memory_;
- bool data_saved_;
+ void data_feed_in(shared_ptr<sigrok::Device> device,
+ shared_ptr<sigrok::Packet> packet);
Q_SIGNALS:
void capture_state_changed(int state);
void name_changed();
- void trigger_event(util::Timestamp location);
+ void trigger_event(int segment_id, util::Timestamp location);
- void frame_began();
+ void new_segment(int new_segment_id);
+ void segment_completed(int segment_id);
void data_received();
- void frame_ended();
-
void add_view(const QString &title, views::ViewType type,
Session *session);
public Q_SLOTS:
void on_data_saved();
+
+private:
+ DeviceManager &device_manager_;
+ shared_ptr<devices::Device> device_;
+ QString default_name_, name_;
+
+ list< shared_ptr<views::ViewBase> > views_;
+ shared_ptr<pv::views::ViewBase> main_view_;
+
+ shared_ptr<pv::toolbars::MainBar> main_bar_;
+
+ mutable mutex sampling_mutex_; //!< Protects access to capture_state_.
+ capture_state capture_state_;
+
+ unordered_set< shared_ptr<data::SignalBase> > signalbases_;
+ unordered_set< shared_ptr<data::SignalData> > all_signal_data_;
+
+ /// trigger_list_ contains pairs of <segment_id, timestamp> values.
+ vector< std::pair<uint32_t, util::Timestamp> > trigger_list_;
+
+ mutable recursive_mutex data_mutex_;
+ shared_ptr<data::Logic> logic_data_;
+ uint64_t cur_samplerate_;
+ shared_ptr<data::LogicSegment> cur_logic_segment_;
+ map< shared_ptr<sigrok::Channel>, shared_ptr<data::AnalogSegment> >
+ cur_analog_segments_;
+ int32_t highest_segment_id_;
+
+ std::thread sampling_thread_;
+
+ bool out_of_memory_;
+ bool data_saved_;
+ bool frame_began_;
};
} // namespace pv