#include "dbus-unit.h"
#include "dbus-job.h"
#include "dbus-manager.h"
+#include "bus-kernel.h"
/* As soon as 5s passed since a unit was added to our GC queue, make sure to run a gc sweep */
#define GC_QUEUE_USEC_MAX (10*USEC_PER_SEC)
static int manager_dispatch_time_change_fd(sd_event_source *source, int fd, uint32_t revents, void *userdata);
static int manager_dispatch_idle_pipe_fd(sd_event_source *source, int fd, uint32_t revents, void *userdata);
static int manager_dispatch_jobs_in_progress(sd_event_source *source, usec_t usec, void *userdata);
+static int manager_dispatch_run_queue(sd_event_source *source, void *userdata);
static int manager_setup_notify(Manager *m) {
union {
} else {
/* Enable that we get SIGWINCH on kbrequest */
if (ioctl(fd, KDSIGACCEPT, SIGWINCH) < 0)
- log_warning("Failed to enable kbrequest handling: %s", strerror(errno));
+ log_warning("Failed to enable kbrequest handling: %m");
}
return 0;
if (r < 0)
return r;
+ /* Process signals a bit earlier than the rest of things */
+ r = sd_event_source_set_priority(m->signal_event_source, -5);
+ if (r < 0)
+ return r;
+
if (m->running_as == SYSTEMD_SYSTEM)
return enable_special_signals(m);
if (!m->environment)
return -ENOMEM;
+ strv_sort(m->environment);
+
+ return 0;
+}
+
+static int manager_setup_kdbus(Manager *m) {
+ _cleanup_free_ char *p = NULL;
+
+ assert(m);
+
+#ifdef ENABLE_KDBUS
+ if (m->kdbus_fd >= 0)
+ return 0;
+
+ /* If there's already a bus address set, don't set up kdbus */
+ if (m->running_as == SYSTEMD_USER && getenv("DBUS_SESSION_BUS_ADDRESS"))
+ return 0;
+
+ m->kdbus_fd = bus_kernel_create_bus(m->running_as == SYSTEMD_SYSTEM ? "system" : "user", &p);
+ if (m->kdbus_fd < 0) {
+ log_debug("Failed to set up kdbus: %s", strerror(-m->kdbus_fd));
+ return m->kdbus_fd;
+ }
+
+ log_debug("Successfully set up kdbus on %s", p);
+#endif
+
return 0;
}
-int manager_new(SystemdRunningAs running_as, bool reexecuting, Manager **_m) {
+static int manager_connect_bus(Manager *m, bool reexecuting) {
+ bool try_bus_connect;
+
+ assert(m);
+
+ try_bus_connect =
+ m->kdbus_fd >= 0 ||
+ reexecuting ||
+ (m->running_as == SYSTEMD_USER && getenv("DBUS_SESSION_BUS_ADDRESS"));
+
+ /* Try to connect to the busses, if possible. */
+ return bus_init(m, try_bus_connect);
+}
+
+int manager_new(SystemdRunningAs running_as, Manager **_m) {
Manager *m;
- int r = -ENOMEM;
- bool try_bus_connect = false;
+ int r;
assert(_m);
assert(running_as >= 0);
m->idle_pipe[0] = m->idle_pipe[1] = m->idle_pipe[2] = m->idle_pipe[3] = -1;
- m->pin_cgroupfs_fd = m->notify_fd = m->signal_fd = m->time_change_fd = m->dev_autofs_fd = m->private_listen_fd = -1;
+ m->pin_cgroupfs_fd = m->notify_fd = m->signal_fd = m->time_change_fd = m->dev_autofs_fd = m->private_listen_fd = m->kdbus_fd = -1;
m->current_job_id = 1; /* start as id #1, so that we can leave #0 around as "null-like" value */
r = manager_default_environment(m);
if (r < 0)
goto fail;
+ r = sd_event_add_defer(m->event, manager_dispatch_run_queue, m, &m->run_queue_event_source);
+ if (r < 0)
+ goto fail;
+
+ r = sd_event_source_set_priority(m->run_queue_event_source, SD_EVENT_PRIORITY_IDLE);
+ if (r < 0)
+ goto fail;
+
+ r = sd_event_source_set_enabled(m->run_queue_event_source, SD_EVENT_OFF);
+ if (r < 0)
+ goto fail;
+
r = manager_setup_signals(m);
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- if (running_as == SYSTEMD_SYSTEM)
- try_bus_connect = reexecuting;
- else if (getenv("DBUS_SESSION_BUS_ADDRESS"))
- try_bus_connect = true;
- else
- log_debug("Skipping DBus session bus connection attempt - no DBUS_SESSION_BUS_ADDRESS set...");
-
- /* Try to connect to the busses, if possible. */
- r = bus_init(m, try_bus_connect);
- if (r < 0)
+ m->udev = udev_new();
+ if (!m->udev) {
+ r = -ENOMEM;
goto fail;
+ }
m->taint_usr = dir_is_empty("/usr") > 0;
sd_event_source_unref(m->time_change_event_source);
sd_event_source_unref(m->jobs_in_progress_event_source);
sd_event_source_unref(m->idle_pipe_event_source);
+ sd_event_source_unref(m->run_queue_event_source);
if (m->signal_fd >= 0)
close_nointr_nofail(m->signal_fd);
close_nointr_nofail(m->notify_fd);
if (m->time_change_fd >= 0)
close_nointr_nofail(m->time_change_fd);
+ if (m->kdbus_fd >= 0)
+ close_nointr_nofail(m->kdbus_fd);
manager_close_idle_pipe(m);
+ udev_unref(m->udev);
sd_event_unref(m->event);
free(m->notify_socket);
r = q;
}
+ /* We might have deserialized the kdbus control fd, but if we
+ * didn't, then let's create the bus now. */
+ manager_setup_kdbus(m);
+ manager_connect_bus(m, !!serialization);
+
/* Third, fire things up! */
q = manager_coldplug(m);
if (q < 0)
return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Path %s is not absolute.", path);
if (!name)
- name = path_get_file_name(path);
+ name = basename(path);
t = unit_name_to_type(name);
job_finish_and_invalidate(j, JOB_CANCELED, false);
}
-static unsigned manager_dispatch_run_queue(Manager *m) {
+static int manager_dispatch_run_queue(sd_event_source *source, void *userdata) {
+ Manager *m = userdata;
Job *j;
- unsigned n = 0;
-
- if (m->dispatching_run_queue)
- return 0;
- m->dispatching_run_queue = true;
+ assert(source);
+ assert(m);
while ((j = m->run_queue)) {
assert(j->installed);
assert(j->in_run_queue);
job_run_and_invalidate(j);
- n++;
}
- m->dispatching_run_queue = false;
-
if (m->n_running_jobs > 0)
manager_watch_jobs_in_progress(m);
if (m->n_on_console > 0)
manager_watch_idle_pipe(m);
- return n;
+ return 1;
}
static unsigned manager_dispatch_dbus_queue(Manager *m) {
if (manager_dispatch_cgroup_queue(m) > 0)
continue;
- if (manager_dispatch_run_queue(m) > 0)
- continue;
-
if (manager_dispatch_dbus_queue(m) > 0)
continue;
if (m->running_as != SYSTEMD_SYSTEM)
return;
+ if (detect_container(NULL) > 0)
+ return;
+
if (u->type != UNIT_SERVICE &&
u->type != UNIT_MOUNT &&
u->type != UNIT_SWAP)
_cleanup_free_ char *ce;
ce = cescape(*e);
- if (ce)
- fprintf(f, "env=%s\n", *e);
+ if (!ce)
+ return -ENOMEM;
+
+ fprintf(f, "env=%s\n", *e);
}
}
+ if (m->kdbus_fd >= 0) {
+ int copy;
+
+ copy = fdset_put_dup(fds, m->kdbus_fd);
+ if (copy < 0)
+ return copy;
+
+ fprintf(f, "kdbus-fd=%i\n", copy);
+ }
+
bus_serialize(m, f);
fputc('\n', f);
} else if (startswith(l, "taint-usr=")) {
int b;
- if ((b = parse_boolean(l+10)) < 0)
+ b = parse_boolean(l+10);
+ if (b < 0)
log_debug("Failed to parse taint /usr flag %s", l+10);
else
m->taint_usr = m->taint_usr || b;
strv_free(m->environment);
m->environment = e;
+
+ } else if (startswith(l, "kdbus-fd=")) {
+ int fd;
+
+ if (safe_atoi(l + 9, &fd) < 0 || fd < 0 || !fdset_contains(fds, fd))
+ log_debug("Failed to parse kdbus fd: %s", l + 9);
+ else {
+ if (m->kdbus_fd >= 0)
+ close_nointr_nofail(m->kdbus_fd);
+
+ m->kdbus_fd = fdset_remove(fds, fd);
+ }
+
} else if (bus_deserialize_item(m, l) == 0)
log_debug("Unknown serialization item '%s'", l);
}
}
finish:
- if (ferror(f)) {
+ if (ferror(f))
r = -EIO;
- goto finish;
- }
assert(m->n_reloading > 0);
m->n_reloading --;
if (m->n_running_jobs == 0)
m->jobs_in_progress_event_source = sd_event_source_unref(m->jobs_in_progress_event_source);
- if (hashmap_size(m->jobs) > 0 && m->jobs_in_progress_event_source) {
- sd_event_source_set_time(m->jobs_in_progress_event_source, JOBS_IN_PROGRESS_PERIOD_SEC);
+ if (hashmap_size(m->jobs) > 0) {
+ if (m->jobs_in_progress_event_source)
+ sd_event_source_set_time(m->jobs_in_progress_event_source, JOBS_IN_PROGRESS_PERIOD_SEC);
return;
}
if (b != l)
strv_free(b);
- m->environment = l;
+ m->environment = strv_sort(l);
return 0;
}
~ianmdlvl / elogind.git / blobdiff