dbus: install some properties on the job objects

[elogind.git] / manager.c

diff --git a/manager.c b/manager.c
index ac1c79c5f6f634a2c6e98235801a3e194c39ecdf..b574c6380dad18b6886851b1732efe7186c2eedc 100644 (file)
--- a/manager.c
+++ b/manager.c
@@ -16,6 +16,7 @@
 #include "strv.h"
 #include "log.h"
 #include "util.h"
+#include "ratelimit.h"
 
 static int manager_setup_signals(Manager *m) {
         sigset_t mask;
@@ -56,7 +57,8 @@ Manager* manager_new(void) {
         if (!(m = new0(Manager, 1)))
                 return NULL;
 
-        m->signal_watch.fd = m->mount_watch.fd = m->epoll_fd = -1;
+        m->signal_watch.fd = m->mount_watch.fd = m->udev_watch.fd = m->epoll_fd = -1;
+        m->current_job_id = 1; /* start as id #1, so that we can leave #0 around as "null-like" value */
 
         if (!(m->units = hashmap_new(string_hash_func, string_compare_func)))
                 goto fail;
@@ -76,6 +78,10 @@ Manager* manager_new(void) {
         if (manager_setup_signals(m) < 0)
                 goto fail;
 
+        /* FIXME: this should be called only when the D-Bus bus daemon is running */
+        if (bus_init(m) < 0)
+                goto fail;
+
         return m;
 
 fail:
@@ -100,6 +106,8 @@ void manager_free(Manager *m) {
                 if (unit_vtable[c]->shutdown)
                         unit_vtable[c]->shutdown(m);
 
+        bus_done(m);
+
         hashmap_free(m->units);
         hashmap_free(m->jobs);
         hashmap_free(m->transaction_jobs);
@@ -1060,7 +1068,7 @@ static int manager_dispatch_sigchld(Manager *m) {
                 if (si.si_code != CLD_EXITED && si.si_code != CLD_KILLED && si.si_code != CLD_DUMPED)
                         continue;
 
-                log_debug("child %llu died (code=%s, status=%i)", (long long unsigned) si.si_pid, sigchld_code(si.si_code), si.si_status);
+                log_debug("child %llu died (code=%s, status=%i)", (long long unsigned) si.si_pid, sigchld_code_to_string(si.si_code), si.si_status);
 
                 if (!(u = hashmap_remove(m->watch_pids, UINT32_TO_PTR(si.si_pid))))
                         continue;
@@ -1126,7 +1134,7 @@ static int process_event(Manager *m, struct epoll_event *ev, bool *quit) {
         case WATCH_SIGNAL:
 
                 /* An incoming signal? */
-                if (ev->events != POLLIN)
+                if (ev->events != EPOLLIN)
                         return -EINVAL;
 
                 if ((r = manager_process_signal_fd(m, quit)) < 0)
@@ -1137,7 +1145,7 @@ static int process_event(Manager *m, struct epoll_event *ev, bool *quit) {
         case WATCH_FD:
 
                 /* Some fd event, to be dispatched to the units */
-                UNIT_VTABLE(w->unit)->fd_event(w->unit, w->fd, ev->events, w);
+                UNIT_VTABLE(w->data.unit)->fd_event(w->data.unit, w->fd, ev->events, w);
                 break;
 
         case WATCH_TIMER: {
@@ -1153,7 +1161,7 @@ static int process_event(Manager *m, struct epoll_event *ev, bool *quit) {
                         return k < 0 ? -errno : -EIO;
                 }
 
-                UNIT_VTABLE(w->unit)->timer_event(w->unit, v, w);
+                UNIT_VTABLE(w->data.unit)->timer_event(w->data.unit, v, w);
                 break;
         }
 
@@ -1162,6 +1170,19 @@ static int process_event(Manager *m, struct epoll_event *ev, bool *quit) {
                 mount_fd_event(m, ev->events);
                 break;
 
+        case WATCH_UDEV:
+                /* Some notification from udev, intended for the device subsystem */
+                device_fd_event(m, ev->events);
+                break;
+
+        case WATCH_DBUS_WATCH:
+                bus_watch_event(m, w, ev->events);
+                break;
+
+        case WATCH_DBUS_TIMEOUT:
+                bus_timeout_event(m, w, ev->events);
+                break;
+
         default:
                 assert_not_reached("Unknown epoll event type.");
         }
@@ -1173,14 +1194,27 @@ int manager_loop(Manager *m) {
         int r;
         bool quit = false;
 
+        RATELIMIT_DEFINE(rl, 1*USEC_PER_SEC, 1000);
+
         assert(m);
 
         for (;;) {
                 struct epoll_event event;
                 int n;
 
+                if (!ratelimit_test(&rl)) {
+                        /* Yay, something is going seriously wrong, pause a little */
+                        log_warning("Looping too fast. Throttling execution a little.");
+                        sleep(1);
+                }
+
                 manager_dispatch_run_queue(m);
 
+                if (m->request_bus_dispatch) {
+                        bus_dispatch(m);
+                        continue;
+                }
+
                 if ((n = epoll_wait(m->epoll_fd, &event, 1, -1)) < 0) {
 
                         if (errno == -EINTR)
@@ -1198,3 +1232,51 @@ int manager_loop(Manager *m) {
                         return 0;
         }
 }
+
+int manager_get_unit_from_dbus_path(Manager *m, const char *s, Unit **_u) {
+        char *n;
+        Unit *u;
+
+        assert(m);
+        assert(s);
+        assert(_u);
+
+        if (!startswith(s, "/org/freedesktop/systemd1/unit/"))
+                return -EINVAL;
+
+        if (!(n = bus_path_unescape(s+31)))
+                return -ENOMEM;
+
+        u = manager_get_unit(m, n);
+        free(n);
+
+        if (!u)
+                return -ENOENT;
+
+        *_u = u;
+
+        return 0;
+}
+
+int manager_get_job_from_dbus_path(Manager *m, const char *s, Job **_j) {
+        Job *j;
+        unsigned id;
+        int r;
+
+        assert(m);
+        assert(s);
+        assert(_j);
+
+        if (!startswith(s, "/org/freedesktop/systemd1/job/"))
+                return -EINVAL;
+
+        if ((r = safe_atou(s + 30, &id)) < 0)
+                return r;
+
+        if (!(j = manager_get_job(m, id)))
+                return -ENOENT;
+
+        *_j = j;
+
+        return 0;
+}