QtMir

Merge lp:~gerboland/qtmir/restore-firstFramePosted-event into lp:qtmir

  1. restore-firstFramePosted-event
  2. Merge into trunk
Proposed by Gerry Boland
Status: Merged
Approved by: Daniel d'Andrada
Approved revision: 587
Merged at revision: 601
Proposed branch: lp:~gerboland/qtmir/restore-firstFramePosted-event
Merge into: lp:qtmir
Diff against target: 73 lines (+7/-3)
3 files modified
src/modules/Unity/Application/surfacemanager.cpp (+4/-0)
src/platforms/mirserver/tracepoints.tp (+0/-3)
src/platforms/mirserver/windowmanagementpolicy.cpp (+3/-0)
To merge this branch: bzr merge lp:~gerboland/qtmir/restore-firstFramePosted-event
Reviewer Review Type Date Requested Status
Unity8 CI Bot (community) continuous-integration Approve
Daniel d'Andrada (community) Approve
Review via email: mp+315223@code.launchpad.net

Commit message

Restore lost LTTng tracepoints, and delete unused ones

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:587
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/452/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3885/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3913
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3758
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3758/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3758/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3758
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3758/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3758
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3758/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3758
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3758/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3758
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3758/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/452/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Ok

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:587
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/489/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4074
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4102
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3941
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3941/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3941
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3941/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3941
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3941/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3941
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3941/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3941
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3941/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3941
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3941/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/489/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/modules/Unity/Application/surfacemanager.cpp'
2--- src/modules/Unity/Application/surfacemanager.cpp 2016-11-22 20:37:19 +0000
3+++ src/modules/Unity/Application/surfacemanager.cpp 2017-01-20 14:07:30 +0000
4@@ -18,6 +18,7 @@
5
6 #include "mirsurface.h"
7 #include "sessionmanager.h"
8+#include "tracepoints.h"
9
10 // mirserver
11 #include "nativeinterface.h"
12@@ -89,6 +90,7 @@
13 if (session)
14 session->registerSurface(surface);
15
16+ tracepoint(qtmir, surfaceCreated);
17 Q_EMIT surfaceCreated(surface);
18 }
19
20@@ -97,6 +99,7 @@
21 MirSurface *surface = find(windowInfo);
22 forgetMirSurface(windowInfo.window());
23 surface->setLive(false);
24+ tracepoint(qtmir, surfaceDestroyed);
25 }
26
27 MirSurface *SurfaceManager::find(const miral::WindowInfo &needle) const
28@@ -117,6 +120,7 @@
29 void SurfaceManager::onWindowReady(const miral::WindowInfo &windowInfo)
30 {
31 if (auto mirSurface = find(windowInfo)) {
32+ tracepoint(qtmir, firstFrameDrawn); // MirAL decides surface ready when it swaps its first frame
33 mirSurface->setReady();
34 }
35 }
36
37=== modified file 'src/platforms/mirserver/tracepoints.tp'
38--- src/platforms/mirserver/tracepoints.tp 2015-09-14 14:49:07 +0000
39+++ src/platforms/mirserver/tracepoints.tp 2017-01-20 14:07:30 +0000
40@@ -8,8 +8,5 @@
41 TRACEPOINT_EVENT(qtmirserver, sessionAuthorizeStart, TP_ARGS(0), TP_FIELDS())
42 TRACEPOINT_EVENT(qtmirserver, sessionAuthorizeEnd, TP_ARGS(0), TP_FIELDS())
43
44-TRACEPOINT_EVENT(qtmirserver, surfacePlacementStart, TP_ARGS(0), TP_FIELDS())
45-TRACEPOINT_EVENT(qtmirserver, surfacePlacementEnd, TP_ARGS(0), TP_FIELDS())
46-
47 TRACEPOINT_EVENT(qtmirserver, touchEventDispatch_start, TP_ARGS(int64_t, event_time), TP_FIELDS(ctf_integer(int64_t, event_time, event_time)))
48 TRACEPOINT_EVENT(qtmirserver, touchEventDispatch_end, TP_ARGS(int64_t, event_time), TP_FIELDS(ctf_integer(int64_t, event_time, event_time)))
49
50=== modified file 'src/platforms/mirserver/windowmanagementpolicy.cpp'
51--- src/platforms/mirserver/windowmanagementpolicy.cpp 2016-11-22 18:01:11 +0000
52+++ src/platforms/mirserver/windowmanagementpolicy.cpp 2017-01-20 14:07:30 +0000
53@@ -23,6 +23,7 @@
54 #include "miral/window_specification.h"
55
56 #include "mirqtconversion.h"
57+#include "tracepoints.h"
58
59 #include <mir/scene/surface.h>
60 #include <QDebug>
61@@ -136,11 +137,13 @@
62
63 void WindowManagementPolicy::advise_new_app(miral::ApplicationInfo &application)
64 {
65+ tracepoint(qtmirserver, starting);
66 Q_EMIT m_appNotifier.appAdded(application);
67 }
68
69 void WindowManagementPolicy::advise_delete_app(const miral::ApplicationInfo &application)
70 {
71+ tracepoint(qtmirserver, stopping);
72 Q_EMIT m_appNotifier.appRemoved(application);
73 }
74

Subscribers

People subscribed via source and target branches