Merge branch 'systrace' into 'mer-5.4'

[mer] Add systrace trace points in a few crucial places. Contributes to JB#37989. See merge request !7
sailfishos · May 5, 2017 · 1fee6bf · 1fee6bf
2 parents bf670bd + 2dcb934
commit 1fee6bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/compositor/wayland_wrapper/qwlsurface.cpp b/src/compositor/wayland_wrapper/qwlsurface.cpp
@@ -54,6 +54,8 @@
 #include <QGuiApplication>
 #include <QScreen>
 
+#include <private/qsystrace_p.h>
+
 #include <wayland-server.h>
 
 QT_BEGIN_NAMESPACE
@@ -214,6 +216,8 @@ QRegion Surface::opaqueRegion() const
 
 void Surface::sendFrameCallback()
 {
+    QSystraceEvent trace("graphics", "QtWL::sendFrame");
+
     uint time = m_compositor->currentTimeMsecs();
     foreach (FrameCallback *callback, m_frameCallbacks) {
         if (callback->canSend) {
@@ -416,6 +420,7 @@ void Surface::surface_set_input_region(Resource *, struct wl_resource *region)
 
 void Surface::surface_commit(Resource *)
 {
+    QSystraceEvent trace("graphics", "QtWL::commit");
     m_damage = m_pending.damage;
 
     if (m_pending.buffer || m_pending.newlyAttached) {

diff --git a/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp b/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp
@@ -48,6 +48,8 @@
 #include <qpa/qplatformopenglcontext.h>
 #endif
 
+#include <private/qsystrace_p.h>
+
 #include <QtCore/QDebug>
 
 QT_BEGIN_NAMESPACE
@@ -158,6 +160,7 @@ bool SurfaceBuffer::isShmBuffer() const
 
 void SurfaceBuffer::sendRelease()
 {
+    QSystraceEvent trace("graphics", "QtWL::release");
     Q_ASSERT(m_buffer);
     wl_buffer_send_release(m_buffer);
 }