[pulseview.git] / pv / data / decoderstack.cpp

/*
 * This file is part of the PulseView project.
 *
 * Copyright (C) 2012 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
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 */

#include <libsigrokdecode/libsigrokdecode.h>

#include <boost/foreach.hpp>
#include <boost/thread/thread.hpp>

#include <stdexcept>

#include <QDebug>

#include "decoderstack.h"

#include <pv/data/logic.h>
#include <pv/data/logicsnapshot.h>
#include <pv/data/decode/decoder.h>
#include <pv/data/decode/annotation.h>
#include <pv/view/logicsignal.h>

using boost::lock_guard;
using boost::mutex;
using boost::shared_ptr;
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;

mutex DecoderStack::_global_decode_mutex;

DecoderStack::DecoderStack(const srd_decoder *const dec) :
	_samples_decoded(0)
{
	_stack.push_back(shared_ptr<decode::Decoder>(
		new decode::Decoder(dec)));
}

DecoderStack::~DecoderStack()
{
	_decode_thread.interrupt();
	_decode_thread.join();
}

const std::list< boost::shared_ptr<decode::Decoder> >&
DecoderStack::stack() const
{
	return _stack;
}

void DecoderStack::push(boost::shared_ptr<decode::Decoder> decoder)
{
	assert(decoder);
	_stack.push_back(decoder);
}

void DecoderStack::remove(int index)
{
	assert(index >= 0);
	assert(index < (int)_stack.size());

	// Find the decoder in the stack
	list< shared_ptr<Decoder> >::iterator iter = _stack.begin();
	for(int i = 0; i < index; i++, iter++)
		assert(iter != _stack.end());

	// Delete the element
	_stack.erase(iter);
}

int64_t DecoderStack::samples_decoded() const
{
	lock_guard<mutex> decode_lock(_mutex);
	return _samples_decoded;
}

std::vector<Row> DecoderStack::get_visible_rows() const
{
	lock_guard<mutex> lock(_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,
	const Row &row, uint64_t start_sample,
	uint64_t end_sample) const
{
	lock_guard<mutex> lock(_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);
	return _error_message;
}

void DecoderStack::clear()
{
	_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();

	clear();

	// 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 probe 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)) &&
			((data = logic_signal->logic_data())))
			break;

	if (!data)
		return;

	// 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);
}

uint64_t DecoderStack::get_max_sample_count() const
{
	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;
}

void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
{
	srd_session *session;
	uint8_t chunk[DecodeChunkLength];
	srd_decoder_inst *prev_di = NULL;

	assert(data);

	// Check we have a snapshot of data
	const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
		data->get_snapshots();
	if (snapshots.empty())
		return;

	// Check that all decoders have the required probes
	BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
		if (!dec->have_required_probes())
			return;

	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();

	// Create the session
	srd_session_new(&session);
	assert(session);

	// Create the decoders
	BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
	{
		srd_decoder_inst *const di = dec->create_decoder_inst(session);

		if (!di)
		{
			_error_message = tr("Failed to create decoder instance");
			srd_session_destroy(session);
			return;
		}

		if (prev_di)
			srd_inst_stack (session, prev_di, di);

		prev_di = di;
	}

	// Start the session
	srd_session_metadata_set(session, SRD_CONF_SAMPLERATE,
		g_variant_new_uint64((uint64_t)_samplerate));

	srd_pd_output_callback_add(session, SRD_OUTPUT_ANN,
		DecoderStack::annotation_callback, this);

	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;
		}
	}

	// Destroy the session
	srd_session_destroy(session);
}

void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
{
	assert(pdata);
	assert(decoder);

	DecoderStack *const d = (DecoderStack*)decoder;
	assert(d);

	lock_guard<mutex> lock(d->_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));	
	}

	assert(row_iter != d->_rows.end());
	if (row_iter == d->_rows.end()) {
		qDebug() << "Unexpected annotation: decoder = " << decc <<
			", format = " << a.format();
		assert(0);
		return;
	}

	// Add the annotation
	(*row_iter).second.push_annotation(a);

	d->new_decode_data();
}

} // namespace data
} // namespace pv
Commit	Line	Data
119aff65 JH	1	/*
	2	* This file is part of the PulseView project.
	3	*
	4	* Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
	5	*
	6	* This program is free software; you can redistribute it and/or modify
	7	* it under the terms of the GNU General Public License as published by
	8	* the Free Software Foundation; either version 2 of the License, or
	9	* (at your option) any later version.
	10	*
	11	* This program is distributed in the hope that it will be useful,
	12	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	13	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	14	* GNU General Public License for more details.
	15	*
	16	* You should have received a copy of the GNU General Public License
	17	* along with this program; if not, write to the Free Software
	18	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	19	*/
	20
e332f6d3 JH	21	#include <libsigrokdecode/libsigrokdecode.h>
e332f6d3 JH	22
7491a29f	23	#include <boost/foreach.hpp>
e0fc5810 JH	24	#include <boost/thread/thread.hpp>
e0fc5810 JH	25
e92cd4e4 JH	26	#include <stdexcept>
e92cd4e4 JH	27
b213ef09 JH	28	#include <QDebug>
b213ef09 JH	29
6e89374a	30	#include "decoderstack.h"
119aff65	31
e0fc5810 JH	32	#include <pv/data/logic.h>
e0fc5810 JH	33	#include <pv/data/logicsnapshot.h>
7491a29f	34	#include <pv/data/decode/decoder.h>
06e810f2	35	#include <pv/data/decode/annotation.h>
e0fc5810	36	#include <pv/view/logicsignal.h>
708c5523	37
819f4c25 JH	38	using boost::lock_guard;
	39	using boost::mutex;
	40	using boost::shared_ptr;
	41	using std::deque;
f9101a91 JH	42	using std::make_pair;
f9101a91 JH	43	using std::max;
819f4c25 JH	44	using std::min;
819f4c25 JH	45	using std::list;
f9101a91 JH	46	using std::map;
f9101a91 JH	47	using std::pair;
819f4c25	48	using std::vector;
e332f6d3	49
f9101a91 JH	50	using namespace pv::data::decode;
f9101a91 JH	51
119aff65 JH	52	namespace pv {
	53	namespace data {
	54
6e89374a JH	55	const double DecoderStack::DecodeMargin = 1.0;
	56	const double DecoderStack::DecodeThreshold = 0.2;
	57	const int64_t DecoderStack::DecodeChunkLength = 4096;
e0fc5810	58
6e89374a	59	mutex DecoderStack::_global_decode_mutex;
fe89c961	60
5dfeb70f JH	61	DecoderStack::DecoderStack(const srd_decoder *const dec) :
5dfeb70f JH	62	_samples_decoded(0)
119aff65	63	{
7491a29f JH	64	_stack.push_back(shared_ptr<decode::Decoder>(
7491a29f JH	65	new decode::Decoder(dec)));
119aff65 JH	66	}
119aff65 JH	67
6e89374a	68	DecoderStack::~DecoderStack()
640d69ce JH	69	{
	70	_decode_thread.interrupt();
	71	_decode_thread.join();
4e5a4405 JH	72	}
4e5a4405 JH	73
7491a29f JH	74	const std::list< boost::shared_ptr<decode::Decoder> >&
7491a29f JH	75	DecoderStack::stack() const
4e5a4405	76	{
7491a29f	77	return _stack;
4e5a4405 JH	78	}
4e5a4405 JH	79
7491a29f	80	void DecoderStack::push(boost::shared_ptr<decode::Decoder> decoder)
4e5a4405	81	{
7491a29f JH	82	assert(decoder);
7491a29f JH	83	_stack.push_back(decoder);
4e5a4405 JH	84	}
4e5a4405 JH	85
613d097c JH	86	void DecoderStack::remove(int index)
613d097c JH	87	{
613d097c JH	88	assert(index >= 0);
	89	assert(index < (int)_stack.size());
	90
	91	// Find the decoder in the stack
	92	list< shared_ptr<Decoder> >::iterator iter = _stack.begin();
	93	for(int i = 0; i < index; i++, iter++)
	94	assert(iter != _stack.end());
	95
	96	// Delete the element
	97	_stack.erase(iter);
	98	}
	99
5dfeb70f JH	100	int64_t DecoderStack::samples_decoded() const
	101	{
	102	lock_guard<mutex> decode_lock(_mutex);
	103	return _samples_decoded;
	104	}
	105
dd048a7e	106	std::vector<Row> DecoderStack::get_visible_rows() const
f9101a91 JH	107	{
	108	lock_guard<mutex> lock(_mutex);
	109
	110	vector<Row> rows;
	111
	112	BOOST_FOREACH (const shared_ptr<decode::Decoder> &dec, _stack)
	113	{
	114	assert(dec);
dd048a7e JH	115	if (!dec->shown())
	116	continue;
	117
f9101a91 JH	118	const srd_decoder *const decc = dec->decoder();
	119	assert(dec->decoder());
	120
	121	// Add a row for the decoder if it doesn't have a row list
	122	if (!decc->annotation_rows)
	123	rows.push_back(Row(decc));
	124
	125	// Add the decoder rows
	126	for (const GSList *l = decc->annotation_rows; l; l = l->next)
	127	{
	128	const srd_decoder_annotation_row *const ann_row =
	129	(srd_decoder_annotation_row *)l->data;
	130	assert(ann_row);
	131	rows.push_back(Row(decc, ann_row));
	132	}
	133	}
	134
	135	return rows;
	136	}
	137
92421299 JH	138	void DecoderStack::get_annotation_subset(
92421299 JH	139	std::vector<pv::data::decode::Annotation> &dest,
f9101a91 JH	140	const Row &row, uint64_t start_sample,
f9101a91 JH	141	uint64_t end_sample) const
e0fc5810	142	{
b6b267bb	143	lock_guard<mutex> lock(_mutex);
92421299	144
f9101a91 JH	145	std::map<const Row, decode::RowData>::const_iterator iter =
	146	_rows.find(row);
	147	if (iter != _rows.end())
	148	(*iter).second.get_annotation_subset(dest,
	149	start_sample, end_sample);
e0fc5810 JH	150	}
e0fc5810 JH	151
6e89374a	152	QString DecoderStack::error_message()
b6b267bb JH	153	{
	154	lock_guard<mutex> lock(_mutex);
	155	return _error_message;
	156	}
	157
f9101a91 JH	158	void DecoderStack::clear()
	159	{
	160	_samples_decoded = 0;
	161	_error_message = QString();
	162	_rows.clear();
	163	_class_rows.clear();
	164	}
	165
6e89374a	166	void DecoderStack::begin_decode()
640d69ce	167	{
7491a29f JH	168	shared_ptr<pv::view::LogicSignal> logic_signal;
	169	shared_ptr<pv::data::Logic> data;
	170
640d69ce JH	171	_decode_thread.interrupt();
	172	_decode_thread.join();
	173
92421299	174	clear();
4e5a4405	175
f9101a91 JH	176	// Add classes
	177	BOOST_FOREACH (const shared_ptr<decode::Decoder> &dec, _stack)
	178	{
	179	assert(dec);
	180	const srd_decoder *const decc = dec->decoder();
	181	assert(dec->decoder());
	182
	183	// Add a row for the decoder if it doesn't have a row list
	184	if (!decc->annotation_rows)
	185	_rows[Row(decc)] = decode::RowData();
	186
	187	// Add the decoder rows
	188	for (const GSList *l = decc->annotation_rows; l; l = l->next)
	189	{
	190	const srd_decoder_annotation_row *const ann_row =
	191	(srd_decoder_annotation_row *)l->data;
	192	assert(ann_row);
	193
	194	const Row row(decc, ann_row);
	195
	196	// Add a new empty row data object
	197	_rows[row] = decode::RowData();
	198
	199	// Map out all the classes
	200	for (const GSList *ll = ann_row->ann_classes;
	201	ll; ll = ll->next)
	202	_class_rows[make_pair(decc,
	203	GPOINTER_TO_INT(ll->data))] = row;
	204	}
	205	}
	206
e0fc5810 JH	207	// We get the logic data of the first probe in the list.
	208	// This works because we are currently assuming all
	209	// LogicSignals have the same data/snapshot
7491a29f JH	210	BOOST_FOREACH (const shared_ptr<decode::Decoder> &dec, _stack)
	211	if (dec && !dec->probes().empty() &&
	212	((logic_signal = (*dec->probes().begin()).second)) &&
7aa09b00	213	((data = logic_signal->logic_data())))
7491a29f JH	214	break;
	215
	216	if (!data)
	217	return;
	218
	219	// Get the samplerate and start time
	220	_start_time = data->get_start_time();
9d28da5a	221	_samplerate = data->samplerate();
7491a29f JH	222	if (_samplerate == 0.0)
7491a29f JH	223	_samplerate = 1.0;
e0fc5810	224
6e89374a	225	_decode_thread = boost::thread(&DecoderStack::decode_proc, this,
e0fc5810	226	data);
640d69ce JH	227	}
640d69ce JH	228
a007f5ad JH	229	uint64_t DecoderStack::get_max_sample_count() const
a007f5ad JH	230	{
f9101a91 JH	231	uint64_t max_sample_count = 0;
	232
	233	for (map<const Row, RowData>::const_iterator i = _rows.begin();
	234	i != _rows.end(); i++)
	235	max_sample_count = max(max_sample_count,
	236	(*i).second.get_max_sample());
	237
	238	return max_sample_count;
a007f5ad JH	239	}
a007f5ad JH	240
6e89374a	241	void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
119aff65	242	{
b6b267bb	243	srd_session *session;
e0fc5810	244	uint8_t chunk[DecodeChunkLength];
7491a29f	245	srd_decoder_inst *prev_di = NULL;
e0fc5810 JH	246
	247	assert(data);
	248
a2d4b551	249	// Check we have a snapshot of data
e0fc5810 JH	250	const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
	251	data->get_snapshots();
	252	if (snapshots.empty())
	253	return;
	254
a2d4b551 JH	255	// Check that all decoders have the required probes
	256	BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
	257	if (!dec->have_required_probes())
	258	return;
	259
e0fc5810 JH	260	const shared_ptr<pv::data::LogicSnapshot> &snapshot =
e0fc5810 JH	261	snapshots.front();
c02f1e09	262	const int64_t sample_count = snapshot->get_sample_count();
064a7f42 JH	263	const unsigned int chunk_sample_count =
064a7f42 JH	264	DecodeChunkLength / snapshot->unit_size();
e0fc5810	265
b6b267bb JH	266	// Create the session
	267	srd_session_new(&session);
	268	assert(session);
e0fc5810	269
7491a29f JH	270	// Create the decoders
	271	BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
	272	{
	273	srd_decoder_inst *const di = dec->create_decoder_inst(session);
e0fc5810	274
7491a29f JH	275	if (!di)
7491a29f JH	276	{
8a290daf	277	_error_message = tr("Failed to create decoder instance");
7491a29f JH	278	srd_session_destroy(session);
	279	return;
	280	}
b6b267bb	281
7491a29f JH	282	if (prev_di)
7491a29f JH	283	srd_inst_stack (session, prev_di, di);
b6b267bb	284
7491a29f	285	prev_di = di;
b6b267bb JH	286	}
b6b267bb JH	287
b6b267bb	288	// Start the session
7491a29f JH	289	srd_session_metadata_set(session, SRD_CONF_SAMPLERATE,
	290	g_variant_new_uint64((uint64_t)_samplerate));
	291
	292	srd_pd_output_callback_add(session, SRD_OUTPUT_ANN,
	293	DecoderStack::annotation_callback, this);
	294
b6b267bb JH	295	srd_session_start(session);
b6b267bb JH	296
e0fc5810	297	for (int64_t i = 0;
819f4c25 JH	298	!boost::this_thread::interruption_requested() &&
819f4c25 JH	299	i < sample_count;
064a7f42	300	i += chunk_sample_count)
e0fc5810	301	{
fe89c961 JH	302	lock_guard<mutex> decode_lock(_global_decode_mutex);
fe89c961 JH	303
e0fc5810	304	const int64_t chunk_end = min(
064a7f42	305	i + chunk_sample_count, sample_count);
e0fc5810 JH	306	snapshot->get_samples(chunk, i, chunk_end);
e0fc5810 JH	307
f00fc2a9 BV	308	if (srd_session_send(session, i, i + sample_count,
f00fc2a9 BV	309	chunk, chunk_end - i) != SRD_OK) {
8a290daf	310	_error_message = tr("Decoder reported an error");
e0fc5810	311	break;
b6b267bb	312	}
5dfeb70f JH	313
	314	{
	315	lock_guard<mutex> lock(_mutex);
	316	_samples_decoded = chunk_end;
	317	}
e0fc5810	318	}
b6b267bb JH	319
	320	// Destroy the session
	321	srd_session_destroy(session);
e0fc5810 JH	322	}
e0fc5810 JH	323
6e89374a	324	void DecoderStack::annotation_callback(srd_proto_data pdata, void decoder)
e0fc5810	325	{
e0fc5810 JH	326	assert(pdata);
	327	assert(decoder);
	328
6e89374a	329	DecoderStack const d = (DecoderStack)decoder;
f9101a91	330	assert(d);
e0fc5810	331
b6b267bb	332	lock_guard<mutex> lock(d->_mutex);
6d8b0562	333
f9101a91 JH	334	const Annotation a(pdata);
	335
	336	// Find the row
	337	assert(pdata->pdo);
	338	assert(pdata->pdo->di);
	339	const srd_decoder *const decc = pdata->pdo->di->decoder;
	340	assert(decc);
	341
	342	map<const Row, decode::RowData>::iterator row_iter = d->_rows.end();
	343
	344	// Try looking up the sub-row of this class
	345	const map<pair<const srd_decoder*, int>, Row>::const_iterator r =
	346	d->_class_rows.find(make_pair(decc, a.format()));
	347	if (r != d->_class_rows.end())
	348	row_iter = d->_rows.find((*r).second);
	349	else
6d8b0562	350	{
f9101a91 JH	351	// Failing that, use the decoder as a key
f9101a91 JH	352	row_iter = d->_rows.find(Row(decc));
6d8b0562 UH	353	}
6d8b0562 UH	354
f9101a91 JH	355	assert(row_iter != d->_rows.end());
	356	if (row_iter == d->_rows.end()) {
	357	qDebug() << "Unexpected annotation: decoder = " << decc <<
	358	", format = " << a.format();
	359	assert(0);
	360	return;
	361	}
9cef9567	362
f9101a91 JH	363	// Add the annotation
f9101a91 JH	364	(*row_iter).second.push_annotation(a);
92421299	365
9cef9567	366	d->new_decode_data();
119aff65 JH	367	}
	368
	369	} // namespace data
	370	} // namespace pv