From: Soeren Apel Date: Wed, 1 Jan 2020 18:08:25 +0000 (+0100) Subject: DecodeTrace: Add profiling and some optimizations X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=5a9146acd1a3ec81ff74e108f50d5b2885ff21a1;p=pulseview.git DecodeTrace: Add profiling and some optimizations --- diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp index 83a8021e..7e12533e 100644 --- a/pv/data/decode/rowdata.cpp +++ b/pv/data/decode/rowdata.cpp @@ -28,7 +28,8 @@ namespace data { namespace decode { RowData::RowData(Row* row) : - row_(row) + row_(row), + prev_ann_start_sample_(0) { assert(row); } @@ -46,7 +47,7 @@ uint64_t RowData::get_annotation_count() const } void RowData::get_annotation_subset( - vector &dest, + vector &dest, uint64_t start_sample, uint64_t end_sample) const { // Determine whether we must apply per-class filtering or not @@ -65,10 +66,11 @@ void RowData::get_annotation_subset( if (all_ann_classes_enabled) { // No filtering, send everyting out as-is + dest.reserve(dest.size() + annotations_.size()); for (const auto& annotation : annotations_) if ((annotation.end_sample() > start_sample) && (annotation.start_sample() <= end_sample)) - dest.push_back(annotation); + dest.push_back(&annotation); } else { if (!all_ann_classes_disabled) { // Filter out invisible annotation classes @@ -78,18 +80,39 @@ void RowData::get_annotation_subset( if (c->visible) class_visible[c->id] = 1; + dest.reserve(dest.size() + annotations_.size()); for (const auto& annotation : annotations_) if ((class_visible[annotation.ann_class()]) && (annotation.end_sample() > start_sample) && (annotation.start_sample() <= end_sample)) - dest.push_back(annotation); + dest.push_back(&annotation); } } } void RowData::emplace_annotation(srd_proto_data *pdata) { - annotations_.emplace_back(pdata, row_); + // We insert the annotation in a way so that the annotation list + // is sorted by start sample. Otherwise, we'd have to sort when + // painting, which is expensive + + if (pdata->start_sample < prev_ann_start_sample_) { + // Find location to insert the annotation at + + auto it = annotations_.end(); + do { + it--; + } while ((it->start_sample() > pdata->start_sample) && (it != annotations_.begin())); + + // Allow inserting at the front + if (it != annotations_.begin()) + it++; + + annotations_.insert(it, Annotation(pdata, row_)); + } else { + annotations_.emplace_back(pdata, row_); + prev_ann_start_sample_ = pdata->start_sample; + } } } // namespace decode diff --git a/pv/data/decode/rowdata.hpp b/pv/data/decode/rowdata.hpp index 0012acd4..4454d691 100644 --- a/pv/data/decode/rowdata.hpp +++ b/pv/data/decode/rowdata.hpp @@ -26,6 +26,7 @@ #include +using std::deque; using std::vector; namespace pv { @@ -39,7 +40,6 @@ class RowData public: RowData(Row* row); -public: uint64_t get_max_sample() const; uint64_t get_annotation_count() const; @@ -50,14 +50,15 @@ public: * fit into the sample range are considered. */ void get_annotation_subset( - vector &dest, + vector &dest, uint64_t start_sample, uint64_t end_sample) const; void emplace_annotation(srd_proto_data *pdata); private: - vector annotations_; - const Row* row_; + deque annotations_; + Row* row_; + uint64_t prev_ann_start_sample_; }; } // namespace decode diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index d6eb9247..831c8e7f 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -41,11 +41,8 @@ using std::min; using std::out_of_range; using std::shared_ptr; using std::unique_lock; -using pv::data::decode::Annotation; using pv::data::decode::AnnotationClass; using pv::data::decode::DecodeChannel; -using pv::data::decode::Decoder; -using pv::data::decode::Row; namespace pv { namespace data { @@ -474,17 +471,15 @@ uint64_t DecodeSignal::get_annotation_count(const Row* row, uint32_t segment_id) auto row_it = segment->annotation_rows.find(row); const RowData* rd; - if (row_it == segment->annotation_rows.end()) { - // FIXME Use the fallback row, but how? - assert(false); + if (row_it == segment->annotation_rows.end()) return 0; - } else + else rd = &(row_it->second); return rd->get_annotation_count(); } -void DecodeSignal::get_annotation_subset(vector &dest, +void DecodeSignal::get_annotation_subset(vector &dest, const Row* row, uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const { @@ -498,29 +493,27 @@ void DecodeSignal::get_annotation_subset(vector &dest, auto row_it = segment->annotation_rows.find(row); const RowData* rd; - if (row_it == segment->annotation_rows.end()) { - // FIXME Use the fallback row, but how? - assert(false); + if (row_it == segment->annotation_rows.end()) return; - } else + else rd = &(row_it->second); rd->get_annotation_subset(dest, start_sample, end_sample); } -void DecodeSignal::get_annotation_subset(vector &dest, +void DecodeSignal::get_annotation_subset(vector &dest, uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const { // Use forward_lists for faster merging - forward_list *all_ann_list = new forward_list(); + forward_list *all_ann_list = new forward_list(); vector rows = get_rows(); for (const Row* row : rows) { - vector *ann_vector = new vector(); + vector *ann_vector = new vector(); get_annotation_subset(*ann_vector, row, segment_id, start_sample, end_sample); - forward_list *ann_list = - new forward_list(ann_vector->begin(), ann_vector->end()); + forward_list *ann_list = + new forward_list(ann_vector->begin(), ann_vector->end()); delete ann_vector; all_ann_list->merge(*ann_list); diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp index 0e5d38c6..f8994adb 100644 --- a/pv/data/decodesignal.hpp +++ b/pv/data/decodesignal.hpp @@ -150,7 +150,7 @@ public: * Note: The annotations may be unsorted and only annotations that fully * fit into the sample range are considered. */ - void get_annotation_subset(vector &dest, const Row* row, + void get_annotation_subset(vector &dest, const Row* row, uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const; /** @@ -158,7 +158,7 @@ public: * Note: The annotations may be unsorted and only annotations that fully * fit into the sample range are considered. */ - void get_annotation_subset(vector &dest, uint32_t segment_id, + void get_annotation_subset(vector &dest, uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const; uint32_t get_binary_data_chunk_count(uint32_t segment_id, diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp index fc7ae6b0..276d9fa6 100644 --- a/pv/views/trace/decodetrace.cpp +++ b/pv/views/trace/decodetrace.cpp @@ -34,6 +34,7 @@ extern "C" { #include #include #include +#include #include #include #include @@ -81,7 +82,6 @@ namespace pv { namespace views { namespace trace { - #define DECODETRACE_COLOR_SATURATION (180) /* 0-255 */ #define DECODETRACE_COLOR_VALUE (170) /* 0-255 */ @@ -213,6 +213,10 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp) { lock_guard lock(row_modification_mutex_); +#if DECODETRACE_SHOW_RENDER_TIME + render_time_.restart(); +#endif + // Set default pen to allow for text width calculation p.setPen(Qt::black); @@ -236,7 +240,7 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp) continue; } - vector annotations; + vector annotations; decode_signal_->get_annotation_subset(annotations, r.decode_row, current_segment_, sample_range.first, sample_range.second); @@ -271,6 +275,10 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp) const QString err = decode_signal_->error_message(); if (!err.isEmpty()) draw_error(p, err, pp); + +#if DECODETRACE_SHOW_RENDER_TIME + qDebug() << "Rendering" << base_->name() << "took" << render_time_.elapsed() << "ms"; +#endif } void DecodeTrace::paint_fore(QPainter &p, ViewItemPaintParams &pp) @@ -325,7 +333,7 @@ void DecodeTrace::paint_fore(QPainter &p, ViewItemPaintParams &pp) void DecodeTrace::update_stack_button() { - const vector< shared_ptr > &stack = decode_signal_->decoder_stack(); + const vector< shared_ptr > &stack = decode_signal_->decoder_stack(); // Only show decoders in the menu that can be stacked onto the last one in the stack if (!stack.empty()) { @@ -352,8 +360,6 @@ void DecodeTrace::update_stack_button() void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form) { - using pv::data::decode::Decoder; - assert(form); // Add the standard options @@ -608,18 +614,16 @@ void DecodeTrace::mouse_left_press_event(const QMouseEvent* event) } } -void DecodeTrace::draw_annotations(vector annotations, +void DecodeTrace::draw_annotations(vector annotations, QPainter &p, int h, const ViewItemPaintParams &pp, int y, QColor row_color, int row_title_width) { - using namespace pv::data::decode; - Annotation::Class block_class = 0; bool block_class_uniform = true; qreal block_start = 0; int block_ann_count = 0; - const Annotation *prev_ann; + const Annotation* prev_ann; qreal prev_end = INT_MIN; qreal a_end; @@ -628,17 +632,11 @@ void DecodeTrace::draw_annotations(vector annotati tie(pixels_offset, samples_per_pixel) = get_pixels_offset_samples_per_pixel(); - // Sort the annotations by start sample so that decoders - // can't confuse us by creating annotations out of order - stable_sort(annotations.begin(), annotations.end(), - [](const Annotation &a, const Annotation &b) { - return a.start_sample() < b.start_sample(); }); - // Gather all annotations that form a visual "block" and draw them as such - for (const Annotation &a : annotations) { + for (const Annotation* a : annotations) { - const qreal abs_a_start = a.start_sample() / samples_per_pixel; - const qreal abs_a_end = a.end_sample() / samples_per_pixel; + const qreal abs_a_start = a->start_sample() / samples_per_pixel; + const qreal abs_a_end = a->end_sample() / samples_per_pixel; const qreal a_start = abs_a_start - pixels_offset; a_end = abs_a_end - pixels_offset; @@ -650,7 +648,7 @@ void DecodeTrace::draw_annotations(vector annotati // Annotation wider than the threshold for a useful label width? if (a_width >= min_useful_label_width_) { - for (const QString &ann_text : a.annotations()) { + for (const QString &ann_text : a->annotations()) { const qreal w = p.boundingRect(QRectF(), 0, ann_text).width(); // Annotation wide enough to fit a label? Don't put it in a block then if (w <= a_width) { @@ -664,8 +662,7 @@ void DecodeTrace::draw_annotations(vector annotati if ((abs(delta) > 1) || a_is_separate) { // Block was broken, draw annotations that form the current block if (block_ann_count == 1) - draw_annotation(*prev_ann, p, h, pp, y, row_color, - row_title_width); + draw_annotation(prev_ann, p, h, pp, y, row_color, row_title_width); else if (block_ann_count > 0) draw_annotation_block(block_start, prev_end, block_class, block_class_uniform, p, h, y, row_color); @@ -682,14 +679,14 @@ void DecodeTrace::draw_annotations(vector annotati block_ann_count = 0; } else { prev_end = a_end; - prev_ann = &a; + prev_ann = a; if (block_ann_count == 0) { block_start = a_start; - block_class = a.ann_class(); + block_class = a->ann_class(); block_class_uniform = true; } else - if (a.ann_class() != block_class) + if (a->ann_class() != block_class) block_class_uniform = false; block_ann_count++; @@ -697,32 +694,31 @@ void DecodeTrace::draw_annotations(vector annotati } if (block_ann_count == 1) - draw_annotation(*prev_ann, p, h, pp, y, row_color, row_title_width); + draw_annotation(prev_ann, p, h, pp, y, row_color, row_title_width); else if (block_ann_count > 0) draw_annotation_block(block_start, prev_end, block_class, block_class_uniform, p, h, y, row_color); } -void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, - QPainter &p, int h, const ViewItemPaintParams &pp, int y, - QColor row_color, int row_title_width) const +void DecodeTrace::draw_annotation(const Annotation* a, QPainter &p, int h, + const ViewItemPaintParams &pp, int y, QColor row_color, int row_title_width) const { double samples_per_pixel, pixels_offset; tie(pixels_offset, samples_per_pixel) = get_pixels_offset_samples_per_pixel(); - const double start = a.start_sample() / samples_per_pixel - + const double start = a->start_sample() / samples_per_pixel - pixels_offset; - const double end = a.end_sample() / samples_per_pixel - pixels_offset; + const double end = a->end_sample() / samples_per_pixel - pixels_offset; - QColor color = get_annotation_color(row_color, a.ann_class()); + QColor color = get_annotation_color(row_color, a->ann_class()); p.setPen(color.darker()); p.setBrush(color); if (start > pp.right() + DrawPadding || end < pp.left() - DrawPadding) return; - if (a.start_sample() == a.end_sample()) + if (a->start_sample() == a->end_sample()) draw_instant(a, p, h, start, y); else draw_range(a, p, h, start, end, y, pp, row_title_width); @@ -757,11 +753,11 @@ void DecodeTrace::draw_annotation_block(qreal start, qreal end, p.drawRoundedRect(rect, r, r); } -void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p, - int h, qreal x, int y) const +void DecodeTrace::draw_instant(const Annotation* a, QPainter &p, int h, qreal x, + int y) const { - const QString text = a.annotations().empty() ? - QString() : a.annotations().back(); + const QString text = a->annotations().empty() ? + QString() : a->annotations().back(); const qreal w = min((qreal)p.boundingRect(QRectF(), 0, text).width(), 0.0) + h; const QRectF rect(x - w / 2, y - h / 2, w, h); @@ -772,13 +768,13 @@ void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter & p.drawText(rect, Qt::AlignCenter | Qt::AlignVCenter, text); } -void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, - int h, qreal start, qreal end, int y, const ViewItemPaintParams &pp, +void DecodeTrace::draw_range(const Annotation* a, QPainter &p, int h, + qreal start, qreal end, int y, const ViewItemPaintParams &pp, int row_title_width) const { const qreal top = y + .5 - h / 2; const qreal bottom = y + .5 + h / 2; - const vector annotations = a.annotations(); + const vector annotations = a->annotations(); // If the two ends are within 1 pixel, draw a vertical line if (start + 1.0 > end) { @@ -819,10 +815,10 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, QString best_annotation; int best_width = 0; - for (const QString &a : annotations) { - const int w = p.boundingRect(QRectF(), 0, a).width(); + for (const QString &s : annotations) { + const int w = p.boundingRect(QRectF(), 0, s).width(); if (w <= rect.width() && w > best_width) - best_annotation = a, best_width = w; + best_annotation = s, best_width = w; } if (best_annotation.isEmpty()) @@ -857,9 +853,6 @@ void DecodeTrace::draw_error(QPainter &p, const QString &message, void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, int right) const { - using namespace pv::data; - using pv::data::decode::Decoder; - double samples_per_pixel, pixels_offset; const int64_t sample_count = decode_signal_->get_working_sample_count(current_segment_); @@ -992,8 +985,6 @@ DecodeTraceRow* DecodeTrace::get_row_at_point(const QPoint &point) const QString DecodeTrace::get_annotation_at_point(const QPoint &point) { - using namespace pv::data::decode; - if (!enabled()) return QString(); @@ -1007,18 +998,17 @@ const QString DecodeTrace::get_annotation_at_point(const QPoint &point) if (point.y() > (int)(get_row_y(r) + (annotation_height_ / 2))) return QString(); - vector annotations; + vector annotations; decode_signal_->get_annotation_subset(annotations, r->decode_row, current_segment_, sample_range.first, sample_range.second); return (annotations.empty()) ? - QString() : annotations[0].annotations().front(); + QString() : annotations[0]->annotations().front(); } -void DecodeTrace::create_decoder_form(int index, - shared_ptr &dec, QWidget *parent, - QFormLayout *form) +void DecodeTrace::create_decoder_form(int index, shared_ptr &dec, + QWidget *parent, QFormLayout *form) { GlobalSettings settings; @@ -1139,10 +1129,8 @@ QComboBox* DecodeTrace::create_channel_selector_init_state(QWidget *parent, return selector; } -void DecodeTrace::export_annotations(vector *annotations) const +void DecodeTrace::export_annotations(vector *annotations) const { - using namespace pv::data::decode; - GlobalSettings settings; const QString dir = settings.value("MainWindow/SaveDirectory").toString(); @@ -1160,23 +1148,23 @@ void DecodeTrace::export_annotations(vector *annotations) const if (file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) { QTextStream out_stream(&file); - for (Annotation &ann : *annotations) { + for (const Annotation* ann : *annotations) { const QString sample_range = QString("%1-%2") \ - .arg(QString::number(ann.start_sample()), QString::number(ann.end_sample())); + .arg(QString::number(ann->start_sample()), QString::number(ann->end_sample())); - const QString row_name = quote + ann.row()->description() + quote; + const QString row_name = quote + ann->row()->description() + quote; QString all_ann_text; - for (const QString &s : ann.annotations()) + for (const QString &s : ann->annotations()) all_ann_text = all_ann_text + quote + s + quote + ","; all_ann_text.chop(1); - const QString first_ann_text = quote + ann.annotations().front() + quote; + const QString first_ann_text = quote + ann->annotations().front() + quote; QString out_text = format; out_text = out_text.replace("%s", sample_range); out_text = out_text.replace("%d", - quote + QString::fromUtf8(ann.row()->decoder()->name()) + quote); + quote + QString::fromUtf8(ann->row()->decoder()->name()) + quote); out_text = out_text.replace("%r", row_name); out_text = out_text.replace("%1", first_ann_text); out_text = out_text.replace("%a", all_ann_text); @@ -1528,12 +1516,10 @@ void DecodeTrace::on_show_hide_class(QWidget* sender) void DecodeTrace::on_copy_annotation_to_clipboard() { - using namespace pv::data::decode; - if (!selected_row_) return; - vector *annotations = new vector(); + vector *annotations = new vector(); decode_signal_->get_annotation_subset(*annotations, selected_row_, current_segment_, selected_sample_range_.first, selected_sample_range_.first); @@ -1542,10 +1528,10 @@ void DecodeTrace::on_copy_annotation_to_clipboard() return; QClipboard *clipboard = QApplication::clipboard(); - clipboard->setText(annotations->front().annotations().front(), QClipboard::Clipboard); + clipboard->setText(annotations->front()->annotations().front(), QClipboard::Clipboard); if (clipboard->supportsSelection()) - clipboard->setText(annotations->front().annotations().front(), QClipboard::Selection); + clipboard->setText(annotations->front()->annotations().front(), QClipboard::Selection); delete annotations; } @@ -1616,12 +1602,10 @@ void DecodeTrace::on_export_all_rows_with_cursor() void DecodeTrace::on_export_row_from_here() { - using namespace pv::data::decode; - if (!selected_row_) return; - vector *annotations = new vector(); + vector *annotations = new vector(); decode_signal_->get_annotation_subset(*annotations, selected_row_, current_segment_, selected_sample_range_.first, selected_sample_range_.second); @@ -1635,9 +1619,7 @@ void DecodeTrace::on_export_row_from_here() void DecodeTrace::on_export_all_rows_from_here() { - using namespace pv::data::decode; - - vector *annotations = new vector(); + vector *annotations = new vector(); decode_signal_->get_annotation_subset(*annotations, current_segment_, selected_sample_range_.first, selected_sample_range_.second); diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp index d7fddbc2..8d651d03 100644 --- a/pv/views/trace/decodetrace.hpp +++ b/pv/views/trace/decodetrace.hpp @@ -20,6 +20,7 @@ #ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP #define PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP +#include #include "trace.hpp" #include @@ -29,6 +30,7 @@ #include #include +#include #include #include #include @@ -40,6 +42,8 @@ #include #include +#define DECODETRACE_SHOW_RENDER_TIME 0 + using std::deque; using std::list; using std::map; @@ -48,6 +52,9 @@ using std::pair; using std::shared_ptr; using std::vector; +using pv::data::SignalBase; +using pv::data::decode::Annotation; +using pv::data::decode::Decoder; using pv::data::decode::Row; struct srd_channel; @@ -111,14 +118,14 @@ private: static const unsigned int AnimationDurationInTicks; public: - DecodeTrace(pv::Session &session, shared_ptr signalbase, + DecodeTrace(pv::Session &session, shared_ptr signalbase, int index); ~DecodeTrace(); bool enabled() const; - shared_ptr base() const; + shared_ptr base() const; /** * Computes the vertical extents of the contents of this row item. @@ -160,30 +167,25 @@ public: virtual void mouse_left_press_event(const QMouseEvent* event); private: - void draw_annotations(vector annotations, - QPainter &p, int h, const ViewItemPaintParams &pp, int y, - QColor row_color, int row_title_width); + void draw_annotations(vector annotations, QPainter &p, + int h, const ViewItemPaintParams &pp, int y, QColor row_color, + int row_title_width); - void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p, - int h, const ViewItemPaintParams &pp, int y, - QColor row_color, int row_title_width) const; + void draw_annotation(const Annotation* a, QPainter &p, int h, + const ViewItemPaintParams &pp, int y, QColor row_color, + int row_title_width) const; - void draw_annotation_block(qreal start, qreal end, - pv::data::decode::Annotation::Class ann_class, bool use_ann_format, - QPainter &p, int h, int y, QColor row_color) const; + void draw_annotation_block(qreal start, qreal end, Annotation::Class ann_class, + bool use_ann_format, QPainter &p, int h, int y, QColor row_color) const; - void draw_instant(const pv::data::decode::Annotation &a, QPainter &p, - int h, qreal x, int y) const; + void draw_instant(const Annotation* a, QPainter &p, int h, qreal x, int y) const; - void draw_range(const pv::data::decode::Annotation &a, QPainter &p, - int h, qreal start, qreal end, int y, const ViewItemPaintParams &pp, - int row_title_width) const; + void draw_range(const Annotation* a, QPainter &p, int h, qreal start, qreal end, + int y, const ViewItemPaintParams &pp, int row_title_width) const; - void draw_error(QPainter &p, const QString &message, - const ViewItemPaintParams &pp); + void draw_error(QPainter &p, const QString &message, const ViewItemPaintParams &pp); - void draw_unresolved_period(QPainter &p, int h, int left, - int right) const; + void draw_unresolved_period(QPainter &p, int h, int left, int right) const; pair get_pixels_offset_samples_per_pixel() const; @@ -207,8 +209,7 @@ private: void update_stack_button(); - void create_decoder_form(int index, - shared_ptr &dec, + void create_decoder_form(int index, shared_ptr &dec, QWidget *parent, QFormLayout *form); QComboBox* create_channel_selector(QWidget *parent, @@ -216,7 +217,7 @@ private: QComboBox* create_channel_selector_init_state(QWidget *parent, const data::decode::DecodeChannel *ch); - void export_annotations(vector *annotations) const; + void export_annotations(vector *annotations) const; void initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id); void update_rows(); @@ -298,6 +299,10 @@ private: QTimer delayed_trace_updater_, animation_timer_; QPolygon default_marker_shape_; + +#if DECODETRACE_SHOW_RENDER_TIME + QElapsedTimer render_time_; +#endif }; } // namespace trace