Merge lp:~ted/qtmir/ual-pause into lp:qtmir

[Ted Gould]

Use UAL pause/resume functions for stopping/continuing all tasks in the cgroup

Switching from internal functions for doing all the signaling and OOM adjusting to using the ones in UAL.

 * Are there any related MPs required for this MP to build/function as expected? Please list.

https://code.launchpad.net/~ted/unity8/dash-oom-score/+merge/238888

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yup.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Naw, just removing a one-line dep. I think I'm good for that change.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:261
http://jenkins.qa.ubuntu.com/job/qtmir-ci/97/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-amd64-ci/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/97
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/97/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

Okay, to get all the Oxide renderers you'll need this too:

https://code.launchpad.net/~ted/ubuntu-app-launch/setuid-oom-adjust/+merge/236422

[Gerry Boland (gerboland)]

Hey Ted, thanks for this! Lots of red, yay! Couple of things I noticed before doing a full review:

Please add checklist: https://wiki.ubuntu.com/Process/Merges/Checklists/QtMir
with the list of required MRs

As you're removing ProcessController, I suspect you can remove qtmir's dependence on process-cpp package.

+++ src/modules/Unity/Application/taskcontroller.h
-/*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+/* Copyright (C) 2013-2014 Canonical, Ltd.
Unnecessary change

+++ src/modules/Unity/Application/upstart/applicationcontroller.cpp
+bool ApplicationController::pauseApplicationWithAppId(const QString& appId)
+ qDebug() << "ApplicationController::pauseApplication FAILED to stop appId=" << appId;
failed to _pause_ appId

+ qDebug() << "ApplicationController::resumeApplication FAILED to stop appId=" << appId;
failed to _resume_

+++ tests/modules/common/mock_application_controller.h
+ (void) appId;
Us Qt people tend to use a macro for this: Q_UNUSED(appId);

And couple of higher-level questions about UAL's behaviour (mostly confirmations for me):
1. UAL changes the OOM-killer score when we pause/resume apps, yes?
2. UAL gives app a unlikely-to-be-killed OOM score on start of that app?

Something that worries me about this change is that apps not managed by upstart will no longer have correct OOM-killer weights. Are trust helpers managed by upstart these days? Does the OSK get a good OOM-killer value? I need to test this carefully.

review: Needs Fixing

[Ted Gould (ted)]

On Mon, 2014-10-06 at 12:17 +0000, Gerry Boland wrote:

> As you're removing ProcessController, I suspect you can remove qtmir's
> dependence on process-cpp package.

Not my goal, but it seems so. There were a few pieces left to kill. r262

> +++ src/modules/Unity/Application/taskcontroller.h
> -/*
> - * Copyright (C) 2013-2014 Canonical, Ltd.
> +/* Copyright (C) 2013-2014 Canonical, Ltd.
> Unnecessary change

Fixed r263.

> +++ src/modules/Unity/Application/upstart/applicationcontroller.cpp
> +bool ApplicationController::pauseApplicationWithAppId(const QString& appId)
> + qDebug() << "ApplicationController::pauseApplication FAILED to stop appId=" << appId;
> failed to _pause_ appId
>
> + qDebug() << "ApplicationController::resumeApplication FAILED to stop appId=" << appId;
> failed to _resume_

Fixed r264.

> +++ tests/modules/common/mock_application_controller.h
> + (void) appId;
> Us Qt people tend to use a macro for this: Q_UNUSED(appId);

Fixed r265.

> And couple of higher-level questions about UAL's behaviour (mostly
> confirmations for me):
> 1. UAL changes the OOM-killer score when we pause/resume apps, yes?

Correct.

> 2. UAL gives app a unlikely-to-be-killed OOM score on start of that
> app?

Correct.

> Something that worries me about this change is that apps not managed
> by upstart will no longer have correct OOM-killer weights. Are trust
> helpers managed by upstart these days? Does the OSK get a good
> OOM-killer value? I need to test this carefully.

All processes are managed by Upstart, so they can all have an OOM score
set in their Upstart job. For instance that's how UAL sets the initial
value, it makes Upstart do it on job creation. I don't know that the OSK
job has that configured properly though.

[lp:~ted/qtmir/ual-pause]

262. By Ted Gould on 2014-10-06

Trying to remove process-cpp entirely

263. By Ted Gould on 2014-10-06

No clue how that got changed

264. By Ted Gould on 2014-10-06

Debug message cut-and-paste error

265. By Ted Gould on 2014-10-06

Use Q_UNUSED() macro

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~ted/qtmir/ual-pause]

266. By Ted Gould on 2014-10-06

Merge trunk

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~ted/qtmir/ual-pause]

267. By Ted Gould on 2014-10-06

Removing the process module from the QMake files

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~ted/qtmir/ual-pause]

268. By Ted Gould on 2014-10-07

Switch to using the accessor in the application object

269. By Ted Gould on 2014-10-07

Changing the API back to being appId based so that we don't have to let longAppId through.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~ted/qtmir/ual-pause]

270. By Ted Gould on 2014-10-07

Apparently a new process-cpp inclusion

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

CI still not happy. Appears we still use process-cpp in a test. You'd better restore it, and we'll change that later.

review: Needs Fixing

[Gerry Boland (gerboland)]

One important piece of info for you:
https://code.launchpad.net/~unity-team/qtmir/dash-killed-less-likely/+merge/237915
this will land first, and we need the ability to give Dash a custom OOM weight. You need to adjust this to suit unfortunately.

review: Needs Fixing

[Gerry Boland (gerboland)]

- pid_t pid = m_appController->primaryPidForAppId(app->appId());
- if (pid == 0) {
- pid = app->pid();
- }
-m_processController->oomController()->ensureProcessLikelyToBeKilled(pid);

This code is needed, as unity-dash is not managed by UAL, but is spawned by upstart, and we need to suspend/resume it

review: Needs Fixing

[lp:~ted/qtmir/ual-pause]

271. By Ted Gould on 2014-10-20

Partial trunk update

272. By Ted Gould on 2014-10-20

Getting closer to trunk

273. By Ted Gould on 2014-10-20

Merge trunk

[Ted Gould (ted)]

As discussed on IRC here's the change to the dash Upstart job to put the OOM score at 200.

https://code.launchpad.net/~ted/unity8/dash-oom-score/+merge/238888

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~ted/qtmir/ual-pause]

274. By Ted Gould on 2014-10-20

Add pack process-cpp-dev

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:274
http://jenkins.qa.ubuntu.com/job/qtmir-ci/145/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-amd64-ci/145
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/145
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/145/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Working well. Only issue is that dash is not being suspended/resumed. This bit of code you removed was doing it:

- pid_t pid = m_appController->primaryPidForAppId(app->appId());
- if (pid == 0) {
- pid = app->pid();
- }

i.e. if UAL didn't know the PID for the process, then we'd use the PID that AppMan saves. Then you could call signal(SIGSTOP) manually. That'll do to fix it.
Thanks
-G

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:275
http://jenkins.qa.ubuntu.com/job/qtmir-ci/147/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-amd64-ci/147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/147
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/147/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Hey Ted,
my apologies but I've been told that your initial design to not suspend/resume the dash is now correct. Can you please revert revision 275. Then am happy to approve
-Gerry

review: Needs Fixing

[Ted Gould (ted)]

Pushed without r275

[Gerry Boland (gerboland)]

Works great, thanks Ted

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yep
 * Did CI run pass? If not, please explain why.
Y

review: Approve

=== modified file 'src/modules/Unity/Application/Application.pro'
--- src/modules/Unity/Application/Application.pro	2014-09-17 17:29:42 +0000
+++ src/modules/Unity/Application/Application.pro	2014-10-24 15:59:35 +0000
@@ -36,7 +36,6 @@
     ubuntukeyboardinfo.cpp \
     mirsurfaceitem.cpp \
     mirbuffersgtexture.cpp \
-    processcontroller.cpp \
     proc_info.cpp \
     session.cpp \
     sessionmanager.cpp \
@@ -60,7 +59,6 @@
     mirsurfaceitemmodel.h \
     mirbuffersgtexture.h \
     objectlistmodel.h \
-    processcontroller.h \
     proc_info.h \
     session.h \
     session_interface.h \

=== modified file 'src/modules/Unity/Application/application.cpp'
--- src/modules/Unity/Application/application.cpp	2014-10-13 10:07:10 +0000
+++ src/modules/Unity/Application/application.cpp	2014-10-24 15:59:35 +0000
@@ -325,13 +325,13 @@
 void Application::onSessionSuspended()
 {
     qCDebug(QTMIR_APPLICATIONS) << "Application::onSessionSuspended - appId=" << appId();
-    m_taskController->suspend(this);
+    m_taskController->suspend(longAppId());
 }
 
 void Application::onSessionResumed()
 {
     qCDebug(QTMIR_APPLICATIONS) << "Application::onSessionResumed - appId=" << appId();
-    m_taskController->resume(this);
+    m_taskController->resume(longAppId());
 }
 
 void Application::respawn()

=== modified file 'src/modules/Unity/Application/applicationcontroller.h'
--- src/modules/Unity/Application/applicationcontroller.h	2014-07-02 22:56:08 +0000
+++ src/modules/Unity/Application/applicationcontroller.h	2014-10-24 15:59:35 +0000
@@ -48,6 +48,9 @@
     virtual bool stopApplicationWithAppId(const QString &appId) = 0;
     virtual bool startApplicationWithAppIdAndArgs(const QString &appId, const QStringList &arguments) = 0;
 
+    virtual bool pauseApplicationWithAppId(const QString &appId) = 0;
+    virtual bool resumeApplicationWithAppId(const QString &appId) = 0;
+
     virtual QFileInfo findDesktopFileForAppId(const QString &appId) const = 0;
 
 Q_SIGNALS:

=== removed file 'src/modules/Unity/Application/processcontroller.cpp'
--- src/modules/Unity/Application/processcontroller.cpp	2014-10-10 08:38:30 +0000
+++ src/modules/Unity/Application/processcontroller.cpp	1970-01-01 00:00:00 +0000
@@ -1,231 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3, as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "processcontroller.h"
-
-#include "logging.h"
-
-// Process C++
-#include <core/posix/process.h>
-#include <core/posix/this_process.h>
-#include <core/posix/linux/proc/process/oom_adj.h>
-#include <core/posix/linux/proc/process/oom_score_adj.h>
-
-// std
-#include <signal.h>
-#include <unistd.h>
-
-/*
- * ProcessController
- * This class manages individual processes during their lifetime. It allows one to pause
- * and resume processes.
- *
- * It also has methods to set a score on processes which is used by the Out of Memory (OOM)
- * process killer to decide what process gets killed in a low memory situation.
- */
-
-namespace plpp = core::posix::linux::proc::process;
-
-namespace qtmir
-{
-
-ProcessController::OomController::OomController()
-{
-}
-
-/*!
- * \brief ProcessController::OomController::ensureProcessLikelyToBeKilled
- * \param pid
- * Set the process OOM-killer score so that the process is _more_ likely to be killed
- * in a low memory situation
- */
-
-/*
- * Useful information about these OOM-weighting methods
- *
- * the "Process C++" library wraps some APIs exported by the kernel in the the /proc filesystem.
- * The OOM score is one of these, but the APIs for it changed from Linux 2.6.36 onward.
- *
- * === Up to Linux 2.6.36 ===
- * /proc/[pid]/oom_adj (wrapped by plpp::OomAdj) was used up to 2.6.36 (is deprecated now)
- * Valid values are in the range -16 to +15, plus the special value -17, which disables
- * OOM-killing altogether for this process.  A positive score increases the likelihood
- * of this process being killed by the OOM-killer; a negative score decreases the likelihood.
- *
- * The default value for this file is 0; a new process inherits its parent's oom_adj setting.
- *
- * === Linux 2.6.36 and later ===
- * /proc/[pid]/oom_score_adj (wrapped by plpp::OomScoreAdj) is the recommended API.  Valid
- * values are in the range -1000 (never kill) to 1000 (always kill).
- *
- * For backward compatibility with previous kernels, /proc/[pid]/oom_adj can still be used to
- * tune the badness score.  Its value is scaled linearly with oom_score_adj. So writing to
- * /proc/[pid]/oom_score_adj or /proc/[pid]/oom_adj will change the other with its scaled value.
- *
- * === How OOM score changing is implemented ===
- * To support all available kernels, we thus perform the following for any OOM score change:
- *  1. Attempt to use the newer kernel API (plpp::OomScoreAdj). Fetch the min & max possible
- *     values and calculate a desired score for the process.
- *  2. If that fails, fall back to the older kernel API (plpp::OomSAdj), again fetching min
- *     & max possible values and calculating a desired score for the process.
- */
-void ProcessController::OomController::ensureProcessLikelyToBeKilled(pid_t pid)
-{
-    // We avoid boundary values for oom_score_adj. For that, we
-    // set it to 80% of the total available range.
-    static const float defaultPercentage = 0.8;
-
-    core::posix::Process process(pid);
-
-    try {
-        plpp::OomScoreAdj shellScore;
-        core::posix::this_process::instance() >> shellScore;
-
-        plpp::OomScoreAdj processScore
-        {
-            static_cast<int>((plpp::OomScoreAdj::max_value() - shellScore.value) * defaultPercentage) + shellScore.value
-        };
-
-        process << processScore;
-    } catch(...) {
-        // Accessing OomScoreAdj resulted in an exception being thrown.
-        // Trying with the deprecated OomAdj now as a last resort.
-        try
-        {
-            process << plpp::OomAdj{plpp::OomAdj::max_value()};
-        } catch(...)
-        {
-            qDebug() << "ensureProcessIsLikelyToBeKilled failed for pid=" << pid;
-        }
-    }
-}
-
-/*!
- * \brief ProcessController::OomController::ensureProcessLessLikelyToBeKilled
- * \param pid
- * Set the process OOM-killer score so that, in a low memory situation, the process
- * is _more_ likely to be killed than the foreground application, but less likely
- * than the background applications
- */
-void ProcessController::OomController::ensureProcessLessLikelyToBeKilled(pid_t pid)
-{
-    // Set it to 50% of the total available range.
-    static const float defaultPercentage = 0.5;
-
-    core::posix::Process process(pid);
-
-    try {
-        plpp::OomScoreAdj shellScore;
-        core::posix::this_process::instance() >> shellScore;
-
-        plpp::OomScoreAdj processScore
-        {
-            static_cast<int>((plpp::OomScoreAdj::max_value() - shellScore.value) * defaultPercentage) + shellScore.value
-        };
-
-        process << processScore;
-    } catch(...) {
-        // Accessing OomScoreAdj resulted in an exception being thrown.
-        // Trying with the deprecated OomAdj now as a last resort.
-        try
-        {
-            process << plpp::OomAdj{plpp::OomAdj::max_value()};
-        } catch(...)
-        {
-            qDebug() << "ensureProcessIsLessLikelyToBeKilled failed for pid=" << pid;
-        }
-    }
-}
-
-/*!
- * \brief ProcessController::OomController::ensureProcessUnlikelyToBeKilled
- * \param pid
- * Set the process OOM-killer weighting so that the process is _less_ likely to be killed
- * in a low memory situation
- */
-void ProcessController::OomController::ensureProcessUnlikelyToBeKilled(pid_t pid)
-{
-    // By system default, we set the oom_score_adj of Unity8 to -10 (via lightdm).
-    // As we want to avoid that any app's oom_score_adj is <= Unity8's oom_score_adj,
-    // (i.e. Unity8 would be killed before that app is) we choose a default increase of +1.
-    static const int default_increase = 1;
-
-    core::posix::Process process(pid);
-
-    try {
-        plpp::OomScoreAdj shellScore;
-        core::posix::this_process::instance() >> shellScore;
-
-        plpp::OomScoreAdj processScore
-        {
-            shellScore.value + default_increase
-        };
-
-        process << processScore;
-    } catch(...) {
-        // Accessing OomScoreAdj resulted in an exception being thrown.
-        // Trying with the deprecated OomAdj now as a last resort.
-        // By system default, we set the oom_score_adj of Unity8 to -10 (via lightdm).
-        // As we want to avoid that any app's oom_score_adj or oom_adj is <= Unity8's oom_score_adj,
-        // we choose a default value of -9 for oom_score_adj and 0 for oom_adj.
-        static const int defaultValue = 0;
-
-        try
-        {
-            process << plpp::OomAdj{defaultValue};
-        } catch(...)
-        {
-            qDebug() << "ensureProcessIsUnlikelyToBeKilled failed for pid" << pid;
-        }
-    }
-}
-
-ProcessController::ProcessController()
-    : m_oomController(new ProcessController::OomController())
-{
-}
-
-ProcessController::~ProcessController()
-{
-}
-
-const QSharedPointer<ProcessController::OomController>& ProcessController::oomController() const
-{
-    return m_oomController;
-}
-
-/*!
- * \brief ProcessController::sigStopProcessGroupForPid
- * \param pid
- * \return True if process was stopped successfully, false otherwise
- */
-bool ProcessController::sigStopProcessGroupForPid(pid_t pid) const
-{
-    return -1 != kill(-pid, SIGSTOP);
-}
-
-/*!
- * \brief ProcessController::sigContinueProcessGroupForPid
- * \param pid
- * \return True of process was resumed successfully, false otherwise
- */
-bool ProcessController::sigContinueProcessGroupForPid(pid_t pid) const
-{
-    return -1 != kill(-pid, SIGCONT);
-}
-
-} // namespace qtmir

=== removed file 'src/modules/Unity/Application/processcontroller.h'
--- src/modules/Unity/Application/processcontroller.h	2014-10-10 08:38:30 +0000
+++ src/modules/Unity/Application/processcontroller.h	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3, as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef PROCESS_CONTROLLER_H
-#define PROCESS_CONTROLLER_H
-
-#include <QSharedPointer>
-
-#include <sys/types.h>
-
-namespace qtmir
-{
-
-class ProcessController
-{
-public:
-    class OomController
-    {
-    public:
-        OomController();
-        OomController(const OomController&) = delete;
-        virtual ~OomController() = default;
-
-        OomController& operator=(const OomController&) = delete;
-
-        virtual void ensureProcessLikelyToBeKilled(pid_t);
-        virtual void ensureProcessLessLikelyToBeKilled(pid_t);
-        virtual void ensureProcessUnlikelyToBeKilled(pid_t);
-    };
-
-    ProcessController();
-    ProcessController(const ProcessController&) = delete;
-    virtual ~ProcessController();
-
-    ProcessController& operator=(const ProcessController&) = delete;
-
-    virtual const QSharedPointer<OomController>& oomController() const;
-
-    virtual bool sigStopProcessGroupForPid(pid_t pid) const;
-    virtual bool sigContinueProcessGroupForPid(pid_t pid) const;
-
-protected:
-    QSharedPointer<OomController> m_oomController;
-};
-
-} // namespace qtmir
-
-#endif // PROCESS_CONTROLLER_H

=== modified file 'src/modules/Unity/Application/taskcontroller.cpp'
--- src/modules/Unity/Application/taskcontroller.cpp	2014-10-10 08:38:30 +0000
+++ src/modules/Unity/Application/taskcontroller.cpp	2014-10-24 15:59:35 +0000
@@ -23,12 +23,6 @@
 // Qt
 #include <QStringList>
 
-// Process C++
-#include <core/posix/process.h>
-#include <core/posix/this_process.h>
-#include <core/posix/linux/proc/process/oom_adj.h>
-#include <core/posix/linux/proc/process/oom_score_adj.h>
-
 // STL
 #include <mutex>
 
@@ -41,11 +35,9 @@
 
 TaskController::TaskController(
         QObject *parent,
-        const QSharedPointer<ApplicationController> &appController,
-        const QSharedPointer<ProcessController> &processController) :
+        const QSharedPointer<ApplicationController> &appController) :
     QObject(parent),
-    m_appController(appController),
-    m_processController(processController)
+    m_appController(appController)
 {
     connect(m_appController.data(),
             &ApplicationController::applicationAboutToBeStarted,
@@ -53,11 +45,6 @@
             &TaskController::processStarting);
 
     connect(m_appController.data(),
-            &ApplicationController::applicationStarted,
-            this,
-            &TaskController::onApplicationStarted);
-
-    connect(m_appController.data(),
             &ApplicationController::applicationStopped,
             this,
             &TaskController::processStopped);
@@ -109,64 +96,20 @@
     return m_appController->findDesktopFileForAppId(appId);
 }
 
-bool TaskController::suspend(const Application* app)
-{
-    qCDebug(QTMIR_APPLICATIONS) << "TaskController::suspend - appId=" << app->appId();
-    pid_t pid = m_appController->primaryPidForAppId(app->appId());
-    if (pid == 0) {
-        pid = app->pid();
-    }
-
-    // FIXME This harcodes the unity8-dash name, we should consider a different approach,
-    // some privileged way to define which apps should be less likely to be killed.
-    if (app->appId() == "unity8-dash") {
-        m_processController->oomController()->ensureProcessLessLikelyToBeKilled(pid);
-    } else {
-        m_processController->oomController()->ensureProcessLikelyToBeKilled(pid);
-    }
-
-    if (pid) {
-        // We do assume that the app was launched by ubuntu-app-launch and with that,
-        // in its own process group. For that, we interpret the pid as pgid and
-        // sigstop the complete process group on suspend.
-        return m_processController->sigStopProcessGroupForPid(pid);
-    } else {
-        return false;
-    }
-}
-
-bool TaskController::resume(const Application* app)
-{
-    qCDebug(QTMIR_APPLICATIONS) << "TaskController::resume - appId=" << app->appId();
-    pid_t pid = m_appController->primaryPidForAppId(app->appId());
-    if (pid == 0) {
-        pid = app->pid();
-    }
-
-    m_processController->oomController()->ensureProcessUnlikelyToBeKilled(pid);
-
-    if (pid) {
-        // We do assume that the app was launched by ubuntu-app-launch and with that,
-        // in its own process group. For that, we interpret the pid as pgid and
-        // sigcont the complete process group on resume.
-        return m_processController->sigContinueProcessGroupForPid(pid);
-        return true;
-    } else {
-        qCDebug(QTMIR_APPLICATIONS) << "TaskController::resume - couldn't find PID to resume for appId=" << app->appId();
-        return false;
-    }
-}
-
-void TaskController::onApplicationStarted(const QString& id)
-{
-    pid_t pid = m_appController->primaryPidForAppId(id);
-    m_processController->oomController()->ensureProcessUnlikelyToBeKilled(pid);
+bool TaskController::suspend(const QString &appId)
+{
+    qCDebug(QTMIR_APPLICATIONS) << "TaskController::suspend - appId=" << appId;
+    return m_appController->pauseApplicationWithAppId(appId);
+}
+
+bool TaskController::resume(const QString &appId)
+{
+    qCDebug(QTMIR_APPLICATIONS) << "TaskController::resume - appId=" << appId;
+    return m_appController->resumeApplicationWithAppId(appId);
 }
 
 void TaskController::onApplicationFocusRequest(const QString& id)
 {
-    pid_t pid = m_appController->primaryPidForAppId(id);
-    m_processController->oomController()->ensureProcessUnlikelyToBeKilled(pid);
     Q_EMIT requestFocus(id);
 }
 

=== modified file 'src/modules/Unity/Application/taskcontroller.h'
--- src/modules/Unity/Application/taskcontroller.h	2014-09-18 09:39:48 +0000
+++ src/modules/Unity/Application/taskcontroller.h	2014-10-24 15:59:35 +0000
@@ -23,7 +23,6 @@
 
 #include "application.h"
 #include "applicationcontroller.h"
-#include "processcontroller.h"
 
 namespace qtmir
 {
@@ -34,15 +33,14 @@
 public:
     TaskController(
             QObject *parent,
-            const QSharedPointer<ApplicationController> &appController,
-            const QSharedPointer<ProcessController> &processController = QSharedPointer<ProcessController>(new ProcessController()));
+            const QSharedPointer<ApplicationController> &appController);
     ~TaskController();
 
     bool start(const QString &appId, const QStringList &args);
     bool stop(const QString &appId);
 
-    bool suspend(const Application* app);
-    bool resume(const Application* app);
+    bool suspend(const QString &appId);
+    bool resume(const QString &appId);
 
     bool appIdHasProcessId(const QString &appId, const quint64 pid) const;
     QFileInfo findDesktopFileForAppId(const QString &appId) const;
@@ -55,7 +53,6 @@
     void requestResume(const QString &appId);
 
 private Q_SLOTS:
-    void onApplicationStarted(const QString &id);
     void onApplicationFocusRequest(const QString &id);
     void onApplicationResumeRequest(const QString &id);
 
@@ -63,7 +60,6 @@
 
 private:
     const QSharedPointer<ApplicationController> m_appController;
-    const QSharedPointer<ProcessController> m_processController;
 };
 
 } // namespace qtmir

=== modified file 'src/modules/Unity/Application/upstart/applicationcontroller.cpp'
--- src/modules/Unity/Application/upstart/applicationcontroller.cpp	2014-07-01 13:38:06 +0000
+++ src/modules/Unity/Application/upstart/applicationcontroller.cpp	2014-10-24 15:59:35 +0000
@@ -203,6 +203,25 @@
     return result;
 }
 
+bool ApplicationController::pauseApplicationWithAppId(const QString& appId)
+{
+    auto result = ubuntu_app_launch_pause_application(toLongAppIdIfPossible(appId).toLatin1().constData());
+    if (!result)
+        qDebug() << "ApplicationController::pauseApplication FAILED to pause appId=" << appId;
+
+    return result;
+}
+
+bool ApplicationController::resumeApplicationWithAppId(const QString& appId)
+{
+    auto result = ubuntu_app_launch_resume_application(toLongAppIdIfPossible(appId).toLatin1().constData());
+    if (!result)
+        qDebug() << "ApplicationController::resumeApplication FAILED to resume appId=" << appId;
+
+    return result;
+}
+
+
 QFileInfo ApplicationController::findDesktopFileForAppId(const QString &appId) const
 {
     qCDebug(QTMIR_APPLICATIONS) << "ApplicationController::desktopFilePathForAppId - appId=" << appId;

=== modified file 'src/modules/Unity/Application/upstart/applicationcontroller.h'
--- src/modules/Unity/Application/upstart/applicationcontroller.h	2014-07-01 13:38:06 +0000
+++ src/modules/Unity/Application/upstart/applicationcontroller.h	2014-10-24 15:59:35 +0000
@@ -37,6 +37,9 @@
     bool stopApplicationWithAppId(const QString& appId) override;
     bool startApplicationWithAppIdAndArgs(const QString& appId, const QStringList& arguments) override;
 
+    bool pauseApplicationWithAppId(const QString& appId) override;
+    bool resumeApplicationWithAppId(const QString& appId) override;
+
     QFileInfo findDesktopFileForAppId(const QString &appId) const override;
 
 private:

=== modified file 'tests/modules/ApplicationManager/application_manager_test.cpp'
--- tests/modules/ApplicationManager/application_manager_test.cpp	2014-10-10 08:38:30 +0000
+++ tests/modules/ApplicationManager/application_manager_test.cpp	2014-10-24 15:59:35 +0000
@@ -56,12 +56,6 @@
 
     EXPECT_CALL(desktopFileReaderFactory, createInstance(_, _)).Times(1);
 
-    EXPECT_CALL(processController, sigStopProcessGroupForPid(_)).Times(1);
-    EXPECT_CALL(processController, sigContinueProcessGroupForPid(_)).Times(1);
-    EXPECT_CALL(oomController, ensureProcessUnlikelyToBeKilled(_)).Times(1);
-    EXPECT_CALL(oomController, ensureProcessLikelyToBeKilled(_)).Times(1);
-    EXPECT_CALL(oomController, ensureProcessLessLikelyToBeKilled(_)).Times(0);
-
     auto application = applicationManager.startApplication(
                 appId,
                 ApplicationManager::NoFlag,
@@ -87,12 +81,6 @@
 
     ON_CALL(appController,appIdHasProcessId(_,_)).WillByDefault(Return(false));
 
-    EXPECT_CALL(processController, sigStopProcessGroupForPid(_)).Times(1);
-    EXPECT_CALL(processController, sigContinueProcessGroupForPid(_)).Times(1);
-    EXPECT_CALL(oomController, ensureProcessUnlikelyToBeKilled(_)).Times(1);
-    EXPECT_CALL(oomController, ensureProcessLikelyToBeKilled(_)).Times(0);
-    EXPECT_CALL(oomController, ensureProcessLessLikelyToBeKilled(_)).Times(1);
-
     bool authed = true;
 
     std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("Oo", procId);
@@ -131,12 +119,6 @@
         onSessionStarting( mirSession );
 
         EXPECT_NE(nullptr, application);
-
-        appIds.insert(appId);
-        auto it = appController.children.find(appId);
-        if (it != appController.children.end())
-            EXPECT_CALL(oomController,
-                        ensureProcessUnlikelyToBeKilled(it->pid())).Times(1);
     }
 
     for (auto appId : appIds)

=== modified file 'tests/modules/TaskController/taskcontroller_test.cpp'
--- tests/modules/TaskController/taskcontroller_test.cpp	2014-09-10 11:01:14 +0000
+++ tests/modules/TaskController/taskcontroller_test.cpp	2014-10-24 15:59:35 +0000
@@ -19,13 +19,8 @@
 #include <Unity/Application/desktopfilereader.h>
 #include <Unity/Application/application.h>
 
-#include "mock_oom_controller.h"
-#include "mock_process_controller.h"
 #include "mock_desktop_file_reader.h"
 
-#include <core/posix/fork.h>
-#include <core/posix/linux/proc/process/oom_score_adj.h>
-
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
@@ -56,6 +51,8 @@
 
     MOCK_METHOD1(stopApplicationWithAppId, bool(const QString&));
     MOCK_METHOD2(startApplicationWithAppIdAndArgs, bool(const QString&, const QStringList&));
+    MOCK_METHOD1(pauseApplicationWithAppId, bool(const QString&));
+    MOCK_METHOD1(resumeApplicationWithAppId, bool(const QString&));
 };
 }
 
@@ -72,19 +69,8 @@
 
     EXPECT_CALL(appController, startApplicationWithAppIdAndArgs(appId, QStringList())).Times(1).WillRepeatedly(Return(true));
 
-    testing::NiceMock<MockOomController> oomController;
-    QSharedPointer<ProcessController::OomController> oomControllerPtr(
-                &oomController,
-                [](ProcessController::OomController*){});
-
-    NiceMock<testing::MockProcessController> processController(oomControllerPtr);
-    QSharedPointer<ProcessController> processControllerPtr(
-                &processController,
-                [](ProcessController*){});
-
     TaskController taskController(nullptr,
-                                  appControllerPtr,
-                                  processControllerPtr);
+                                  appControllerPtr);
 
     taskController.start(appId, QStringList());
 }
@@ -102,189 +88,9 @@
 
     EXPECT_CALL(appController, stopApplicationWithAppId(appId)).Times(1).WillRepeatedly(Return(true));
 
-    testing::NiceMock<MockOomController> oomController;
-    QSharedPointer<ProcessController::OomController> oomControllerPtr(
-                &oomController,
-                [](ProcessController::OomController*){});
-
-    NiceMock<testing::MockProcessController> processController(oomControllerPtr);
-    QSharedPointer<ProcessController> processControllerPtr(
-                &processController,
-                [](ProcessController*){});
-
     TaskController taskController(nullptr,
-                                  appControllerPtr,
-                                  processControllerPtr);
+                                  appControllerPtr);
 
     taskController.stop(appId);
 }
 
-TEST(TaskController, suspendingAnApplicationAdjustsOomScoreForCorrectPid)
-{
-    using namespace ::testing;
-
-    const QString appId{"com.canonical.does.not.exist"};
-
-    testing::NiceMock<TriggerableApplicationController> appController;
-    QSharedPointer<TriggerableApplicationController> appControllerPtr(
-                &appController,
-                [](ApplicationController*){});
-
-    EXPECT_CALL(appController, primaryPidForAppId(appId)).Times(1).WillRepeatedly(Return(-1));
-
-    testing::NiceMock<MockOomController> oomController;
-    QSharedPointer<ProcessController::OomController> oomControllerPtr(
-                &oomController,
-                [](ProcessController::OomController*){});
-
-    NiceMock<testing::MockProcessController> processController(oomControllerPtr);
-    QSharedPointer<ProcessController> processControllerPtr(
-                &processController,
-                [](ProcessController*){});
-
-    EXPECT_CALL(oomController, ensureProcessLikelyToBeKilled(-1)).Times(1);
-
-    auto taskController = QSharedPointer<TaskController>(new TaskController(nullptr,
-                                  appControllerPtr,
-                                  processControllerPtr));
-
-
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-    Application *app = new Application(taskController, mockDesktopFileReader, Application::Running, QStringList(), nullptr);
-    taskController->suspend(app);
-    delete app;
-}
-
-TEST(TaskController, resumingAnApplicationAdjustsOomScoreForCorrectPid)
-{
-    using namespace ::testing;
-
-    const QString appId{"com.canonical.does.not.exist"};
-
-    testing::NiceMock<TriggerableApplicationController> appController;
-    QSharedPointer<TriggerableApplicationController> appControllerPtr(
-                &appController,
-                [](ApplicationController*){});
-
-    EXPECT_CALL(appController, primaryPidForAppId(appId)).Times(1).WillRepeatedly(Return(-1));
-
-    testing::NiceMock<MockOomController> oomController;
-    QSharedPointer<ProcessController::OomController> oomControllerPtr(
-                &oomController,
-                [](ProcessController::OomController*){});
-
-    NiceMock<testing::MockProcessController> processController(oomControllerPtr);
-    QSharedPointer<ProcessController> processControllerPtr(
-                &processController,
-                [](ProcessController*){});
-
-    EXPECT_CALL(oomController, ensureProcessUnlikelyToBeKilled(-1)).Times(1);
-
-    auto taskController = QSharedPointer<TaskController>(new TaskController(nullptr,
-                                  appControllerPtr,
-                                  processControllerPtr));
-
-
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-    Application *app = new Application(taskController, mockDesktopFileReader, Application::Running, QStringList(), nullptr);
-    taskController->resume(app);
-    delete app;
-}
-
-TEST(TaskController, aStartedApplicationIsOomScoreAdjusted)
-{
-    using namespace ::testing;
-
-    const QString appId{"com.canonical.does.not.exist"};
-
-    testing::NiceMock<TriggerableApplicationController> appController;
-    QSharedPointer<TriggerableApplicationController> appControllerPtr(
-                &appController,
-                [](ApplicationController*){});
-    EXPECT_CALL(appController, primaryPidForAppId(appId)).Times(1).WillRepeatedly(Return(42));
-
-    testing::NiceMock<MockOomController> oomController;
-    QSharedPointer<ProcessController::OomController> oomControllerPtr(
-                &oomController,
-                [](ProcessController::OomController*){});
-
-    NiceMock<testing::MockProcessController> processController(oomControllerPtr);
-    QSharedPointer<ProcessController> processControllerPtr(
-                &processController,
-                [](ProcessController*){});
-
-    EXPECT_CALL(oomController, ensureProcessUnlikelyToBeKilled(42)).Times(1);
-
-    TaskController taskController(nullptr,
-                                  appControllerPtr,
-                                  processControllerPtr);
-
-    appControllerPtr->triggerApplicationStarted(appId);
-}
-
-TEST(TaskController, aFocusedApplicationIsOomScoreAdjusted)
-{
-    using namespace ::testing;
-
-    const QString appId{"com.canonical.does.not.exist"};
-
-    testing::NiceMock<TriggerableApplicationController> appController;
-    QSharedPointer<TriggerableApplicationController> appControllerPtr(
-                &appController,
-                [](ApplicationController*){});
-    EXPECT_CALL(appController, primaryPidForAppId(appId)).Times(1).WillRepeatedly(Return(42));
-
-    testing::NiceMock<MockOomController> oomController;
-    QSharedPointer<ProcessController::OomController> oomControllerPtr(
-                &oomController,
-                [](ProcessController::OomController*){});
-
-    NiceMock<testing::MockProcessController> processController(oomControllerPtr);
-    QSharedPointer<ProcessController> processControllerPtr(
-                &processController,
-                [](ProcessController*){});
-
-    EXPECT_CALL(oomController, ensureProcessUnlikelyToBeKilled(42)).Times(1);
-
-    TaskController taskController(nullptr,
-                                  appControllerPtr,
-                                  processControllerPtr);
-
-    appControllerPtr->triggerApplicationFocusRequest(appId);
-}
-
-TEST(TaskController, oomControllerUpdatesOomScoreAdjCorrectly)
-{
-    ProcessController::OomController oomController;
-
-    auto child = core::posix::fork([]()
-    {
-        while (true);
-
-        return core::posix::exit::Status::success;
-    }, core::posix::StandardStream::empty);
-
-    EXPECT_GT(child.pid(), 0);
-
-    core::posix::linux::proc::process::OomScoreAdj oomScoreAdj;
-    child >> oomScoreAdj;
-
-    core::posix::linux::proc::process::OomScoreAdj likelyOomScoreAdj, unlikelyOomScoreAdj;
-    {
-        oomController.ensureProcessLikelyToBeKilled(child.pid());
-        child >> likelyOomScoreAdj;
-
-        EXPECT_GE(likelyOomScoreAdj.value, oomScoreAdj.value);
-    }
-
-    {
-        oomController.ensureProcessUnlikelyToBeKilled(child.pid());
-        child >> unlikelyOomScoreAdj;
-
-        EXPECT_LE(unlikelyOomScoreAdj.value, likelyOomScoreAdj.value);
-    }
-}

=== modified file 'tests/modules/common/common.pri'
--- tests/modules/common/common.pri	2014-09-11 16:18:40 +0000
+++ tests/modules/common/common.pri	2014-10-24 15:59:35 +0000
@@ -1,5 +1,5 @@
 CONFIG += no_keywords # keywords clash with ProcessC++
-PKGCONFIG += process-cpp ubuntu-app-launch-2
+PKGCONFIG += ubuntu-app-launch-2 process-cpp
 
 QT += quick
 
@@ -7,8 +7,6 @@
     ../common/mock_desktop_file_reader.h \
     ../common/mock_focus_controller.h \
     ../common/mock_mir_session.h \
-    ../common/mock_oom_controller.h \
-    ../common/mock_process_controller.h \
     ../common/mock_proc_info.h \
     ../common/mock_prompt_session.h \
     ../common/mock_prompt_session_manager.h \

=== modified file 'tests/modules/common/mock_application_controller.h'
--- tests/modules/common/mock_application_controller.h	2014-07-01 13:38:06 +0000
+++ tests/modules/common/mock_application_controller.h	2014-10-24 15:59:35 +0000
@@ -34,6 +34,8 @@
 
     MOCK_METHOD1(stopApplicationWithAppId, bool(const QString&));
     MOCK_METHOD2(startApplicationWithAppIdAndArgs, bool(const QString&, const QStringList&));
+    MOCK_METHOD1(pauseApplicationWithAppId, bool(const QString&));
+    MOCK_METHOD1(resumeApplicationWithAppId, bool(const QString&));
 
     MockApplicationController()
     {
@@ -57,6 +59,14 @@
         ON_CALL(*this, startApplicationWithAppIdAndArgs(_, _))
                 .WillByDefault(
                     Invoke(this, &MockApplicationController::doStartApplicationWithAppIdAndArgs));
+
+        ON_CALL(*this, pauseApplicationWithAppId(_))
+                .WillByDefault(
+                    Invoke(this, &MockApplicationController::doPauseApplicationWithAppId));
+
+        ON_CALL(*this, resumeApplicationWithAppId(_))
+                .WillByDefault(
+                    Invoke(this, &MockApplicationController::doResumeApplicationWithAppId));
     }
 
     pid_t doPrimaryPidForAppId(const QString& appId)
@@ -85,14 +95,14 @@
 
     bool doStopApplicationWithAppId(const QString& appId)
     {
-        (void) appId;
+        Q_UNUSED(appId);
 
         return false;
     }
 
     bool doStartApplicationWithAppIdAndArgs(const QString& appId, const QStringList& args)
     {
-        (void) args;
+        Q_UNUSED(args);
 
         auto child = core::posix::fork([]()
         {
@@ -110,6 +120,20 @@
         return false;
     }
 
+    bool doPauseApplicationWithAppId(const QString& appId)
+    {
+        Q_UNUSED(appId);
+
+        return false;
+    }
+
+    bool doResumeApplicationWithAppId(const QString& appId)
+    {
+        Q_UNUSED(appId);
+
+        return false;
+    }
+
     QMap<QString, core::posix::ChildProcess> children;
 };
 } // namespace testing

=== removed file 'tests/modules/common/mock_oom_controller.h'
--- tests/modules/common/mock_oom_controller.h	2014-10-10 08:38:30 +0000
+++ tests/modules/common/mock_oom_controller.h	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3, as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#ifndef MOCK_OOM_CONTROLLER_H
-#define MOCK_OOM_CONTROLLER_H
-
-#include <Unity/Application/processcontroller.h>
-
-#include <gmock/gmock.h>
-
-namespace testing
-{
-struct MockOomController : public qtmir::ProcessController::OomController
-{
-    MOCK_METHOD1(ensureProcessLikelyToBeKilled, void(pid_t));
-    MOCK_METHOD1(ensureProcessLessLikelyToBeKilled, void(pid_t));
-    MOCK_METHOD1(ensureProcessUnlikelyToBeKilled, void(pid_t));
-};
-}
-
-#endif // MOCK_OOM_CONTROLLER_H

=== removed file 'tests/modules/common/mock_process_controller.h'
--- tests/modules/common/mock_process_controller.h	2014-07-01 13:38:06 +0000
+++ tests/modules/common/mock_process_controller.h	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3, as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#ifndef MOCK_PROCESS_CONTROLLER_H
-#define MOCK_PROCESS_CONTROLLER_H
-
-#include <Unity/Application/processcontroller.h>
-
-#include <gmock/gmock.h>
-
-namespace testing
-{
-struct MockProcessController : public qtmir::ProcessController
-{
-    MockProcessController(const QSharedPointer<qtmir::ProcessController::OomController>& oomController)
-        : m_oomController(oomController)
-    {
-    }
-
-    const QSharedPointer<qtmir::ProcessController::OomController>& oomController() const
-    {
-        return m_oomController;
-    }
-
-    MOCK_CONST_METHOD1(sigStopProcessGroupForPid, bool(pid_t));
-    MOCK_CONST_METHOD1(sigContinueProcessGroupForPid, bool(pid_t));
-
-    QSharedPointer<qtmir::ProcessController::OomController> m_oomController;
-};
-}
-
-#endif // MOCK_PROCESS_CONTROLLER_H

=== modified file 'tests/modules/common/qtmir_test.h'
--- tests/modules/common/qtmir_test.h	2014-09-11 16:18:40 +0000
+++ tests/modules/common/qtmir_test.h	2014-10-24 15:59:35 +0000
@@ -20,8 +20,6 @@
 
 #include <gtest/gtest.h>
 
-#include <core/posix/linux/proc/process/oom_score_adj.h>
-
 #include <Unity/Application/application_manager.h>
 #include <Unity/Application/applicationcontroller.h>
 #include <Unity/Application/mirsurfacemanager.h>
@@ -32,8 +30,6 @@
 
 #include "mock_application_controller.h"
 #include "mock_desktop_file_reader.h"
-#include "mock_oom_controller.h"
-#include "mock_process_controller.h"
 #include "mock_proc_info.h"
 #include "mock_mir_session.h"
 #include "mock_focus_controller.h"
@@ -80,12 +76,7 @@
 {
 public:
     QtMirTest()
-        : processController{
-            QSharedPointer<ProcessController::OomController> (
-                &oomController,
-                [](ProcessController::OomController*){})
-        }
-        , mirConfig{
+        : mirConfig{
             QSharedPointer<FakeMirServerConfiguration> (new FakeMirServerConfiguration)
         }
         , taskController{
@@ -94,10 +85,7 @@
                       nullptr,
                       QSharedPointer<ApplicationController>(
                           &appController,
-                          [](ApplicationController*){}),
-                      QSharedPointer<ProcessController>(
-                          &processController,
-                          [](ProcessController*){})
+                          [](ApplicationController*){})
                   )
               )
         }
@@ -150,8 +138,6 @@
         return nullptr;
     }
 
-    testing::NiceMock<testing::MockOomController> oomController;
-    testing::NiceMock<testing::MockProcessController> processController;
     testing::NiceMock<testing::MockApplicationController> appController;
     testing::NiceMock<testing::MockProcInfo> procInfo;
     testing::NiceMock<testing::MockDesktopFileReaderFactory> desktopFileReaderFactory;