shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

machined: always look for leader PID first

Browse Source 
When looking for the machine belonging to a PID, always look for the
leader first, only then fall back to a cgroup check. We keep direct
track of the leader PID, but only indirectly of the cgroup, hence prefer
the PID.
This commit is contained in:
Lennart Poettering 2015-08-23 14:04:31 +02:00
parent c454426c54
commit 077c8c366b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/machine/machined-dbus.c
View File

@ -1477,7 +1477,6 @@ int manager_job_is_active(Manager *manager, const char *path) {
} }
int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **machine) { int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **machine) {
_cleanup_free_ char *unit = NULL;
Machine *mm; Machine *mm;
int r; int r;
@ -1485,12 +1484,14 @@ int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **machine) {
assert(pid >= 1); assert(pid >= 1);
assert(machine); assert(machine);
r = cg_pid_get_unit(pid, &unit);
if (r < 0)
mm = hashmap_get(m->machine_leaders, UINT_TO_PTR(pid)); mm = hashmap_get(m->machine_leaders, UINT_TO_PTR(pid));
else if (!mm) {
mm = hashmap_get(m->machine_units, unit); _cleanup_free_ char *unit = NULL;
r = cg_pid_get_unit(pid, &unit);
if (r >= 0)
mm = hashmap_get(m->machine_units, unit);
}
if (!mm) if (!mm)
return 0; return 0;