morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34515 from YHNdnzj/machined-machines-by

Browse Source 
machined: modernize a bit
This commit is contained in:
Yu Watanabe
2024-09-21 13:53:41 +09:00
committed by GitHub
parent 0121b84e41 f3270bed48
commit 0f03562d97
5 changed files with 79 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/machine/machine.c
View File

@@ -53,6 +53,7 @@ int machine_new(MachineClass class, const char *name, Machine **ret) {
return -ENOMEM;
*m = (Machine) {
.class = class,
.leader = PIDREF_NULL,
.vsock_cid = VMADDR_CID_ANY,
};
@@ -63,8 +64,6 @@ int machine_new(MachineClass class, const char *name, Machine **ret) {
return -ENOMEM;
}
m->class = class;
*ret = TAKE_PTR(m);
return 0;
}
@@ -121,7 +120,7 @@ Machine* machine_free(Machine *m) {
m->leader_pidfd_event_source = sd_event_source_disable_unref(m->leader_pidfd_event_source);
if (pidref_is_set(&m->leader)) {
if (m->manager)
(void) hashmap_remove_value(m->manager->machine_leaders, PID_TO_PTR(m->leader.pid), m);
(void) hashmap_remove_value(m->manager->machines_by_leader, &m->leader, m);
pidref_done(&m->leader);
}
@@ -471,7 +470,10 @@ static int machine_ensure_scope(Machine *m, sd_bus_message *properties, sd_bus_e
}
assert(m->unit);
hashmap_put(m->manager->machine_units, m->unit, m);
r = hashmap_ensure_put(&m->manager->machines_by_unit, &string_hash_ops, m->unit, m);
if (r < 0)
return r;
return 0;
}
@@ -519,7 +521,7 @@ int machine_start(Machine *m, sd_bus_message *properties, sd_bus_error *error) {
if (m->started)
return 0;
r = hashmap_put(m->manager->machine_leaders, PID_TO_PTR(m->leader.pid), m);
r = hashmap_ensure_put(&m->manager->machines_by_leader, &pidref_hash_ops, &m->leader, m);
if (r < 0)
return r;
@@ -706,6 +708,8 @@ void machine_release_unit(Machine *m) {
if (!m->unit)
return;
assert(m->manager);
if (m->referenced) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
int r;
@@ -719,7 +723,7 @@ void machine_release_unit(Machine *m) {
m->referenced = false;
}
(void) hashmap_remove(m->manager->machine_units, m->unit);
(void) hashmap_remove_value(m->manager->machines_by_unit, m->unit, m);
m->unit = mfree(m->unit);
}

53
src/machine/machined-core.c
View File

@@ -1,9 +1,62 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "cgroup-util.h"
#include "machined.h"
#include "process-util.h"
#include "strv.h"
#include "user-util.h"
int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **ret) {
Machine *mm;
int r;
assert(m);
assert(pid_is_valid(pid));
assert(ret);
mm = hashmap_get(m->machines_by_leader, &PIDREF_MAKE_FROM_PID(pid));
if (!mm) {
_cleanup_free_ char *unit = NULL;
r = cg_pid_get_unit(pid, &unit);
if (r >= 0)
mm = hashmap_get(m->machines_by_unit, unit);
}
if (!mm) {
*ret = NULL;
return 0;
}
*ret = mm;
return 1;
}
int manager_add_machine(Manager *m, const char *name, Machine **ret) {
Machine *machine;
int r;
assert(m);
assert(name);
machine = hashmap_get(m->machines, name);
if (!machine) {
r = machine_new(_MACHINE_CLASS_INVALID, name, &machine);
if (r < 0)
return r;
r = machine_link(m, machine);
if (r < 0) {
machine_free(machine);
return r;
}
}
if (ret)
*ret = machine;
return 0;
}
int manager_find_machine_for_uid(Manager *m, uid_t uid, Machine **ret_machine, uid_t *ret_internal_uid) {
Machine *machine;
int r;

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

@@ -169,7 +169,7 @@ static int method_get_machine_by_pid(sd_bus_message *message, void *userdata, sd
r = manager_get_machine_by_pid(m, pid, &machine);
if (r < 0)
return r;
if (!machine)
if (r == 0)
return sd_bus_error_setf(error, BUS_ERROR_NO_MACHINE_FOR_PID, "PID "PID_FMT" does not belong to any known machine", pid);
p = machine_bus_path(machine);
@@ -1229,7 +1229,7 @@ int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *err
return 0;
}
machine = hashmap_get(m->machine_units, unit);
machine = hashmap_get(m->machines_by_unit, unit);
if (!machine)
return 0;
@@ -1276,7 +1276,7 @@ int match_properties_changed(sd_bus_message *message, void *userdata, sd_bus_err
return 0;
}
machine = hashmap_get(m->machine_units, unit);
machine = hashmap_get(m->machines_by_unit, unit);
if (!machine)
return 0;
@@ -1298,7 +1298,7 @@ int match_unit_removed(sd_bus_message *message, void *userdata, sd_bus_error *er
return 0;
}
machine = hashmap_get(m->machine_units, unit);
machine = hashmap_get(m->machines_by_unit, unit);
if (!machine)
return 0;
@@ -1463,50 +1463,3 @@ int manager_job_is_active(Manager *manager, const char *path) {
return true;
}
int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **machine) {
Machine *mm;
int r;
assert(m);
assert(pid >= 1);
assert(machine);
mm = hashmap_get(m->machine_leaders, PID_TO_PTR(pid));
if (!mm) {
_cleanup_free_ char *unit = NULL;
r = cg_pid_get_unit(pid, &unit);
if (r >= 0)
mm = hashmap_get(m->machine_units, unit);
}
if (!mm)
return 0;
*machine = mm;
return 1;
}
int manager_add_machine(Manager *m, const char *name, Machine **_machine) {
Machine *machine;
int r;
assert(m);
assert(name);
machine = hashmap_get(m->machines, name);
if (!machine) {
r = machine_new(_MACHINE_CLASS_INVALID, name, &machine);
if (r < 0)
return r;
r = machine_link(m, machine);
if (r < 0)
return 0;
}
if (_machine)
*_machine = machine;
return 0;
}

15
src/machine/machined.c
View File

@@ -45,10 +45,7 @@ static int manager_new(Manager **ret) {
return -ENOMEM;
m->machines = hashmap_new(&machine_hash_ops);
m->machine_units = hashmap_new(&string_hash_ops);
m->machine_leaders = hashmap_new(NULL);
if (!m->machines || !m->machine_units || !m->machine_leaders)
if (!m->machines)
return -ENOMEM;
r = sd_event_default(&m->event);
@@ -83,9 +80,13 @@ static Manager* manager_unref(Manager *m) {
assert(m->n_operations == 0);
hashmap_free(m->machines); /* This will free all machines, so that the machine_units/machine_leaders is empty */
hashmap_free(m->machine_units);
hashmap_free(m->machine_leaders);
hashmap_free(m->machines); /* This will free all machines, thus the by_unit/by_leader hashmaps shall be empty */
assert(hashmap_isempty(m->machines_by_unit));
hashmap_free(m->machines_by_unit);
assert(hashmap_isempty(m->machines_by_leader));
hashmap_free(m->machines_by_leader);
hashmap_free(m->image_cache);
sd_event_source_unref(m->image_cache_defer_event);

8
src/machine/machined.h
View File

@@ -21,8 +21,8 @@ struct Manager {
sd_bus *bus;
Hashmap *machines;
Hashmap *machine_units;
Hashmap *machine_leaders;
Hashmap *machines_by_unit;
Hashmap *machines_by_leader;
sd_event_source *deferred_gc_event_source;
@@ -42,8 +42,8 @@ struct Manager {
sd_varlink_server *varlink_machine_server;
};
int manager_add_machine(Manager *m, const char *name, Machine **_machine);
int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **machine);
int manager_add_machine(Manager *m, const char *name, Machine **ret);
int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **ret);
extern const BusObjectImplementation manager_object;