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

diff --git a/pv/session.cpp b/pv/session.cpp
index dd78f4a1..ecbb4722 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;
@@ -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,31 +405,13 @@ 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();
@@ -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,7 +463,7 @@ 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_)
 	{
@@ -530,7 +513,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 +617,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();
 		}