Mutex protected SigSession::_signals

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 763fc16903cc17372e07f5c08cb63d897b41b91f..307330ecb3e40065cc26b5dd8a05b6617b71ace3 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -57,7 +57,7 @@ public:
        void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
                uint64_t sample_rate);
 
        void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
                uint64_t sample_rate);
 

-       std::vector< boost::shared_ptr<view::Signal> >&
+       std::vector< boost::shared_ptr<view::Signal> >

                get_signals();
 
        boost::shared_ptr<LogicData> get_data();
                get_signals();
 
        boost::shared_ptr<LogicData> get_data();


@@ -73,8 +73,10 @@ private:
                struct sr_datafeed_packet *packet);
 
 private:
                struct sr_datafeed_packet *packet);
 
 private:

-       mutable boost::mutex _data_mutex;
+       mutable boost::mutex _signals_mutex;

        std::vector< boost::shared_ptr<view::Signal> > _signals;
        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;
 
        boost::shared_ptr<LogicData> _logic_data;
        boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;