diff view for top down and bottom up

Author: lievenhey

src/models/costdelegate.cpp

@@ -31,7 +31,8 @@ void CostDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option,
     }
 
     const auto totalCost = index.data(m_totalCostRole).toULongLong();
-    const auto fraction = std::abs(float(cost) / totalCost);
+    // TODO C++17: std::clamp
+    const auto fraction = std::max(0.f, std::min(1.f, std::abs(float(cost) / totalCost)));
 
     auto rect = option.rect;
     rect.setWidth(rect.width() * fraction);

src/models/data.cpp

@@ -312,7 +312,7 @@ QString Data::prettifySymbol(const QString& name)
     return result == name ? name : result;
 }
 
-TopDownResults TopDownResults::fromBottomUp(const BottomUpResults& bottomUpData, bool skipFirstLevel)
+TopDownResults Data::TopDownResults::fromBottomUp(const BottomUpResults& bottomUpData, bool skipFirstLevel)
 {
     TopDownResults results;
     results.selfCosts.initializeCostsFrom(bottomUpData.costs);

src/models/data.h

@@ -526,7 +526,9 @@ struct TopDownResults
     TopDown root;
     Costs selfCosts;
     Costs inclusiveCosts;
-    static TopDownResults fromBottomUp(const Data::BottomUpResults& bottomUpData, bool skipFirstLevel);
+    static TopDownResults fromBottomUp(const Data::BottomUpResults& bottomUpData, bool skipFirestLevel);
+
+    static TopDownResults diffTopDownResults(const Data::TopDownResults& a, const Data::TopDownResults& b);
 };
 
 struct PerLibrary : SymbolTree<PerLibrary>

src/resultstopdownpage.cpp

@@ -9,6 +9,7 @@
 #include "resultstopdownpage.h"
 #include "ui_resultstopdownpage.h"
 
+#include "data.h"
 #include "parsers/perf/perfparser.h"
 #include "resultsutil.h"
 
@@ -18,38 +19,17 @@
 ResultsTopDownPage::ResultsTopDownPage(FilterAndZoomStack* filterStack, PerfParser* parser,
                                        CostContextMenu* contextMenu, QWidget* parent)
     : QWidget(parent)
+    , m_model(new TopDownModel(this))
     , ui(new Ui::ResultsTopDownPage)
 {
     ui->setupUi(this);
 
-    auto topDownCostModel = new TopDownModel(this);
-    ResultsUtil::setupTreeView(ui->topDownTreeView, contextMenu, ui->topDownSearch, topDownCostModel);
-    ResultsUtil::setupCostDelegate(topDownCostModel, ui->topDownTreeView);
-    ResultsUtil::setupContextMenu(ui->topDownTreeView, contextMenu, topDownCostModel, filterStack, this);
-
-    connect(parser, &PerfParser::topDownDataAvailable, this,
-            [this, topDownCostModel](const Data::TopDownResults& data) {
-                topDownCostModel->setData(data);
-                ResultsUtil::hideEmptyColumns(data.inclusiveCosts, ui->topDownTreeView, TopDownModel::NUM_BASE_COLUMNS);
-
-                ResultsUtil::hideEmptyColumns(data.selfCosts, ui->topDownTreeView,
-                                              TopDownModel::NUM_BASE_COLUMNS + data.inclusiveCosts.numTypes());
-                ResultsUtil::hideTracepointColumns(data.selfCosts, ui->topDownTreeView,
-                                                   TopDownModel::NUM_BASE_COLUMNS + data.inclusiveCosts.numTypes());
-
-                // hide self cost columns for sched:sched_switch and off-CPU
-                // quasi all rows will have a cost of 0%, and only the leaves will show
-                // a non-zero value that is equal to the inclusive cost then
-                const auto costs = data.inclusiveCosts.numTypes();
-                const auto schedSwitchName = QLatin1String("sched:sched_switch");
-                const auto offCpuName = PerfParser::tr("off-CPU Time");
-                for (int i = 0; i < costs; ++i) {
-                    const auto typeName = data.inclusiveCosts.typeName(i);
-                    if (typeName == schedSwitchName || typeName == offCpuName) {
-                        ui->topDownTreeView->hideColumn(topDownCostModel->selfCostColumn(i));
-                    }
-                }
-            });
+    ResultsUtil::setupTreeViewDiff(ui->topDownTreeView, contextMenu, ui->topDownSearch, m_model);
+    ResultsUtil::setupCostDelegate(m_model, ui->topDownTreeView);
+    ResultsUtil::setupContextMenu(ui->topDownTreeView, contextMenu, m_model, filterStack, this);
+
+    if (parser)
+        connect(parser, &PerfParser::topDownDataAvailable, this, &ResultsTopDownPage::setTopDownResults);
 
     ResultsUtil::setupResultsAggregation(ui->costAggregationComboBox);
 }
@@ -60,3 +40,28 @@ void ResultsTopDownPage::clear()
 {
     ui->topDownSearch->setText({});
 }
+
+void ResultsTopDownPage::setTopDownResults(const Data::TopDownResults& data)
+{
+    m_model->setData(data);
+    ResultsUtil::hideEmptyColumns(data.inclusiveCosts, ui->topDownTreeView, TopDownModel::NUM_BASE_COLUMNS);
+
+    ResultsUtil::hideEmptyColumns(data.selfCosts, ui->topDownTreeView,
+                                  TopDownModel::NUM_BASE_COLUMNS + data.inclusiveCosts.numTypes());
+    ResultsUtil::hideTracepointColumns(data.selfCosts, ui->topDownTreeView,
+                                       TopDownModel::NUM_BASE_COLUMNS + data.inclusiveCosts.numTypes());
+
+    // hide self cost columns for sched:sched_switch and off-CPU
+    // quasi all rows will have a cost of 0%, and only the leaves will show
+    // a non-zero value that is equal to the inclusive cost then
+    const auto costs = data.inclusiveCosts.numTypes();
+    const auto schedSwitchName = QLatin1String("sched:sched_switch");
+    const auto offCpuName = PerfParser::tr("off-CPU Time");
+    for (int i = 0; i < costs; ++i) {
+        const auto typeName = data.inclusiveCosts.typeName(i);
+        // use contains to also work in diff view
+        if (typeName.contains(schedSwitchName) || typeName.contains(offCpuName)) {
+            ui->topDownTreeView->hideColumn(m_model->selfCostColumn(i));
+        }
+    }
+}

src/resultstopdownpage.h

@@ -16,13 +16,15 @@ class ResultsTopDownPage;
 
 namespace Data {
 struct Symbol;
+struct TopDownResults;
 }
 
 class QTreeView;
 
 class PerfParser;
 class FilterAndZoomStack;
 class CostContextMenu;
+class TopDownModel;
 
 class ResultsTopDownPage : public QWidget
 {
@@ -34,12 +36,16 @@ class ResultsTopDownPage : public QWidget
 
     void clear();
 
+public slots:
+    void setTopDownResults(const Data::TopDownResults& data);
+
 signals:
     void jumpToCallerCallee(const Data::Symbol& symbol);
     void openEditor(const Data::Symbol& symbol);
     void selectSymbol(const Data::Symbol& symbol);
     void jumpToDisassembly(const Data::Symbol& symbol);
 
 private:
+    TopDownModel* m_model = nullptr;
     QScopedPointer<Ui::ResultsTopDownPage> ui;
 };