X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=8fc3242392bd2642f36a2e093010d8a8c146df38;hp=a764e452d3d82bc203f88e83cac34bf231fbb699;hb=c063290ac7189bdd15221450f598504f43286b43;hpb=ff008de665c7990d5f3408f918ff090d8e6c60b2 diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index a764e452..8fc32423 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -14,8 +14,7 @@ * 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 + * along with this program; if not, see . */ #include @@ -27,7 +26,7 @@ #include "decoderstack.hpp" #include -#include +#include #include #include #include @@ -35,18 +34,18 @@ using std::lock_guard; using std::mutex; -using boost::optional; using std::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::shared_ptr; +using std::make_shared; using std::vector; +using boost::optional; + using namespace pv::data::decode; namespace pv { @@ -54,10 +53,10 @@ 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; +const int64_t DecoderStack::DecodeChunkLength = 10 * 1024 * 1024; +const unsigned int DecoderStack::DecodeNotifyPeriod = 1024; -mutex DecoderStack::global_decode_mutex_; +mutex DecoderStack::global_srd_mutex_; DecoderStack::DecoderStack(pv::Session &session, const srd_decoder *const dec) : @@ -75,8 +74,7 @@ DecoderStack::DecoderStack(pv::Session &session, connect(&session_, SIGNAL(frame_ended()), this, SLOT(on_frame_ended())); - stack_.push_back(shared_ptr( - new decode::Decoder(dec))); + stack_.push_back(make_shared(dec)); } DecoderStack::~DecoderStack() @@ -88,13 +86,12 @@ DecoderStack::~DecoderStack() } } -const std::list< std::shared_ptr >& -DecoderStack::stack() const +const list< shared_ptr >& DecoderStack::stack() const { return stack_; } -void DecoderStack::push(std::shared_ptr decoder) +void DecoderStack::push(shared_ptr decoder) { assert(decoder); stack_.push_back(decoder); @@ -107,7 +104,7 @@ void DecoderStack::remove(int index) // Find the decoder in the stack auto iter = stack_.begin(); - for(int i = 0; i < index; i++, iter++) + for (int i = 0; i < index; i++, iter++) assert(iter != stack_.end()); // Delete the element @@ -119,7 +116,7 @@ double DecoderStack::samplerate() const return samplerate_; } -double DecoderStack::start_time() const +const pv::util::Timestamp& DecoderStack::start_time() const { return start_time_; } @@ -130,14 +127,13 @@ int64_t DecoderStack::samples_decoded() const return samples_decoded_; } -std::vector DecoderStack::get_visible_rows() const +vector DecoderStack::get_visible_rows() const { lock_guard lock(output_mutex_); vector rows; - for (const shared_ptr &dec : stack_) - { + for (const shared_ptr &dec : stack_) { assert(dec); if (!dec->shown()) continue; @@ -147,15 +143,14 @@ std::vector DecoderStack::get_visible_rows() const // Add a row for the decoder if it doesn't have a row list if (!decc->annotation_rows) - rows.push_back(Row(decc)); + rows.emplace_back(decc); // Add the decoder rows - for (const GSList *l = decc->annotation_rows; l; l = l->next) - { + 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)); + rows.emplace_back(decc, ann_row); } } @@ -163,7 +158,7 @@ std::vector DecoderStack::get_visible_rows() const } void DecoderStack::get_annotation_subset( - std::vector &dest, + vector &dest, const Row &row, uint64_t start_sample, uint64_t end_sample) const { @@ -193,9 +188,6 @@ void DecoderStack::clear() void DecoderStack::begin_decode() { - shared_ptr logic_signal; - shared_ptr data; - if (decode_thread_.joinable()) { interrupt_ = true; input_cond_.notify_one(); @@ -213,8 +205,7 @@ void DecoderStack::begin_decode() } // Add classes - for (const shared_ptr &dec : stack_) - { + for (const shared_ptr &dec : stack_) { assert(dec); const srd_decoder *const decc = dec->decoder(); assert(dec->decoder()); @@ -224,8 +215,7 @@ void DecoderStack::begin_decode() rows_[Row(decc)] = decode::RowData(); // Add the decoder rows - for (const GSList *l = decc->annotation_rows; l; l = l->next) - { + 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); @@ -245,26 +235,29 @@ void DecoderStack::begin_decode() // 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 + // logic signals have the same data/segment + pv::data::SignalBase *signalbase; + pv::data::Logic *data = nullptr; + for (const shared_ptr &dec : stack_) if (dec && !dec->channels().empty() && - ((logic_signal = (*dec->channels().begin()).second)) && - ((data = logic_signal->logic_data()))) + ((signalbase = (*dec->channels().begin()).second.get())) && + ((data = signalbase->logic_data().get()))) break; if (!data) return; - // Check we have a snapshot of data - const deque< shared_ptr > &snapshots = - data->logic_snapshots(); - if (snapshots.empty()) + // Check we have a segment of data + const deque< shared_ptr > &segments = + data->logic_segments(); + if (segments.empty()) return; - snapshot_ = snapshots.front(); + segment_ = segments.front(); // Get the samplerate and start time - start_time_ = snapshot_->start_time(); - samplerate_ = snapshot_->samplerate(); + start_time_ = segment_->start_time(); + samplerate_ = segment_->samplerate(); if (samplerate_ == 0.0) samplerate_ = 1.0; @@ -272,13 +265,13 @@ void DecoderStack::begin_decode() decode_thread_ = std::thread(&DecoderStack::decode_proc, this); } -uint64_t DecoderStack::get_max_sample_count() const +uint64_t DecoderStack::max_sample_count() const { uint64_t max_sample_count = 0; - for (auto i = rows_.cbegin(); i != rows_.end(); i++) + for (const auto& row : rows_) max_sample_count = max(max_sample_count, - (*i).second.get_max_sample()); + row.second.get_max_sample()); return max_sample_count; } @@ -286,37 +279,46 @@ uint64_t DecoderStack::get_max_sample_count() const optional DecoderStack::wait_for_data() const { unique_lock input_lock(input_mutex_); - while(!interrupt_ && !frame_complete_ && - samples_decoded_ >= sample_count_) + + // Do wait if we decoded all samples but we're still capturing + // Do not wait if we're done capturing + while (!interrupt_ && !frame_complete_ && + (samples_decoded_ >= sample_count_) && + (session_.get_capture_state() != Session::Stopped)) { + input_cond_.wait(input_lock); + } + + // Return value is valid if we're not aborting the decode, return boost::make_optional(!interrupt_ && - (samples_decoded_ < sample_count_ || !frame_complete_), + // and there's more work to do... + (samples_decoded_ < sample_count_ || !frame_complete_) && + // and if the end of the data hasn't been reached yet + (!((samples_decoded_ >= sample_count_) && (session_.get_capture_state() == Session::Stopped))), sample_count_); } void DecoderStack::decode_data( - const int64_t sample_count, const unsigned int unit_size, + const int64_t abs_start_samplenum, const int64_t sample_count, const unsigned int unit_size, srd_session *const session) { - uint8_t chunk[DecodeChunkLength]; - const unsigned int chunk_sample_count = - DecodeChunkLength / snapshot_->unit_size(); + DecodeChunkLength / segment_->unit_size(); - for (int64_t i = 0; !interrupt_ && i < sample_count; - i += chunk_sample_count) - { - lock_guard decode_lock(global_decode_mutex_); + for (int64_t i = abs_start_samplenum; !interrupt_ && i < sample_count; + i += chunk_sample_count) { const int64_t chunk_end = min( i + chunk_sample_count, sample_count); - snapshot_->get_samples(chunk, i, chunk_end); + const uint8_t* chunk = segment_->get_samples(i, chunk_end); - if (srd_session_send(session, i, i + sample_count, chunk, - (chunk_end - i) * unit_size) != SRD_OK) { + if (srd_session_send(session, i, chunk_end, chunk, + (chunk_end - i) * unit_size, unit_size) != SRD_OK) { error_message_ = tr("Decoder reported an error"); + delete[] chunk; break; } + delete[] chunk; { lock_guard lock(output_mutex_); @@ -334,23 +336,24 @@ void DecoderStack::decode_proc() { optional sample_count; srd_session *session; - srd_decoder_inst *prev_di = NULL; + srd_decoder_inst *prev_di = nullptr; - assert(snapshot_); + assert(segment_); + + // Prevent any other decode threads from accessing libsigrokdecode + lock_guard srd_lock(global_srd_mutex_); // Create the session srd_session_new(&session); assert(session); // Create the decoders - const unsigned int unit_size = snapshot_->unit_size(); + const unsigned int unit_size = segment_->unit_size(); - for (const shared_ptr &dec : stack_) - { - srd_decoder_inst *const di = dec->create_decoder_inst(session, unit_size); + for (const shared_ptr &dec : stack_) { + srd_decoder_inst *const di = dec->create_decoder_inst(session); - if (!di) - { + if (!di) { error_message_ = tr("Failed to create decoder instance"); srd_session_destroy(session); return; @@ -365,7 +368,7 @@ void DecoderStack::decode_proc() // Get the intial sample count { unique_lock input_lock(input_mutex_); - sample_count = sample_count_ = snapshot_->get_sample_count(); + sample_count = sample_count_ = segment_->get_sample_count(); } // Start the session @@ -377,9 +380,11 @@ void DecoderStack::decode_proc() srd_session_start(session); + int64_t abs_start_samplenum = 0; do { - decode_data(*sample_count, unit_size, session); - } while(error_message_.isEmpty() && (sample_count = wait_for_data())); + decode_data(abs_start_samplenum, *sample_count, unit_size, session); + abs_start_samplenum = *sample_count; + } while (error_message_.isEmpty() && (sample_count = wait_for_data())); // Destroy the session srd_session_destroy(session); @@ -409,17 +414,16 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder) 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 - { + 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()) { qDebug() << "Unexpected annotation: decoder = " << decc << ", format = " << a.format(); - assert(0); + assert(false); return; } @@ -436,8 +440,8 @@ void DecoderStack::on_data_received() { { unique_lock lock(input_mutex_); - if (snapshot_) - sample_count_ = snapshot_->get_sample_count(); + if (segment_) + sample_count_ = segment_->get_sample_count(); } input_cond_.notify_one(); } @@ -446,7 +450,7 @@ void DecoderStack::on_frame_ended() { { unique_lock lock(input_mutex_); - if (snapshot_) + if (segment_) frame_complete_ = true; } input_cond_.notify_one();