101 lines
3.3 KiB
Diff
101 lines
3.3 KiB
Diff
|
From dd935122a989eeb31a0ab4d42ad5381f1f48446e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Thu, 6 Mar 2014 02:19:42 +0100
|
||
|
|
Subject: [PATCH] core: correctly unregister PIDs from PID hashtables
|
||
|
|
|
||
|
|
(cherry picked from commit bd44e61b0480712ec5585ff7b0295362a5f9dd36)
|
||
|
|
---
|
||
|
|
src/core/unit.c | 42 ++++++++++++++++++------------------------
|
||
|
|
1 file changed, 18 insertions(+), 24 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/core/unit.c b/src/core/unit.c
|
||
|
|
index 1bbcb39..5a5592c 100644
|
||
|
|
--- a/src/core/unit.c
|
||
|
|
+++ b/src/core/unit.c
|
||
|
|
@@ -1703,11 +1703,11 @@ int unit_watch_pid(Unit *u, pid_t pid) {
|
||
|
|
/* Watch a specific PID. We only support one or two units
|
||
|
|
* watching each PID for now, not more. */
|
||
|
|
|
||
|
|
- r = hashmap_ensure_allocated(&u->manager->watch_pids1, trivial_hash_func, trivial_compare_func);
|
||
|
|
+ r = set_ensure_allocated(&u->pids, trivial_hash_func, trivial_compare_func);
|
||
|
|
if (r < 0)
|
||
|
|
return r;
|
||
|
|
|
||
|
|
- r = set_ensure_allocated(&u->pids, trivial_hash_func, trivial_compare_func);
|
||
|
|
+ r = hashmap_ensure_allocated(&u->manager->watch_pids1, trivial_hash_func, trivial_compare_func);
|
||
|
|
if (r < 0)
|
||
|
|
return r;
|
||
|
|
|
||
|
|
@@ -1736,7 +1736,17 @@ void unit_unwatch_pid(Unit *u, pid_t pid) {
|
||
|
|
set_remove(u->pids, LONG_TO_PTR(pid));
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int watch_pids_in_path(Unit *u, const char *path) {
|
||
|
|
+void unit_unwatch_all_pids(Unit *u) {
|
||
|
|
+ assert(u);
|
||
|
|
+
|
||
|
|
+ while (!set_isempty(u->pids))
|
||
|
|
+ unit_unwatch_pid(u, PTR_TO_LONG(set_first(u->pids)));
|
||
|
|
+
|
||
|
|
+ set_free(u->pids);
|
||
|
|
+ u->pids = NULL;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+static int unit_watch_pids_in_path(Unit *u, const char *path) {
|
||
|
|
_cleanup_closedir_ DIR *d = NULL;
|
||
|
|
_cleanup_fclose_ FILE *f = NULL;
|
||
|
|
int ret = 0, r;
|
||
|
|
@@ -1774,7 +1784,7 @@ static int watch_pids_in_path(Unit *u, const char *path) {
|
||
|
|
if (!p)
|
||
|
|
return -ENOMEM;
|
||
|
|
|
||
|
|
- r = watch_pids_in_path(u, p);
|
||
|
|
+ r = unit_watch_pids_in_path(u, p);
|
||
|
|
if (r < 0 && ret >= 0)
|
||
|
|
ret = r;
|
||
|
|
}
|
||
|
|
@@ -1787,31 +1797,15 @@ static int watch_pids_in_path(Unit *u, const char *path) {
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
|
||
|
|
-
|
||
|
|
int unit_watch_all_pids(Unit *u) {
|
||
|
|
assert(u);
|
||
|
|
|
||
|
|
- if (!u->cgroup_path)
|
||
|
|
- return -ENOENT;
|
||
|
|
-
|
||
|
|
/* Adds all PIDs from our cgroup to the set of PIDs we watch */
|
||
|
|
|
||
|
|
- return watch_pids_in_path(u, u->cgroup_path);
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
-void unit_unwatch_all_pids(Unit *u) {
|
||
|
|
- Iterator i;
|
||
|
|
- void *e;
|
||
|
|
-
|
||
|
|
- assert(u);
|
||
|
|
-
|
||
|
|
- SET_FOREACH(e, u->pids, i) {
|
||
|
|
- hashmap_remove_value(u->manager->watch_pids1, e, u);
|
||
|
|
- hashmap_remove_value(u->manager->watch_pids2, e, u);
|
||
|
|
- }
|
||
|
|
+ if (!u->cgroup_path)
|
||
|
|
+ return -ENOENT;
|
||
|
|
|
||
|
|
- set_free(u->pids);
|
||
|
|
- u->pids = NULL;
|
||
|
|
+ return unit_watch_pids_in_path(u, u->cgroup_path);
|
||
|
|
}
|
||
|
|
|
||
|
|
void unit_tidy_watch_pids(Unit *u, pid_t except1, pid_t except2) {
|
||
|
|
@@ -1829,7 +1823,7 @@ void unit_tidy_watch_pids(Unit *u, pid_t except1, pid_t except2) {
|
||
|
|
continue;
|
||
|
|
|
||
|
|
if (!pid_is_unwaited(pid))
|
||
|
|
- set_remove(u->pids, e);
|
||
|
|
+ unit_unwatch_pid(u, pid);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|