summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-02-02 12:42:08 +0100
committerLennart Poettering <lennart@poettering.net>2010-02-02 12:42:08 +0100
commit86fbf370855aaa0c6e04d17bdd1d9d0c81bc5101 (patch)
tree6c49b24267232ed23ff344a2e1ff1369bfe21581
parent3813169516563114bf55d2198b3e01f10f197b9a (diff)
dbus: install some properties on the job objects
-rw-r--r--dbus-job.c101
-rw-r--r--manager.c23
-rw-r--r--manager.h1
3 files changed, 124 insertions, 1 deletions
diff --git a/dbus-job.c b/dbus-job.c
index 0ac11bc1fb..fd84aa6ab3 100644
--- a/dbus-job.c
+++ b/dbus-job.c
@@ -1,5 +1,7 @@
/*-*- Mode: C; c-basic-offset: 8 -*-*/
+#include <errno.h>
+
#include "dbus.h"
#include "log.h"
@@ -7,13 +9,99 @@ static const char introspection[] =
DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
"<node>"
" <interface name=\"org.freedesktop.systemd1.Job\">"
+ " <property name=\"Id\" type=\"u\" access=\"read\"/>"
+ " <property name=\"Unit\" type=\"(so)\" access=\"read\"/>"
+ " <property name=\"Type\" type=\"s\" access=\"read\"/>"
+ " <property name=\"State\" type=\"s\" access=\"read\"/>"
" </interface>"
BUS_PROPERTIES_INTERFACE
BUS_INTROSPECTABLE_INTERFACE
"</node>";
+static int bus_job_append_state(Manager *m, DBusMessageIter *i, const char *property, void *data) {
+ Job *j = data;
+ const char *state;
+
+ assert(m);
+ assert(i);
+ assert(property);
+ assert(j);
+
+ state = job_state_to_string(j->state);
+
+ if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &state))
+ return -ENOMEM;
+
+ return 0;
+}
+
+static int bus_job_append_type(Manager *m, DBusMessageIter *i, const char *property, void *data) {
+ Job *j = data;
+ const char *type;
+
+ assert(m);
+ assert(i);
+ assert(property);
+ assert(j);
+
+ type = job_type_to_string(j->type);
+
+ if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &type))
+ return -ENOMEM;
+
+ return 0;
+}
+
+static int bus_job_append_unit(Manager *m, DBusMessageIter *i, const char *property, void *data) {
+ Job *j = data;
+ DBusMessageIter sub;
+ char *p;
+ const char *id;
+
+ assert(m);
+ assert(i);
+ assert(property);
+ assert(j);
+
+ if (!dbus_message_iter_open_container(i, DBUS_TYPE_STRUCT, NULL, &sub))
+ return -ENOMEM;
+
+ if (!(p = unit_dbus_path(j->unit)))
+ return -ENOMEM;
+
+ id = unit_id(j->unit);
+
+ if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &id) ||
+ !dbus_message_iter_append_basic(&sub, DBUS_TYPE_OBJECT_PATH, &p)) {
+ free(p);
+ return -ENOMEM;
+ }
+
+ free(p);
+
+ if (!dbus_message_iter_close_container(i, &sub))
+ return -ENOMEM;
+
+ return 0;
+}
+
+static DBusHandlerResult bus_job_message_dispatch(Job *j, DBusMessage *message) {
+
+ const BusProperty properties[] = {
+ { "org.freedesktop.systemd1.Job", "Id", bus_property_append_uint32, "u", &j->id },
+ { "org.freedesktop.systemd1.Job", "State", bus_job_append_state, "s", j },
+ { "org.freedesktop.systemd1.Job", "Type", bus_job_append_type, "s", j },
+ { "org.freedesktop.systemd1.Job", "Unit", bus_job_append_unit, "(so)", j },
+ { NULL, NULL, NULL, NULL, NULL }
+ };
+
+ return bus_default_message_handler(j->manager, message, introspection, properties);
+}
+
DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBusMessage *message, void *data) {
Manager *m = data;
+ Job *j;
+ int r;
assert(connection);
assert(message);
@@ -24,7 +112,18 @@ DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBusMessa
dbus_message_get_member(message),
dbus_message_get_path(message));
- return bus_default_message_handler(m, message, introspection, NULL);
+ if ((r = manager_get_job_from_dbus_path(m, dbus_message_get_path(message), &j)) < 0) {
+
+ if (r == -ENOMEM)
+ return DBUS_HANDLER_RESULT_NEED_MEMORY;
+
+ if (r == -ENOENT)
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+ return bus_send_error_reply(m, message, NULL, r);
+ }
+
+ return bus_job_message_dispatch(j, message);
}
const DBusObjectPathVTable bus_job_vtable = {
diff --git a/manager.c b/manager.c
index 3bbc85542c..b574c6380d 100644
--- a/manager.c
+++ b/manager.c
@@ -1257,3 +1257,26 @@ int manager_get_unit_from_dbus_path(Manager *m, const char *s, Unit **_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;
+}
diff --git a/manager.h b/manager.h
index c30bf765b0..b2b93e9b45 100644
--- a/manager.h
+++ b/manager.h
@@ -109,6 +109,7 @@ Job *manager_get_job(Manager *m, uint32_t id);
Unit *manager_get_unit(Manager *m, const char *name);
int manager_get_unit_from_dbus_path(Manager *m, const char *s, Unit **_u);
+int manager_get_job_from_dbus_path(Manager *m, const char *s, Job **_j);
int manager_load_unit(Manager *m, const char *path_or_name, Unit **_ret);
int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool force, Job **_ret);