Fix #1035 by checking for exceptions when accessing config

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index 4ac7f509b516dcf18b4738753b1dd5038041f6ec..2ee31cfee5afb8ef6de44171322d1d20086e755a 100644 (file)
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -20,6 +20,7 @@
 #ifndef PULSEVIEW_PV_SESSION_HPP
 #define PULSEVIEW_PV_SESSION_HPP
 
+#include <functional>
 #include <map>
 #include <memory>
 #include <mutex>
@@ -29,13 +30,6 @@
 #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>
@@ -62,10 +56,13 @@ class Device;
 class InputFormat;
 class Logic;
 class Meta;
+class Option;
 class OutputFormat;
 class Packet;
 class Session;
-}
+}  // namespace sigrok
+
+using sigrok::Option;
 
 namespace pv {
 
@@ -74,6 +71,7 @@ class DeviceManager;
 namespace data {
 class Analog;
 class AnalogSegment;
+class DecodeSignal;
 class Logic;
 class LogicSegment;
 class SignalBase;
@@ -103,6 +101,8 @@ public:
                Running
        };
 
+       static shared_ptr<sigrok::Context> sr_context;
+
 public:
        Session(DeviceManager &device_manager, QString name);
 
@@ -164,19 +164,24 @@ public:
 
        double get_samplerate() const;
 
+       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);
 
        bool has_view(shared_ptr<views::ViewBase> view);
 
-       const unordered_set< shared_ptr<data::SignalBase> >
-               signalbases() const;
+       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(shared_ptr<data::SignalBase> signalbase);
+       void remove_decode_signal(shared_ptr<data::DecodeSignal> signal);
 #endif
 
 private:
@@ -187,11 +192,17 @@ private:
        shared_ptr<data::SignalBase> signalbase_from_channel(
                shared_ptr<sigrok::Channel> channel) const;
 
-private:
+       static map<string, Glib::VariantBase> input_format_options(
+               vector<string> user_spec,
+               map<string, shared_ptr<Option>> fmt_opts);
+
        void sample_thread_proc(function<void (const QString)> error_handler);
 
        void free_unused_memory();
 
+       void signal_new_segment();
+       void signal_segment_completed();
+
        void feed_in_header();
 
        void feed_in_meta(shared_ptr<sigrok::Meta> meta);
@@ -199,6 +210,7 @@ private:
        void feed_in_trigger();
 
        void feed_in_frame_begin();
+       void feed_in_frame_end();
 
        void feed_in_logic(shared_ptr<sigrok::Logic> logic);
 
@@ -207,6 +219,27 @@ private:
        void data_feed_in(shared_ptr<sigrok::Device> device,
                shared_ptr<sigrok::Packet> packet);
 
+Q_SIGNALS:
+       void capture_state_changed(int state);
+       void device_changed();
+
+       void signals_changed();
+
+       void name_changed();
+
+       void trigger_event(int segment_id, util::Timestamp location);
+
+       void new_segment(int new_segment_id);
+       void segment_completed(int segment_id);
+
+       void data_received();
+
+       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_;
@@ -223,39 +256,22 @@ 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_;
        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_;
-
-Q_SIGNALS:
-       void capture_state_changed(int state);
-       void device_changed();
-
-       void signals_changed();
-
-       void name_changed();
-
-       void trigger_event(util::Timestamp location);
-
-       void frame_began();
-
-       void data_received();
-
-       void frame_ended();
-
-       void add_view(const QString &title, views::ViewType type,
-               Session *session);
-
-public Q_SLOTS:
-       void on_data_saved();
+       bool frame_began_;
 };
 
 } // namespace pv