summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/dbus-job.c9
-rw-r--r--src/dbus-job.h2
-rw-r--r--src/dbus-manager.c1
-rw-r--r--src/dbus-unit.c5
-rw-r--r--src/job.c3
-rw-r--r--src/job.h1
-rw-r--r--src/systemadm.vala2
-rw-r--r--src/systemctl.vala87
-rw-r--r--src/systemd-interfaces.vala2
9 files changed, 82 insertions, 30 deletions
diff --git a/src/dbus-job.c b/src/dbus-job.c
index 3a6e7159e9..34e64fc681 100644
--- a/src/dbus-job.c
+++ b/src/dbus-job.c
@@ -197,15 +197,19 @@ oom:
log_error("Failed to allocate job change signal.");
}
-void bus_job_send_removed_signal(Job *j) {
+void bus_job_send_removed_signal(Job *j, bool success) {
char *p = NULL;
DBusMessage *m = NULL;
+ dbus_bool_t b = success;
assert(j);
- if (set_isempty(j->manager->subscribed) || !j->sent_dbus_new_signal)
+ if (set_isempty(j->manager->subscribed))
return;
+ if (!j->sent_dbus_new_signal)
+ bus_job_send_change_signal(j);
+
if (!(p = job_dbus_path(j)))
goto oom;
@@ -215,6 +219,7 @@ void bus_job_send_removed_signal(Job *j) {
if (!dbus_message_append_args(m,
DBUS_TYPE_UINT32, &j->id,
DBUS_TYPE_OBJECT_PATH, &p,
+ DBUS_TYPE_BOOLEAN, &b,
DBUS_TYPE_INVALID))
goto oom;
diff --git a/src/dbus-job.h b/src/dbus-job.h
index cf9176052d..4602358856 100644
--- a/src/dbus-job.h
+++ b/src/dbus-job.h
@@ -25,7 +25,7 @@
#include <dbus/dbus.h>
void bus_job_send_change_signal(Job *j);
-void bus_job_send_removed_signal(Job *j);
+void bus_job_send_removed_signal(Job *j, bool success);
extern const DBusObjectPathVTable bus_job_vtable;
diff --git a/src/dbus-manager.c b/src/dbus-manager.c
index 90ab8d1a0c..9833b6c85f 100644
--- a/src/dbus-manager.c
+++ b/src/dbus-manager.c
@@ -81,6 +81,7 @@
" <signal name=\"JobRemoved\">" \
" <arg name=\"id\" type=\"u\"/>" \
" <arg name=\"job\" type=\"o\"/>" \
+ " <arg name=\"success\" type=\"b\"/>" \
" </signal>" \
" <property name=\"Version\" type=\"s\" access=\"read\"/>" \
" <property name=\"RunningAs\" type=\"s\" access=\"read\"/>" \
diff --git a/src/dbus-unit.c b/src/dbus-unit.c
index 5c474c0c1e..ba428a8d5c 100644
--- a/src/dbus-unit.c
+++ b/src/dbus-unit.c
@@ -421,9 +421,12 @@ void bus_unit_send_removed_signal(Unit *u) {
assert(u);
- if (set_isempty(u->meta.manager->subscribed) || !u->meta.sent_dbus_new_signal)
+ if (set_isempty(u->meta.manager->subscribed))
return;
+ if (!u->meta.sent_dbus_new_signal)
+ bus_unit_send_change_signal(u);
+
if (!(p = unit_dbus_path(u)))
goto oom;
diff --git a/src/job.c b/src/job.c
index 9937ed735b..78fe136328 100644
--- a/src/job.c
+++ b/src/job.c
@@ -56,7 +56,7 @@ void job_free(Job *j) {
/* Detach from next 'bigger' objects */
if (j->installed) {
- bus_job_send_removed_signal(j);
+ bus_job_send_removed_signal(j, !j->failed);
if (j->unit->meta.job == j) {
j->unit->meta.job = NULL;
@@ -476,6 +476,7 @@ int job_finish_and_invalidate(Job *j, bool success) {
return 0;
}
+ j->failed = !success;
u = j->unit;
t = j->type;
job_free(j);
diff --git a/src/job.h b/src/job.h
index 1ae97b75d0..054aa530c6 100644
--- a/src/job.h
+++ b/src/job.h
@@ -108,6 +108,7 @@ struct Job {
bool override:1;
bool in_dbus_queue:1;
bool sent_dbus_new_signal:1;
+ bool failed:1;
};
Job* job_new(Manager *m, JobType type, Unit *unit);
diff --git a/src/systemadm.vala b/src/systemadm.vala
index b28759a076..9e4a2a2340 100644
--- a/src/systemadm.vala
+++ b/src/systemadm.vala
@@ -728,7 +728,7 @@ public class MainWindow : Window {
} while (unit_model.iter_next(ref iter));
}
- public void on_job_removed(uint32 id, ObjectPath path) {
+ public void on_job_removed(uint32 id, ObjectPath path, bool success) {
TreeIter iter;
if (!(job_model.get_iter_first(out iter)))
return;
diff --git a/src/systemctl.vala b/src/systemctl.vala
index 821be5a4f8..e1e8a0c832 100644
--- a/src/systemctl.vala
+++ b/src/systemctl.vala
@@ -24,7 +24,11 @@ static string type = null;
static bool all = false;
static bool replace = false;
static bool session = false;
-static Connection bus = null;
+static bool block = false;
+static Connection? bus = null;
+static List<ObjectPath> jobs = null;
+static MainLoop main_loop = null;
+static int exit_code = 0;
public static int job_info_compare(void* key1, void* key2) {
Manager.JobInfo *j1 = (Manager.JobInfo*) key1;
@@ -44,11 +48,11 @@ public static int unit_info_compare(void* key1, void* key2) {
return Posix.strcmp(u1->id, u2->id);
}
-public void on_unit_changed(Unit u) {
+public void monitor_on_unit_changed(Unit u) {
stdout.printf("Unit %s changed.\n", u.id);
}
-public void on_unit_new(string id, ObjectPath path) {
+public void monitor_on_unit_new(string id, ObjectPath path) {
stdout.printf("Unit %s added.\n", id);
Unit u = bus.get_object(
@@ -56,17 +60,17 @@ public void on_unit_new(string id, ObjectPath path) {
path,
"org.freedesktop.systemd1.Unit") as Unit;
- u.changed += on_unit_changed;
+ u.changed += monitor_on_unit_changed;
/* FIXME: We leak memory here */
u.ref();
}
-public void on_job_changed(Job j) {
+public void monitor_on_job_changed(Job j) {
stdout.printf("Job %u changed.\n", j.id);
}
-public void on_job_new(uint32 id, ObjectPath path) {
+public void monitor_on_job_new(uint32 id, ObjectPath path) {
stdout.printf("Job %u added.\n", id);
Job j = bus.get_object(
@@ -74,18 +78,34 @@ public void on_job_new(uint32 id, ObjectPath path) {
path,
"org.freedesktop.systemd1.Job") as Job;
- j.changed += on_job_changed;
+ j.changed += monitor_on_job_changed;
/* FIXME: We leak memory here */
j.ref();
}
-public void on_unit_removed(string id, ObjectPath path) {
+public void monitor_on_unit_removed(string id, ObjectPath path) {
stdout.printf("Unit %s removed.\n", id);
}
-public void on_job_removed(uint32 id, ObjectPath path) {
- stdout.printf("Job %u removed.\n", id);
+public void monitor_on_job_removed(uint32 id, ObjectPath path, bool success) {
+ stdout.printf("Job %u removed (success=%i).\n", id, (int) success);
+}
+
+public void block_on_job_removed(uint32 id, ObjectPath path, bool success) {
+
+ for (unowned List<ObjectPath> i = jobs; i != null; i = i.next)
+ if (i.data == path) {
+ jobs.remove_link(i);
+ break;
+ }
+
+ if (jobs == null) {
+ if (!success)
+ exit_code = 1;
+
+ main_loop.quit();
+ }
}
static const OptionEntry entries[] = {
@@ -94,11 +114,11 @@ static const OptionEntry entries[] = {
{ "replace", 0, 0, OptionArg.NONE, out replace, "When installing a new job, replace existing conflicting ones", null },
{ "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 },
+ { "block", 0, 0, OptionArg.NONE, out block, "Wait until the operation finished", null },
{ null }
};
int main (string[] args) {
-
OptionContext context = new OptionContext("[COMMAND [ARGUMENT...]]");
context.add_main_entries(entries, null);
context.set_description(
@@ -226,6 +246,9 @@ int main (string[] args) {
return 1;
}
+ if (block)
+ manager.subscribe();
+
for (int i = 2; i < args.length; i++) {
ObjectPath p = manager.load_unit(args[i]);
@@ -237,14 +260,19 @@ int main (string[] args) {
string mode = replace ? "replace" : "fail";
+ ObjectPath j = null;
+
if (args[1] == "start")
- u.start(mode);
+ j = u.start(mode);
else if (args[1] == "stop")
- u.stop(mode);
+ j = u.stop(mode);
else if (args[1] == "restart")
- u.restart(mode);
+ j = u.restart(mode);
else if (args[1] == "reload")
- u.reload(mode);
+ j = u.reload(mode);
+
+ if (block)
+ jobs.append(j);
}
} else if (args[1] == "isolate") {
@@ -261,19 +289,24 @@ int main (string[] args) {
p,
"org.freedesktop.systemd1.Unit") as Unit;
- u.start("isolate");
+ ObjectPath j = u.start("isolate");
+
+ if (block) {
+ manager.subscribe();
+ jobs.append(j);
+ }
} else if (args[1] == "monitor") {
manager.subscribe();
- manager.unit_new += on_unit_new;
- manager.unit_removed += on_unit_removed;
- manager.job_new += on_job_new;
- manager.job_removed += on_job_removed;
+ manager.unit_new += monitor_on_unit_new;
+ manager.unit_removed += monitor_on_unit_removed;
+ manager.job_new += monitor_on_job_new;
+ manager.job_removed += monitor_on_job_removed;
- MainLoop l = new MainLoop();
- l.run();
+ main_loop = new MainLoop();
+ main_loop.run();
} else if (args[1] == "dump")
stdout.puts(manager.dump());
@@ -313,9 +346,17 @@ int main (string[] args) {
return 1;
}
+ if (jobs != null && block) {
+ manager.job_removed += block_on_job_removed;
+
+ main_loop = new MainLoop();
+ main_loop.run();
+ }
+
} catch (DBus.Error e) {
stderr.printf("%s\n".printf(e.message));
+ return 1;
}
- return 0;
+ return exit_code;
}
diff --git a/src/systemd-interfaces.vala b/src/systemd-interfaces.vala
index 7282bf3dd8..a8aeb75579 100644
--- a/src/systemd-interfaces.vala
+++ b/src/systemd-interfaces.vala
@@ -71,7 +71,7 @@ public interface Manager : DBus.Object {
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);
- public abstract signal void job_removed(uint32 id, ObjectPath path);
+ public abstract signal void job_removed(uint32 id, ObjectPath path, bool success);
}
[DBus (name = "org.freedesktop.systemd1.Unit")]
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-18 17:54:44 +0000