X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=2bd3a054038f846d2263a26caf3ee124422f9293;hp=d5126660f56b140d2337d64b1df625a4ea44b148;hb=33994eb405ba3ab59625ea2fa38dcc00d8b66687;hpb=3084ed4b15663dd717ff656745db305f377ab215

diff --git a/pv/session.cpp b/pv/session.cpp
index d5126660..2bd3a054 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -60,6 +60,7 @@ using std::lock_guard;
 using std::list;
 using std::map;
 using std::mutex;
+using std::recursive_mutex;
 using std::set;
 using std::shared_ptr;
 using std::string;
@@ -89,7 +90,6 @@ Session::Session(DeviceManager &device_manager) :
 	capture_state_(Stopped),
 	cur_samplerate_(0)
 {
-	set_default_device();
 }
 
 Session::~Session()
@@ -133,7 +133,7 @@ void Session::set_device(shared_ptr<devices::Device> device)
 		(shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
 			data_feed_in(device, packet);
 		});
-	update_signals(device_);
+	update_signals();
 
 	decode_traces_.clear();
 
@@ -168,17 +168,21 @@ void Session::start_capture(function<void (const QString)> error_handler)
 
 	// Check that at least one channel is enabled
 	assert(device_);
-	const std::shared_ptr<sigrok::Device> device = device_->device();
-	assert(device);
-	auto channels = device->channels();
-	bool enabled = std::any_of(channels.begin(), channels.end(),
-		[](shared_ptr<Channel> channel) { return channel->enabled(); });
-
-	if (!enabled) {
-		error_handler(tr("No channels enabled."));
-		return;
+	const shared_ptr<sigrok::Device> sr_dev = device_->device();
+	if (sr_dev) {
+		const auto channels = sr_dev->channels();
+		if (!std::any_of(channels.begin(), channels.end(),
+			[](shared_ptr<Channel> channel) {
+				return channel->enabled(); })) {
+			error_handler(tr("No channels enabled."));
+			return;
+		}
 	}
 
+	// Clear signal data
+	for (const shared_ptr<data::SignalData> d : get_data())
+		d->clear();
+
 	// Begin the session
 	sampling_thread_ = std::thread(
 		&Session::sample_thread_proc, this, device_,
@@ -233,9 +237,9 @@ bool Session::add_decoder(srd_decoder *const dec)
 
 		// Make a list of all the channels
 		std::vector<const srd_channel*> all_channels;
-		for(const GSList *i = dec->channels; i; i = i->next)
+		for (const GSList *i = dec->channels; i; i = i->next)
 			all_channels.push_back((const srd_channel*)i->data);
-		for(const GSList *i = dec->opt_channels; i; i = i->next)
+		for (const GSList *i = dec->opt_channels; i; i = i->next)
 			all_channels.push_back((const srd_channel*)i->data);
 
 		// Auto select the initial channels
@@ -297,17 +301,25 @@ void Session::set_capture_state(capture_state state)
 	lock_guard<mutex> lock(sampling_mutex_);
 	const bool changed = capture_state_ != state;
 	capture_state_ = state;
-	if(changed)
+	if (changed)
 		capture_state_changed(state);
 }
 
-void Session::update_signals(shared_ptr<devices::Device> device)
+void Session::update_signals()
 {
-	assert(device);
-	assert(capture_state_ == Stopped);
+	assert(device_);
+
+	lock_guard<recursive_mutex> lock(data_mutex_);
+
+	const shared_ptr<sigrok::Device> sr_dev = device_->device();
+	if (!sr_dev) {
+		signals_.clear();
+		logic_data_.reset();
+		return;
+	}
 
 	// Detect what data types we will receive
-	auto channels = device->device()->channels();
+	auto channels = sr_dev->channels();
 	unsigned int logic_channel_count = std::count_if(
 		channels.begin(), channels.end(),
 		[] (shared_ptr<Channel> channel) {
@@ -315,7 +327,7 @@ void Session::update_signals(shared_ptr<devices::Device> device)
 
 	// Create data containers for the logic data segments
 	{
-		lock_guard<mutex> data_lock(data_mutex_);
+		lock_guard<recursive_mutex> data_lock(data_mutex_);
 
 		if (logic_channel_count == 0) {
 			logic_data_.reset();
@@ -334,7 +346,7 @@ void Session::update_signals(shared_ptr<devices::Device> device)
 		unordered_set< shared_ptr<view::Signal> > prev_sigs(signals_);
 		signals_.clear();
 
-		for (auto channel : device->device()->channels()) {
+		for (auto channel : sr_dev->channels()) {
 			shared_ptr<view::Signal> signal;
 
 			// Find the channel in the old signals
@@ -357,7 +369,7 @@ void Session::update_signals(shared_ptr<devices::Device> device)
 				case SR_CHANNEL_LOGIC:
 					signal = shared_ptr<view::Signal>(
 						new view::LogicSignal(*this,
-							device,	channel,
+							device_, channel,
 							logic_data_));
 					break;
 
@@ -397,29 +409,18 @@ shared_ptr<view::Signal> Session::signal_from_channel(
 	return shared_ptr<view::Signal>();
 }
 
-void Session::read_sample_rate(shared_ptr<sigrok::Device> device)
-{
-	assert(device);
-	const auto keys = device->config_keys(ConfigKey::DEVICE_OPTIONS);
-	const auto iter = keys.find(ConfigKey::SAMPLERATE);
-	cur_samplerate_ = (iter != keys.end() &&
-		(*iter).second.find(sigrok::GET) != (*iter).second.end()) ?
-		VariantBase::cast_dynamic<Variant<guint64>>(
-			device->config_get(ConfigKey::SAMPLERATE)).get() : 0;
-}
-
 void Session::sample_thread_proc(shared_ptr<devices::Device> device,
 	function<void (const QString)> error_handler)
 {
 	assert(device);
 	assert(error_handler);
 
-	const std::shared_ptr<sigrok::Device> sr_dev = device->device();
-	assert(sr_dev);
-	read_sample_rate(sr_dev);
+	(void)device;
+
+	cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
 
 	try {
-		device_->session()->start();
+		device_->start();
 	} catch(Error e) {
 		error_handler(e.what());
 		return;
@@ -441,7 +442,7 @@ void Session::sample_thread_proc(shared_ptr<devices::Device> device,
 
 void Session::feed_in_header()
 {
-	read_sample_rate(device_->device());
+	cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
 }
 
 void Session::feed_in_meta(shared_ptr<Meta> meta)
@@ -468,12 +469,14 @@ void Session::feed_in_frame_begin()
 
 void Session::feed_in_logic(shared_ptr<Logic> logic)
 {
-	lock_guard<mutex> lock(data_mutex_);
+	lock_guard<recursive_mutex> lock(data_mutex_);
 
 	if (!logic_data_)
 	{
-		qDebug() << "Unexpected logic packet";
-		return;
+		// The only reason logic_data_ would not have been created is
+		// if it was not possible to determine the signals when the
+		// device was created.
+		update_signals();
 	}
 
 	if (!cur_logic_segment_)
@@ -482,18 +485,8 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 		set_capture_state(Running);
 
 		// Get sample limit.
-		assert(device_);
-		const std::shared_ptr<sigrok::Device> device =
-			device_->device();
-		assert(device);
-		const auto keys = device->config_keys(
-			ConfigKey::DEVICE_OPTIONS);
-		const auto iter = keys.find(ConfigKey::LIMIT_SAMPLES);
-		const uint64_t sample_limit = (iter != keys.end() &&
-			(*iter).second.find(sigrok::GET) !=
-			(*iter).second.end()) ?
-			VariantBase::cast_dynamic<Variant<guint64>>(
-			device->config_get(ConfigKey::LIMIT_SAMPLES)).get() : 0;
+		const uint64_t sample_limit = device_->read_config<uint64_t>(
+			ConfigKey::LIMIT_SAMPLES);
 
 		// Create a new data segment
 		cur_logic_segment_ = shared_ptr<data::LogicSegment>(
@@ -518,7 +511,7 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 
 void Session::feed_in_analog(shared_ptr<Analog> analog)
 {
-	lock_guard<mutex> lock(data_mutex_);
+	lock_guard<recursive_mutex> lock(data_mutex_);
 
 	const vector<shared_ptr<Channel>> channels = analog->channels();
 	const unsigned int channel_count = channels.size();
@@ -622,7 +615,7 @@ void Session::data_feed_in(shared_ptr<sigrok::Device> device,
 	case SR_DF_END:
 	{
 		{
-			lock_guard<mutex> lock(data_mutex_);
+			lock_guard<recursive_mutex> lock(data_mutex_);
 			cur_logic_segment_.reset();
 			cur_analog_segments_.clear();
 		}