X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=580b6796c680f8a76c679dfad20d7ea11640aaa4;hb=5b7cf66c34d7beeef055b06b95d72f9d7a3de680;hp=81ccca720a0b38ca7d5d0a2b58b926f8e91c51ed;hpb=8d634081d8b0cc741dd34d8c646474ff6754aea8;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 81ccca72..580b6796 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -36,7 +36,8 @@ namespace pv {
 // TODO: This should not be necessary
 SigSession* SigSession::_session = NULL;
 
-SigSession::SigSession()
+SigSession::SigSession() :
+	_capture_state(Stopped)
 {
 	// TODO: This should not be necessary
 	_session = this;
@@ -44,6 +45,12 @@ SigSession::SigSession()
 
 SigSession::~SigSession()
 {
+	stop_capture();
+
+	if(_sampling_thread.get())
+		_sampling_thread->join();
+	_sampling_thread.reset();
+
 	// TODO: This should not be necessary
 	_session = NULL;
 }
@@ -59,8 +66,51 @@ void SigSession::load_file(const std::string &name)
 	}
 }
 
+SigSession::capture_state SigSession::get_capture_state() const
+{
+	lock_guard<mutex> lock(_state_mutex);
+	return _capture_state;
+}
+
 void SigSession::start_capture(struct sr_dev_inst *sdi,
 	uint64_t record_length, uint64_t sample_rate)
+{
+	stop_capture();
+
+
+	_sampling_thread.reset(new boost::thread(
+		&SigSession::sample_thread_proc, this, sdi,
+		record_length, sample_rate));
+}
+
+void SigSession::stop_capture()
+{
+	if(get_capture_state() == Stopped)
+		return;
+
+	sr_session_stop();
+
+	// Check that sampling stopped
+	if(_sampling_thread.get())
+		_sampling_thread->join();
+	_sampling_thread.reset();
+
+	_capture_state = Stopped;
+}
+
+vector< shared_ptr<view::Signal> > SigSession::get_signals()
+{
+	lock_guard<mutex> lock(_signals_mutex);
+	return _signals;
+}
+
+boost::shared_ptr<LogicData> SigSession::get_data()
+{
+	return _logic_data;
+}
+
+void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
+	uint64_t record_length, uint64_t sample_rate)
 {
 	sr_session_new();
 	sr_session_datafeed_callback_add(data_feed_in_proc);
@@ -90,20 +140,15 @@ void SigSession::start_capture(struct sr_dev_inst *sdi,
 		return;
 	}
 
+	{
+		lock_guard<mutex> lock(_state_mutex);
+		_capture_state = Running;
+	}
+
 	sr_session_run();
 	sr_session_destroy();
 }
 
-vector< shared_ptr<view::Signal> >& SigSession::get_signals()
-{
-	return _signals;
-}
-
-boost::shared_ptr<LogicData> SigSession::get_data()
-{
-	return _logic_data;
-}
-
 void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
 	struct sr_datafeed_packet *packet)
 {
@@ -114,43 +159,55 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
 
 	switch (packet->type) {
 	case SR_DF_HEADER:
+	{
+		lock_guard<mutex> lock(_signals_mutex);
 		_signals.clear();
 		break;
+	}
 
 	case SR_DF_META_LOGIC:
-		{
-			assert(packet->payload);
+	{
+		assert(packet->payload);
+		const sr_datafeed_meta_logic &meta_logic =
+			*(sr_datafeed_meta_logic*)packet->payload;
+
+	{
+		lock_guard<mutex> lock(_data_mutex);
 
-			const sr_datafeed_meta_logic &meta_logic =
-				*(sr_datafeed_meta_logic*)packet->payload;
+		// Create an empty LogiData for coming data snapshots
+		_logic_data.reset(new LogicData(meta_logic));
+		assert(_logic_data);
+		if(!_logic_data)
+			break;
+	}
 
-			// Create an empty LogiData for coming data snapshots
-			_logic_data.reset(new LogicData(meta_logic));
-			assert(_logic_data);
-			if(!_logic_data)
-				break;
+	{
+		lock_guard<mutex> lock(_signals_mutex);
 
-			// Add the signals
-			for (int i = 0; i < meta_logic.num_probes; i++)
+		// Add the signals
+		for (int i = 0; i < meta_logic.num_probes; i++)
+		{
+			const sr_probe *const probe =
+				(const sr_probe*)g_slist_nth_data(
+					sdi->probes, i);
+			if(probe->enabled)
 			{
-				const sr_probe *const probe =
-					(const sr_probe*)g_slist_nth_data(
-						sdi->probes, i);
-				if(probe->enabled)
-				{
-					shared_ptr<LogicSignal> signal(
-						new LogicSignal(probe->name,
-							_logic_data,
-							probe->index));
-					_signals.push_back(signal);
-				}
+				shared_ptr<LogicSignal> signal(
+					new LogicSignal(probe->name,
+						_logic_data,
+						probe->index));
+				_signals.push_back(signal);
 			}
-
-			break;
 		}
 
-	case SR_DF_LOGIC:
+		signals_changed();
+		break;
+	}
+	}
 
+	case SR_DF_LOGIC:
+	{
+		lock_guard<mutex> lock(_data_mutex);
 		assert(packet->payload);
 		if(!_cur_logic_snapshot)
 		{
@@ -167,13 +224,20 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
 				*(sr_datafeed_logic*)packet->payload);
 		}
 
+		data_updated();
 		break;
+	}
 
 	case SR_DF_END:
-		_cur_logic_snapshot.reset();
+	{
+		{
+			lock_guard<mutex> lock(_data_mutex);
+			_cur_logic_snapshot.reset();
+		}
 		data_updated();
 		break;
 	}
+	}
 }
 
 void SigSession::data_feed_in_proc(const struct sr_dev_inst *sdi,