X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=6f66be7c586be3958b6b08290829264e401997c3;hp=cbdbac07c2031d6232af8089bbf51b7f25d403ac;hb=f9101a91fc942a28515872ae6c7285973bd54b91;hpb=2b49eeb02d92b4744f8ebfcfd38ef27384cdd751

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index cbdbac07..6f66be7c 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the PulseView project.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2012-14 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,24 +18,44 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifdef ENABLE_DECODE
+#include <libsigrokdecode/libsigrokdecode.h>
+#endif
+
 #include "sigsession.h"
 
 #include "devicemanager.h"
+
 #include "data/analog.h"
 #include "data/analogsnapshot.h"
+#include "data/decoderstack.h"
 #include "data/logic.h"
 #include "data/logicsnapshot.h"
+#include "data/decode/decoder.h"
+
 #include "view/analogsignal.h"
+#include "view/decodetrace.h"
 #include "view/logicsignal.h"
 
 #include <assert.h>
 
+#include <stdexcept>
+
+#include <boost/foreach.hpp>
+
 #include <sys/stat.h>
 
 #include <QDebug>
 
-using namespace boost;
-using namespace std;
+using boost::dynamic_pointer_cast;
+using boost::function;
+using boost::lock_guard;
+using boost::mutex;
+using boost::shared_ptr;
+using std::map;
+using std::set;
+using std::string;
+using std::vector;
 
 namespace pv {
 
@@ -55,9 +75,7 @@ SigSession::~SigSession()
 {
 	stop_capture();
 
-	if (_sampling_thread.get())
-		_sampling_thread->join();
-	_sampling_thread.reset();
+	_sampling_thread.join();
 
 	if (_sdi)
 		_device_manager.release_device(_sdi);
@@ -74,12 +92,15 @@ struct sr_dev_inst* SigSession::get_device() const
 
 void SigSession::set_device(struct sr_dev_inst *sdi)
 {
+	// Ensure we are not capturing before setting the device
+	stop_capture();
+
 	if (_sdi)
 		_device_manager.release_device(_sdi);
 	if (sdi)
 		_device_manager.use_device(sdi, this);
 	_sdi = sdi;
-	update_signals();
+	update_signals(sdi);
 }
 
 void SigSession::release_device(struct sr_dev_inst *sdi)
@@ -88,16 +109,50 @@ void SigSession::release_device(struct sr_dev_inst *sdi)
 
 	assert(_capture_state == Stopped);
 	_sdi = NULL;
-	update_signals();
+	update_signals(NULL);
 }
 
 void SigSession::load_file(const string &name,
 	function<void (const QString)> error_handler)
 {
 	stop_capture();
-	_sampling_thread.reset(new boost::thread(
-		&SigSession::load_thread_proc, this, name,
-		error_handler));
+
+	if (sr_session_load(name.c_str()) == SR_OK) {
+		GSList *devlist = NULL;
+		sr_session_dev_list(&devlist);
+
+		if (!devlist || !devlist->data ||
+			sr_session_start() != SR_OK) {
+			error_handler(tr("Failed to start session."));
+			return;
+		}
+
+		sr_dev_inst *const sdi = (sr_dev_inst*)devlist->data;
+		g_slist_free(devlist);
+
+		_decode_traces.clear();
+		update_signals(sdi);
+		read_sample_rate(sdi);
+
+		_sampling_thread = boost::thread(
+			&SigSession::load_session_thread_proc, this,
+			error_handler);
+
+	} else {
+		sr_input *in = NULL;
+
+		if (!(in = load_input_file_format(name.c_str(),
+			error_handler)))
+			return;
+
+		_decode_traces.clear();
+		update_signals(in->sdi);
+		read_sample_rate(in->sdi);
+
+		_sampling_thread = boost::thread(
+			&SigSession::load_input_thread_proc, this,
+			name, in, error_handler);
+	}
 }
 
 SigSession::capture_state SigSession::get_capture_state() const
@@ -106,8 +161,7 @@ SigSession::capture_state SigSession::get_capture_state() const
 	return _capture_state;
 }
 
-void SigSession::start_capture(uint64_t record_length,
-	function<void (const QString)> error_handler)
+void SigSession::start_capture(function<void (const QString)> error_handler)
 {
 	stop_capture();
 
@@ -132,9 +186,8 @@ void SigSession::start_capture(uint64_t record_length,
 	}
 
 	// Begin the session
-	_sampling_thread.reset(new boost::thread(
-		&SigSession::sample_thread_proc, this, _sdi,
-		record_length, error_handler));
+	_sampling_thread = boost::thread(
+		&SigSession::sample_thread_proc, this, _sdi, error_handler);
 }
 
 void SigSession::stop_capture()
@@ -145,22 +198,101 @@ void SigSession::stop_capture()
 	sr_session_stop();
 
 	// Check that sampling stopped
-	if (_sampling_thread.get())
-		_sampling_thread->join();
-	_sampling_thread.reset();
+	_sampling_thread.join();
+}
+
+set< shared_ptr<data::SignalData> > SigSession::get_data() const
+{
+	lock_guard<mutex> lock(_signals_mutex);
+	set< shared_ptr<data::SignalData> > data;
+	BOOST_FOREACH(const shared_ptr<view::Signal> sig, _signals) {
+		assert(sig);
+		data.insert(sig->data());
+	}
+
+	return data;
 }
 
-vector< shared_ptr<view::Signal> > SigSession::get_signals()
+vector< shared_ptr<view::Signal> > SigSession::get_signals() const
 {
 	lock_guard<mutex> lock(_signals_mutex);
 	return _signals;
 }
 
-boost::shared_ptr<data::Logic> SigSession::get_data()
+#ifdef ENABLE_DECODE
+bool SigSession::add_decoder(srd_decoder *const dec)
 {
-	return _logic_data;
+	map<const srd_probe*, shared_ptr<view::LogicSignal> > probes;
+	shared_ptr<data::DecoderStack> decoder_stack;
+
+	try
+	{
+		lock_guard<mutex> lock(_signals_mutex);
+
+		// Create the decoder
+		decoder_stack = shared_ptr<data::DecoderStack>(
+			new data::DecoderStack(dec));
+
+		// Auto select the initial probes
+		for(const GSList *i = dec->probes; i; i = i->next)
+		{
+			const srd_probe *const probe = (const srd_probe*)i->data;
+			BOOST_FOREACH(shared_ptr<view::Signal> s, _signals)
+			{
+				shared_ptr<view::LogicSignal> l =
+					dynamic_pointer_cast<view::LogicSignal>(s);
+				if (l && QString::fromUtf8(probe->name).
+					toLower().contains(
+					l->get_name().toLower()))
+					probes[probe] = l;
+			}
+		}
+
+		assert(decoder_stack);
+		assert(!decoder_stack->stack().empty());
+		assert(decoder_stack->stack().front());
+		decoder_stack->stack().front()->set_probes(probes);
+
+		// Create the decode signal
+		shared_ptr<view::DecodeTrace> d(
+			new view::DecodeTrace(*this, decoder_stack,
+				_decode_traces.size()));
+		_decode_traces.push_back(d);
+	}
+	catch(std::runtime_error e)
+	{
+		return false;
+	}
+
+	signals_changed();
+
+	// Do an initial decode
+	decoder_stack->begin_decode();
+
+	return true;
+}
+
+vector< shared_ptr<view::DecodeTrace> > SigSession::get_decode_signals() const
+{
+	lock_guard<mutex> lock(_signals_mutex);
+	return _decode_traces;
 }
 
+void SigSession::remove_decode_signal(view::DecodeTrace *signal)
+{
+	for (vector< shared_ptr<view::DecodeTrace> >::iterator i =
+		_decode_traces.begin();
+		i != _decode_traces.end();
+		i++)
+		if ((*i).get() == signal)
+		{
+			_decode_traces.erase(i);
+			signals_changed();
+			return;
+		}
+}
+#endif
+
 void SigSession::set_capture_state(capture_state state)
 {
 	lock_guard<mutex> lock(_sampling_mutex);
@@ -246,17 +378,18 @@ sr_input* SigSession::load_input_file_format(const string &filename,
 	return in;
 }
 
-void SigSession::update_signals()
+void SigSession::update_signals(const sr_dev_inst *const sdi)
 {
 	assert(_capture_state == Stopped);
 
-	shared_ptr<view::Signal> signal;
 	unsigned int logic_probe_count = 0;
-	unsigned int analog_probe_count = 0;
+
+	// Clear the decode traces
+	_decode_traces.clear();
 
 	// Detect what data types we will receive
-	if(_sdi) {
-		for (const GSList *l = _sdi->probes; l; l = l->next) {
+	if(sdi) {
+		for (const GSList *l = sdi->probes; l; l = l->next) {
 			const sr_probe *const probe = (const sr_probe *)l->data;
 			if (!probe->enabled)
 				continue;
@@ -265,15 +398,11 @@ void SigSession::update_signals()
 			case SR_PROBE_LOGIC:
 				logic_probe_count++;
 				break;
-
-			case SR_PROBE_ANALOG:
-				analog_probe_count++;
-				break;
 			}
 		}
 	}
 
-	// Create data containers for the data snapshots
+	// Create data containers for the logic data snapshots
 	{
 		lock_guard<mutex> data_lock(_data_mutex);
 
@@ -283,44 +412,49 @@ void SigSession::update_signals()
 				logic_probe_count));
 			assert(_logic_data);
 		}
-
-		_analog_data.reset();
-		if (analog_probe_count != 0) {
-			_analog_data.reset(new data::Analog());
-			assert(_analog_data);
-		}
 	}
 
 	// Make the Signals list
-	{
+	do {
 		lock_guard<mutex> lock(_signals_mutex);
 
 		_signals.clear();
 
-		if(_sdi) {
-			for (const GSList *l = _sdi->probes; l; l = l->next) {
-				const sr_probe *const probe =
-					(const sr_probe *)l->data;
-				assert(probe);
-
-				switch(probe->type) {
-				case SR_PROBE_LOGIC:
-					signal = shared_ptr<view::Signal>(
-						new view::LogicSignal(*this, probe,
-							_logic_data));
-					break;
-
-				case SR_PROBE_ANALOG:
-					signal = shared_ptr<view::Signal>(
-						new view::AnalogSignal(*this, probe,
-							_analog_data));
-					break;
-				}
-
-				_signals.push_back(signal);
+		if(!sdi)
+			break;
+
+		for (const GSList *l = sdi->probes; l; l = l->next) {
+			shared_ptr<view::Signal> signal;
+			sr_probe *const probe =	(sr_probe *)l->data;
+			assert(probe);
+
+			switch(probe->type) {
+			case SR_PROBE_LOGIC:
+				signal = shared_ptr<view::Signal>(
+					new view::LogicSignal(*this, probe,
+						_logic_data));
+				break;
+
+			case SR_PROBE_ANALOG:
+			{
+				shared_ptr<data::Analog> data(
+					new data::Analog());
+				signal = shared_ptr<view::Signal>(
+					new view::AnalogSignal(*this, probe,
+						data));
+				break;
+			}
+
+			default:
+				assert(0);
+				break;
 			}
+
+			assert(signal);
+			_signals.push_back(signal);
 		}
-	}
+
+	} while(0);
 
 	signals_changed();
 }
@@ -338,42 +472,89 @@ bool SigSession::is_trigger_enabled() const
 	return false;
 }
 
-void SigSession::load_thread_proc(const string name,
-	function<void (const QString)> error_handler)
+shared_ptr<view::Signal> SigSession::signal_from_probe(
+	const sr_probe *probe) const
 {
-	sr_input *in = NULL;
+	lock_guard<mutex> lock(_signals_mutex);
+	BOOST_FOREACH(shared_ptr<view::Signal> sig, _signals) {
+		assert(sig);
+		if (sig->probe() == probe)
+			return sig;
+	}
+	return shared_ptr<view::Signal>();
+}
 
-	if (sr_session_load(name.c_str()) == SR_OK) {
-		if (sr_session_start() != SR_OK) {
-			error_handler(tr("Failed to start session."));
+void SigSession::read_sample_rate(const sr_dev_inst *const sdi)
+{
+	GVariant *gvar;
+	uint64_t sample_rate = 0;
+
+	// Read out the sample rate
+	if(sdi->driver)
+	{
+		const int ret = sr_config_get(sdi->driver, sdi, NULL,
+			SR_CONF_SAMPLERATE, &gvar);
+		if (ret != SR_OK) {
+			qDebug("Failed to get samplerate\n");
 			return;
 		}
+
+		sample_rate = g_variant_get_uint64(gvar);
+		g_variant_unref(gvar);
 	}
-	else if(!(in = load_input_file_format(name.c_str(), error_handler)))
-		return;
+
+	// Set the sample rate of all data
+	const set< shared_ptr<data::SignalData> > data_set = get_data();
+	BOOST_FOREACH(shared_ptr<data::SignalData> data, data_set) {
+		assert(data);
+		data->set_samplerate(sample_rate);
+	}
+}
+
+void SigSession::load_session_thread_proc(
+	function<void (const QString)> error_handler)
+{
+	(void)error_handler;
+
+	sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
+
+	set_capture_state(Running);
+
+	sr_session_run();
+
+	sr_session_destroy();
+	set_capture_state(Stopped);
+
+	// Confirm that SR_DF_END was received
+	assert(!_cur_logic_snapshot);
+	assert(_cur_analog_snapshots.empty());
+}
+
+void SigSession::load_input_thread_proc(const string name,
+	sr_input *in, function<void (const QString)> error_handler)
+{
+	(void)error_handler;
+
+	assert(in);
+	assert(in->format);
 
 	sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
 
 	set_capture_state(Running);
 
-	if(in) {
-		assert(in->format);
-		in->format->loadfile(in, name.c_str());
-	} else
-		sr_session_run();
+	in->format->loadfile(in, name.c_str());
 
 	sr_session_destroy();
 	set_capture_state(Stopped);
 
 	// Confirm that SR_DF_END was received
 	assert(!_cur_logic_snapshot);
-	assert(!_cur_analog_snapshot);
+	assert(_cur_analog_snapshots.empty());
 
 	delete in;
 }
 
 void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
-	uint64_t record_length,
 	function<void (const QString)> error_handler)
 {
 	assert(sdi);
@@ -388,15 +569,6 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
 		return;
 	}
 
-	// Set the sample limit
-	if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES,
-		g_variant_new_uint64(record_length)) != SR_OK) {
-		error_handler(tr("Failed to configure "
-			"time-based sample limit."));
-		sr_session_destroy();
-		return;
-	}
-
 	if (sr_session_start() != SR_OK) {
 		error_handler(tr("Failed to start session."));
 		return;
@@ -410,33 +582,16 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
 	set_capture_state(Stopped);
 
 	// Confirm that SR_DF_END was received
-	assert(!_cur_logic_snapshot);
-	assert(!_cur_analog_snapshot);
+	if (_cur_logic_snapshot)
+	{
+		qDebug("SR_DF_END was not received.");
+		assert(0);
+	}
 }
 
 void SigSession::feed_in_header(const sr_dev_inst *sdi)
 {
-	GVariant *gvar;
-	uint64_t sample_rate = 0;
-
-	// Read out the sample rate
-	if(sdi->driver)
-	{
-		const int ret = sr_config_get(sdi->driver,
-			SR_CONF_SAMPLERATE, &gvar, sdi);
-		if (ret != SR_OK) {
-			qDebug("Failed to get samplerate\n");
-			return;
-		}
-
-		sample_rate = g_variant_get_uint64(gvar);
-		g_variant_unref(gvar);
-	}
-
-	if(_analog_data)
-		_analog_data->set_samplerate(sample_rate);
-	if(_logic_data)
-		_logic_data->set_samplerate(sample_rate);
+	read_sample_rate(sdi);
 }
 
 void SigSession::feed_in_meta(const sr_dev_inst *sdi,
@@ -456,6 +611,8 @@ void SigSession::feed_in_meta(const sr_dev_inst *sdi,
 			break;
 		}
 	}
+
+	signals_changed();
 }
 
 void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
@@ -470,6 +627,7 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
 
 	if (!_cur_logic_snapshot)
 	{
+		// This could be the first packet after a trigger
 		set_capture_state(Running);
 
 		// Create a new data snapshot
@@ -490,25 +648,58 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
 {
 	lock_guard<mutex> lock(_data_mutex);
 
-	if(!_analog_data)
-	{
-		qDebug() << "Unexpected analog packet";
-		return;	// This analog packet was not expected.
-	}
+	const unsigned int probe_count = g_slist_length(analog.probes);
+	const size_t sample_count = analog.num_samples / probe_count;
+	const float *data = analog.data;
+	bool sweep_beginning = false;
 
-	if (!_cur_analog_snapshot)
+	for (GSList *p = analog.probes; p; p = p->next)
 	{
-		set_capture_state(Running);
+		shared_ptr<data::AnalogSnapshot> snapshot;
 
-		// Create a new data snapshot
-		_cur_analog_snapshot = shared_ptr<data::AnalogSnapshot>(
-			new data::AnalogSnapshot(analog));
-		_analog_data->push_snapshot(_cur_analog_snapshot);
+		sr_probe *const probe = (sr_probe*)p->data;
+		assert(probe);
+
+		// Try to get the snapshot of the probe
+		const map< const sr_probe*, shared_ptr<data::AnalogSnapshot> >::
+			iterator iter = _cur_analog_snapshots.find(probe);
+		if (iter != _cur_analog_snapshots.end())
+			snapshot = (*iter).second;
+		else
+		{
+			// If no snapshot was found, this means we havn't
+			// created one yet. i.e. this is the first packet
+			// in the sweep containing this snapshot.
+			sweep_beginning = true;
+
+			// Create a snapshot, keep it in the maps of probes
+			snapshot = shared_ptr<data::AnalogSnapshot>(
+				new data::AnalogSnapshot());
+			_cur_analog_snapshots[probe] = snapshot;
+
+			// Find the annalog data associated with the probe
+			shared_ptr<view::AnalogSignal> sig =
+				dynamic_pointer_cast<view::AnalogSignal>(
+					signal_from_probe(probe));
+			assert(sig);
+
+			shared_ptr<data::Analog> data(sig->analog_data());
+			assert(data);
+
+			// Push the snapshot into the analog data.
+			data->push_snapshot(snapshot);
+		}
+
+		assert(snapshot);
+
+		// Append the samples in the snapshot
+		snapshot->append_interleaved_samples(data++, sample_count,
+			probe_count);
 	}
-	else
-	{
-		// Append to the existing data snapshot
-		_cur_analog_snapshot->append_payload(analog);
+
+	if (sweep_beginning) {
+		// This could be the first packet after a trigger
+		set_capture_state(Running);
 	}
 
 	data_updated();
@@ -546,7 +737,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
 		{
 			lock_guard<mutex> lock(_data_mutex);
 			_cur_logic_snapshot.reset();
-			_cur_analog_snapshot.reset();
+			_cur_analog_snapshots.clear();
 		}
 		data_updated();
 		break;