X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=c179b24a85701f548468ae244019444700af21e8;hp=74ad7d362d0b2fe1e93dc31e928202b06689d23c;hb=f65cd27bdbf70644052dd43dac4bbe9403f4dfee;hpb=a2d4b5512a87a5d60e09fd69b6eec34332c714de diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index 74ad7d36..c179b24a 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -20,24 +20,23 @@ #include -#include -#include - #include #include -#include "decoderstack.h" +#include "decoderstack.hpp" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -using boost::lock_guard; -using boost::mutex; -using boost::shared_ptr; +using std::lock_guard; +using std::mutex; +using boost::optional; +using std::unique_lock; using std::deque; using std::make_pair; using std::max; @@ -45,6 +44,7 @@ using std::min; using std::list; using std::map; using std::pair; +using std::shared_ptr; using std::vector; using namespace pv::data::decode; @@ -55,61 +55,76 @@ 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; +mutex DecoderStack::global_decode_mutex_; -DecoderStack::DecoderStack(const srd_decoder *const dec) : - _samples_decoded(0) +DecoderStack::DecoderStack(pv::Session &session, + const srd_decoder *const dec) : + session_(session), + sample_count_(0), + frame_complete_(false), + samples_decoded_(0) { - _stack.push_back(shared_ptr( + 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( new decode::Decoder(dec))); } DecoderStack::~DecoderStack() { - _decode_thread.interrupt(); - _decode_thread.join(); + if (decode_thread_.joinable()) { + interrupt_ = true; + input_cond_.notify_one(); + decode_thread_.join(); + } } -const std::list< boost::shared_ptr >& +const std::list< std::shared_ptr >& DecoderStack::stack() const { - return _stack; + return stack_; } -void DecoderStack::push(boost::shared_ptr decoder) +void DecoderStack::push(std::shared_ptr decoder) { assert(decoder); - _stack.push_back(decoder); + stack_.push_back(decoder); } void DecoderStack::remove(int index) { assert(index >= 0); - assert(index < (int)_stack.size()); + assert(index < (int)stack_.size()); // Find the decoder in the stack - list< shared_ptr >::iterator iter = _stack.begin(); + auto iter = stack_.begin(); for(int i = 0; i < index; i++, iter++) - assert(iter != _stack.end()); + assert(iter != stack_.end()); // Delete the element - _stack.erase(iter); + stack_.erase(iter); } int64_t DecoderStack::samples_decoded() const { - lock_guard decode_lock(_mutex); - return _samples_decoded; + lock_guard decode_lock(output_mutex_); + return samples_decoded_; } std::vector DecoderStack::get_visible_rows() const { - lock_guard lock(_mutex); + lock_guard lock(output_mutex_); vector rows; - BOOST_FOREACH (const shared_ptr &dec, _stack) + for (const shared_ptr &dec : stack_) { assert(dec); if (!dec->shown()) @@ -140,27 +155,28 @@ void DecoderStack::get_annotation_subset( const Row &row, uint64_t start_sample, uint64_t end_sample) const { - lock_guard lock(_mutex); + lock_guard lock(output_mutex_); - std::map::const_iterator iter = - _rows.find(row); - if (iter != _rows.end()) + const auto iter = rows_.find(row); + if (iter != rows_.end()) (*iter).second.get_annotation_subset(dest, start_sample, end_sample); } QString DecoderStack::error_message() { - lock_guard lock(_mutex); - return _error_message; + lock_guard lock(output_mutex_); + return error_message_; } void DecoderStack::clear() { - _samples_decoded = 0; - _error_message = QString(); - _rows.clear(); - _class_rows.clear(); + sample_count_ = 0; + frame_complete_ = false; + samples_decoded_ = 0; + error_message_ = QString(); + rows_.clear(); + class_rows_.clear(); } void DecoderStack::begin_decode() @@ -168,13 +184,24 @@ void DecoderStack::begin_decode() shared_ptr logic_signal; shared_ptr data; - _decode_thread.interrupt(); - _decode_thread.join(); + if (decode_thread_.joinable()) { + interrupt_ = true; + input_cond_.notify_one(); + decode_thread_.join(); + } clear(); + // Check that all decoders have the required channels + for (const shared_ptr &dec : stack_) + if (!dec->have_required_channels()) { + error_message_ = tr("One or more required channels " + "have not been specified"); + return; + } + // Add classes - BOOST_FOREACH (const shared_ptr &dec, _stack) + for (const shared_ptr &dec : stack_) { assert(dec); const srd_decoder *const decc = dec->decoder(); @@ -182,7 +209,7 @@ void DecoderStack::begin_decode() // Add a row for the decoder if it doesn't have a row list if (!decc->annotation_rows) - _rows[Row(decc)] = decode::RowData(); + rows_[Row(decc)] = decode::RowData(); // Add the decoder rows for (const GSList *l = decc->annotation_rows; l; l = l->next) @@ -194,87 +221,125 @@ void DecoderStack::begin_decode() const Row row(decc, ann_row); // Add a new empty row data object - _rows[row] = decode::RowData(); + 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, + class_rows_[make_pair(decc, GPOINTER_TO_INT(ll->data))] = row; } } - // We get the logic data of the first probe in the list. + // 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 &dec, _stack) - if (dec && !dec->probes().empty() && - ((logic_signal = (*dec->probes().begin()).second)) && + for (const shared_ptr &dec : stack_) + 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 > &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; + 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); + interrupt_ = false; + decode_thread_ = std::thread(&DecoderStack::decode_proc, this); } uint64_t DecoderStack::get_max_sample_count() const { uint64_t max_sample_count = 0; - for (map::const_iterator i = _rows.begin(); - i != _rows.end(); i++) + for (auto i = rows_.cbegin(); 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) +optional DecoderStack::wait_for_data() const +{ + unique_lock input_lock(input_mutex_); + while(!interrupt_ && !frame_complete_ && + samples_decoded_ >= sample_count_) + input_cond_.wait(input_lock); + return boost::make_optional(!interrupt_ && + (samples_decoded_ < sample_count_ || !frame_complete_), + sample_count_); +} + +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(); + + for (int64_t i = 0; !interrupt_ && i < sample_count; + i += chunk_sample_count) + { + lock_guard decode_lock(global_decode_mutex_); - // Check we have a snapshot of data - const deque< shared_ptr > &snapshots = - data->get_snapshots(); - if (snapshots.empty()) - return; + const int64_t chunk_end = min( + i + chunk_sample_count, sample_count); + snapshot_->get_samples(chunk, i, chunk_end); - // Check that all decoders have the required probes - BOOST_FOREACH(const shared_ptr &dec, _stack) - if (!dec->have_required_probes()) - return; + 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; + } - const shared_ptr &snapshot = - snapshots.front(); - const int64_t sample_count = snapshot->get_sample_count(); - const unsigned int chunk_sample_count = - DecodeChunkLength / snapshot->unit_size(); + { + lock_guard lock(output_mutex_); + samples_decoded_ = chunk_end; + } + + if (i % DecodeNotifyPeriod == 0) + new_decode_data(); + } + + new_decode_data(); +} + +void DecoderStack::decode_proc() +{ + optional 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 - BOOST_FOREACH(const shared_ptr &dec, _stack) + const unsigned int unit_size = snapshot_->unit_size(); + + for (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 create decoder instance"); + error_message_ = tr("Failed to create decoder instance"); srd_session_destroy(session); return; } @@ -285,37 +350,24 @@ void DecoderStack::decode_proc(shared_ptr data) prev_di = di; } + // Get the intial sample count + { + unique_lock 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)); + 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 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 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); @@ -329,7 +381,7 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder) DecoderStack *const d = (DecoderStack*)decoder; assert(d); - lock_guard lock(d->_mutex); + lock_guard lock(d->output_mutex_); const Annotation a(pdata); @@ -339,21 +391,20 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder) const srd_decoder *const decc = pdata->pdo->di->decoder; assert(decc); - map::iterator row_iter = d->_rows.end(); - + auto 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); + const auto 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)); + row_iter = d->rows_.find(Row(decc)); } - assert(row_iter != d->_rows.end()); - if (row_iter == d->_rows.end()) { + assert(row_iter != d->rows_.end()); + if (row_iter == d->rows_.end()) { qDebug() << "Unexpected annotation: decoder = " << decc << ", format = " << a.format(); assert(0); @@ -362,8 +413,31 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder) // Add the annotation (*row_iter).second.push_annotation(a); +} + +void DecoderStack::on_new_frame() +{ + begin_decode(); +} - d->new_decode_data(); +void DecoderStack::on_data_received() +{ + { + unique_lock lock(input_mutex_); + if (snapshot_) + sample_count_ = snapshot_->get_sample_count(); + } + input_cond_.notify_one(); +} + +void DecoderStack::on_frame_ended() +{ + { + unique_lock lock(input_mutex_); + if (snapshot_) + frame_complete_ = true; + } + input_cond_.notify_one(); } } // namespace data