Mutex protected SigSession::_signals

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index b6e5a56842c5c79def1356532001823e3eb3cd69..307330ecb3e40065cc26b5dd8a05b6617b71ace3 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -22,8 +22,10 @@
 #define PULSEVIEW_PV_SIGSESSION_H
 
 #include <boost/shared_ptr.hpp>
+#include <boost/thread.hpp>
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <QObject>
@@ -36,7 +38,10 @@ namespace pv {
 
 class LogicData;
 class LogicDataSnapshot;
+
+namespace view {
 class Signal;
+}
 
 class SigSession : public QObject
 {
@@ -52,12 +57,15 @@ public:
        void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
                uint64_t sample_rate);
 
-       std::vector< boost::shared_ptr<Signal> >&
+       std::vector< boost::shared_ptr<view::Signal> >
                get_signals();
 
        boost::shared_ptr<LogicData> get_data();
 
 private:
+       void sample_thread_proc(struct sr_dev_inst *sdi,
+               uint64_t record_length, uint64_t sample_rate);
+
        void data_feed_in(const struct sr_dev_inst *sdi,
                struct sr_datafeed_packet *packet);
 
@@ -65,11 +73,18 @@ private:
                struct sr_datafeed_packet *packet);
 
 private:
-       std::vector< boost::shared_ptr<Signal> > _signals;
+       mutable boost::mutex _signals_mutex;
+       std::vector< boost::shared_ptr<view::Signal> > _signals;
+
+       mutable boost::mutex _data_mutex;
        boost::shared_ptr<LogicData> _logic_data;
        boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
 
+       std::auto_ptr<boost::thread> _sampling_thread;
+
 signals:
+       void signals_changed();
+
        void data_updated();
 
 private: