diff options
author | Lennart Poettering <lennart@poettering.net> | 2015-09-02 11:21:24 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2015-09-02 11:21:24 +0200 |
commit | a8c0f367142dcaa08e1d1aa8398207d4f762cef8 (patch) | |
tree | ab178c51603af8d647254a078ddf56e6a05616d6 /src/core/unit.h | |
parent | d18ec0491ed7c502080c03fa5fe93c8b6ac3d6ea (diff) | |
parent | efdb02375beb0a940c3320865572913780b4d7de (diff) |
Merge pull request #1116 from poettering/unified-rebased
core: unified cgroup hierarchy support
Diffstat (limited to 'src/core/unit.h')
-rw-r--r-- | src/core/unit.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/unit.h b/src/core/unit.h index bc26653247..3c7684411b 100644 --- a/src/core/unit.h +++ b/src/core/unit.h @@ -184,9 +184,10 @@ struct Unit { /* Counterparts in the cgroup filesystem */ char *cgroup_path; - CGroupControllerMask cgroup_realized_mask; - CGroupControllerMask cgroup_subtree_mask; - CGroupControllerMask cgroup_members_mask; + CGroupMask cgroup_realized_mask; + CGroupMask cgroup_subtree_mask; + CGroupMask cgroup_members_mask; + int cgroup_inotify_wd; /* How to start OnFailure units */ JobMode on_failure_job_mode; @@ -522,7 +523,6 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su int unit_watch_pid(Unit *u, pid_t pid); void unit_unwatch_pid(Unit *u, pid_t pid); -int unit_watch_all_pids(Unit *u); void unit_unwatch_all_pids(Unit *u); void unit_tidy_watch_pids(Unit *u, pid_t except1, pid_t except2); @@ -567,8 +567,6 @@ bool unit_active_or_pending(Unit *u); int unit_add_default_target_dependency(Unit *u, Unit *target); -char *unit_default_cgroup_path(Unit *u); - void unit_start_on_failure(Unit *u); void unit_trigger_notify(Unit *u); |