#include <libsigrokdecode/libsigrokdecode.h>
+#include <boost/foreach.hpp>
#include <boost/thread/thread.hpp>
#include <stdexcept>
#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>
-#include <pv/view/decode/annotation.h>
-using namespace boost;
-using namespace std;
+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 {
mutex DecoderStack::_global_decode_mutex;
DecoderStack::DecoderStack(const srd_decoder *const dec) :
- _decoder(dec),
- _options(g_hash_table_new_full(g_str_hash,
- g_str_equal, g_free, (GDestroyNotify)g_variant_unref))
+ _samples_decoded(0)
{
+ _stack.push_back(shared_ptr<decode::Decoder>(
+ new decode::Decoder(dec)));
}
DecoderStack::~DecoderStack()
{
_decode_thread.interrupt();
_decode_thread.join();
-
- g_hash_table_destroy(_options);
}
-const srd_decoder* DecoderStack::decoder() const
+const std::list< boost::shared_ptr<decode::Decoder> >&
+DecoderStack::stack() const
{
- return _decoder;
+ return _stack;
}
-const map<const srd_probe*, shared_ptr<view::LogicSignal> >&
-DecoderStack::probes() const
+void DecoderStack::push(boost::shared_ptr<decode::Decoder> decoder)
{
- return _probes;
+ assert(decoder);
+ _stack.push_back(decoder);
}
-void DecoderStack::set_probes(std::map<const srd_probe*,
- boost::shared_ptr<view::LogicSignal> > probes)
+void DecoderStack::remove(int index)
{
- _probes = probes;
- begin_decode();
+ 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);
}
-const GHashTable* DecoderStack::options() const
+int64_t DecoderStack::samples_decoded() const
{
- return _options;
+ lock_guard<mutex> decode_lock(_mutex);
+ return _samples_decoded;
}
-void DecoderStack::set_option(const char *id, GVariant *value)
+std::vector<Row> DecoderStack::get_visible_rows() const
{
- g_variant_ref(value);
- g_hash_table_replace(_options, (void*)g_strdup(id), value);
- begin_decode();
+ 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;
}
-const vector< shared_ptr<view::decode::Annotation> >
- DecoderStack::annotations() const
+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);
- return _annotations;
+
+ 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()
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();
- _annotations.clear();
+ clear();
- if (_probes.empty())
- return;
-
- // Get the samplerate and start time
- shared_ptr<pv::view::LogicSignal> logic_signal =
- dynamic_pointer_cast<pv::view::LogicSignal>(
- (*_probes.begin()).second);
- if (logic_signal) {
- shared_ptr<pv::data::Logic> data(
- logic_signal->data());
- if (data) {
- _start_time = data->get_start_time();
- _samplerate = data->get_samplerate();
- if (_samplerate == 0.0)
- _samplerate = 1.0;
+ // 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
- shared_ptr<pv::view::LogicSignal> sig = (*_probes.begin()).second;
- assert(sig);
- shared_ptr<data::Logic> data = sig->data();
+ 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);
}
-void DecoderStack::clear_snapshots()
+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() - 1;
+ const int64_t sample_count = snapshot->get_sample_count();
+ const unsigned int unit_size = snapshot->unit_size();
+ const unsigned int chunk_sample_count =
+ DecodeChunkLength / unit_size;
// Create the session
srd_session_new(&session);
assert(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);
+ // Create the decoders
+ BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
+ {
+ srd_decoder_inst *const di = dec->create_decoder_inst(session, unit_size);
- // Create the decoder instance
- srd_decoder_inst *const decoder_inst = srd_inst_new(
- session, _decoder->id, _options);
- if(!decoder_inst) {
- _error_message = tr("Failed to initialise decoder");
- return;
- }
+ if (!di)
+ {
+ _error_message = tr("Failed to create decoder instance");
+ srd_session_destroy(session);
+ return;
+ }
- // Setup the probes
- GHashTable *const probes = g_hash_table_new_full(g_str_hash,
- g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
+ if (prev_di)
+ srd_inst_stack (session, prev_di, di);
- for(map<const srd_probe*, shared_ptr<view::LogicSignal> >::
- const_iterator i = _probes.begin();
- i != _probes.end(); i++)
- {
- shared_ptr<view::Signal> signal((*i).second);
- GVariant *const gvar = g_variant_new_int32(
- signal->probe()->index);
- g_variant_ref_sink(gvar);
- g_hash_table_insert(probes, (*i).first->id, gvar);
+ prev_di = di;
}
- srd_inst_probe_set_all(decoder_inst, probes);
-
// 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;
- !this_thread::interruption_requested() && i < sample_count;
- i += DecodeChunkLength)
+ !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 + DecodeChunkLength, sample_count);
+ 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("Failed to initialise decoder");
+ 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(_mutex);
+ _samples_decoded = chunk_end;
+ }
}
// Destroy the session
void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
{
- using namespace pv::view::decode;
-
assert(pdata);
assert(decoder);
DecoderStack *const d = (DecoderStack*)decoder;
+ assert(d);
- shared_ptr<Annotation> a(new Annotation(pdata));
lock_guard<mutex> lock(d->_mutex);
- d->_annotations.push_back(a);
+
+ 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();
}
projects / pulseview.git / blobdiff