X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=systemadm.vala;h=c761511c1c52f32a0c67f2f071716ed5675e9d35;hp=18d3a367aa781abdeefded08bbe43ddc49f5199b;hb=edddf4ff8841951cdbb698f72a3f4f8554ce8d33;hpb=501c7d0b77607fe858911b1c94070b63b6cc221e diff --git a/systemadm.vala b/systemadm.vala index 18d3a367a..c761511c1 100644 --- a/systemadm.vala +++ b/systemadm.vala @@ -1,8 +1,29 @@ +/*** + 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 . +***/ + using Gtk; using GLib; using DBus; using Pango; +static bool session = false; + public class LeftLabel : Label { public LeftLabel(string? text = null) { if (text != null) @@ -49,7 +70,7 @@ public class MainWindow : Window { private RightLabel unit_description_label; private RightLabel unit_load_state_label; private RightLabel unit_active_state_label; - private RightLabel unit_load_path_label; + private RightLabel unit_fragment_path_label; private RightLabel unit_active_enter_timestamp_label; private RightLabel unit_active_exit_timestamp_label; private RightLabel unit_can_start_label; @@ -64,7 +85,7 @@ public class MainWindow : Window { position = WindowPosition.CENTER; set_default_size(1000, 700); set_border_width(12); - destroy.connect(Gtk.main_quit); + destroy += Gtk.main_quit; Notebook notebook = new Notebook(); add(notebook); @@ -77,15 +98,14 @@ public class MainWindow : Window { notebook.append_page(job_vbox, new Label("Jobs")); job_vbox.set_border_width(12); - - unit_model = new ListStore(6, typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string)); - job_model = new ListStore(5, typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string)); + unit_model = new ListStore(6, typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(Unit)); + job_model = new ListStore(5, typeof(string), typeof(string), typeof(string), typeof(string), typeof(Job)); unit_view = new TreeView.with_model(unit_model); job_view = new TreeView.with_model(job_model); - unit_view.cursor_changed.connect(unit_changed); - job_view.cursor_changed.connect(job_changed); + unit_view.cursor_changed += unit_changed; + job_view.cursor_changed += job_changed; unit_view.insert_column_with_attributes(-1, "Unit", new CellRendererText(), "text", 0); unit_view.insert_column_with_attributes(-1, "Description", new CellRendererText(), "text", 1); @@ -114,7 +134,7 @@ public class MainWindow : Window { unit_description_label = new RightLabel(); unit_load_state_label = new RightLabel(); unit_active_state_label = new RightLabel(); - unit_load_path_label = new RightLabel(); + unit_fragment_path_label = new RightLabel(); unit_active_enter_timestamp_label = new RightLabel(); unit_active_exit_timestamp_label = new RightLabel(); unit_can_start_label = new RightLabel(); @@ -142,8 +162,8 @@ public class MainWindow : Window { unit_table.attach(unit_load_state_label, 1, 2, 2, 3, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0); unit_table.attach(new LeftLabel("Active State:"), 0, 1, 3, 4, AttachOptions.FILL, AttachOptions.FILL, 0, 0); unit_table.attach(unit_active_state_label, 1, 2, 3, 4, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0); - unit_table.attach(new LeftLabel("Load Path:"), 0, 1, 4, 5, AttachOptions.FILL, AttachOptions.FILL, 0, 0); - unit_table.attach(unit_load_path_label, 1, 2, 4, 5, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0); + unit_table.attach(new LeftLabel("Fragment Path:"), 0, 1, 4, 5, AttachOptions.FILL, AttachOptions.FILL, 0, 0); + unit_table.attach(unit_fragment_path_label, 1, 2, 4, 5, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0); unit_table.attach(new LeftLabel("Active Enter Timestamp:"), 0, 1, 5, 6, AttachOptions.FILL, AttachOptions.FILL, 0, 0); unit_table.attach(unit_active_enter_timestamp_label, 1, 2, 5, 6, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0); unit_table.attach(new LeftLabel("Active Exit Timestamp:"), 0, 1, 6, 7, AttachOptions.FILL, AttachOptions.FILL, 0, 0); @@ -170,10 +190,10 @@ public class MainWindow : Window { reload_button = new Button.with_mnemonic("_Reload"); restart_button = new Button.with_mnemonic("Res_tart"); - start_button.clicked.connect(on_start); - stop_button.clicked.connect(on_stop); - reload_button.clicked.connect(on_reload); - restart_button.clicked.connect(on_restart); + start_button.clicked += on_start; + stop_button.clicked += on_stop; + reload_button.clicked += on_reload; + restart_button.clicked += on_restart; bbox.pack_start(start_button, false, true, 0); bbox.pack_start(stop_button, false, true, 0); @@ -187,17 +207,24 @@ public class MainWindow : Window { cancel_button = new Button.with_mnemonic("_Cancel"); - cancel_button.clicked.connect(on_cancel); + cancel_button.clicked += on_cancel; bbox.pack_start(cancel_button, false, true, 0); - bus = Bus.get(BusType.SESSION); + bus = Bus.get(session ? BusType.SESSION : BusType.SYSTEM); - manager = bus.get_object ( + manager = bus.get_object( "org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1") as Manager; + manager.unit_new += on_unit_new; + manager.job_new += on_job_new; + manager.unit_removed += on_unit_removed; + manager.job_removed += on_job_removed; + + manager.subscribe(); + clear_unit(); populate_unit_model(); populate_job_model(); @@ -211,6 +238,11 @@ public class MainWindow : Window { foreach (var i in list) { TreeIter iter; + Unit u = bus.get_object( + "org.freedesktop.systemd1", + i.unit_path, + "org.freedesktop.systemd1.Unit") as Unit; + unit_model.append(out iter); unit_model.set(iter, 0, i.id, @@ -218,7 +250,7 @@ public class MainWindow : Window { 2, i.load_state, 3, i.active_state, 4, i.job_type != "" ? "→ %s".printf(i.job_type) : "", - 5, i.unit_path); + 5, u); } } @@ -230,13 +262,18 @@ public class MainWindow : Window { foreach (var i in list) { TreeIter iter; + Job j = bus.get_object( + "org.freedesktop.systemd1", + i.job_path, + "org.freedesktop.systemd1.Job") as Job; + job_model.append(out iter); job_model.set(iter, 0, "%u".printf(i.id), 1, i.name, 2, "→ %s".printf(i.type), 3, i.state, - 4, i.job_path); + 4, j); } } @@ -248,15 +285,12 @@ public class MainWindow : Window { return null; TreeIter iter; - string path; + Unit u; unit_model.get_iter(out iter, p); - unit_model.get(iter, 5, out path); + unit_model.get(iter, 5, out u); - return bus.get_object ( - "org.freedesktop.systemd1", - path, - "org.freedesktop.systemd1.Unit") as Unit; + return u; } public void unit_changed() { @@ -278,7 +312,7 @@ public class MainWindow : Window { unit_description_label.set_text_or_na(); unit_load_state_label.set_text_or_na(); unit_active_state_label.set_text_or_na(); - unit_load_path_label.set_text_or_na(); + unit_fragment_path_label.set_text_or_na(); unit_active_enter_timestamp_label.set_text_or_na(); unit_active_exit_timestamp_label.set_text_or_na(); unit_can_reload_label.set_text_or_na(); @@ -290,7 +324,7 @@ public class MainWindow : Window { unit_description_label.set_text_or_na(unit.description); unit_load_state_label.set_text_or_na(unit.load_state); unit_active_state_label.set_text_or_na(unit.active_state); - unit_load_path_label.set_text_or_na(unit.load_path); + unit_fragment_path_label.set_text_or_na(unit.fragment_path); uint64 t = unit.active_enter_timestamp; if (t > 0) { @@ -325,15 +359,12 @@ public class MainWindow : Window { return null; TreeIter iter; - string path; + Job *j; job_model.get_iter(out iter, p); - job_model.get(iter, 4, out path); + job_model.get(iter, 4, out j); - return bus.get_object ( - "org.freedesktop.systemd1", - path, - "org.freedesktop.systemd1.Job") as Job; + return j; } public void job_changed() { @@ -421,16 +452,86 @@ public class MainWindow : Window { message("%s", e.message); } } + + public void on_unit_new(string id, ObjectPath path) { + stderr.printf("new path %s", path); + + Unit u = bus.get_object( + "org.freedesktop.systemd1", + path, + "org.freedesktop.systemd1.Unit") as Unit; + + string t = ""; + Unit.JobLink jl = u.job; + + if (jl.id != 0) { + Job j = bus.get_object( + "org.freedesktop.systemd1", + jl.path, + "org.freedesktop.systemd1.Job") as Job; + + t = j.job_type; + } + + TreeIter iter; + unit_model.append(out iter); + unit_model.set(iter, + 0, u.id, + 1, u.description, + 2, u.load_state, + 3, u.active_state, + 4, t != "" ? "→ %s".printf(t) : "", + 5, u); + } + + public void on_job_new(uint32 id, ObjectPath path) { + stderr.printf("new path %s", path); + + Job j = bus.get_object( + "org.freedesktop.systemd1", + path, + "org.freedesktop.systemd1.Job") as Job; + + TreeIter iter; + job_model.append(out iter); + job_model.set(iter, + 0, "%u".printf(j.id), + 1, j.unit.id, + 2, "→ %s".printf(j.job_type), + 3, j.state, + 4, j); + } + + public void on_unit_removed(string id, ObjectPath path) { + stdout.printf("Unit %s removed.\n", id); + + /* FIXME */ + } + + public void on_job_removed(uint32 id, ObjectPath path) { + stdout.printf("Job %u removed.\n", id); + + /* FIXME */ + } } +static const OptionEntry entries[] = { + { "session", 0, 0, OptionArg.NONE, out session, "Connect to session bus", null }, + { "system", 0, OptionFlags.REVERSE, OptionArg.NONE, out session, "Connect to system bus", null }, + { null } +}; + int main (string[] args) { - Gtk.init(ref args); try { + Gtk.init_with_args(ref args, "[OPTION...]", entries, "systemadm"); + MainWindow window = new MainWindow(); window.show_all(); } catch (DBus.Error e) { message("%s", e.message); + } catch (GLib.Error e) { + message("%s", e.message); } Gtk.main();