Unify calls to profiler service event methods.

Don't needlessly duplicate information about the profiler being available
and allow inlining. Use macros to check availability of the profiler
in calling code and generally simplify the code.

Task-number: QTBUG-35315
Change-Id: I0a9daec4a95f74b9db795ef2918a01fb772ea107
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

8 files changed, 64 insertions, 97 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index eff8158335..297bea6e6a 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -171,11 +171,9 @@ ShaderManager::Shader *ShaderManager::prepareMaterial(QSGMaterial *material)
     if (qsg_render_timing)
         qDebug("   - compiling material: %dms", (int) qsg_renderer_timer.elapsed());
 
-    if (QQmlProfilerService::enabled) {
-        QQmlProfilerService::sceneGraphFrame(
-                    QQmlProfilerService::SceneGraphContextFrame,
-                    qsg_renderer_timer.nsecsElapsed());
-    }
+    Q_QML_PROFILE(sceneGraphFrame(
+            QQmlProfilerService::SceneGraphContextFrame,
+            qsg_renderer_timer.nsecsElapsed()));
 #endif
 
     rewrittenShaders[type] = shader;
@@ -210,11 +208,9 @@ ShaderManager::Shader *ShaderManager::prepareMaterialNoRewrite(QSGMaterial *mate
     if (qsg_render_timing)
         qDebug("   - compiling material: %dms", (int) qsg_renderer_timer.elapsed());
 
-    if (QQmlProfilerService::enabled) {
-        QQmlProfilerService::sceneGraphFrame(
-                    QQmlProfilerService::SceneGraphContextFrame,
-                    qsg_renderer_timer.nsecsElapsed());
-    }
+    Q_QML_PROFILE(sceneGraphFrame(
+            QQmlProfilerService::SceneGraphContextFrame,
+            qsg_renderer_timer.nsecsElapsed()));
 #endif
 
     return shader;
diff --git a/src/quick/scenegraph/coreapi/qsgrenderer.cpp b/src/quick/scenegraph/coreapi/qsgrenderer.cpp
index e35bfe5494..44b80df15d 100644
--- a/src/quick/scenegraph/coreapi/qsgrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgrenderer.cpp
@@ -287,14 +287,12 @@ void QSGRenderer::renderScene(const QSGBindable &bindable)
                int(renderTime / 1000000));
     }
 
-    if (QQmlProfilerService::enabled) {
-        QQmlProfilerService::sceneGraphFrame(
-                    QQmlProfilerService::SceneGraphRendererFrame,
-                    preprocessTime,
-                    updatePassTime - preprocessTime,
-                    bindTime - updatePassTime,
-                    renderTime - bindTime);
-    }
+    Q_QML_PROFILE(sceneGraphFrame(
+            QQmlProfilerService::SceneGraphRendererFrame,
+            preprocessTime,
+            updatePassTime - preprocessTime,
+            bindTime - updatePassTime,
+            renderTime - bindTime));
 
 #endif
 }
diff --git a/src/quick/scenegraph/qsgadaptationlayer.cpp b/src/quick/scenegraph/qsgadaptationlayer.cpp
index cb9e4bdf88..8798208ea3 100644
--- a/src/quick/scenegraph/qsgadaptationlayer.cpp
+++ b/src/quick/scenegraph/qsgadaptationlayer.cpp
@@ -196,13 +196,11 @@ void QSGDistanceFieldGlyphCache::update()
                (int) qsg_render_timer.elapsed());
 
     }
-    if (QQmlProfilerService::enabled) {
-        QQmlProfilerService::sceneGraphFrame(
-                    QQmlProfilerService::SceneGraphAdaptationLayerFrame,
-                    count,
-                    renderTime,
-                    qsg_render_timer.nsecsElapsed() - renderTime);
-    }
+    Q_QML_PROFILE(sceneGraphFrame(
+            QQmlProfilerService::SceneGraphAdaptationLayerFrame,
+            count,
+            renderTime,
+            qsg_render_timer.nsecsElapsed() - renderTime));
 #endif
 }
 
diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
index ac1bdb7841..facb11d275 100644
--- a/src/quick/scenegraph/qsgrenderloop.cpp
+++ b/src/quick/scenegraph/qsgrenderloop.cpp
@@ -342,13 +342,11 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window)
         lastFrameTime = QTime::currentTime();
     }
 
-    if (QQmlProfilerService::enabled) {
-        QQmlProfilerService::sceneGraphFrame(
-                    QQmlProfilerService::SceneGraphRenderLoopFrame,
-                    syncTime,
-                    renderTime,
-                    swapTime);
-    }
+    Q_QML_PROFILE(sceneGraphFrame(
+            QQmlProfilerService::SceneGraphRenderLoopFrame,
+            syncTime,
+            renderTime,
+            swapTime));
 
     // Might have been set during syncSceneGraph()
     if (data.updatePending)
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
index d8fe947122..98a88a8540 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp
+++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -609,13 +609,11 @@ void QSGRenderThread::syncAndRender()
                    int((renderTime - syncTime)/1000000),
                    int(threadTimer.elapsed() - renderTime/1000000));
 
-        if (QQmlProfilerService::enabled) {
-            QQmlProfilerService::sceneGraphFrame(
-                        QQmlProfilerService::SceneGraphRenderLoopFrame,
-                        syncTime,
-                        renderTime - syncTime,
-                        threadTimer.nsecsElapsed() - renderTime);
-        }
+        Q_QML_PROFILE(sceneGraphFrame(
+                QQmlProfilerService::SceneGraphRenderLoopFrame,
+                syncTime,
+                renderTime - syncTime,
+                threadTimer.nsecsElapsed() - renderTime));
 #endif
 }
 
@@ -1143,14 +1141,12 @@ void QSGThreadedRenderLoop::polishAndSync(Window *w)
                int((syncTime - waitTime)/1000000),
                int((timer.nsecsElapsed() - syncTime)/1000000));
 
-    if (QQmlProfilerService::enabled) {
-        QQmlProfilerService::sceneGraphFrame(
-                    QQmlProfilerService::SceneGraphPolishAndSync,
-                    polishTime,
-                    waitTime - polishTime,
-                    syncTime - waitTime,
-                    timer.nsecsElapsed() - syncTime);
-    }
+    Q_QML_PROFILE(sceneGraphFrame(
+            QQmlProfilerService::SceneGraphPolishAndSync,
+            polishTime,
+            waitTime - polishTime,
+            syncTime - waitTime,
+            timer.nsecsElapsed() - syncTime));
 #endif
 }
 
diff --git a/src/quick/scenegraph/qsgwindowsrenderloop.cpp b/src/quick/scenegraph/qsgwindowsrenderloop.cpp
index 5d9583cafb..14569788b0 100644
--- a/src/quick/scenegraph/qsgwindowsrenderloop.cpp
+++ b/src/quick/scenegraph/qsgwindowsrenderloop.cpp
@@ -202,13 +202,11 @@ void QSGWindowsRenderLoop::show(QQuickWindow *window)
                    int((time_current - time_created)/1000000),
                    int((qsg_render_timer.nsecsElapsed() - time_current)/1000000));
         }
-        if (QQmlProfilerService::enabled) {
-            QQmlProfilerService::sceneGraphFrame(
-                        QQmlProfilerService::SceneGraphWindowsRenderShow,
-                        time_created - time_start,
-                        time_current - time_created,
-                        qsg_render_timer.nsecsElapsed() - time_current);
-        }
+        Q_QML_PROFILE(sceneGraphFrame(
+                QQmlProfilerService::SceneGraphWindowsRenderShow,
+                time_created - time_start,
+                time_current - time_created,
+                qsg_render_timer.nsecsElapsed() - time_current));
 #endif
 
     }
@@ -407,11 +405,9 @@ void QSGWindowsRenderLoop::render()
             qDebug("WindowsRenderLoop: animations=%d ms",
                    int((qsg_render_timer.nsecsElapsed() - time_start)/1000000));
         }
-        if (QQmlProfilerService::Enabled) {
-            QQmlProfilerService::sceneGraphFrame(
-                        QQmlProfilerService::SceneGraphWindowsAnimations,
-                        qsg_render_timer.nsecsElapsed() - time_start);
-        }
+        Q_QML_PROFILE(sceneGraphFrame(
+                QQmlProfilerService::SceneGraphWindowsAnimations,
+                qsg_render_timer.nsecsElapsed() - time_start));
 #endif
 
         // It is not given that animations triggered another maybeUpdate()
@@ -473,19 +469,12 @@ void QSGWindowsRenderLoop::renderWindow(QQuickWindow *window)
                    int((time_rendered - time_synced)/1000000),
                    int((time_swapped - time_rendered)/1000000));
         }
-        if (QQmlProfilerService::enabled) {
-            QQmlProfilerService::sceneGraphFrame(
-                        QQmlProfilerService::SceneGraphWindowsPolishFrame,
-                        time_polished - time_start
-                        );
-
-            QQmlProfilerService::sceneGraphFrame(
-                        QQmlProfilerService::SceneGraphRenderLoopFrame,
-                        time_synced - time_polished,
-                        time_rendered - time_synced,
-                        time_swapped - time_rendered
-                        );
-        }
+        Q_QML_PROFILE(sceneGraphFrame(QQmlProfilerService::SceneGraphWindowsPolishFrame,
+                time_polished - time_start));
+        Q_QML_PROFILE(sceneGraphFrame(QQmlProfilerService::SceneGraphRenderLoopFrame,
+                time_synced - time_polished,
+                time_rendered - time_synced,
+                time_swapped - time_rendered));
 #endif
 }
 
diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp
index 389945849f..0fce410b62 100644
--- a/src/quick/scenegraph/util/qsgatlastexture.cpp
+++ b/src/quick/scenegraph/util/qsgatlastexture.cpp
@@ -381,15 +381,13 @@ bool Atlas::bind(QSGTexture::Filtering filtering)
                    (int) (qsg_renderer_timer.elapsed()));
         }
 
-        if (QQmlProfilerService::enabled) {
-            QQmlProfilerService::sceneGraphFrame(
-                        QQmlProfilerService::SceneGraphTexturePrepare,
-                        0,  // bind (not relevant)
-                        0,  // convert (not relevant)
-                        0,  // swizzle (not relevant)
-                        qsg_renderer_timer.nsecsElapsed(), // (upload all of the above)
-                        0); // mipmap (not used ever...)
-        }
+        Q_QML_PROFILE(sceneGraphFrame(
+                QQmlProfilerService::SceneGraphTexturePrepare,
+                0,  // bind (not relevant)
+                0,  // convert (not relevant)
+                0,  // swizzle (not relevant)
+                qsg_renderer_timer.nsecsElapsed(), // (upload all of the above)
+                0)); // mipmap (not used ever...)
 #endif
     }
 
diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp
index df724d8a01..4243e71844 100644
--- a/src/quick/scenegraph/util/qsgtexture.cpp
+++ b/src/quick/scenegraph/util/qsgtexture.cpp
@@ -634,11 +634,9 @@ void QSGPlainTexture::bind()
                        m_texture_size.width(),
                        m_texture_size.height());
             }
-            if (QQmlProfilerService::enabled) {
-                QQmlProfilerService::sceneGraphFrame(
-                            QQmlProfilerService::SceneGraphTextureDeletion,
-                            qsg_renderer_timer.nsecsElapsed());
-            }
+            Q_QML_PROFILE(sceneGraphFrame(
+                    QQmlProfilerService::SceneGraphTextureDeletion,
+                    qsg_renderer_timer.nsecsElapsed()));
 #endif
         }
         m_texture_id = 0;
@@ -738,17 +736,13 @@ void QSGPlainTexture::bind()
 
     }
 
-    if (QQmlProfilerService::enabled) {
-        mipmapTime = qsg_renderer_timer.nsecsElapsed();
-
-        QQmlProfilerService::sceneGraphFrame(
-                    QQmlProfilerService::SceneGraphTexturePrepare,
-                    bindTime,
-                    convertTime - bindTime,
-                    swizzleTime - convertTime,
-                    uploadTime - swizzleTime,
-                    mipmapTime - uploadTime);
-    }
+    Q_QML_PROFILE(sceneGraphFrame(
+            QQmlProfilerService::SceneGraphTexturePrepare,
+            bindTime,
+            convertTime - bindTime,
+            swizzleTime - convertTime,
+            uploadTime - swizzleTime,
+            qsg_renderer_timer.nsecsElapsed() - uploadTime));
 
 #endif