X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=d6fef9a7eee143e0de1f3f877654f6e117066719;hp=dd78f4a176088ebb69cc5089558b4d310a7d4415;hb=859ca3070b30afde85ac345e8761ebf3b10017b1;hpb=ffe001198ecb5ea2e44c2947868c258afe948f20

diff --git a/pv/session.cpp b/pv/session.cpp
index dd78f4a1..d6fef9a7 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()
@@ -168,15 +168,15 @@ 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;
+		}
 	}
 
 	// Begin the session
@@ -304,7 +304,8 @@ void Session::set_capture_state(capture_state state)
 void Session::update_signals()
 {
 	assert(device_);
-	assert(capture_state_ == Stopped);
+
+	lock_guard<recursive_mutex> lock(data_mutex_);
 
 	const shared_ptr<sigrok::Device> sr_dev = device_->device();
 	if (!sr_dev) {
@@ -322,7 +323,7 @@ void Session::update_signals()
 
 	// 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();
@@ -404,34 +405,16 @@ 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);
-	map< const ConfigKey*, set<sigrok::Capability> > keys;
-
-	try {
-		keys = device->config_keys(ConfigKey::DEVICE_OPTIONS);
-	} catch (const Error) {}
-
-	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);
+	cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
 
 	try {
-		device_->session()->start();
+		device_->start();
 	} catch(Error e) {
 		error_handler(e.what());
 		return;
@@ -453,7 +436,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)
@@ -480,12 +463,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_)
@@ -494,18 +479,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>(
@@ -530,7 +505,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();
@@ -634,7 +609,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();
 		}