unity-mir

Merge lp:~gerboland/unity-mir/wait-for-upstart-notification into lp:unity-mir

  1. wait-for-upstart-notification
  2. Merge into trunk
Proposed by Gerry Boland
Status: Merged
Approved by: Michał Sawicz
Approved revision: 159
Merged at revision: 157
Proposed branch: lp:~gerboland/unity-mir/wait-for-upstart-notification
Merge into: lp:unity-mir
Diff against target: 91 lines (+15/-9)
4 files modified
debian/control (+2/-2)
src/modules/Unity/Application/Application.pro (+1/-1)
src/modules/Unity/Application/taskcontroller.cpp (+11/-5)
src/modules/Unity/Application/taskcontroller.h (+1/-1)
To merge this branch: bzr merge lp:~gerboland/unity-mir/wait-for-upstart-notification
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+198041@code.launchpad.net

Commit message

Implement preStart callback added to upstart-app-launch-2

Description of the change

Implement preStart callback added to upstart-app-launch-2
Depends on https://code.launchpad.net/~ted/upstart-app-launch/application-starting/+merge/198027

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:159
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/178/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/41/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/42/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/41/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/178/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:159
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/179/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/42/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/43/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/42/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/179/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Yup.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mir-autolanding/102/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3567/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-autolanding/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-autolanding/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-autolanding/24/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
http://jenkins.qa.ubuntu.com/job/unity-mir-autolanding/102/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3567/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-autolanding/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-autolanding/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-autolanding/24/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-11-22 16:04:11 +0000
3+++ debian/control 2013-12-06 12:34:26 +0000
4@@ -8,7 +8,7 @@
5 libmirserver-dev (>= 0.1.2),
6 libmirclient-dev (>= 0.1.2),
7 libunity-api-dev,
8- libupstart-app-launch1-dev,
9+ libupstart-app-launch2-dev,
10 qt5-default,
11 qtbase5-dev,
12 qtdeclarative5-dev,
13@@ -40,7 +40,7 @@
14 Depends: ${misc:Depends},
15 ${shlibs:Depends},
16 libunity-mir1 (= ${binary:Version}),
17- libupstart-app-launch1-dev,
18+ libupstart-app-launch2-dev,
19 libmirserver-dev (>= 0.0.11),
20 libmirclient-dev (>= 0.0.11),
21 libplatform-api1-dev,
22
23=== modified file 'src/modules/Unity/Application/Application.pro'
24--- src/modules/Unity/Application/Application.pro 2013-11-28 21:08:46 +0000
25+++ src/modules/Unity/Application/Application.pro 2013-12-06 12:34:26 +0000
26@@ -9,7 +9,7 @@
27 QMAKE_CXXFLAGS_RELEASE += -Werror # so no stop on warning in debug builds
28 QMAKE_LFLAGS = -std=c++11 -Wl,-no-undefined
29
30-PKGCONFIG += mircommon mirserver ubuntu-platform-api glib-2.0 upstart-app-launch-1
31+PKGCONFIG += mircommon mirserver ubuntu-platform-api glib-2.0 upstart-app-launch-2
32
33 INCLUDEPATH += ../../../unity-mir
34 LIBS += -L../../../unity-mir -lunity-mir \
35
36=== modified file 'src/modules/Unity/Application/taskcontroller.cpp'
37--- src/modules/Unity/Application/taskcontroller.cpp 2013-10-22 12:43:33 +0000
38+++ src/modules/Unity/Application/taskcontroller.cpp 2013-12-06 12:34:26 +0000
39@@ -305,13 +305,17 @@
40 TaskController::TaskController(QObject *parent) :
41 QObject(parent)
42 {
43- startCallback = [](const gchar * appId, gpointer userData) {
44+ preStartCallback = [](const gchar * appId, gpointer userData) {
45 Q_UNUSED(userData)
46- pid_t pid = upstart_app_launch_get_primary_pid(appId);
47- ensureProcessIsUnlikelyToBeKilled(pid);
48 Q_EMIT TaskController::singleton()->processStartReport(QString(appId), false);
49 };
50
51+ startedCallback = [](const gchar * appId, gpointer userData) {
52+ Q_UNUSED(userData)
53+ pid_t pid = upstart_app_launch_get_primary_pid(appId);
54+ ensureProcessIsUnlikelyToBeKilled(pid);
55+ };
56+
57 stopCallback = [](const gchar * appId, gpointer userData) {
58 Q_UNUSED(userData)
59 Q_EMIT TaskController::singleton()->processStopped(QString(appId), false);
60@@ -341,7 +345,8 @@
61 Q_EMIT TaskController::singleton()->requestResume(QString(appId));
62 };
63
64- upstart_app_launch_observer_add_app_start(startCallback, nullptr);
65+ upstart_app_launch_observer_add_app_starting(preStartCallback, nullptr);
66+ upstart_app_launch_observer_add_app_started(startedCallback, nullptr);
67 upstart_app_launch_observer_add_app_stop(stopCallback, nullptr);
68 upstart_app_launch_observer_add_app_focus(focusCallback, nullptr);
69 upstart_app_launch_observer_add_app_resume(resumeCallback, nullptr);
70@@ -350,7 +355,8 @@
71
72 TaskController::~TaskController()
73 {
74- upstart_app_launch_observer_delete_app_start(startCallback, nullptr);
75+ upstart_app_launch_observer_delete_app_starting(preStartCallback, nullptr);
76+ upstart_app_launch_observer_delete_app_started(startedCallback, nullptr);
77 upstart_app_launch_observer_delete_app_stop(stopCallback, nullptr);
78 upstart_app_launch_observer_delete_app_focus(focusCallback, nullptr);
79 upstart_app_launch_observer_delete_app_resume(resumeCallback, nullptr);
80
81=== modified file 'src/modules/Unity/Application/taskcontroller.h'
82--- src/modules/Unity/Application/taskcontroller.h 2013-10-15 08:54:04 +0000
83+++ src/modules/Unity/Application/taskcontroller.h 2013-12-06 12:34:26 +0000
84@@ -53,7 +53,7 @@
85 TaskController(QObject *parent = 0);
86
87 static TaskController* m_theTaskController;
88- upstart_app_launch_app_observer_t startCallback, stopCallback, focusCallback, resumeCallback;
89+ upstart_app_launch_app_observer_t preStartCallback, startedCallback, stopCallback, focusCallback, resumeCallback;
90 upstart_app_launch_app_failed_observer_t failureCallback;
91 };
92

Subscribers

People subscribed via source and target branches