X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=c3bf26d25699c12135707b40512414c9ee0ef4f3;hp=1c6b3c6b57c792e5c040e62593a0bd8161eef94e;hb=8bd26d8b9c831b509ee3241ea4dac6f50c023622;hpb=9242129958c996f9ff71da7c7b74d7983b5c59f6

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 1c6b3c6b..c3bf26d2 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -20,7 +20,6 @@
 
 #include <libsigrokdecode/libsigrokdecode.h>
 
-#include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/thread/thread.hpp>
 
@@ -34,36 +33,59 @@
 #include <pv/data/logicsnapshot.h>
 #include <pv/data/decode/decoder.h>
 #include <pv/data/decode/annotation.h>
+#include <pv/sigsession.h>
 #include <pv/view/logicsignal.h>
 
 using boost::lock_guard;
 using boost::mutex;
+using boost::optional;
 using boost::shared_ptr;
+using boost::unique_lock;
 using std::deque;
+using std::make_pair;
+using std::max;
 using std::min;
 using std::list;
+using std::map;
+using std::pair;
 using std::vector;
 
+using namespace pv::data::decode;
+
 namespace pv {
 namespace data {
 
 const double DecoderStack::DecodeMargin = 1.0;
 const double DecoderStack::DecodeThreshold = 0.2;
 const int64_t DecoderStack::DecodeChunkLength = 4096;
+const unsigned int DecoderStack::DecodeNotifyPeriod = 65536;
 
 mutex DecoderStack::_global_decode_mutex;
 
-DecoderStack::DecoderStack(const srd_decoder *const dec) :
+DecoderStack::DecoderStack(pv::SigSession &session,
+	const srd_decoder *const dec) :
+	_session(session),
+	_sample_count(0),
+	_frame_complete(false),
 	_samples_decoded(0)
 {
+	connect(&_session, SIGNAL(frame_began()),
+		this, SLOT(on_new_frame()));
+	connect(&_session, SIGNAL(data_received()),
+		this, SLOT(on_data_received()));
+	connect(&_session, SIGNAL(frame_ended()),
+		this, SLOT(on_frame_ended()));
+
 	_stack.push_back(shared_ptr<decode::Decoder>(
 		new decode::Decoder(dec)));
 }
 
 DecoderStack::~DecoderStack()
 {
-	_decode_thread.interrupt();
-	_decode_thread.join();
+	if (_decode_thread.joinable()) {
+		_decode_thread.interrupt();
+		_decode_thread.join();
+	}
 }
 
 const std::list< boost::shared_ptr<decode::Decoder> >&
@@ -80,8 +102,6 @@ void DecoderStack::push(boost::shared_ptr<decode::Decoder> decoder)
 
 void DecoderStack::remove(int index)
 {
-	using pv::data::decode::Decoder;
-
 	assert(index >= 0);
 	assert(index < (int)_stack.size());
 
@@ -96,117 +116,231 @@ void DecoderStack::remove(int index)
 
 int64_t DecoderStack::samples_decoded() const
 {
-	lock_guard<mutex> decode_lock(_mutex);
+	lock_guard<mutex> decode_lock(_output_mutex);
 	return _samples_decoded;
 }
 
+std::vector<Row> DecoderStack::get_visible_rows() const
+{
+	lock_guard<mutex> lock(_output_mutex);
+
+	vector<Row> rows;
+
+	BOOST_FOREACH (const shared_ptr<decode::Decoder> &dec, _stack)
+	{
+		assert(dec);
+		if (!dec->shown())
+			continue;
+
+		const srd_decoder *const decc = dec->decoder();
+		assert(dec->decoder());
+
+		// Add a row for the decoder if it doesn't have a row list
+		if (!decc->annotation_rows)
+			rows.push_back(Row(decc));
+
+		// Add the decoder rows
+		for (const GSList *l = decc->annotation_rows; l; l = l->next)
+		{
+			const srd_decoder_annotation_row *const ann_row =
+				(srd_decoder_annotation_row *)l->data;
+			assert(ann_row);
+			rows.push_back(Row(decc, ann_row));
+		}
+	}
+
+	return rows;
+}
+
 void DecoderStack::get_annotation_subset(
 	std::vector<pv::data::decode::Annotation> &dest,
-	uint64_t start_sample, uint64_t end_sample) const
+	const Row &row, uint64_t start_sample,
+	uint64_t end_sample) const
 {
-	lock_guard<mutex> lock(_mutex);
-
-	const vector<size_t>::const_iterator start_iter =
-		lower_bound(_ann_end_index.begin(),
-			_ann_end_index.end(), start_sample,
-			bind(&DecoderStack::index_entry_end_sample_lt,
-				this, _1, _2));
-
-	const vector<size_t>::const_iterator end_iter =
-		upper_bound(_ann_start_index.begin(),
-			_ann_start_index.end(), end_sample,
-			bind(&DecoderStack::index_entry_start_sample_gt,
-				this, _1, _2));
-
-	for (vector<size_t>::const_iterator i = start_iter;
-		i != _ann_end_index.end() && *i != *end_iter; i++)
-		dest.push_back(_annotations[*i]);
+	lock_guard<mutex> lock(_output_mutex);
+
+	std::map<const Row, decode::RowData>::const_iterator iter =
+		_rows.find(row);
+	if (iter != _rows.end())
+		(*iter).second.get_annotation_subset(dest,
+			start_sample, end_sample);
 }
 
 QString DecoderStack::error_message()
 {
-	lock_guard<mutex> lock(_mutex);
+	lock_guard<mutex> lock(_output_mutex);
 	return _error_message;
 }
 
+void DecoderStack::clear()
+{
+	_sample_count = 0;
+	_frame_complete = false;
+	_samples_decoded = 0;
+	_error_message = QString();
+	_rows.clear();
+	_class_rows.clear();
+}
+
 void DecoderStack::begin_decode()
 {
 	shared_ptr<pv::view::LogicSignal> logic_signal;
 	shared_ptr<pv::data::Logic> data;
 
-	_decode_thread.interrupt();
-	_decode_thread.join();
-
-	_samples_decoded = 0;
+	if (_decode_thread.joinable()) {
+		_decode_thread.interrupt();
+		_decode_thread.join();
+	}
 
 	clear();
 
-	// We get the logic data of the first probe in the list.
+	// Check that all decoders have the required channels
+	BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
+		if (!dec->have_required_probes()) {
+			_error_message = tr("One or more required channels "
+				"have not been specified");
+			return;
+		}
+
+	// Add classes
+	BOOST_FOREACH (const shared_ptr<decode::Decoder> &dec, _stack)
+	{
+		assert(dec);
+		const srd_decoder *const decc = dec->decoder();
+		assert(dec->decoder());
+
+		// Add a row for the decoder if it doesn't have a row list
+		if (!decc->annotation_rows)
+			_rows[Row(decc)] = decode::RowData();
+
+		// Add the decoder rows
+		for (const GSList *l = decc->annotation_rows; l; l = l->next)
+		{
+			const srd_decoder_annotation_row *const ann_row =
+				(srd_decoder_annotation_row *)l->data;
+			assert(ann_row);
+
+			const Row row(decc, ann_row);
+
+			// Add a new empty row data object
+			_rows[row] = decode::RowData();
+
+			// Map out all the classes
+			for (const GSList *ll = ann_row->ann_classes;
+				ll; ll = ll->next)
+				_class_rows[make_pair(decc,
+					GPOINTER_TO_INT(ll->data))] = row;
+		}
+	}
+
+	// We get the logic data of the first channel in the list.
 	// This works because we are currently assuming all
 	// LogicSignals have the same data/snapshot
 	BOOST_FOREACH (const shared_ptr<decode::Decoder> &dec, _stack)
-		if (dec && !dec->probes().empty() &&
-			((logic_signal = (*dec->probes().begin()).second)) &&
+		if (dec && !dec->channels().empty() &&
+			((logic_signal = (*dec->channels().begin()).second)) &&
 			((data = logic_signal->logic_data())))
 			break;
 
 	if (!data)
 		return;
 
+	// Check we have a snapshot of data
+	const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
+		data->get_snapshots();
+	if (snapshots.empty())
+		return;
+	_snapshot = snapshots.front();
+
 	// Get the samplerate and start time
 	_start_time = data->get_start_time();
 	_samplerate = data->samplerate();
 	if (_samplerate == 0.0)
 		_samplerate = 1.0;
 
-	_decode_thread = boost::thread(&DecoderStack::decode_proc, this,
-		data);
+	_decode_thread = boost::thread(&DecoderStack::decode_proc, this);
 }
 
-void DecoderStack::clear()
+uint64_t DecoderStack::get_max_sample_count() const
 {
-	_annotations.clear();
-	_ann_start_index.clear();
-	_ann_end_index.clear();
+	uint64_t max_sample_count = 0;
+
+	for (map<const Row, RowData>::const_iterator i = _rows.begin();
+		i != _rows.end(); i++)
+		max_sample_count = max(max_sample_count,
+			(*i).second.get_max_sample());
+
+	return max_sample_count;
 }
 
-uint64_t DecoderStack::get_max_sample_count() const
+optional<int64_t> DecoderStack::wait_for_data() const
 {
-	if (_annotations.empty())
-		return 0;
-	return _annotations.back().end_sample();
+	unique_lock<mutex> input_lock(_input_mutex);
+	while(!boost::this_thread::interruption_requested() &&
+		!_frame_complete && _samples_decoded >= _sample_count)
+		_input_cond.wait(input_lock);
+	return boost::make_optional(
+		!boost::this_thread::interruption_requested() &&
+		(_samples_decoded < _sample_count || !_frame_complete),
+		_sample_count);
 }
 
-void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
+void DecoderStack::decode_data(
+	const int64_t sample_count, const unsigned int unit_size,
+	srd_session *const session)
 {
-	srd_session *session;
 	uint8_t chunk[DecodeChunkLength];
-	srd_decoder_inst *prev_di = NULL;
 
-	assert(data);
+	const unsigned int chunk_sample_count =
+		DecodeChunkLength / _snapshot->unit_size();
 
-	const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
-		data->get_snapshots();
-	if (snapshots.empty())
-		return;
+	for (int64_t i = 0;
+		!boost::this_thread::interruption_requested() &&
+			i < sample_count;
+		i += chunk_sample_count)
+	{
+		lock_guard<mutex> decode_lock(_global_decode_mutex);
 
-	const shared_ptr<pv::data::LogicSnapshot> &snapshot =
-		snapshots.front();
-	const int64_t sample_count = snapshot->get_sample_count();
-	const unsigned int chunk_sample_count =
-		DecodeChunkLength / snapshot->unit_size();
+		const int64_t chunk_end = min(
+			i + chunk_sample_count, sample_count);
+		_snapshot->get_samples(chunk, i, chunk_end);
 
-	// Clear error message upon every new session run
-	_error_message = QString();
+		if (srd_session_send(session, i, i + sample_count, chunk,
+				(chunk_end - i) * unit_size) != SRD_OK) {
+			_error_message = tr("Decoder reported an error");
+			break;
+		}
+
+		{
+			lock_guard<mutex> lock(_output_mutex);
+			_samples_decoded = chunk_end;
+		}
+
+		if (i % DecodeNotifyPeriod == 0)
+			new_decode_data();
+	}
+
+	new_decode_data();
+}
+
+void DecoderStack::decode_proc()
+{
+	optional<int64_t> sample_count;
+	srd_session *session;
+	srd_decoder_inst *prev_di = NULL;
+
+	assert(_snapshot);
 
 	// Create the session
 	srd_session_new(&session);
 	assert(session);
 
 	// Create the decoders
+	const unsigned int unit_size = _snapshot->unit_size();
+
 	BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
 	{
-		srd_decoder_inst *const di = dec->create_decoder_inst(session);
+		srd_decoder_inst *const di = dec->create_decoder_inst(session, unit_size);
 
 		if (!di)
 		{
@@ -221,6 +355,12 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 		prev_di = di;
 	}
 
+	// Get the intial sample count
+	{
+		unique_lock<mutex> input_lock(_input_mutex);
+		sample_count = _sample_count = _snapshot->get_sample_count();
+	}
+
 	// Start the session
 	srd_session_metadata_set(session, SRD_CONF_SAMPLERATE,
 		g_variant_new_uint64((uint64_t)_samplerate));
@@ -230,129 +370,80 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 
 	srd_session_start(session);
 
-	for (int64_t i = 0;
-		!boost::this_thread::interruption_requested() &&
-			i < sample_count;
-		i += chunk_sample_count)
-	{
-		lock_guard<mutex> decode_lock(_global_decode_mutex);
-
-		const int64_t chunk_end = min(
-			i + chunk_sample_count, sample_count);
-		snapshot->get_samples(chunk, i, chunk_end);
-
-		if (srd_session_send(session, i, i + sample_count,
-				chunk, chunk_end - i) != SRD_OK) {
-			_error_message = tr("Decoder reported an error");
-			break;
-		}
-
-		{
-			lock_guard<mutex> lock(_mutex);
-			_samples_decoded = chunk_end;
-		}
-	}
+	do {
+		decode_data(*sample_count, unit_size, session);
+	} while(_error_message.isEmpty() && (sample_count = wait_for_data()));
 
 	// Destroy the session
 	srd_session_destroy(session);
 }
 
-bool DecoderStack::index_entry_start_sample_gt(
-	const uint64_t sample, const size_t index) const
+void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 {
-	assert(index < _annotations.size());
-	return _annotations[index].start_sample() > sample;
-}
+	assert(pdata);
+	assert(decoder);
 
-bool DecoderStack::index_entry_end_sample_lt(
-	const size_t index, const uint64_t sample) const
-{
-	assert(index < _annotations.size());
-	return _annotations[index].end_sample() < sample;
-}
+	DecoderStack *const d = (DecoderStack*)decoder;
+	assert(d);
+
+	lock_guard<mutex> lock(d->_output_mutex);
+
+	const Annotation a(pdata);
+
+	// Find the row
+	assert(pdata->pdo);
+	assert(pdata->pdo->di);
+	const srd_decoder *const decc = pdata->pdo->di->decoder;
+	assert(decc);
+
+	map<const Row, decode::RowData>::iterator row_iter = d->_rows.end();
+	
+	// Try looking up the sub-row of this class
+	const map<pair<const srd_decoder*, int>, Row>::const_iterator r =
+		d->_class_rows.find(make_pair(decc, a.format()));
+	if (r != d->_class_rows.end())
+		row_iter = d->_rows.find((*r).second);
+	else
+	{
+		// Failing that, use the decoder as a key
+		row_iter = d->_rows.find(Row(decc));	
+	}
 
-bool DecoderStack::index_entry_end_sample_gt(
-	const uint64_t sample, const size_t index) const
-{
-	assert(index < _annotations.size());
-	return _annotations[index].end_sample() > sample;
-}
+	assert(row_iter != d->_rows.end());
+	if (row_iter == d->_rows.end()) {
+		qDebug() << "Unexpected annotation: decoder = " << decc <<
+			", format = " << a.format();
+		assert(0);
+		return;
+	}
 
-void DecoderStack::insert_annotation_into_start_index(
-	const pv::data::decode::Annotation &a, const size_t storage_offset)
-{
-	vector<size_t>::iterator i = _ann_start_index.end();
-	if (!_ann_start_index.empty() &&
-		_annotations[_ann_start_index.back()].start_sample() >
-			a.start_sample())
-		i = upper_bound(_ann_start_index.begin(),
-			_ann_start_index.end(), a.start_sample(),
-			bind(&DecoderStack::index_entry_start_sample_gt,
-				this, _1, _2));
-
-	_ann_start_index.insert(i, storage_offset);
+	// Add the annotation
+	(*row_iter).second.push_annotation(a);
 }
 
-void DecoderStack::insert_annotation_into_end_index(
-	const pv::data::decode::Annotation &a, const size_t storage_offset)
+void DecoderStack::on_new_frame()
 {
-	vector<size_t>::iterator i = _ann_end_index.end();
-	if (!_ann_end_index.empty() &&
-		_annotations[_ann_end_index.back()].end_sample() <
-			a.end_sample())
-		i = upper_bound(_ann_end_index.begin(),
-			_ann_end_index.end(), a.end_sample(),
-			bind(&DecoderStack::index_entry_end_sample_gt,
-				this, _1, _2));
-
-	_ann_end_index.insert(i, storage_offset);
+	begin_decode();
 }
 
-void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
+void DecoderStack::on_data_received()
 {
-	using pv::data::decode::Annotation;
-
-	GSList *l, *ll;
-	int row, ann_class, idx = 0;
-	struct srd_decoder_annotation_row *ann_row;
-	struct srd_decoder *decc;
-
-	assert(pdata);
-	assert(decoder);
-
-	DecoderStack *const d = (DecoderStack*)decoder;
-
-	lock_guard<mutex> lock(d->_mutex);
-
-	Annotation a = Annotation(pdata);
-
-	decc = pdata->pdo->di->decoder;
-	BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, d->stack()) {
-		if (dec->decoder() == decc)
-			break;
-		idx++;
+	{
+		unique_lock<mutex> lock(_input_mutex);
+		if (_snapshot)
+			_sample_count = _snapshot->get_sample_count();
 	}
-	a.set_pd_index(idx);
+	_input_cond.notify_one();
+}
 
-	for (l = decc->annotation_rows, row = 0; l; l = l->next, row++)
+void DecoderStack::on_frame_ended()
+{
 	{
-		ann_row = (struct srd_decoder_annotation_row *)l->data;
-
-		for (ll = ann_row->ann_classes, ann_class = 0; ll;
-					ll = ll->next, ann_class++)
-		{
-			if (GPOINTER_TO_INT(ll->data) == a.format())
-				a.set_row(row);
-		}
+		unique_lock<mutex> lock(_input_mutex);
+		if (_snapshot)
+			_frame_complete = true;
 	}
-
-	const size_t offset = d->_annotations.size();
-	d->_annotations.push_back(a);
-
-	d->insert_annotation_into_start_index(a, offset);
-	d->insert_annotation_into_end_index(a, offset);
-
-	d->new_decode_data();
+	_input_cond.notify_one();
 }
 
 } // namespace data