Merge lp:~xnox/qtmir/no-more-cgmanager-or-upstart into lp:qtmir

[Dimitri John Ledkov]

Drop cgmanager dependency, since ubuntu-app-launch moved to systemd, there is no longer any upstart cgroups.

Drop cgmanager dependency, since ubuntu-app-launch moved to systemd, there is no longer any upstart cgroups.

[Gerry Boland (gerboland)]

ok

review: Approve

Unmerged revisions

640. By Dimitri John Ledkov on 2017-04-24

Drop cgmanager dependency, since ubuntu-app-launch moved to systemd, there is no longer any upstart cgroups.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-03-24 11:29:56 +0000
+++ CMakeLists.txt	2017-04-24 13:56:27 +0000
@@ -91,7 +91,6 @@
 pkg_check_modules(QTDBUSTEST libqtdbustest-1 REQUIRED)
 pkg_check_modules(QTDBUSMOCK libqtdbusmock-1 REQUIRED)
 pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=27)
-pkg_check_modules(CGMANAGER libcgmanager REQUIRED)
 pkg_check_modules(CONTENT_HUB libcontent-hub>=0.2 REQUIRED)
 pkg_check_modules(VALGRIND valgrind REQUIRED)
 

=== modified file 'debian/control'
--- debian/control	2017-03-24 11:29:56 +0000
+++ debian/control	2017-04-24 13:56:27 +0000
@@ -6,7 +6,6 @@
                cmake-extras (>= 0.10),
                debhelper (>= 9),
                google-mock (>= 1.6.0+svn437),
-               libcgmanager-dev,
                libcontent-hub-dev (>= 0.2),
                libfontconfig1-dev,
                libgles2-mesa-dev,

=== modified file 'src/modules/Unity/Application/CMakeLists.txt'
--- src/modules/Unity/Application/CMakeLists.txt	2017-03-13 16:49:49 +0000
+++ src/modules/Unity/Application/CMakeLists.txt	2017-04-24 13:56:27 +0000
@@ -14,7 +14,6 @@
     ${UBUNTU_PLATFORM_API_INCLUDE_DIRS}
     ${UBUNTU_APP_LAUNCH_INCLUDE_DIRS}
     ${GSETTINGS_QT_INCLUDE_DIRS}
-    ${CGMANAGER_INCLUDE_DIRS}
 
     ${LTTNG_INCLUDE_DIRS}
     ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
@@ -30,7 +29,6 @@
 set(QMLMIRPLUGIN_SRC
     application_manager.cpp
     application.cpp
-    cgmanager.cpp
     ../../../common/abstractdbusservicemonitor.cpp
     ../../../common/debughelpers.cpp
     dbusfocusinfo.cpp

=== removed file 'src/modules/Unity/Application/cgmanager.cpp'
--- src/modules/Unity/Application/cgmanager.cpp	2016-08-08 13:55:43 +0000
+++ src/modules/Unity/Application/cgmanager.cpp	1970-01-01 00:00:00 +0000
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2016 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 "cgmanager.h"
-
-// QPA mirserver
-#include <logging.h>
-
-#include <cgmanager/cgmanager.h>
-
-#include <QDBusArgument>
-#include <QDBusMessage>
-
-using namespace qtmir;
-
-// According to D-Bus interface defined in:
-// https://github.com/lxc/cgmanager/blob/master/org.linuxcontainers.cgmanager.xml
-
-CGManager::CGManager(QObject *parent)
-    : QObject(parent)
-{
-}
-
-CGManager::~CGManager()
-{
-    QDBusConnection::disconnectFromPeer("cgmanager");
-}
-
-QDBusConnection CGManager::getConnection()
-{
-    auto connection = QDBusConnection("cgmanager");
-
-    if (!connection.isConnected()) {
-        connection = QDBusConnection::connectToPeer(CGMANAGER_DBUS_PATH, "cgmanager");
-        if (!connection.isConnected()) {
-            qCWarning(QTMIR_DBUS, "CGManager: Failed to connect to %s", CGMANAGER_DBUS_PATH);
-        }
-    }
-
-    return connection;
-}
-
-QString CGManager::getCGroupOfPid(const QString &controller, pid_t pid)
-{
-    auto connection = getConnection();
-    if (!connection.isConnected()) {
-        return QString();
-    }
-
-    auto message = QDBusMessage::createMethodCall(QString() /*service*/, m_path, m_interface, "GetPidCgroup");
-
-    QList<QVariant> arguments;
-    arguments << QVariant(controller);
-    arguments << QVariant((int)pid);
-
-    message.setArguments(arguments);
-
-    QDBusMessage reply = connection.call(message);
-
-    if (reply.type() == QDBusMessage::ReplyMessage) {
-        return reply.arguments().at(0).toString();
-    } else {
-        Q_ASSERT(reply.type() == QDBusMessage::ErrorMessage);
-        qCWarning(QTMIR_DBUS) << "CGManager::getCGroupOfPid failed." << reply.errorMessage();
-        return QString();
-    }
-}
-
-QSet<pid_t> CGManager::getTasks(const QString &controller, const QString &cgroup)
-{
-    auto connection = getConnection();
-    if (!connection.isConnected()) {
-        return QSet<pid_t>();
-    }
-
-    auto message = QDBusMessage::createMethodCall(QString() /*service*/, m_path, m_interface, "GetTasks");
-
-    QList<QVariant> arguments;
-    arguments << QVariant(controller);
-    arguments << QVariant(cgroup);
-
-    message.setArguments(arguments);
-
-    QDBusMessage reply = connection.call(message);
-
-    if (reply.type() == QDBusMessage::ErrorMessage) {
-        qCWarning(QTMIR_DBUS) << "CGManager::getCGroupOfPid failed." << reply.errorMessage();
-        return QSet<pid_t>();
-    }
-
-    Q_ASSERT(reply.type() == QDBusMessage::ReplyMessage);
-
-    auto arg = reply.arguments().at(0).value<QDBusArgument>();
-    Q_ASSERT(arg.currentType() == QDBusArgument::ArrayType);
-
-    auto pidList = qdbus_cast<QList<int>>(arg);
-    Q_ASSERT(pidList.count() > 0);
-
-    QSet<pid_t> pidSet;
-    for (int i = 0; i < pidList.count(); ++i) {
-        pidSet << (pid_t)pidList[i];
-    }
-    return pidSet;
-}

=== removed file 'src/modules/Unity/Application/cgmanager.h'
--- src/modules/Unity/Application/cgmanager.h	2016-07-01 16:15:54 +0000
+++ src/modules/Unity/Application/cgmanager.h	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2016 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 QTMIR_CGMANAGER_H
-#define QTMIR_CGMANAGER_H
-
-#include <QDBusConnection>
-
-namespace qtmir {
-
-class CGManager : public QObject {
-    Q_OBJECT
-public:
-    CGManager(QObject *parent = nullptr);
-    virtual ~CGManager();
-
-    QString getCGroupOfPid(const QString &controller, pid_t pid);
-
-    QSet<pid_t> getTasks(const QString &controller, const QString &cgroup);
-
-private:
-    const QString m_interface{"org.linuxcontainers.cgmanager0_0"};
-    const QString m_path{"/org/linuxcontainers/cgmanager"};
-    QDBusConnection getConnection();
-};
-
-} // namespace qtmir
-
-#endif // QTMIR_CGMANAGER_H

=== modified file 'src/modules/Unity/Application/dbusfocusinfo.cpp'
--- src/modules/Unity/Application/dbusfocusinfo.cpp	2017-03-31 15:18:43 +0000
+++ src/modules/Unity/Application/dbusfocusinfo.cpp	2017-04-24 13:56:27 +0000
@@ -17,7 +17,6 @@
 #include "dbusfocusinfo.h"
 
 // local
-#include "cgmanager.h"
 #include "mirsurfacelistmodel.h"
 #include "mirsurfaceinterface.h"
 #include "session_interface.h"
@@ -35,8 +34,6 @@
 {
     QDBusConnection::sessionBus().registerService("com.canonical.Unity.FocusInfo");
     QDBusConnection::sessionBus().registerObject("/com/canonical/Unity/FocusInfo", this, QDBusConnection::ExportScriptableSlots);
-
-    m_cgManager = new CGManager(this);
 }
 
 bool DBusFocusInfo::isPidFocused(unsigned int pid)
@@ -54,22 +51,8 @@
 
 QSet<pid_t> DBusFocusInfo::fetchAssociatedPids(pid_t pid)
 {
-    QString cgroup = m_cgManager->getCGroupOfPid("freezer", pid);
-
-    // If a cgroup has a format like this:
-    // /user.slice/user-32011.slice/session-c3.scope/upstart/application-legacy-puritine_gedit_0.0-
-    // All PIds in it are associated with a single application.
-    if (cgroup.split("/").contains("upstart")) {
-        QSet<pid_t> pidSet = m_cgManager->getTasks("freezer", cgroup);
-        qCDebug(QTMIR_DBUS) << "DBusFocusInfo: pid" << pid << "is in cgroup" << cgroup << "along with:" << pidSet;
-        if (pidSet.isEmpty()) {
-            pidSet << pid;
-        }
-        return pidSet;
-    } else {
-        qCDebug(QTMIR_DBUS) << "DBusFocusInfo: pid" << pid << "is in cgroup" << cgroup << "which is not app-specific";
-        return QSet<pid_t>({pid});
-    }
+    qCDebug(QTMIR_DBUS) << "DBusFocusInfo: pid" << pid << "unable to determine cgroup, assuming is not app-specific. TODO port me to systemd ubuntu-app-launch";
+    return QSet<pid_t>({pid});
 }
 
 SessionInterface* DBusFocusInfo::findSessionWithPid(const QSet<pid_t> &pidSet)

=== modified file 'src/modules/Unity/Application/dbusfocusinfo.h'
--- src/modules/Unity/Application/dbusfocusinfo.h	2016-11-03 20:17:46 +0000
+++ src/modules/Unity/Application/dbusfocusinfo.h	2017-04-24 13:56:27 +0000
@@ -21,7 +21,6 @@
 
 namespace qtmir {
 
-class CGManager;
 class MirSurfaceInterface;
 
 /*
@@ -57,8 +56,6 @@
     MirSurfaceInterface *findQmlSurface(const QString &serializedId);
 
     const QList<Application*> &m_applications;
-
-    CGManager *m_cgManager;
 };
 
 } // namespace qtmir