From b152adec93b05c0d01b240e0f28326eb1d8e18e9 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 10 Apr 2010 17:37:56 +0200 Subject: [PATCH] dbus: add Dump() D-Bus call --- dbus-manager.c | 30 ++++++++++++++++++++++++++++++ systemctl.vala | 4 +++- systemd-interfaces.vala | 2 ++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dbus-manager.c b/dbus-manager.c index 754916482..2323260db 100644 --- a/dbus-manager.c +++ b/dbus-manager.c @@ -49,6 +49,7 @@ " " \ " " \ " " \ + " " \ " " \ " " \ " " \ @@ -330,6 +331,35 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection if (!(reply = dbus_message_new_method_return(message))) goto oom; + } else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1", "Dump")) { + FILE *f; + char *dump = NULL; + size_t size; + + if (!(reply = dbus_message_new_method_return(message))) + goto oom; + + if (!(f = open_memstream(&dump, &size))) + goto oom; + + manager_dump_units(m, f, NULL); + manager_dump_jobs(m, f, NULL); + + if (ferror(f)) { + fclose(f); + free(dump); + goto oom; + } + + fclose(f); + + if (!dbus_message_append_args(reply, DBUS_TYPE_STRING, &dump, DBUS_TYPE_INVALID)) { + free(dump); + goto oom; + } + + free(dump); + } else if (dbus_message_is_method_call(message, "org.freedesktop.DBus.Introspectable", "Introspect")) { char *introspection = NULL; FILE *f; diff --git a/systemctl.vala b/systemctl.vala index 22a971cc8..6c01ad126 100644 --- a/systemctl.vala +++ b/systemctl.vala @@ -222,7 +222,9 @@ int main (string[] args) { MainLoop l = new MainLoop(); l.run(); - } else { + } else if (args[1] == "dump") + stdout.puts(manager.dump()); + else { stderr.printf("Unknown command %s.\n", args[1]); return 1; } diff --git a/systemd-interfaces.vala b/systemd-interfaces.vala index 9947df54a..0323c0dbc 100644 --- a/systemd-interfaces.vala +++ b/systemd-interfaces.vala @@ -54,6 +54,8 @@ public interface Manager : DBus.Object { public abstract void subscribe() throws DBus.Error; public abstract void unsubscribe() throws DBus.Error; + public abstract string dump() throws DBus.Error; + public abstract signal void unit_new(string id, ObjectPath path); public abstract signal void unit_removed(string id, ObjectPath path); public abstract signal void job_new(uint32 id, ObjectPath path); -- 2.30.2