diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-04-10 17:37:56 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-04-10 18:00:22 +0200 |
| commit | b152adec93b05c0d01b240e0f28326eb1d8e18e9 (patch) | |
| tree | 240e8dc421b7a786c9eaddc116709c7f7e595c91 | |
| parent | 51a1a79d3fbb23cfb4ce07ea218e77efbce94cdd (diff) | |
dbus: add Dump() D-Bus call
| -rw-r--r-- | dbus-manager.c | 30 | ||||
| -rw-r--r-- | systemctl.vala | 4 | ||||
| -rw-r--r-- | systemd-interfaces.vala | 2 |
3 files changed, 35 insertions, 1 deletions
diff --git a/dbus-manager.c b/dbus-manager.c index 7549164829..2323260dbb 100644 --- a/dbus-manager.c +++ b/dbus-manager.c @@ -49,6 +49,7 @@ " </method>" \ " <method name=\"Subscribe\"/>" \ " <method name=\"Unsubscribe\"/>" \ + " <method name=\"Dump\"/>" \ " <signal name=\"UnitNew\">" \ " <arg name=\"id\" type=\"s\"/>" \ " <arg name=\"unit\" type=\"o\"/>" \ @@ -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 22a971cc82..6c01ad1263 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 9947df54a7..0323c0dbcb 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); |