Session: Use a monotonic clock to measure acquisition time.

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index 19fd993872edc04ba8bae3ca8ad11568dce9a894..a4aaf6aabbcc8c94bf32e446375e8b9218a36b26 100644 (file)
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -20,6 +20,12 @@
 #ifndef PULSEVIEW_PV_SESSION_HPP
 #define PULSEVIEW_PV_SESSION_HPP
 
+#ifdef ENABLE_FLOW
+#include <atomic>
+#include <condition_variable>
+#endif
+
+#include <functional>
 #include <map>
 #include <memory>
 #include <mutex>
@@ -32,10 +38,17 @@
 #include <QObject>
 #include <QSettings>
 #include <QString>
+#include <QElapsedTimer>
+
+#ifdef ENABLE_FLOW
+#include <gstreamermm.h>
+#include <libsigrokflow/libsigrokflow.hpp>
+#endif
 
 #include "util.hpp"
 #include "views/viewbase.hpp"
 
+
 using std::function;
 using std::list;
 using std::map;
@@ -45,6 +58,13 @@ using std::shared_ptr;
 using std::string;
 using std::unordered_set;
 
+#ifdef ENABLE_FLOW
+using Glib::RefPtr;
+using Gst::AppSink;
+using Gst::Element;
+using Gst::Pipeline;
+#endif
+
 struct srd_decoder;
 struct srd_channel;
 
@@ -132,8 +152,12 @@ public:
         */
        bool data_saved() const;
 
+       void save_setup(QSettings &settings) const;
+
        void save_settings(QSettings &settings) const;
 
+       void restore_setup(QSettings &settings);
+
        void restore_settings(QSettings &settings);
 
        /**
@@ -148,9 +172,10 @@ public:
 
        void set_default_device();
 
-       void load_init_file(const string &file_name, const string &format);
+       void load_init_file(const string &file_name, const string &format,
+               const string &setup_file_name);
 
-       void load_file(QString file_name,
+       void load_file(QString file_name, QString setup_file_name = QString(),
                shared_ptr<sigrok::InputFormat> format = nullptr,
                const map<string, Glib::VariantBase> &options =
                        map<string, Glib::VariantBase>());
@@ -165,6 +190,8 @@ public:
 
        uint32_t get_segment_count() const;
 
+       vector<util::Timestamp> get_triggers(uint32_t segment_id) const;
+
        void register_view(shared_ptr<views::ViewBase> view);
 
        void deregister_view(shared_ptr<views::ViewBase> view);
@@ -200,6 +227,12 @@ private:
        void signal_new_segment();
        void signal_segment_completed();
 
+#ifdef ENABLE_FLOW
+       bool on_gst_bus_message(const Glib::RefPtr<Gst::Bus>& bus, const Glib::RefPtr<Gst::Message>& message);
+
+       Gst::FlowReturn on_gst_new_sample();
+#endif
+
        void feed_in_header();
 
        void feed_in_meta(shared_ptr<sigrok::Meta> meta);
@@ -224,7 +257,7 @@ Q_SIGNALS:
 
        void name_changed();
 
-       void trigger_event(util::Timestamp location);
+       void trigger_event(int segment_id, util::Timestamp location);
 
        void new_segment(int new_segment_id);
        void segment_completed(int segment_id);
@@ -237,6 +270,10 @@ Q_SIGNALS:
 public Q_SLOTS:
        void on_data_saved();
 
+#ifdef ENABLE_DECODE
+       void on_new_decoders_selected(vector<const srd_decoder*> decoders);
+#endif
+
 private:
        DeviceManager &device_manager_;
        shared_ptr<devices::Device> device_;
@@ -253,6 +290,9 @@ private:
        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_;
@@ -266,6 +306,18 @@ private:
        bool out_of_memory_;
        bool data_saved_;
        bool frame_began_;
+
+       QElapsedTimer acq_time_;
+
+#ifdef ENABLE_FLOW
+       RefPtr<Pipeline> pipeline_;
+       RefPtr<Element> source_;
+       RefPtr<AppSink> sink_;
+
+       mutable mutex pipeline_done_mutex_;
+       mutable condition_variable pipeline_done_cond_;
+       atomic<bool> pipeline_done_interrupt_;
+#endif
 };
 
 } // namespace pv