#include <unistd.h>
#include <sys/epoll.h>
-#include <systemd/sd-daemon.h>
+#include "sd-daemon.h"
-#include "machined.h"
-#include "dbus-common.h"
-#include "dbus-loop.h"
#include "strv.h"
#include "conf-parser.h"
-#include "mkdir.h"
#include "cgroup-util.h"
+#include "mkdir.h"
+#include "bus-util.h"
+#include "bus-error.h"
+#include "machined.h"
Manager *manager_new(void) {
Manager *m;
+ int r;
m = new0(Manager, 1);
if (!m)
return NULL;
- m->bus_fd = -1;
- m->epoll_fd = -1;
-
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;
}
+ r = sd_event_default(&m->event);
+ if (r < 0) {
+ manager_free(m);
+ return NULL;
+ }
+
+ sd_event_set_watchdog(m->event, true);
+
return m;
}
hashmap_free(m->machines);
hashmap_free(m->machine_units);
+ hashmap_free(m->machine_leaders);
- if (m->bus) {
- dbus_connection_flush(m->bus);
- dbus_connection_close(m->bus);
- dbus_connection_unref(m->bus);
- }
-
- if (m->bus_fd >= 0)
- close_nointr_nofail(m->bus_fd);
-
- if (m->epoll_fd >= 0)
- close_nointr_nofail(m->epoll_fd);
+ sd_bus_unref(m->bus);
+ sd_event_unref(m->event);
free(m);
}
-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) {
- if (_machine)
- *_machine = machine;
-
- return 0;
- }
-
- machine = machine_new(m, name);
- if (!machine)
- return -ENOMEM;
-
- if (_machine)
- *_machine = machine;
-
- return 0;
-}
-
int manager_enumerate_machines(Manager *m) {
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
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));
return r;
}
-int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **machine) {
- _cleanup_free_ char *unit = NULL;
- Machine *mm;
+static int manager_connect_bus(Manager *m) {
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
int r;
assert(m);
- assert(pid >= 1);
- assert(machine);
+ assert(!m->bus);
- r = cg_pid_get_unit(pid, &unit);
- if (r < 0)
+ r = sd_bus_default_system(&m->bus);
+ if (r < 0) {
+ log_error("Failed to connect to system bus: %s", strerror(-r));
return r;
+ }
- mm = hashmap_get(m->machine_units, unit);
- if (!mm)
- return 0;
-
- *machine = mm;
- return 1;
-}
-
-static int manager_connect_bus(Manager *m) {
- DBusError error;
- int r;
- struct epoll_event ev = {
- .events = EPOLLIN,
- .data.u32 = FD_BUS,
- };
-
- assert(m);
- assert(!m->bus);
- assert(m->bus_fd < 0);
+ 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));
+ return r;
+ }
- dbus_error_init(&error);
+ 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));
+ return r;
+ }
- m->bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
- if (!m->bus) {
- log_error("Failed to get system D-Bus connection: %s", bus_error_message(&error));
- r = -ECONNREFUSED;
- goto fail;
+ 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));
+ return r;
}
- if (!dbus_connection_register_object_path(m->bus, "/org/freedesktop/machine1", &bus_manager_vtable, m) ||
- !dbus_connection_register_fallback(m->bus, "/org/freedesktop/machine1/machine", &bus_machine_vtable, m) ||
- !dbus_connection_add_filter(m->bus, bus_message_filter, m, NULL)) {
- r = log_oom();
- goto fail;
+ r = sd_bus_add_match(m->bus,
+ NULL,
+ "type='signal',"
+ "sender='org.freedesktop.systemd1',"
+ "interface='org.freedesktop.systemd1.Manager',"
+ "member='JobRemoved',"
+ "path='/org/freedesktop/systemd1'",
+ match_job_removed,
+ m);
+ if (r < 0) {
+ log_error("Failed to add match for JobRemoved: %s", strerror(-r));
+ return r;
}
- dbus_bus_add_match(m->bus,
- "type='signal',"
- "sender='org.freedesktop.systemd1',"
- "interface='org.freedesktop.systemd1.Manager',"
- "member='JobRemoved',"
- "path='/org/freedesktop/systemd1'",
- &error);
- if (dbus_error_is_set(&error)) {
- log_error("Failed to add match for JobRemoved: %s", bus_error_message(&error));
- dbus_error_free(&error);
+ r = sd_bus_add_match(m->bus,
+ NULL,
+ "type='signal',"
+ "sender='org.freedesktop.systemd1',"
+ "interface='org.freedesktop.systemd1.Manager',"
+ "member='UnitRemoved',"
+ "path='/org/freedesktop/systemd1'",
+ match_unit_removed,
+ m);
+ if (r < 0) {
+ log_error("Failed to add match for UnitRemoved: %s", strerror(-r));
+ return r;
}
- dbus_bus_add_match(m->bus,
- "type='signal',"
- "sender='org.freedesktop.systemd1',"
- "interface='org.freedesktop.systemd1.Manager',"
- "member='UnitRemoved',"
- "path='/org/freedesktop/systemd1'",
- &error);
- if (dbus_error_is_set(&error)) {
- log_error("Failed to add match for UnitRemoved: %s", bus_error_message(&error));
- dbus_error_free(&error);
+ r = sd_bus_add_match(m->bus,
+ NULL,
+ "type='signal',"
+ "sender='org.freedesktop.systemd1',"
+ "interface='org.freedesktop.DBus.Properties',"
+ "member='PropertiesChanged'",
+ match_properties_changed,
+ m);
+ if (r < 0) {
+ log_error("Failed to add match for PropertiesChanged: %s", strerror(-r));
+ return r;
}
- dbus_bus_add_match(m->bus,
- "type='signal',"
- "sender='org.freedesktop.systemd1',"
- "interface='org.freedesktop.DBus.Properties',"
- "member='PropertiesChanged'",
- &error);
- if (dbus_error_is_set(&error)) {
- log_error("Failed to add match for PropertiesChanged: %s", bus_error_message(&error));
- dbus_error_free(&error);
+ r = sd_bus_add_match(m->bus,
+ NULL,
+ "type='signal',"
+ "sender='org.freedesktop.systemd1',"
+ "interface='org.freedesktop.systemd1.Manager',"
+ "member='Reloading',"
+ "path='/org/freedesktop/systemd1'",
+ match_reloading,
+ m);
+ if (r < 0) {
+ log_error("Failed to add match for Reloading: %s", strerror(-r));
+ return r;
}
- r = bus_method_call_with_reply(
+ r = sd_bus_call_method(
m->bus,
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
"org.freedesktop.systemd1.Manager",
"Subscribe",
- NULL,
&error,
- DBUS_TYPE_INVALID);
+ NULL, NULL);
if (r < 0) {
- log_error("Failed to enable subscription: %s", bus_error(&error, r));
- dbus_error_free(&error);
- }
-
- r = dbus_bus_request_name(m->bus, "org.freedesktop.machine1", DBUS_NAME_FLAG_DO_NOT_QUEUE, &error);
- if (dbus_error_is_set(&error)) {
- log_error("Failed to register name on bus: %s", bus_error_message(&error));
- r = -EIO;
- goto fail;
+ log_error("Failed to enable subscription: %s", bus_error_message(&error, r));
+ return r;
}
- if (r != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
- log_error("Failed to acquire name.");
- r = -EEXIST;
- goto fail;
+ r = sd_bus_request_name(m->bus, "org.freedesktop.machine1", 0);
+ if (r < 0) {
+ log_error("Failed to register name: %s", strerror(-r));
+ return r;
}
- m->bus_fd = bus_loop_open(m->bus);
- if (m->bus_fd < 0) {
- r = m->bus_fd;
- goto fail;
+ 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));
+ return r;
}
- if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->bus_fd, &ev) < 0)
- goto fail;
-
return 0;
-
-fail:
- dbus_error_free(&error);
-
- return r;
}
void manager_gc(Manager *m, bool drop_not_started) {
assert(m);
while ((machine = m->machine_gc_queue)) {
- LIST_REMOVE(Machine, gc_queue, m->machine_gc_queue, machine);
+ LIST_REMOVE(gc_queue, m->machine_gc_queue, machine);
machine->in_gc_queue = false;
- if (machine_check_gc(machine, drop_not_started) == 0) {
+ if (!machine_check_gc(machine, drop_not_started)) {
machine_stop(machine);
machine_free(machine);
}
}
int manager_startup(Manager *m) {
- int r;
Machine *machine;
Iterator i;
+ int r;
assert(m);
- assert(m->epoll_fd <= 0);
-
- m->epoll_fd = epoll_create1(EPOLL_CLOEXEC);
- if (m->epoll_fd < 0)
- return -errno;
/* Connect to the bus */
r = manager_connect_bus(m);
/* And start everything */
HASHMAP_FOREACH(machine, m->machines, i)
- machine_start(machine);
+ machine_start(machine, NULL, NULL);
return 0;
}
-int manager_run(Manager *m) {
- assert(m);
-
- for (;;) {
- struct epoll_event event;
- int n;
-
- manager_gc(m, true);
+static bool check_idle(void *userdata) {
+ Manager *m = userdata;
- if (dbus_connection_dispatch(m->bus) != DBUS_DISPATCH_COMPLETE)
- continue;
-
- manager_gc(m, true);
-
- n = epoll_wait(m->epoll_fd, &event, 1, -1);
- if (n < 0) {
- if (errno == EINTR || errno == EAGAIN)
- continue;
+ manager_gc(m, true);
- log_error("epoll() failed: %m");
- return -errno;
- }
-
- if (n == 0)
- continue;
-
- switch (event.data.u32) {
-
- case FD_BUS:
- bus_loop_dispatch(m->bus_fd);
- break;
+ return hashmap_isempty(m->machines);
+}
- default:
- assert_not_reached("Unknown fd");
- }
- }
+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[]) {
/* Always create the directories people can create inotify
* watches in. Note that some applications might check for the
- * existence of /run/systemd/seats/ to determine whether
- * machined is available, so please always make sure this check
- * stays in. */
+ * existence of /run/systemd/machines/ to determine whether
+ * machined is available, so please always make sure this
+ * check stays in. */
mkdir_label("/run/systemd/machines", 0755);
m = manager_new();
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"
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);
~ianmdlvl / elogind.git / blobdiff