Merge lp:~gerboland/qtmir/lttng into lp:qtmir

[Gerry Boland]

Add LTTng tracepoints

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

[Gerry Boland (gerboland)]

To test, here's a good guide: http://gould.cx/ted/blog/Measuring_Upstart_App_Launch_using_LTTng

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:233
http://jenkins.qa.ubuntu.com/job/qtmir-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/10/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:234
http://jenkins.qa.ubuntu.com/job/qtmir-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/12/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

Code looks ok, it's pretty simple. But didn't actually try out lttng.

I wonder if the traces are already good enough as they are or if we should add some parameters such as the process id of the client for which we create a surface so that you can separate traces from/for different clients.

review: Approve

[Gerry Boland (gerboland)]

> Code looks ok, it's pretty simple. But didn't actually try out lttng.
>
> I wonder if the traces are already good enough as they are or if we should add
> some parameters such as the process id of the client for which we create a
> surface so that you can separate traces from/for different clients.

I did as much as upstart-app-launch does - it just emits events, no paramaters attached. The main statistic we're interested in is the launch time for a single app. In that case, I don't think we care about separating the individual clients. We can always add more later.

[Michał Sawicz (saviq)]

This needs another review looks like?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:242
http://jenkins.qa.ubuntu.com/job/qtmir-ci/26/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-amd64-ci/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/26/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/26/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:244
http://jenkins.qa.ubuntu.com/job/qtmir-ci/30/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-amd64-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/30/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/30/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:245
http://jenkins.qa.ubuntu.com/job/qtmir-ci/35/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-amd64-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/35/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/35/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:246
http://jenkins.qa.ubuntu.com/job/qtmir-ci/37/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-amd64-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/37/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/37/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

Still looks fine.

review: Approve

[lp:~gerboland/qtmir/lttng]

237. By Daniel d'Andrada on 2014-08-25

Revamp screenshotting to use an image provider again, removing screenshot-related methods on Application

Implementing sourceSize support to scale down images if needed to save memory Fixes: 1359819, 1359821
Approved by: Michał Sawicz, Gerry Boland, Michael Zanetti

238. By Daniel van Vugt on 2014-08-25

Add support for building against Mir when it's installed somewhere other
than /usr (like with a custom $PKG_CONFIG_PATH).
Approved by: Gerry Boland, PS Jenkins bot

239. By PS Jenkins bot on 2014-08-25

Releasing 0.4.2+14.10.20140825-0ubuntu1

240. By Cemil Azizoglu on 2014-08-29

Rebuild for the Mir 0.7.0 release.
Approved by: Michał Sawicz

241. By PS Jenkins bot on 2014-08-29

Releasing 0.4.2+14.10.20140829-0ubuntu1

242. By Nick Dedekind on 2014-09-03

Added support for nested prompt sessions. Fixes: 1358388
Approved by: Gerry Boland, PS Jenkins bot

243. By PS Jenkins bot on 2014-09-03

Releasing 0.4.3+14.10.20140903-0ubuntu1

244. By Gerry Boland on 2014-09-04

Add lttng tracepoints

=== modified file 'debian/control'
--- debian/control	2014-08-21 15:06:43 +0000
+++ debian/control	2014-09-04 11:12:02 +0000
@@ -11,6 +11,7 @@
                libboost-system-dev,
                libfontconfig1-dev,
                libglib2.0-dev,
+               liblttng-ust-dev,
                libmirclient-dev (>= 0.6.0),
                libmirserver-dev (>= 0.6.0),
                libprocess-cpp-dev,
@@ -25,6 +26,8 @@
                libmircommon-dev,
                pkg-config,
                protobuf-compiler,
+# lttng-gen-ts needs python3, but doesn't depend on it itself: bug 1359147
+               python3:any,               
                qt5-default,
                qtbase5-dev,
                qtbase5-private-dev,

=== added file 'src/lttng-compiler.pri'
--- src/lttng-compiler.pri	1970-01-01 00:00:00 +0000
+++ src/lttng-compiler.pri	2014-09-04 11:12:02 +0000
@@ -0,0 +1,25 @@
+# Add extra compiler to handle LTTng TP files
+# Append the files to the LTTNG_TP_FILES list
+
+# Note by Gerry (Aug 2014) - I tried to have lttng-gen-tp generate an object file but it failed to link with
+# the shared library we want. If there's a way to pass -fPIC to lttng-gen-tp, this workaround can be avoided
+QMAKE_EXTRA_COMPILERS += lttng_gen_tp_header
+lttng_gen_tp_header.name = "Generating headers .TP files and adding to HEADERS list"
+lttng_gen_tp_header.input = LTTNG_TP_FILES
+lttng_gen_tp_header.output = $${OUT_PWD}/${QMAKE_FILE_BASE}.h
+lttng_gen_tp_header.commands = lttng-gen-tp -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
+lttng_gen_tp_header.dependency_type = TYPE_H
+lttng_gen_tp_header.variable_out = HEADERS #appends the generated file name to the HEADERS list
+lttng_gen_tp_header.CONFIG = no_link target_predeps
+
+QMAKE_EXTRA_COMPILERS += lttng_gen_tp_sources
+lttng_gen_tp_sources.name = "Generating sources from .TP files and adding to SOURCES list"
+lttng_gen_tp_sources.input = LTTNG_TP_FILES
+lttng_gen_tp_sources.output = $${OUT_PWD}/${QMAKE_FILE_BASE}.c
+lttng_gen_tp_sources.commands = lttng-gen-tp -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
+lttng_gen_tp_sources.dependency_type = TYPE_C
+lttng_gen_tp_sources.variable_out = SOURCES #appends the generated file name to the SOURCES list
+lttng_gen_tp_sources.CONFIG = no_link target_predeps
+
+CONFIG    += link_pkgconfig
+PKGCONFIG += lttng-ust

=== modified file 'src/modules/Unity/Application/Application.pro'
--- src/modules/Unity/Application/Application.pro	2014-08-29 11:15:51 +0000
+++ src/modules/Unity/Application/Application.pro	2014-09-04 11:12:02 +0000
@@ -1,3 +1,5 @@
+include(../../../lttng-compiler.pri)
+
 TARGET = unityapplicationplugin
 TEMPLATE = lib
 
@@ -64,6 +66,8 @@
     sessionmodel.h \
     upstart/applicationcontroller.h
 
+LTTNG_TP_FILES += tracepoints.tp
+
 installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
 
 QML_FILES = qmldir

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2014-08-29 11:48:54 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2014-09-04 11:12:02 +0000
@@ -23,7 +23,7 @@
 #include "proc_info.h"
 #include "taskcontroller.h"
 #include "upstart/applicationcontroller.h"
-
+#include "tracepoints.h" // generated from tracepoints.tp
 
 // mirserver
 #include "mirserverconfiguration.h"
@@ -424,6 +424,7 @@
 Application *ApplicationManager::startApplication(const QString &inputAppId, ExecFlags flags,
                                                   const QStringList &arguments)
 {
+    tracepoint(qtmir, startApplication);
     QString appId = toShortAppIdIfPossible(inputAppId);
     qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::startApplication - this=" << this << "appId" << qPrintable(appId);
 
@@ -461,6 +462,7 @@
 
 void ApplicationManager::onProcessStarting(const QString &appId)
 {
+    tracepoint(qtmir, onProcessStarting);
     qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::onProcessStarting - appId=" << appId;
 
     Application *application = findApplication(appId);
@@ -562,6 +564,7 @@
 
 void ApplicationManager::onProcessStopped(const QString &appId)
 {
+    tracepoint(qtmir, onProcessStopped);
     qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::onProcessStopped - appId=" << appId;
     Application *application = findApplication(appId);
 
@@ -637,16 +640,21 @@
 
 void ApplicationManager::authorizeSession(const quint64 pid, bool &authorized)
 {
+    tracepoint(qtmir, authorizeSession);
     authorized = false; //to be proven wrong
 
     qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::authorizeSession - pid=" << pid;
 
     for (Application *app : m_applications) {
-        if (app->state() == Application::Starting
-                && m_taskController->appIdHasProcessId(app->appId(), pid)) {
-            app->setPid(pid);
-            authorized = true;
-            return;
+        if (app->state() == Application::Starting) {
+            tracepoint(qtmir, appIdHasProcessId_start);
+            if (m_taskController->appIdHasProcessId(app->appId(), pid)) {
+                app->setPid(pid);
+                authorized = true;
+                tracepoint(qtmir, appIdHasProcessId_end, 1); //found
+                return;
+            }
+            tracepoint(qtmir, appIdHasProcessId_end, 0); // not found
         }
     }
 

=== modified file 'src/modules/Unity/Application/mirsurfacemanager.cpp'
--- src/modules/Unity/Application/mirsurfacemanager.cpp	2014-08-29 14:58:07 +0000
+++ src/modules/Unity/Application/mirsurfacemanager.cpp	2014-09-04 11:12:02 +0000
@@ -23,6 +23,7 @@
 #include "mirsurfacemanager.h"
 #include "sessionmanager.h"
 #include "application_manager.h"
+#include "tracepoints.h" // generated from tracepoints.tp
 
 // QPA mirserver
 #include "nativeinterface.h"
@@ -114,6 +115,7 @@
 
     // Only notify QML of surface creation once it has drawn its first frame.
     connect(qmlSurface, &MirSurfaceItem::firstFrameDrawn, this, [&](MirSurfaceItem *item) {
+        tracepoint(qtmir, firstFrameDrawn);
         Q_EMIT surfaceCreated(item);
 
         insert(0, item);
@@ -128,7 +130,9 @@
         }
 
         remove(mirSurfaceItem);
+        tracepoint(qtmir, surfaceDestroyed);
     });
+    tracepoint(qtmir, surfaceCreated);
 }
 
 void MirSurfaceManager::onSessionDestroyingSurface(const mir::scene::Session *session,

=== added file 'src/modules/Unity/Application/tracepoints.tp'
--- src/modules/Unity/Application/tracepoints.tp	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/tracepoints.tp	2014-09-04 11:12:02 +0000
@@ -0,0 +1,9 @@
+TRACEPOINT_EVENT(qtmir, startApplication, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(qtmir, onProcessStarting, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(qtmir, authorizeSession, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(qtmir, onProcessStopped, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(qtmir, surfaceCreated, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(qtmir, surfaceDestroyed, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(qtmir, firstFrameDrawn, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(qtmir, appIdHasProcessId_start, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(qtmir, appIdHasProcessId_end, TP_ARGS(int, found), TP_FIELDS(ctf_integer(int, found, found)))

=== modified file 'src/platforms/mirserver/mirplacementstrategy.cpp'
--- src/platforms/mirserver/mirplacementstrategy.cpp	2014-07-01 13:38:06 +0000
+++ src/platforms/mirserver/mirplacementstrategy.cpp	2014-09-04 11:12:02 +0000
@@ -16,6 +16,7 @@
 
 #include "mirplacementstrategy.h"
 #include "logging.h"
+#include "tracepoints.h" // generated from tracepoints.tp
 
 #include <mir/geometry/rectangle.h>
 #include <mir/shell/display_layout.h>
@@ -35,6 +36,8 @@
 MirPlacementStrategy::place(ms::Session const& /*session*/,
         ms::SurfaceCreationParameters const& requestParameters)
 {
+    tracepoint(qtmirserver, surfacePlacementStart);
+
     // TODO: Callback unity8 so that it can make a decision on that.
     //       unity8 must bear in mind that the called function will be on a Mir thread though.
     //       The QPA shouldn't be deciding for itself on such things.
@@ -50,5 +53,7 @@
         << requestParameters.size.width.as_int() << "," << requestParameters.size.height.as_int() << ") and returned ("
         << placedParameters.size.width.as_int() << "," << placedParameters.size.height.as_int() << ")";
 
+    tracepoint(qtmirserver, surfacePlacementEnd);
+
     return placedParameters;
 }

=== modified file 'src/platforms/mirserver/mirserver.pro'
--- src/platforms/mirserver/mirserver.pro	2014-08-05 09:14:13 +0000
+++ src/platforms/mirserver/mirserver.pro	2014-09-04 11:12:02 +0000
@@ -1,3 +1,5 @@
+include(../../lttng-compiler.pri)
+
 TARGET = qpa-mirserver
 TEMPLATE = lib
 
@@ -73,6 +75,8 @@
     unityprotobufservice.h \
     unityrpc.h
 
+LTTNG_TP_FILES += tracepoints.tp
+
 # Installation path
 target.path +=  $$[QT_INSTALL_PLUGINS]/platforms
 

=== modified file 'src/platforms/mirserver/sessionauthorizer.cpp'
--- src/platforms/mirserver/sessionauthorizer.cpp	2014-07-18 08:53:13 +0000
+++ src/platforms/mirserver/sessionauthorizer.cpp	2014-09-04 11:12:02 +0000
@@ -16,6 +16,7 @@
 
 #include "sessionauthorizer.h"
 #include "logging.h"
+#include "tracepoints.h" // generated from tracepoints.tp
 
 // mir
 #include <mir/frontend/session_credentials.h>
@@ -33,10 +34,13 @@
 
 bool SessionAuthorizer::connection_is_allowed(SessionCredentials const& creds)
 {
+    tracepoint(qtmirserver, sessionAuthorizeStart);
     qCDebug(QTMIR_MIR_MESSAGES) << "SessionAuthorizer::connection_is_allowed - this=" << this << "pid=" << creds.pid();
     bool authorized = true;
 
     Q_EMIT requestAuthorizationForSession(creds.pid(), authorized); // needs to block until authorized value returned
+    tracepoint(qtmirserver, sessionAuthorizeEnd);
+
     return authorized;
 }
 

=== modified file 'src/platforms/mirserver/sessionlistener.cpp'
--- src/platforms/mirserver/sessionlistener.cpp	2014-07-01 13:38:06 +0000
+++ src/platforms/mirserver/sessionlistener.cpp	2014-09-04 11:12:02 +0000
@@ -16,6 +16,7 @@
 
 #include "sessionlistener.h"
 #include "logging.h"
+#include "tracepoints.h" // generated from tracepoints.tp
 
 namespace ms = mir::scene;
 
@@ -38,12 +39,14 @@
 
 void SessionListener::starting(std::shared_ptr<ms::Session> const& session)
 {
+    tracepoint(qtmirserver, starting);
     qCDebug(QTMIR_MIR_MESSAGES) << "SessionListener::starting - this=" << this << "session=" << session.get();
     Q_EMIT sessionStarting(session);
 }
 
 void SessionListener::stopping(std::shared_ptr<ms::Session> const& session)
 {
+    tracepoint(qtmirserver, stopping);
     qCDebug(QTMIR_MIR_MESSAGES) << "SessionListener::stopping - this=" << this << "session=" << session.get();
     Q_EMIT sessionStopping(session);
 }
@@ -62,6 +65,7 @@
 
 void SessionListener::surface_created(ms::Session& session, std::shared_ptr<ms::Surface> const& surface)
 {
+    tracepoint(qtmirserver, surfaceCreated);
     qCDebug(QTMIR_MIR_MESSAGES) << "SessionListener::surface_created - this=" << this << "session=" << &session
                                    << "surface=" << surface.get();
     Q_EMIT sessionCreatedSurface(&session, surface);
@@ -69,6 +73,7 @@
 
 void SessionListener::destroying_surface(ms::Session& session, std::shared_ptr<ms::Surface> const& surface)
 {
+    tracepoint(qtmirserver, surfaceDestroyed);
     qCDebug(QTMIR_MIR_MESSAGES) << "SessionListener::destroying_surface - this=" << this << "session=" << &session
                                    << "surface=" << surface.get();
     Q_EMIT sessionDestroyingSurface(&session, surface);

=== added file 'src/platforms/mirserver/tracepoints.tp'
--- src/platforms/mirserver/tracepoints.tp	1970-01-01 00:00:00 +0000
+++ src/platforms/mirserver/tracepoints.tp	2014-09-04 11:12:02 +0000
@@ -0,0 +1,10 @@
+TRACEPOINT_EVENT(qtmirserver, starting, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(qtmirserver, stopping, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(qtmirserver, surfaceCreated, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(qtmirserver, surfaceDestroyed, TP_ARGS(0), TP_FIELDS())
+
+TRACEPOINT_EVENT(qtmirserver, sessionAuthorizeStart, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(qtmirserver, sessionAuthorizeEnd, TP_ARGS(0), TP_FIELDS())
+
+TRACEPOINT_EVENT(qtmirserver, surfacePlacementStart, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(qtmirserver, surfacePlacementEnd, TP_ARGS(0), TP_FIELDS())