#include "utf8.h"
#include "unit-name.h"
#include "bus-util.h"
+#include "bus-errors.h"
#include "time-util.h"
+#include "cgroup-util.h"
#include "machined.h"
static bool valid_machine_name(const char *p) {
_cleanup_free_ char *p = NULL;
Manager *m = userdata;
Machine *machine = NULL;
- uint32_t pid;
+ pid_t pid;
int r;
assert(bus);
assert(message);
assert(m);
+ assert_cc(sizeof(pid_t) == sizeof(uint32_t));
+
r = sd_bus_message_read(message, "u", &pid);
if (r < 0)
return sd_bus_reply_method_errno(bus, message, r, NULL);
+ if (pid == 0) {
+ r = sd_bus_get_owner_pid(bus, sd_bus_message_get_sender(message), &pid);
+ if (r < 0)
+ return sd_bus_reply_method_errno(bus, message, r, NULL);
+ }
+
r = manager_get_machine_by_pid(m, pid, &machine);
if (r < 0)
return sd_bus_reply_method_errno(bus, message, r, NULL);
SD_BUS_VTABLE_END
};
-int machine_node_enumerator(sd_bus *bus, const char *path, char ***nodes, void *userdata) {
- _cleanup_strv_free_ char **l = NULL;
- Machine *machine = NULL;
- Manager *m = userdata;
- Iterator i;
- int r;
-
- assert(bus);
- assert(path);
- assert(nodes);
-
- HASHMAP_FOREACH(machine, m->machines, i) {
- char *p;
-
- p = machine_bus_path(machine);
- if (!p)
- return -ENOMEM;
-
- r = strv_push(&l, p);
- if (r < 0) {
- free(p);
- return r;
- }
- }
-
- *nodes = l;
- l = NULL;
-
- return 1;
-}
-
int match_job_removed(sd_bus *bus, sd_bus_message *message, void *userdata) {
const char *path, *result, *unit;
Manager *m = userdata;
if (r < 0)
return r;
- r = sd_bus_send_with_reply_and_block(manager->bus, m, 0, error, &reply);
+ r = sd_bus_call(manager->bus, m, 0, error, &reply);
if (r < 0)
return r;
return true;
}
+
+int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **machine) {
+ _cleanup_free_ char *unit = NULL;
+ Machine *mm;
+ int r;
+
+ assert(m);
+ assert(pid >= 1);
+ assert(machine);
+
+ r = cg_pid_get_unit(pid, &unit);
+ if (r < 0)
+ mm = hashmap_get(m->machine_leaders, UINT_TO_PTR(pid));
+ else
+ 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;
+
+ assert(m);
+ assert(name);
+
+ machine = hashmap_get(m->machines, name);
+ if (!machine) {
+ machine = machine_new(m, name);
+ if (!machine)
+ return -ENOMEM;
+ }
+
+ if (_machine)
+ *_machine = machine;
+
+ return 0;
+}