Generate flame graph in background thread.

Also add a temporary text that indicates we are generating the graph.

diff --git a/gui/flamegraph.cpp b/gui/flamegraph.cpp
index 301ba21..f45f7c5 100644 (file)
--- a/gui/flamegraph.cpp
+++ b/gui/flamegraph.cpp
@@ -32,6 +32,7 @@
 #include <QDebug>
 #include <QAction>
 
+#include <ThreadWeaver/ThreadWeaver>
 #include <KLocalizedString>
 #include <KColorScheme>
 
@@ -57,6 +58,8 @@ private:
     bool m_isHovered;
 };
 
+Q_DECLARE_METATYPE(FrameGraphicsItem*);
+
 FrameGraphicsItem::FrameGraphicsItem(const quint64 cost, const QString& function, FrameGraphicsItem* parent)
     : QGraphicsRectItem(parent)
     , m_cost(cost)
@@ -235,6 +238,8 @@ FlameGraph::FlameGraph(QWidget* parent, Qt::WindowFlags flags)
     , m_selectedItem(nullptr)
     , m_minRootWidth(0)
 {
+    qRegisterMetaType<FrameGraphicsItem*>();
+
     setLayout(new QVBoxLayout);
 
     m_scene->setItemIndexMethod(QGraphicsScene::NoIndex);
@@ -294,7 +299,14 @@ void FlameGraph::setBottomUpData(const TreeData& bottomUpData)
 void FlameGraph::showData()
 {
     setData(nullptr);
-    setData(parseData(m_showBottomUpData ? m_bottomUpData : m_topDownData));
+
+    using namespace ThreadWeaver;
+    auto data = m_showBottomUpData ? m_bottomUpData : m_topDownData;
+    stream() << make_job([data, this]() {
+        auto parsedData = parseData(data);
+        QMetaObject::invokeMethod(this, "setData", Qt::QueuedConnection,
+                                  Q_ARG(FrameGraphicsItem*, parsedData));
+    });
 }
 
 void FlameGraph::setData(FrameGraphicsItem* rootItem)
@@ -303,6 +315,8 @@ void FlameGraph::setData(FrameGraphicsItem* rootItem)
     m_rootItem = rootItem;
     m_selectedItem = rootItem;
     if (!rootItem) {
+        auto text = m_scene->addText(i18n("generating flame graph..."));
+        m_view->centerOn(text);
         return;
     }
 

diff --git a/gui/flamegraph.h b/gui/flamegraph.h
index 580b9c4..0c08211 100644 (file)
--- a/gui/flamegraph.h
+++ b/gui/flamegraph.h
@@ -41,9 +41,11 @@ public:
 protected:
     bool eventFilter(QObject* object, QEvent* event) override;
 
+private slots:
+    void setData(FrameGraphicsItem* rootItem);
+
 private:
     void showData();
-    void setData(FrameGraphicsItem* rootItem);
     void selectItem(FrameGraphicsItem* item);
 
     TreeData m_topDownData;