X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmachine%2Fmachined.c;h=7f03e8281df44b693765ee32f30dd7755a479adb;hp=35b33c30186fbe7da0195d32ddc1bd9a83a57bcb;hb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;hpb=e7176abbe818c75c6acd90227a7a84c3e05fee31 diff --git a/src/machine/machined.c b/src/machine/machined.c index 35b33c301..7f03e8281 100644 --- a/src/machine/machined.c +++ b/src/machine/machined.c @@ -35,6 +35,7 @@ #include "bus-util.h" #include "bus-error.h" #include "machined.h" +#include "label.h" Manager *manager_new(void) { Manager *m; @@ -44,9 +45,9 @@ Manager *manager_new(void) { if (!m) return NULL; - 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); + m->machines = hashmap_new(&string_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) { manager_free(m); @@ -59,6 +60,8 @@ Manager *manager_new(void) { return NULL; } + sd_event_set_watchdog(m->event, true); + return m; } @@ -104,9 +107,13 @@ int manager_enumerate_machines(Manager *m) { if (!dirent_is_file(de)) continue; + /* Ignore symlinks that map the unit name to the machine */ + if (startswith(de->d_name, "unit:")) + continue; + k = manager_add_machine(m, de->d_name, &machine); if (k < 0) { - log_error("Failed to add machine by file name %s: %s", de->d_name, strerror(-k)); + log_error_errno(-k, "Failed to add machine by file name %s: %m", de->d_name); r = k; continue; @@ -131,29 +138,30 @@ static int manager_connect_bus(Manager *m) { r = sd_bus_default_system(&m->bus); if (r < 0) { - log_error("Failed to connect to system bus: %s", strerror(-r)); + log_error_errno(-r, "Failed to connect to system bus: %m"); return r; } - r = sd_bus_add_object_vtable(m->bus, "/org/freedesktop/machine1", "org.freedesktop.machine1.Manager", manager_vtable, m); + r = sd_bus_add_object_vtable(m->bus, NULL, "/org/freedesktop/machine1", "org.freedesktop.machine1.Manager", manager_vtable, m); if (r < 0) { - log_error("Failed to add manager object vtable: %s", strerror(-r)); + log_error_errno(-r, "Failed to add manager object vtable: %m"); return r; } - r = sd_bus_add_fallback_vtable(m->bus, "/org/freedesktop/machine1/machine", "org.freedesktop.machine1.Machine", machine_vtable, machine_object_find, m); + r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/machine1/machine", "org.freedesktop.machine1.Machine", machine_vtable, machine_object_find, m); if (r < 0) { - log_error("Failed to add machine object vtable: %s", strerror(-r)); + log_error_errno(-r, "Failed to add machine object vtable: %m"); return r; } - r = sd_bus_add_node_enumerator(m->bus, "/org/freedesktop/machine1/machine", machine_node_enumerator, m); + r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/machine1/machine", machine_node_enumerator, m); if (r < 0) { - log_error("Failed to add machine enumerator: %s", strerror(-r)); + log_error_errno(-r, "Failed to add machine enumerator: %m"); return r; } r = sd_bus_add_match(m->bus, + NULL, "type='signal'," "sender='org.freedesktop.systemd1'," "interface='org.freedesktop.systemd1.Manager'," @@ -162,11 +170,12 @@ static int manager_connect_bus(Manager *m) { match_job_removed, m); if (r < 0) { - log_error("Failed to add match for JobRemoved: %s", strerror(-r)); + log_error_errno(-r, "Failed to add match for JobRemoved: %m"); return r; } r = sd_bus_add_match(m->bus, + NULL, "type='signal'," "sender='org.freedesktop.systemd1'," "interface='org.freedesktop.systemd1.Manager'," @@ -175,11 +184,12 @@ static int manager_connect_bus(Manager *m) { match_unit_removed, m); if (r < 0) { - log_error("Failed to add match for UnitRemoved: %s", strerror(-r)); + log_error_errno(-r, "Failed to add match for UnitRemoved: %m"); return r; } r = sd_bus_add_match(m->bus, + NULL, "type='signal'," "sender='org.freedesktop.systemd1'," "interface='org.freedesktop.DBus.Properties'," @@ -187,11 +197,12 @@ static int manager_connect_bus(Manager *m) { match_properties_changed, m); if (r < 0) { - log_error("Failed to add match for PropertiesChanged: %s", strerror(-r)); + log_error_errno(-r, "Failed to add match for PropertiesChanged: %m"); return r; } r = sd_bus_add_match(m->bus, + NULL, "type='signal'," "sender='org.freedesktop.systemd1'," "interface='org.freedesktop.systemd1.Manager'," @@ -200,7 +211,7 @@ static int manager_connect_bus(Manager *m) { match_reloading, m); if (r < 0) { - log_error("Failed to add match for Reloading: %s", strerror(-r)); + log_error_errno(-r, "Failed to add match for Reloading: %m"); return r; } @@ -217,15 +228,15 @@ static int manager_connect_bus(Manager *m) { return r; } - r = sd_bus_request_name(m->bus, "org.freedesktop.machine1", SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_DO_NOT_QUEUE); + r = sd_bus_request_name(m->bus, "org.freedesktop.machine1", 0); if (r < 0) { - log_error("Failed to register name: %s", strerror(-r)); + log_error_errno(-r, "Failed to register name: %m"); return r; } r = sd_bus_attach_event(m->bus, m->event, 0); if (r < 0) { - log_error("Failed to attach bus to event loop: %s", strerror(-r)); + log_error_errno(-r, "Failed to attach bus to event loop: %m"); return r; } @@ -273,26 +284,23 @@ int manager_startup(Manager *m) { return 0; } -int manager_run(Manager *m) { - int r; - - assert(m); +static bool check_idle(void *userdata) { + Manager *m = userdata; - for (;;) { - r = sd_event_get_state(m->event); - if (r < 0) - return r; - if (r == SD_EVENT_FINISHED) - return 0; + manager_gc(m, true); - manager_gc(m, true); + return hashmap_isempty(m->machines); +} - r = sd_event_run(m->event, (uint64_t) -1); - if (r < 0) - return r; - } +int manager_run(Manager *m) { + assert(m); - return 0; + return bus_event_loop_with_idle( + m->event, + m->bus, + "org.freedesktop.machine1", + DEFAULT_EXIT_USEC, + check_idle, m); } int main(int argc, char *argv[]) { @@ -327,11 +335,11 @@ int main(int argc, char *argv[]) { r = manager_startup(m); if (r < 0) { - log_error("Failed to fully start up daemon: %s", strerror(-r)); + log_error_errno(-r, "Failed to fully start up daemon: %m"); goto finish; } - log_debug("systemd-machined running as pid %lu", (unsigned long) getpid()); + log_debug("systemd-machined running as pid "PID_FMT, getpid()); sd_notify(false, "READY=1\n" @@ -339,12 +347,9 @@ int main(int argc, char *argv[]) { r = manager_run(m); - log_debug("systemd-machined stopped as pid %lu", (unsigned long) getpid()); + log_debug("systemd-machined stopped as pid "PID_FMT, getpid()); finish: - sd_notify(false, - "STATUS=Shutting down..."); - if (m) manager_free(m);