Diff view

src/CMakeLists.txt

@@ -43,6 +43,7 @@ set(HOTSPOT_SRCS
     resultscallercalleepage.cpp
     resultsdisassemblypage.cpp
     resultsutil.cpp
+    resultspagediff.cpp
     costheaderview.cpp
     timelinewidget.cpp
     dockwidgetsetup.cpp
@@ -52,6 +53,7 @@ set(HOTSPOT_SRCS
     perfoutputwidgettext.cpp
     perfoutputwidgetkonsole.cpp
     costcontextmenu.cpp
+    diffreportdialog.cpp
     # ui files:
     mainwindow.ui
     aboutdialog.ui
@@ -64,13 +66,15 @@ set(HOTSPOT_SRCS
     resultsflamegraphpage.ui
     resultscallercalleepage.ui
     resultsdisassemblypage.ui
+    resultspagediff.ui
     timelinewidget.ui
     unwindsettingspage.ui
     flamegraphsettingspage.ui
     debuginfodpage.ui
     callgraphwidget.ui
     callgraphsettingspage.ui
     frequencypage.ui
+    diffreportdialog.ui
     # resources:
     resources.qrc
 )

src/diffreportdialog.cpp

@@ -0,0 +1,33 @@
+/*
+    SPDX-FileCopyrightText: Lieven Hey <[email protected]>
+    SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company, [email protected]
+    SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
+#include "diffreportdialog.h"
+#include "ui_diffreportdialog.h"
+
+DiffReportDialog::DiffReportDialog(QWidget* parent)
+    : QDialog(parent)
+    , ui(new Ui::DiffReportDialog)
+{
+    ui->setupUi(this);
+    const auto filterString = QStringLiteral("perf*.data\nperf.data*");
+    ui->file_a->setFilter(filterString);
+    ui->file_b->setFilter(filterString);
+
+    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accepted);
+    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::close);
+}
+
+DiffReportDialog::~DiffReportDialog() = default;
+
+QString DiffReportDialog::fileA() const
+{
+    return ui->file_a->url().toLocalFile();
+}
+
+QString DiffReportDialog::fileB() const
+{
+    return ui->file_b->url().toLocalFile();
+}

src/diffreportdialog.h

@@ -0,0 +1,27 @@
+/*
+    SPDX-FileCopyrightText: Lieven Hey <[email protected]>
+    SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company, [email protected]
+    SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
+#pragma once
+
+#include <QDialog>
+
+namespace Ui {
+class DiffReportDialog;
+}
+
+class DiffReportDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit DiffReportDialog(QWidget* parent = nullptr);
+    ~DiffReportDialog();
+
+    QString fileA() const;
+    QString fileB() const;
+
+private:
+    QScopedPointer<Ui::DiffReportDialog> ui;
+};

src/diffreportdialog.ui

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DiffReportDialog</class>
+ <widget class="QDialog" name="DiffReportDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Diff two files</string>
+  </property>
+  <property name="sizeGripEnabled">
+   <bool>false</bool>
+  </property>
+  <layout class="QFormLayout" name="formLayout">
+   <property name="leftMargin">
+    <number>6</number>
+   </property>
+   <property name="topMargin">
+    <number>6</number>
+   </property>
+   <property name="rightMargin">
+    <number>6</number>
+   </property>
+   <property name="bottomMargin">
+    <number>6</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>File A:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>File B:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="KUrlRequester" name="file_a"/>
+   </item>
+   <item row="1" column="1">
+    <widget class="KUrlRequester" name="file_b"/>
+   </item>
+   <item row="2" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Open</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KUrlRequester</class>
+   <extends>QWidget</extends>
+   <header>kurlrequester.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

src/dockwidgetsetup.cpp

@@ -7,7 +7,10 @@
 
 #include "dockwidgetsetup.h"
 
+#include <QAction>
+
 #include <kddockwidgets/Config.h>
+#include <kddockwidgets/DockWidget.h>
 #include <kddockwidgets/FrameworkWidgetFactory.h>
 #include <kddockwidgets/MainWindow.h>
 
@@ -53,4 +56,13 @@ KDDockWidgets::MainWindow* createDockingArea(const QString& id, QWidget* parent)
     return ret;
 }
 
+KDDockWidgets::DockWidget* dockify(QWidget* widget, const QString& id, const QString& title, const QString& shortcut)
+{
+    auto* dock = new KDDockWidgets::DockWidget(id);
+    dock->setWidget(widget);
+    dock->setTitle(title);
+    dock->toggleAction()->setShortcut(shortcut);
+    return dock;
+}
+
 #include "dockwidgetsetup.moc"

src/dockwidgetsetup.h

@@ -9,10 +9,12 @@
 
 namespace KDDockWidgets {
 class MainWindow;
+class DockWidget;
 }
 
 class QWidget;
 class QString;
 
 void setupDockWidgets();
 KDDockWidgets::MainWindow* createDockingArea(const QString& id, QWidget* parent);
+KDDockWidgets::DockWidget* dockify(QWidget* widget, const QString& id, const QString& title, const QString& shortcut);

src/mainwindow.cpp

@@ -10,6 +10,7 @@
 #include "costcontextmenu.h"
 #include "recordpage.h"
 #include "resultspage.h"
+#include "resultspagediff.h"
 #include "settings.h"
 #include "settingsdialog.h"
 #include "startpage.h"
@@ -45,6 +46,7 @@
 #include <kddockwidgets/LayoutSaver.h>
 
 #include "aboutdialog.h"
+#include "diffreportdialog.h"
 
 #include "parsers/perf/perfparser.h"
 
@@ -103,13 +105,16 @@ MainWindow::MainWindow(QWidget* parent)
     , m_startPage(new StartPage(this))
     , m_recordPage(new RecordPage(this))
     , m_resultsPage(new ResultsPage(m_parser, this))
+    , m_resultsPageDiff(new ResultsPageDiff(this))
     , m_settingsDialog(new SettingsDialog(this))
+    , m_diffReportDialog(new DiffReportDialog(this))
 {
     ui->setupUi(this);
 
     m_pageStack->addWidget(m_startPage);
     m_pageStack->addWidget(m_resultsPage);
     m_pageStack->addWidget(m_recordPage);
+    m_pageStack->addWidget(m_resultsPageDiff);
 
     QVBoxLayout* layout = new QVBoxLayout;
     layout->setContentsMargins(0, 0, 0, 0);
@@ -137,6 +142,7 @@ MainWindow::MainWindow(QWidget* parent)
     connect(m_startPage, &StartPage::recordButtonClicked, this, &MainWindow::onRecordButtonClicked);
     connect(m_startPage, &StartPage::stopParseButtonClicked, this,
             static_cast<void (MainWindow::*)()>(&MainWindow::clear));
+    connect(m_startPage, &StartPage::createDiffReportButtonClicked, this, [this] { m_diffReportDialog->show(); });
     connect(m_parser, &PerfParser::progress, m_startPage, &StartPage::onParseFileProgress);
     connect(m_parser, &PerfParser::debugInfoDownloadProgress, m_startPage, &StartPage::onDebugInfoDownloadProgress);
     connect(this, &MainWindow::openFileError, m_startPage, &StartPage::onOpenFileError);
@@ -262,6 +268,13 @@ MainWindow::MainWindow(QWidget* parent)
 
     const auto restored = serializer.restoredDockWidgets();
     m_resultsPage->initDockWidgets(restored);
+
+    connect(m_diffReportDialog, &QDialog::accepted, this, [this] {
+        m_diffReportDialog->close();
+        clear();
+        m_pageStack->setCurrentWidget(m_resultsPageDiff);
+        m_resultsPageDiff->createDiffReport(m_diffReportDialog->fileA(), m_diffReportDialog->fileB());
+    });
 }
 
 MainWindow::~MainWindow() = default;

src/mainwindow.h

@@ -25,8 +25,10 @@ class KRecentFilesAction;
 
 class StartPage;
 class ResultsPage;
+class ResultsPageDiff;
 class RecordPage;
 class SettingsDialog;
+class DiffReportDialog;
 
 class MainWindow : public KParts::MainWindow
 {
@@ -77,7 +79,9 @@ public slots:
     StartPage* m_startPage;
     RecordPage* m_recordPage;
     ResultsPage* m_resultsPage;
+    ResultsPageDiff* m_resultsPageDiff;
     SettingsDialog* m_settingsDialog;
+    DiffReportDialog* m_diffReportDialog;
 
     KRecentFilesAction* m_recentFilesAction = nullptr;
     QAction* m_reloadAction = nullptr;

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/costproxy.h

@@ -10,7 +10,9 @@
 
 #include <QSortFilterProxyModel>
 
+#include "../util.h"
 #include "callercalleeproxy.h"
+#include "treemodel.h"
 
 template<typename Model>
 class CostProxy : public QSortFilterProxyModel
@@ -39,3 +41,85 @@ class CostProxy : public QSortFilterProxyModel
         return CallerCalleeProxyDetail::match(this, item->symbol);
     }
 };
+
+namespace CostProxyUtil {
+inline int cost(const BottomUpModel* model, int column, int nodeid)
+{
+    return model->results().costs.cost(column, nodeid);
+}
+inline int cost(const TopDownModel* model, int column, int nodeid)
+{
+    const auto inclusiveTypes = model->results().inclusiveCosts.numTypes();
+    if (column >= inclusiveTypes) {
+        return model->results().selfCosts.cost(column - inclusiveTypes, nodeid);
+    }
+    return model->results().inclusiveCosts.cost(column, nodeid);
+}
+
+inline int totalCost(const BottomUpModel* model, int column)
+{
+    return model->results().costs.totalCost(column);
+}
+inline int totalCost(const TopDownModel* model, int column)
+{
+    const auto inclusiveTypes = model->results().inclusiveCosts.numTypes();
+    if (column >= inclusiveTypes) {
+        return model->results().selfCosts.totalCost(column - inclusiveTypes);
+    }
+    return model->results().inclusiveCosts.totalCost(column);
+}
+}
+
+// TODO dedicated cost role
+// The DiffCostProxy does all the heavy lifting of diffing
+// its gets it data from a Model with baseline cost and the file to diff cost in alternating columns
+// this proxy return for every even column the base cost and for every uneven the calculated diff cost
+// this simplifies the other models, since we don't need to add this logic there
+template<typename Model>
+class DiffCostProxy : public CostProxy<Model>
+{
+public:
+    explicit DiffCostProxy(QObject* parent = nullptr)
+        : CostProxy<Model>(parent)
+    {
+    }
+
+    QVariant data(const QModelIndex& index, int role) const override
+    {
+        if (index.column() >= Model::NUM_BASE_COLUMNS) {
+            const auto model = qobject_cast<Model*>(CostProxy<Model>::sourceModel());
+            Q_ASSERT(model);
+
+            const auto node = model->itemFromIndex(CostProxy<Model>::mapToSource(index));
+
+            const auto baseColumn = (index.column() - Model::NUM_BASE_COLUMNS) / 2;
+            const auto column = baseColumn + (index.column() - Model::NUM_BASE_COLUMNS) % 2;
+
+            auto cost = [model, node](int column) { return CostProxyUtil::cost(model, column, node->id); };
+
+            auto totalCost = [model](int column) { return CostProxyUtil::totalCost(model, column); };
+
+            if (column == baseColumn) {
+                if (role == Model::TotalCostRole) {
+                    return totalCost(column);
+                } else if (role == Model::SortRole) {
+                    return cost(column);
+                } else if (role == Qt::DisplayRole) {
+                    return Util::formatCostRelative(cost(column), totalCost(column), true);
+                }
+            } else {
+                if (role == Model::TotalCostRole) {
+                    return cost(baseColumn);
+                } else if (role == Model::SortRole) {
+                    if (cost(baseColumn) == 0)
+                        return 0;
+                    return cost(column);
+                } else if (role == Qt::DisplayRole) {
+                    return Util::formatCostRelative(cost(column), cost(baseColumn), true);
+                }
+            }
+        }
+
+        return CostProxy<Model>::data(index, role);
+    }
+};