summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-02-02 22:22:51 +0100
committerLennart Poettering <lennart@poettering.net>2010-02-02 22:22:51 +0100
commit5630af71d72a2fa8142886ca2fb37e69a1906bca (patch)
tree8ea7cc0a6bca89ffbc5ce5f76aa79eed54f0c271
parentcc13a98b680087b24c1a319d10db98cd755a94d2 (diff)
downloadsystemd-5630af71d72a2fa8142886ca2fb37e69a1906bca.tar.gz
client: add a very basic Vala command line tool
-rw-r--r--.gitignore2
-rw-r--r--Makefile7
-rw-r--r--systemctl.vala134
3 files changed, 141 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 7f892d0570..c15a61be48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ systemd
test-engine
test-job-type
systemd-logger
+systemctl
+systemctl.c
diff --git a/Makefile b/Makefile
index 2f739ce2ac..5a60eac9ff 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ COMMON= \
dbus-unit.o \
dbus-job.o
-all: systemd test-engine test-job-type systemd-logger
+all: systemd test-engine test-job-type systemd-logger systemctl
systemd: main.o $(COMMON)
$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
@@ -43,5 +43,8 @@ test-engine: test-engine.o $(COMMON)
test-job-type: test-job-type.o $(COMMON)
$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
+systemctl: systemctl.vala
+ valac --save-temps systemctl.vala --pkg=dbus-glib-1 --pkg=posix
+
clean:
- rm -f *.o systemd test-engine
+ rm -f *.o systemd test-engine systemctl
diff --git a/systemctl.vala b/systemctl.vala
new file mode 100644
index 0000000000..f3b2e62e59
--- /dev/null
+++ b/systemctl.vala
@@ -0,0 +1,134 @@
+using DBus;
+using GLib;
+
+[DBus (name = "org.freedesktop.systemd1")]
+public interface Manager : DBus.Object {
+
+ public struct UnitInfo {
+ string id;
+ string description;
+ string load_state;
+ string active_state;
+ ObjectPath unit_path;
+ uint32 job_id;
+ string job_type;
+ ObjectPath job_path;
+ }
+
+ public struct JobInfo {
+ uint32 id;
+ string name;
+ string type;
+ string state;
+ ObjectPath job_path;
+ ObjectPath unit_path;
+ }
+
+ public abstract UnitInfo[] ListUnits() throws DBus.Error;
+ public abstract JobInfo[] ListJobs() throws DBus.Error;
+
+ public abstract ObjectPath LoadUnit(string name) throws DBus.Error;
+}
+
+static string type = null;
+static bool all = false;
+
+public static int job_info_compare(void* key1, void* key2) {
+ Manager.JobInfo *j1 = (Manager.JobInfo*) key1;
+ Manager.JobInfo *j2 = (Manager.JobInfo*) key2;
+
+ return Posix.strcmp(j1->name, j2->name);
+}
+
+public static int unit_info_compare(void* key1, void* key2) {
+ Manager.UnitInfo *u1 = (Manager.UnitInfo*) key1;
+ Manager.UnitInfo *u2 = (Manager.UnitInfo*) key2;
+
+ int r = Posix.strcmp(Posix.strrchr(u1->id, '.'), Posix.strrchr(u2->id, '.'));
+ if (r != 0)
+ return r;
+
+ return Posix.strcmp(u1->id, u2->id);
+}
+
+static const OptionEntry entries[] = {
+ { "type", 't', 0, OptionArg.STRING, out type, "List only particular type of units", "TYPE" },
+ { "all", 'a', 0, OptionArg.NONE, out all, "Show all units, including dead ones", null },
+ { null }
+};
+
+int main (string[] args) {
+
+ OptionContext context = new OptionContext(" -- Control systemd");
+ context.add_main_entries(entries, null);
+
+ try {
+ context.parse(ref args);
+ } catch (GLib.OptionError e) {
+ message("Failed to parse command line: %s".printf(e.message));
+ }
+
+ try {
+ Connection bus = Bus.get(BusType.SESSION);
+
+ Manager manager = bus.get_object (
+ "org.freedesktop.systemd1",
+ "/org/freedesktop/systemd1",
+ "org.freedesktop.systemd1") as Manager;
+
+ if (args[1] == "list-units" || args.length <= 1) {
+ var list = manager.ListUnits();
+ uint n = 0;
+ Posix.qsort(list, list.length, sizeof(Manager.UnitInfo), unit_info_compare);
+
+ stdout.printf("%-45s %-6s %-12s → %-15s\n\n", "UNIT", "LOAD", "ACTIVE", "JOB");
+
+ foreach (var i in list) {
+
+ if (type != null && !i.id.has_suffix(".%s".printf(type)))
+ continue;
+
+ if (!all && i.active_state == "inactive")
+ continue;
+
+ stdout.printf("%-45s %-6s %-12s", i.id, i.load_state, i.active_state);
+
+ if (i.job_id != 0)
+ stdout.printf("→ %-15s", i.job_type);
+
+ stdout.puts("\n");
+ n++;
+ }
+
+ if (all)
+ stdout.printf("\n%u units listed.\n", n);
+ else
+ stdout.printf("\n%u live units listed. Pass --all to see dead units, too.\n", n);
+
+
+ } else if (args[1] == "list-jobs") {
+ var list = manager.ListJobs();
+ Posix.qsort(list, list.length, sizeof(Manager.JobInfo), job_info_compare);
+
+ foreach (var i in list)
+ stdout.printf("%-45s → %-15s %-7s\n", i.name, i.type, i.state);
+
+ } else if (args[1] == "load") {
+
+ if (args.length < 3) {
+ stderr.printf("Missing argument.\n");
+ return 1;
+ }
+
+ manager.LoadUnit(args[2]);
+ } else {
+ stderr.printf("Unknown command %s.\n", args[1]);
+ return 1;
+ }
+
+ } catch (DBus.Error e) {
+ stderr.printf("%s\n".printf(e.message));
+ }
+
+ return 0;
+}