vircgroup: extract virCgroupV1AddTask

Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index fe90b6038e46bd2523da359c38f354707dbfffd7..418becf21b65584303578451f7804ee1502bfd73 100644 (file)
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -540,7 +540,7 @@ virCgroupSetValueU64(virCgroupPtr group,
 }
 
 
-static int
+int
 virCgroupSetValueI64(virCgroupPtr group,
                      int controller,
                      const char *key,
@@ -668,50 +668,6 @@ virCgroupNew(pid_t pid,
 }
 
 
-typedef enum {
-    /* Adds a whole process with all threads to specific cgroup except
-     * to systemd named controller. */
-    VIR_CGROUP_TASK_PROCESS = 1 << 0,
-
-    /* Same as VIR_CGROUP_TASK_PROCESS but it also adds the task to systemd
-     * named controller. */
-    VIR_CGROUP_TASK_SYSTEMD = 1 << 1,
-
-    /* Moves only specific thread into cgroup except to systemd
-     * named controller. */
-    VIR_CGROUP_TASK_THREAD = 1 << 2,
-} virCgroupTaskFlags;
-
-
-static int
-virCgroupAddTaskInternal(virCgroupPtr group,
-                         pid_t pid,
-                         unsigned int flags)
-{
-    int ret = -1;
-    size_t i;
-
-    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-        /* Skip over controllers not mounted */
-        if (!group->controllers[i].mountPoint)
-            continue;
-
-        /* We must never add tasks in systemd's hierarchy
-         * unless we're intentionally trying to move a
-         * task into a systemd machine scope */
-        if (i == VIR_CGROUP_CONTROLLER_SYSTEMD &&
-            !(flags & VIR_CGROUP_TASK_SYSTEMD))
-            continue;
-
-        if (virCgroupSetValueI64(group, i, "tasks", pid) < 0)
-            goto cleanup;
-    }
-
-    ret = 0;
- cleanup:
-    return ret;
-}
-
 /**
  * virCgroupAddProcess:
  *
@@ -726,7 +682,7 @@ virCgroupAddTaskInternal(virCgroupPtr group,
 int
 virCgroupAddProcess(virCgroupPtr group, pid_t pid)
 {
-    return virCgroupAddTaskInternal(group, pid, VIR_CGROUP_TASK_PROCESS);
+    return group->backend->addTask(group, pid, VIR_CGROUP_TASK_PROCESS);
 }
 
 /**
@@ -743,9 +699,9 @@ virCgroupAddProcess(virCgroupPtr group, pid_t pid)
 int
 virCgroupAddMachineProcess(virCgroupPtr group, pid_t pid)
 {
-    return virCgroupAddTaskInternal(group, pid,
-                                    VIR_CGROUP_TASK_PROCESS |
-                                    VIR_CGROUP_TASK_SYSTEMD);
+    return group->backend->addTask(group, pid,
+                                   VIR_CGROUP_TASK_PROCESS |
+                                   VIR_CGROUP_TASK_SYSTEMD);
 }
 
 /**
@@ -763,7 +719,7 @@ int
 virCgroupAddThread(virCgroupPtr group,
                    pid_t pid)
 {
-    return virCgroupAddTaskInternal(group, pid, VIR_CGROUP_TASK_THREAD);
+    return group->backend->addTask(group, pid, VIR_CGROUP_TASK_THREAD);
 }
 
 

diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
index 1f28c51c49819d6ea0aaa2610364529cff8c4cb6..bff1f8938e375c7a3cfe7597d766b46ec4ff5cd3 100644 (file)
--- a/src/util/vircgroupbackend.h
+++ b/src/util/vircgroupbackend.h
@@ -35,6 +35,20 @@ typedef enum {
                                        */
 } virCgroupBackendFlags;
 
+typedef enum {
+    /* Adds a whole process with all threads to specific cgroup except
+     * to systemd named controller. */
+    VIR_CGROUP_TASK_PROCESS = 1 << 0,
+
+    /* Same as VIR_CGROUP_TASK_PROCESS but it also adds the task to systemd
+     * named controller. */
+    VIR_CGROUP_TASK_SYSTEMD = 1 << 1,
+
+    /* Moves only specific thread into cgroup except to systemd
+     * named controller. */
+    VIR_CGROUP_TASK_THREAD = 1 << 2,
+} virCgroupBackendTaskFlags;
+
 typedef enum {
     VIR_CGROUP_BACKEND_TYPE_V1 = 0,
     VIR_CGROUP_BACKEND_TYPE_LAST,
@@ -103,6 +117,11 @@ typedef int
 typedef int
 (*virCgroupRemoveCB)(virCgroupPtr group);
 
+typedef int
+(*virCgroupAddTaskCB)(virCgroupPtr group,
+                      pid_t pid,
+                      unsigned int flags);
+
 struct _virCgroupBackend {
     virCgroupBackendType type;
 
@@ -121,6 +140,7 @@ struct _virCgroupBackend {
     virCgroupPathOfControllerCB pathOfController;
     virCgroupMakeGroupCB makeGroup;
     virCgroupRemoveCB remove;
+    virCgroupAddTaskCB addTask;
 };
 typedef struct _virCgroupBackend virCgroupBackend;
 typedef virCgroupBackend *virCgroupBackendPtr;

diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
index a760b9bcfdbedbd37b267adfe9d9f20293bd5545..01714370be7a0bbc02f1b250bf52cfff17e2c762 100644 (file)
--- a/src/util/vircgrouppriv.h
+++ b/src/util/vircgrouppriv.h
@@ -73,6 +73,11 @@ int virCgroupGetValueU64(virCgroupPtr group,
                          const char *key,
                          unsigned long long int *value);
 
+int virCgroupSetValueI64(virCgroupPtr group,
+                         int controller,
+                         const char *key,
+                         long long int value);
+
 int virCgroupPartitionEscape(char **path);
 
 int virCgroupNewPartition(const char *path,

diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
index 90d39e7fbecbd7156325132dcd1e66d45f2a9c07..8545d28ff140d9a05eaa22b3155b8628bbc0cf1d 100644 (file)
--- a/src/util/vircgroupv1.c
+++ b/src/util/vircgroupv1.c
@@ -705,6 +705,36 @@ virCgroupV1Remove(virCgroupPtr group)
 }
 
 
+static int
+virCgroupV1AddTask(virCgroupPtr group,
+                   pid_t pid,
+                   unsigned int flags)
+{
+    int ret = -1;
+    size_t i;
+
+    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
+        /* Skip over controllers not mounted */
+        if (!group->controllers[i].mountPoint)
+            continue;
+
+        /* We must never add tasks in systemd's hierarchy
+         * unless we're intentionally trying to move a
+         * task into a systemd machine scope */
+        if (i == VIR_CGROUP_CONTROLLER_SYSTEMD &&
+            !(flags & VIR_CGROUP_TASK_SYSTEMD))
+            continue;
+
+        if (virCgroupSetValueI64(group, i, "tasks", pid) < 0)
+            goto cleanup;
+    }
+
+    ret = 0;
+ cleanup:
+    return ret;
+}
+
+
 virCgroupBackend virCgroupV1Backend = {
     .type = VIR_CGROUP_BACKEND_TYPE_V1,
 
@@ -722,6 +752,7 @@ virCgroupBackend virCgroupV1Backend = {
     .pathOfController = virCgroupV1PathOfController,
     .makeGroup = virCgroupV1MakeGroup,
     .remove = virCgroupV1Remove,
+    .addTask = virCgroupV1AddTask,
 };