X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=73dd339b60fea95259d6fddc7aace7ec9f3ad0e1;hp=9fd8fb3eb9b5bdf6a1c03cf5f457e9b5113de493;hb=2b05d3110a0a50ce93c8c887a2dc00c1375e92fa;hpb=39ccf9c39ec5c1ddeb5ba62f77cc811a2598bf72

diff --git a/pv/session.cpp b/pv/session.cpp
index 9fd8fb3e..73dd339b 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -138,6 +138,28 @@ void Session::set_device(shared_ptr<devices::Device> device)
 	if (device_)
 		device_->close();
 
+	device_.reset();
+
+	// Remove all stored data
+	signals_.clear();
+	{
+		shared_lock<shared_mutex> lock(signals_mutex_);
+		for (const shared_ptr<data::SignalData> d : all_signal_data_)
+			d->clear();
+	}
+	all_signal_data_.clear();
+	cur_logic_segment_.reset();
+
+	for (auto entry : cur_analog_segments_) {
+		shared_ptr<sigrok::Channel>(entry.first).reset();
+		shared_ptr<data::AnalogSegment>(entry.second).reset();
+	}
+
+	logic_data_.reset();
+	decode_traces_.clear();
+
+	signals_changed();
+
 	device_ = std::move(device);
 	device_->open();
 	device_->session()->add_datafeed_callback([=]
@@ -145,8 +167,6 @@ void Session::set_device(shared_ptr<devices::Device> device)
 			data_feed_in(device, packet);
 		});
 
-	decode_traces_.clear();
-
 	update_signals();
 	device_selected();
 }
@@ -175,10 +195,14 @@ Session::capture_state Session::get_capture_state() const
 
 void Session::start_capture(function<void (const QString)> error_handler)
 {
+	if (!device_) {
+		error_handler(tr("No active device set, can't start acquisition."));
+		return;
+	}
+
 	stop_capture();
 
 	// Check that at least one channel is enabled
-	assert(device_);
 	const shared_ptr<sigrok::Device> sr_dev = device_->device();
 	if (sr_dev) {
 		const auto channels = sr_dev->channels();
@@ -191,13 +215,15 @@ void Session::start_capture(function<void (const QString)> error_handler)
 	}
 
 	// Clear signal data
-	for (const shared_ptr<data::SignalData> d : get_data())
-		d->clear();
+	{
+		shared_lock<shared_mutex> lock(signals_mutex_);
+		for (const shared_ptr<data::SignalData> d : all_signal_data_)
+			d->clear();
+	}
 
 	// Begin the session
 	sampling_thread_ = std::thread(
-		&Session::sample_thread_proc, this, device_,
-			error_handler);
+		&Session::sample_thread_proc, this, error_handler);
 }
 
 void Session::stop_capture()
@@ -210,30 +236,20 @@ void Session::stop_capture()
 		sampling_thread_.join();
 }
 
-set< shared_ptr<data::SignalData> > Session::get_data() const
-{
-	shared_lock<shared_mutex> lock(signals_mutex_);
-	set< shared_ptr<data::SignalData> > data;
-	for (const shared_ptr<view::Signal> sig : signals_) {
-		assert(sig);
-		data.insert(sig->data());
-	}
-
-	return data;
-}
-
 double Session::get_samplerate() const
 {
 	double samplerate = 0.0;
 
-	for (const shared_ptr<pv::data::SignalData> d : get_data()) {
-		assert(d);
-		const vector< shared_ptr<pv::data::Segment> > segments =
-			d->segments();
-		for (const shared_ptr<pv::data::Segment> &s : segments)
-			samplerate = std::max(samplerate, s->samplerate());
+	{
+		shared_lock<shared_mutex> lock(signals_mutex_);
+		for (const shared_ptr<pv::data::SignalData> d : all_signal_data_) {
+			assert(d);
+			const vector< shared_ptr<pv::data::Segment> > segments =
+				d->segments();
+			for (const shared_ptr<pv::data::Segment> &s : segments)
+				samplerate = std::max(samplerate, s->samplerate());
+		}
 	}
-
 	// If there is no sample rate given we use samples as unit
 	if (samplerate == 0.0)
 		samplerate = 1.0;
@@ -333,7 +349,11 @@ void Session::set_capture_state(capture_state state)
 
 void Session::update_signals()
 {
-	assert(device_);
+	if (!device_) {
+		signals_.clear();
+		logic_data_.reset();
+		return;
+	}
 
 	lock_guard<recursive_mutex> lock(data_mutex_);
 
@@ -397,6 +417,7 @@ void Session::update_signals()
 						new view::LogicSignal(*this,
 							device_, channel,
 							logic_data_));
+					all_signal_data_.insert(logic_data_);
 					break;
 
 				case SR_CHANNEL_ANALOG:
@@ -406,6 +427,7 @@ void Session::update_signals()
 					signal = shared_ptr<view::Signal>(
 						new view::AnalogSignal(
 							*this, channel, data));
+					all_signal_data_.insert(data);
 					break;
 				}
 
@@ -435,13 +457,12 @@ shared_ptr<view::Signal> Session::signal_from_channel(
 	return shared_ptr<view::Signal>();
 }
 
-void Session::sample_thread_proc(shared_ptr<devices::Device> device,
-	function<void (const QString)> error_handler)
+void Session::sample_thread_proc(function<void (const QString)> error_handler)
 {
-	assert(device);
 	assert(error_handler);
 
-	(void)device;
+	if (!device_)
+		return;
 
 	cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
 
@@ -501,17 +522,20 @@ void Session::feed_in_trigger()
 	// The channel containing most samples should be most accurate
 	uint64_t sample_count = 0;
 
-	for (const shared_ptr<pv::data::SignalData> d : get_data()) {
-		assert(d);
-		uint64_t temp_count = 0;
-
-		const vector< shared_ptr<pv::data::Segment> > segments =
-			d->segments();
-		for (const shared_ptr<pv::data::Segment> &s : segments)
-			temp_count += s->get_sample_count();
-
-		if (temp_count > sample_count)
-			sample_count = temp_count;
+	{
+		shared_lock<shared_mutex> lock(signals_mutex_);
+		for (const shared_ptr<pv::data::SignalData> d : all_signal_data_) {
+			assert(d);
+			uint64_t temp_count = 0;
+
+			const vector< shared_ptr<pv::data::Segment> > segments =
+				d->segments();
+			for (const shared_ptr<pv::data::Segment> &s : segments)
+				temp_count += s->get_sample_count();
+
+			if (temp_count > sample_count)
+				sample_count = temp_count;
+		}
 	}
 
 	trigger_event(sample_count / get_samplerate());