X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.h;h=513177be356a24ac5fe88e1acbe75702a58fa68e;hp=a9a7ce23dce93b5bbd70efdabc3c84a7bf1db4c3;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hpb=19adbc2c342b190161ec1223377a3619974b91f7 diff --git a/pv/sigsession.h b/pv/sigsession.h index a9a7ce23..513177be 100644 --- a/pv/sigsession.h +++ b/pv/sigsession.h @@ -21,27 +21,35 @@ #ifndef PULSEVIEW_PV_SIGSESSION_H #define PULSEVIEW_PV_SIGSESSION_H -#include -#include -#include - #include +#include +#include #include #include +#include #include +#include + #include #include -#include - struct srd_decoder; -struct srd_probe; +struct srd_channel; + +namespace sigrok { + class Analog; + class Channel; + class Device; + class Logic; + class Meta; + class Packet; + class Session; +} namespace pv { class DeviceManager; -class DevInst; namespace data { class Analog; @@ -73,33 +81,39 @@ public: ~SigSession(); - boost::shared_ptr get_device() const; + DeviceManager& device_manager(); + + const DeviceManager& device_manager() const; + + const std::shared_ptr& session() const; + + std::shared_ptr device() const; /** * Sets device instance that will be used in the next capture session. */ - void set_device(boost::shared_ptr dev_inst); + void set_device(std::shared_ptr device); - void release_device(boost::shared_ptr dev_inst); + void set_file(const std::string &name); - void load_file(const std::string &name, - boost::function error_handler); + void set_default_device(); capture_state get_capture_state() const; - void start_capture(boost::function error_handler); + void start_capture(std::function error_handler); void stop_capture(); - std::set< boost::shared_ptr > get_data() const; + std::set< std::shared_ptr > get_data() const; + + boost::shared_mutex& signals_mutex() const; - std::vector< boost::shared_ptr > - get_signals() const; + const std::vector< std::shared_ptr >& signals() const; #ifdef ENABLE_DECODE bool add_decoder(srd_decoder *const dec); - std::vector< boost::shared_ptr > + std::vector< std::shared_ptr > get_decode_signals() const; void remove_decode_signal(view::DecodeTrace *signal); @@ -108,91 +122,66 @@ public: private: void set_capture_state(capture_state state); - void update_signals(boost::shared_ptr dev_inst); + void update_signals(std::shared_ptr device); - bool is_trigger_enabled() const; + std::shared_ptr signal_from_channel( + std::shared_ptr channel) const; - boost::shared_ptr signal_from_probe( - const sr_probe *probe) const; - - void read_sample_rate(const sr_dev_inst *const sdi); + void read_sample_rate(std::shared_ptr); private: - /** - * Attempts to autodetect the format. Failing that - * @param filename The filename of the input file. - * @return A pointer to the 'struct sr_input_format' that should be - * used, or NULL if no input format was selected or - * auto-detected. - */ - static sr_input_format* determine_input_file_format( - const std::string &filename); - - static sr_input* load_input_file_format( - const std::string &filename, - boost::function error_handler, - sr_input_format *format = NULL); - - void load_session_thread_proc( - boost::function error_handler); + void sample_thread_proc(std::shared_ptr device, + std::function error_handler); - void load_input_thread_proc(const std::string name, sr_input *in, - boost::function error_handler); + void feed_in_header(std::shared_ptr device); - void sample_thread_proc(boost::shared_ptr dev_inst, - boost::function error_handler); + void feed_in_meta(std::shared_ptr device, + std::shared_ptr meta); - void feed_in_header(const sr_dev_inst *sdi); + void feed_in_frame_begin(); - void feed_in_meta(const sr_dev_inst *sdi, - const sr_datafeed_meta &meta); + void feed_in_logic(std::shared_ptr logic); - void feed_in_logic(const sr_datafeed_logic &logic); + void feed_in_analog(std::shared_ptr analog); - void feed_in_analog(const sr_datafeed_analog &analog); - - void data_feed_in(const struct sr_dev_inst *sdi, - const struct sr_datafeed_packet *packet); - - static void data_feed_in_proc(const struct sr_dev_inst *sdi, - const struct sr_datafeed_packet *packet, void *cb_data); + void data_feed_in(std::shared_ptr device, + std::shared_ptr packet); private: - DeviceManager &_device_manager; + DeviceManager &device_manager_; + std::shared_ptr session_; /** * The device instance that will be used in the next capture session. */ - boost::shared_ptr _dev_inst; + std::shared_ptr device_; - std::vector< boost::shared_ptr > _decode_traces; + std::vector< std::shared_ptr > decode_traces_; - mutable boost::mutex _sampling_mutex; - capture_state _capture_state; + mutable std::mutex sampling_mutex_; + capture_state capture_state_; - mutable boost::mutex _signals_mutex; - std::vector< boost::shared_ptr > _signals; + mutable boost::shared_mutex signals_mutex_; + std::vector< std::shared_ptr > signals_; - mutable boost::mutex _data_mutex; - boost::shared_ptr _logic_data; - boost::shared_ptr _cur_logic_snapshot; - std::map< const sr_probe*, boost::shared_ptr > - _cur_analog_snapshots; + mutable std::mutex data_mutex_; + std::shared_ptr logic_data_; + std::shared_ptr cur_logic_snapshot_; + std::map< std::shared_ptr, std::shared_ptr > + cur_analog_snapshots_; - boost::thread _sampling_thread; + std::thread sampling_thread_; -signals: +Q_SIGNALS: void capture_state_changed(int state); void signals_changed(); - void data_updated(); + void frame_began(); -private: - // TODO: This should not be necessary. Multiple concurrent - // sessions should should be supported and it should be - // possible to associate a pointer with a sr_session. - static SigSession *_session; + void data_received(); + + void frame_ended(); }; } // namespace pv