X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.h;h=513177be356a24ac5fe88e1acbe75702a58fa68e;hp=9359176c784ac5ebbd633741e4d4eb9782dde19b;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hpb=6ac6242b25cfbd4df14abe7580adc9d0f4cffe43

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 9359176c..513177be 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -29,14 +29,24 @@
 #include <thread>
 #include <vector>
 
+#include <boost/thread.hpp>
+
 #include <QObject>
 #include <QString>
 
-#include <libsigrok/libsigrok.h>
-
 struct srd_decoder;
 struct srd_channel;
 
+namespace sigrok {
+	class Analog;
+	class Channel;
+	class Device;
+	class Logic;
+	class Meta;
+	class Packet;
+	class Session;
+}
+
 namespace pv {
 
 class DeviceManager;
@@ -49,10 +59,6 @@ class LogicSnapshot;
 class SignalData;
 }
 
-namespace device {
-class DevInst;
-}
-
 namespace view {
 class DecodeTrace;
 class LogicSignal;
@@ -75,21 +81,23 @@ public:
 
 	~SigSession();
 
-	std::shared_ptr<device::DevInst> get_device() const;
+	DeviceManager& device_manager();
+
+	const DeviceManager& device_manager() const;
+
+	const std::shared_ptr<sigrok::Session>& session() const;
+
+	std::shared_ptr<sigrok::Device> device() const;
 
 	/**
 	 * Sets device instance that will be used in the next capture session.
 	 */
-	void set_device(std::shared_ptr<device::DevInst> dev_inst)
-		throw(QString);
+	void set_device(std::shared_ptr<sigrok::Device> device);
 
-	void set_file(const std::string &name)
-		throw(QString);
+	void set_file(const std::string &name);
 
 	void set_default_device();
 
-	void release_device(device::DevInst *dev_inst);
-
 	capture_state get_capture_state() const;
 
 	void start_capture(std::function<void (const QString)> error_handler);
@@ -98,8 +106,9 @@ public:
 
 	std::set< std::shared_ptr<data::SignalData> > get_data() const;
 
-	std::vector< std::shared_ptr<view::Signal> >
-		get_signals() const;
+	boost::shared_mutex& signals_mutex() const;
+
+	const std::vector< std::shared_ptr<view::Signal> >& signals() const;
 
 #ifdef ENABLE_DECODE
 	bool add_decoder(srd_decoder *const dec);
@@ -113,57 +122,55 @@ public:
 private:
 	void set_capture_state(capture_state state);
 
-	void update_signals(std::shared_ptr<device::DevInst> dev_inst);
+	void update_signals(std::shared_ptr<sigrok::Device> device);
 
 	std::shared_ptr<view::Signal> signal_from_channel(
-		const sr_channel *channel) const;
+		std::shared_ptr<sigrok::Channel> channel) const;
 
-	void read_sample_rate(const sr_dev_inst *const sdi);
+	void read_sample_rate(std::shared_ptr<sigrok::Device>);
 
 private:
-	void sample_thread_proc(std::shared_ptr<device::DevInst> dev_inst,
+	void sample_thread_proc(std::shared_ptr<sigrok::Device> device,
 		std::function<void (const QString)> error_handler);
 
-	void feed_in_header(const sr_dev_inst *sdi);
+	void feed_in_header(std::shared_ptr<sigrok::Device> device);
 
-	void feed_in_meta(const sr_dev_inst *sdi,
-		const sr_datafeed_meta &meta);
+	void feed_in_meta(std::shared_ptr<sigrok::Device> device,
+		std::shared_ptr<sigrok::Meta> meta);
 
 	void feed_in_frame_begin();
 
-	void feed_in_logic(const sr_datafeed_logic &logic);
-
-	void feed_in_analog(const sr_datafeed_analog &analog);
+	void feed_in_logic(std::shared_ptr<sigrok::Logic> logic);
 
-	void data_feed_in(const struct sr_dev_inst *sdi,
-		const struct sr_datafeed_packet *packet);
+	void feed_in_analog(std::shared_ptr<sigrok::Analog> analog);
 
-	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<sigrok::Device> device,
+		std::shared_ptr<sigrok::Packet> packet);
 
 private:
-	DeviceManager &_device_manager;
+	DeviceManager &device_manager_;
+	std::shared_ptr<sigrok::Session> session_;
 
 	/**
 	 * The device instance that will be used in the next capture session.
 	 */
-	std::shared_ptr<device::DevInst> _dev_inst;
+	std::shared_ptr<sigrok::Device> device_;
 
-	std::vector< std::shared_ptr<view::DecodeTrace> > _decode_traces;
+	std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
 
-	mutable std::mutex _sampling_mutex;
-	capture_state _capture_state;
+	mutable std::mutex sampling_mutex_;
+	capture_state capture_state_;
 
-	mutable std::mutex _signals_mutex;
-	std::vector< std::shared_ptr<view::Signal> > _signals;
+	mutable boost::shared_mutex signals_mutex_;
+	std::vector< std::shared_ptr<view::Signal> > signals_;
 
-	mutable std::mutex _data_mutex;
-	std::shared_ptr<data::Logic> _logic_data;
-	std::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
-	std::map< const sr_channel*, std::shared_ptr<data::AnalogSnapshot> >
-		_cur_analog_snapshots;
+	mutable std::mutex data_mutex_;
+	std::shared_ptr<data::Logic> logic_data_;
+	std::shared_ptr<data::LogicSnapshot> cur_logic_snapshot_;
+	std::map< std::shared_ptr<sigrok::Channel>, std::shared_ptr<data::AnalogSnapshot> >
+		cur_analog_snapshots_;
 
-	std::thread _sampling_thread;
+	std::thread sampling_thread_;
 
 Q_SIGNALS:
 	void capture_state_changed(int state);
@@ -175,22 +182,6 @@ Q_SIGNALS:
 	void data_received();
 
 	void frame_ended();
-
-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;
-
-public:
-	// TODO: Even more of a hack. The libsigrok API now allows for
-	// multiple sessions. However sr_session_* calls are scattered
-	// around the PV architecture and a single SigSession object is
-	// being used across multiple sequential sessions, which are
-	// created and destroyed in other classes in pv::device. This
-	// is a mess. For now just keep a single sr_session pointer here
-	// which we can use for all those scattered calls.
-	static struct sr_session *_sr_session;
 };
 
 } // namespace pv