From d3e84ddb885e9d5f0ae9930eb905910e3a81f157 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 6 Nov 2013 02:03:04 +0100 Subject: machined: keep track of the initial leader PID of a machine This way we can without races always determine the machine for a leader PID. This allows machine managers to query the machine for a forked off container/VM without a race where the child might already have died before we could read the cgroup information from /proc/$PID/cgroup. --- src/machine/machined.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/machine/machined.c') diff --git a/src/machine/machined.c b/src/machine/machined.c index 25de0d5d46..a5f529384b 100644 --- a/src/machine/machined.c +++ b/src/machine/machined.c @@ -46,8 +46,9 @@ Manager *manager_new(void) { m->machines = hashmap_new(string_hash_func, string_compare_func); m->machine_units = hashmap_new(string_hash_func, string_compare_func); + m->machine_leaders = hashmap_new(trivial_hash_func, trivial_compare_func); - if (!m->machines || !m->machine_units) { + if (!m->machines || !m->machine_units || !m->machine_leaders) { manager_free(m); return NULL; } @@ -71,6 +72,7 @@ void manager_free(Manager *m) { hashmap_free(m->machines); hashmap_free(m->machine_units); + hashmap_free(m->machine_leaders); sd_bus_unref(m->bus); sd_event_unref(m->event); @@ -108,9 +110,10 @@ int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **machine) { r = cg_pid_get_unit(pid, &unit); if (r < 0) - return r; + mm = hashmap_get(m->machine_leaders, UINT_TO_PTR(pid)); + else + mm = hashmap_get(m->machine_units, unit); - mm = hashmap_get(m->machine_units, unit); if (!mm) return 0; -- cgit v1.2.3-54-g00ecf