X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=dbus-unit.c;h=6bccec14a71fef7eee247b60cf3e81a388fe099d;hp=1c6b405adf3abd5120c80233e88a33a3370e8ebc;hb=8d567588cad053f79abe603ab113e1b85a92f1da;hpb=a7334b0952ab66c17ee787e36e6d2c5ceb387de6 diff --git a/dbus-unit.c b/dbus-unit.c index 1c6b405ad..6bccec14a 100644 --- a/dbus-unit.c +++ b/dbus-unit.c @@ -44,11 +44,13 @@ static const char introspection[] = " " " " " " + " " " " " " " " " " - " " + " " + " " " " " " " " @@ -59,23 +61,6 @@ static const char introspection[] = BUS_INTROSPECTABLE_INTERFACE ""; -static int bus_unit_append_id(Manager *m, DBusMessageIter *i, const char *property, void *data) { - Unit *u = data; - const char *id; - - assert(m); - assert(i); - assert(property); - assert(u); - - id = unit_id(u); - - if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &id)) - return -ENOMEM; - - return 0; -} - static int bus_unit_append_description(Manager *m, DBusMessageIter *i, const char *property, void *data) { Unit *u = data; const char *d; @@ -93,7 +78,9 @@ static int bus_unit_append_description(Manager *m, DBusMessageIter *i, const cha return 0; } -static int bus_unit_append_load_state(Manager *m, DBusMessageIter *i, const char *property, void *data) { +DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_unit_append_load_state, unit_load_state, UnitLoadState); + +static int bus_unit_append_active_state(Manager *m, DBusMessageIter *i, const char *property, void *data) { Unit *u = data; const char *state; @@ -102,7 +89,7 @@ static int bus_unit_append_load_state(Manager *m, DBusMessageIter *i, const char assert(property); assert(u); - state = unit_load_state_to_string(u->meta.load_state); + state = unit_active_state_to_string(unit_active_state(u)); if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &state)) return -ENOMEM; @@ -110,7 +97,7 @@ static int bus_unit_append_load_state(Manager *m, DBusMessageIter *i, const char return 0; } -static int bus_unit_append_active_state(Manager *m, DBusMessageIter *i, const char *property, void *data) { +static int bus_unit_append_sub_state(Manager *m, DBusMessageIter *i, const char *property, void *data) { Unit *u = data; const char *state; @@ -119,7 +106,7 @@ static int bus_unit_append_active_state(Manager *m, DBusMessageIter *i, const ch assert(property); assert(u); - state = unit_active_state_to_string(unit_active_state(u)); + state = unit_sub_state_to_string(u); if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &state)) return -ENOMEM; @@ -212,11 +199,12 @@ static int bus_unit_append_job(Manager *m, DBusMessageIter *i, const char *prope static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusMessage *message) { const BusProperty properties[] = { - { "org.freedesktop.systemd1.Unit", "Id", bus_unit_append_id, "s", u }, + { "org.freedesktop.systemd1.Unit", "Id", bus_property_append_string, "s", u->meta.id }, { "org.freedesktop.systemd1.Unit", "Description", bus_unit_append_description, "s", u }, - { "org.freedesktop.systemd1.Unit", "LoadState", bus_unit_append_load_state, "s", u }, + { "org.freedesktop.systemd1.Unit", "LoadState", bus_unit_append_load_state, "s", &u->meta.load_state }, { "org.freedesktop.systemd1.Unit", "ActiveState", bus_unit_append_active_state, "s", u }, - { "org.freedesktop.systemd1.Unit", "LoadPath", bus_property_append_string, "s", u->meta.load_path }, + { "org.freedesktop.systemd1.Unit", "SubState", bus_unit_append_sub_state, "s", u }, + { "org.freedesktop.systemd1.Unit", "FragmentPath", bus_property_append_string, "s", u->meta.fragment_path }, { "org.freedesktop.systemd1.Unit", "ActiveEnterTimestamp", bus_property_append_uint64, "t", &u->meta.active_enter_timestamp }, { "org.freedesktop.systemd1.Unit", "ActiveExitTimestamp", bus_property_append_uint64, "t", &u->meta.active_exit_timestamp }, { "org.freedesktop.systemd1.Unit", "CanReload", bus_unit_append_can_reload, "b", u }, @@ -277,7 +265,7 @@ static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusMessage *message } 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); @@ -325,3 +313,94 @@ static DBusHandlerResult bus_unit_message_handler(DBusConnection *connection, D const DBusObjectPathVTable bus_unit_vtable = { .message_function = bus_unit_message_handler }; + +void bus_unit_send_change_signal(Unit *u) { + char *p = NULL; + DBusMessage *m = NULL; + + assert(u); + assert(u->meta.in_dbus_queue); + + LIST_REMOVE(Meta, dbus_queue, u->meta.manager->dbus_unit_queue, &u->meta); + u->meta.in_dbus_queue = false; + + if (set_isempty(u->meta.manager->subscribed)) + return; + + if (!(p = unit_dbus_path(u))) + goto oom; + + if (u->meta.sent_dbus_new_signal) { + /* Send a change signal */ + + if (!(m = dbus_message_new_signal(p, "org.freedesktop.systemd1.Unit", "Changed"))) + goto oom; + } else { + /* Send a new signal */ + + if (!(m = dbus_message_new_signal("/org/freedesktop/systemd1", "org.freedesktop.systemd1", "UnitNew"))) + goto oom; + + if (!dbus_message_append_args(m, + DBUS_TYPE_STRING, &u->meta.id, + DBUS_TYPE_OBJECT_PATH, &p, + DBUS_TYPE_INVALID)) + goto oom; + } + + if (!dbus_connection_send(u->meta.manager->api_bus, m, NULL)) + goto oom; + + free(p); + dbus_message_unref(m); + + u->meta.sent_dbus_new_signal = true; + + return; + +oom: + free(p); + + if (m) + dbus_message_unref(m); + + log_error("Failed to allocate unit change/new signal."); +} + +void bus_unit_send_removed_signal(Unit *u) { + char *p = NULL; + DBusMessage *m = NULL; + + assert(u); + + if (set_isempty(u->meta.manager->subscribed) || !u->meta.sent_dbus_new_signal) + return; + + if (!(p = unit_dbus_path(u))) + goto oom; + + if (!(m = dbus_message_new_signal("/org/freedesktop/systemd1", "org.freedesktop.systemd1", "UnitRemoved"))) + goto oom; + + if (!dbus_message_append_args(m, + DBUS_TYPE_STRING, &u->meta.id, + DBUS_TYPE_OBJECT_PATH, &p, + DBUS_TYPE_INVALID)) + goto oom; + + if (!dbus_connection_send(u->meta.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 unit remove signal."); +}