X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=9707d8d2cb605ddf61361bd48c648c4b48d65714;hp=5b58761f9c1c3464121299c3c6259a907015a10a;hb=6d483b8b51b4efceacf2f48776af33550bf5d29e;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index 5b58761f..9707d8d2 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -39,10 +39,16 @@ 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 { @@ -61,8 +67,10 @@ DecoderStack::DecoderStack(const srd_decoder *const 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 >& @@ -79,8 +87,6 @@ void DecoderStack::push(boost::shared_ptr decoder) void DecoderStack::remove(int index) { - using pv::data::decode::Decoder; - assert(index >= 0); assert(index < (int)_stack.size()); @@ -99,10 +105,50 @@ int64_t DecoderStack::samples_decoded() const return _samples_decoded; } -const vector DecoderStack::annotations() const +std::vector DecoderStack::get_visible_rows() const { lock_guard lock(_mutex); - return _annotations; + + vector rows; + + BOOST_FOREACH (const shared_ptr &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 &dest, + const Row &row, uint64_t start_sample, + uint64_t end_sample) const +{ + lock_guard lock(_mutex); + + std::map::const_iterator iter = + _rows.find(row); + if (iter != _rows.end()) + (*iter).second.get_annotation_subset(dest, + start_sample, end_sample); } QString DecoderStack::error_message() @@ -111,17 +157,56 @@ 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 logic_signal; shared_ptr data; - _decode_thread.interrupt(); - _decode_thread.join(); + if (_decode_thread.joinable()) { + _decode_thread.interrupt(); + _decode_thread.join(); + } - _samples_decoded = 0; + clear(); + + // Add classes + BOOST_FOREACH (const shared_ptr &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(); - _annotations.clear(); + // 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 @@ -145,16 +230,16 @@ void DecoderStack::begin_decode() data); } -void DecoderStack::clear() -{ - _annotations.clear(); -} - uint64_t DecoderStack::get_max_sample_count() const { - if (_annotations.empty()) - return 0; - return _annotations.back().end_sample(); + uint64_t max_sample_count = 0; + + for (map::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) @@ -165,28 +250,36 @@ void DecoderStack::decode_proc(shared_ptr data) assert(data); + // Check we have a snapshot of data const deque< shared_ptr > &snapshots = data->get_snapshots(); if (snapshots.empty()) return; + // Check that all decoders have the required probes + BOOST_FOREACH(const shared_ptr &dec, _stack) + if (!dec->have_required_probes()) + return; + const shared_ptr &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); - // Create the decoders BOOST_FOREACH(const shared_ptr &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) { - _error_message = tr("Failed to initialise decoder"); + _error_message = tr("Failed to create decoder instance"); srd_session_destroy(session); return; } @@ -209,17 +302,17 @@ void DecoderStack::decode_proc(shared_ptr data) for (int64_t i = 0; !boost::this_thread::interruption_requested() && i < sample_count; - i += DecodeChunkLength) + i += chunk_sample_count) { lock_guard 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; } @@ -235,15 +328,45 @@ void DecoderStack::decode_proc(shared_ptr data) void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder) { - using pv::data::decode::Annotation; - assert(pdata); assert(decoder); DecoderStack *const d = (DecoderStack*)decoder; + assert(d); lock_guard lock(d->_mutex); - d->_annotations.push_back(Annotation(pdata)); + + 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::iterator row_iter = d->_rows.end(); + + // Try looking up the sub-row of this class + const map, 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(); }