core: general cgroup rework

[elogind.git] / src / core / execute.h

diff --git a/src/core/execute.h b/src/core/execute.h
index 15574dc97e1766ac6c270c87f4fd51978c60ba95..c1e9717dc8007ea360fe0994cc800012e19a3c57 100644 (file)
--- a/src/core/execute.h
+++ b/src/core/execute.h
@@ -33,14 +33,11 @@ typedef struct ExecContext ExecContext;
 #include <stdio.h>
 #include <sched.h>
 
 #include <stdio.h>
 #include <sched.h>
 

-struct CGroupBonding;
-struct CGroupAttribute;
-
-typedef struct Unit Unit;
-

 #include "list.h"
 #include "util.h"
 
 #include "list.h"
 #include "util.h"
 

+typedef struct Unit Unit;
+

 typedef enum ExecInput {
         EXEC_INPUT_NULL,
         EXEC_INPUT_TTY,
 typedef enum ExecInput {
         EXEC_INPUT_NULL,
         EXEC_INPUT_TTY,


@@ -148,9 +145,6 @@ struct ExecContext {
 
         bool no_new_privileges;
 
 
         bool no_new_privileges;
 

-        bool control_group_modify;
-        int control_group_persistent;
-

         /* This is not exposed to the user but available
          * internally. We need it to make sure that whenever we spawn
          * /bin/mount it is run in the same process group as us so
         /* This is not exposed to the user but available
          * internally. We need it to make sure that whenever we spawn
          * /bin/mount it is run in the same process group as us so


@@ -166,6 +160,8 @@ struct ExecContext {
         bool cpu_sched_set:1;
 };
 
         bool cpu_sched_set:1;
 };
 

+#include "cgroup.h"
+

 int exec_spawn(ExecCommand *command,
                char **argv,
                ExecContext *context,
 int exec_spawn(ExecCommand *command,
                char **argv,
                ExecContext *context,


@@ -175,9 +171,8 @@ int exec_spawn(ExecCommand *command,
                bool apply_chroot,
                bool apply_tty_stdin,
                bool confirm_spawn,
                bool apply_chroot,
                bool apply_tty_stdin,
                bool confirm_spawn,

-               struct CGroupBonding *cgroup_bondings,
-               struct CGroupAttribute *cgroup_attributes,
-               const char *cgroup_suffix,
+               CGroupControllerMask cgroup_mask,
+               const char *cgroup_path,

                const char *unit_id,
                int pipe_fd[2],
                pid_t *ret);
                const char *unit_id,
                int pipe_fd[2],
                pid_t *ret);