X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dbus-job.c;h=9c6a798075600cd0a910219e45b7edf43ed24aa4;hb=1adf1049dc9def8d8df405bab7f5ae08e1e9573d;hp=896dff7865cfe1a1fbb0ca671f86acbabbc3f25d;hpb=b548631afcd317fd0f762b324c086d1580f83a50;p=elogind.git
diff --git a/dbus-job.c b/dbus-job.c
index 896dff786..9c6a79807 100644
--- a/dbus-job.c
+++ b/dbus-job.c
@@ -1,5 +1,24 @@
/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see .
+***/
+
#include
#include "dbus.h"
@@ -10,6 +29,7 @@ static const char introspection[] =
""
" "
" "
+ " "
" "
" "
" "
@@ -19,39 +39,8 @@ static const char introspection[] =
BUS_INTROSPECTABLE_INTERFACE
"";
-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;
-}
+DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_job_append_state, job_state, JobState);
+DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_job_append_type, job_type, JobType);
static int bus_job_append_unit(Manager *m, DBusMessageIter *i, const char *property, void *data) {
Job *j = data;
@@ -88,10 +77,10 @@ static int bus_job_append_unit(Manager *m, DBusMessageIter *i, const char *prope
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", "JobType", bus_job_append_type, "s", j },
- { "org.freedesktop.systemd1.Job", "Unit", bus_job_append_unit, "(so)", j },
+ { "org.freedesktop.systemd1.Job", "Id", bus_property_append_uint32, "u", &j->id },
+ { "org.freedesktop.systemd1.Job", "State", bus_job_append_state, "s", &j->state },
+ { "org.freedesktop.systemd1.Job", "JobType", bus_job_append_type, "s", &j->type },
+ { "org.freedesktop.systemd1.Job", "Unit", bus_job_append_unit, "(so)", j },
{ NULL, NULL, NULL, NULL, NULL }
};
@@ -108,7 +97,7 @@ static DBusHandlerResult bus_job_message_dispatch(Job *j, DBusMessage *message)
return bus_default_message_handler(j->manager, message, introspection, properties);
if (reply) {
- if (!dbus_connection_send(m->bus, reply, NULL))
+ if (!dbus_connection_send(m->api_bus, reply, NULL))
goto oom;
dbus_message_unref(reply);
@@ -123,7 +112,7 @@ oom:
return DBUS_HANDLER_RESULT_NEED_MEMORY;
}
-DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBusMessage *message, void *data) {
+static DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBusMessage *message, void *data) {
Manager *m = data;
Job *j;
int r;
@@ -154,3 +143,94 @@ DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBusMessa
const DBusObjectPathVTable bus_job_vtable = {
.message_function = bus_job_message_handler
};
+
+void bus_job_send_change_signal(Job *j) {
+ char *p = NULL;
+ DBusMessage *m = NULL;
+
+ assert(j);
+ assert(j->in_dbus_queue);
+
+ LIST_REMOVE(Job, dbus_queue, j->manager->dbus_job_queue, j);
+ j->in_dbus_queue = false;
+
+ if (set_isempty(j->manager->subscribed))
+ return;
+
+ if (!(p = job_dbus_path(j)))
+ goto oom;
+
+ if (j->sent_dbus_new_signal) {
+ /* Send a change signal */
+
+ if (!(m = dbus_message_new_signal(p, "org.freedesktop.systemd1.Job", "Changed")))
+ goto oom;
+ } else {
+ /* Send a new signal */
+
+ if (!(m = dbus_message_new_signal("/org/freedesktop/systemd1", "org.freedesktop.systemd1", "JobNew")))
+ goto oom;
+
+ if (!dbus_message_append_args(m,
+ DBUS_TYPE_UINT32, &j->id,
+ DBUS_TYPE_OBJECT_PATH, &p,
+ DBUS_TYPE_INVALID))
+ goto oom;
+ }
+
+ if (!dbus_connection_send(j->manager->api_bus, m, NULL))
+ goto oom;
+
+ free(p);
+ dbus_message_unref(m);
+
+ j->sent_dbus_new_signal = true;
+
+ return;
+
+oom:
+ free(p);
+
+ if (m)
+ dbus_message_unref(m);
+
+ log_error("Failed to allocate job change signal.");
+}
+
+void bus_job_send_removed_signal(Job *j) {
+ char *p = NULL;
+ DBusMessage *m = NULL;
+
+ assert(j);
+
+ if (set_isempty(j->manager->subscribed) || !j->sent_dbus_new_signal)
+ return;
+
+ if (!(p = job_dbus_path(j)))
+ goto oom;
+
+ if (!(m = dbus_message_new_signal("/org/freedesktop/systemd1", "org.freedesktop.systemd1", "JobRemoved")))
+ goto oom;
+
+ if (!dbus_message_append_args(m,
+ DBUS_TYPE_UINT32, &j->id,
+ DBUS_TYPE_OBJECT_PATH, &p,
+ DBUS_TYPE_INVALID))
+ goto oom;
+
+ if (!dbus_connection_send(j->manager->api_bus, m, NULL))
+ goto oom;
+
+ free(p);
+ dbus_message_unref(m);
+
+ return;
+
+oom:
+ free(p);
+
+ if (m)
+ dbus_message_unref(m);
+
+ log_error("Failed to allocate job remove signal.");
+}