core: do not GC units/jobs that are in the D-Bus queue

Let's make sure that D-Bus messages are always sent out when pending,
before we might GC a unit/job.

This is kinda a follow-up for 8db998981a,
and a similar logic really applies: GC should only be done if we
processed everything else, generated evertyhing else and really don't
need it anymore.
This commit is contained in:
Lennart Poettering
2023-06-08 11:11:49 +02:00
parent 935f80428f
commit af05bb9717
4 changed files with 14 additions and 0 deletions

View File

@@ -241,6 +241,9 @@ void bus_job_send_change_signal(Job *j) {
if (j->in_dbus_queue) {
LIST_REMOVE(dbus_queue, j->manager->dbus_job_queue, j);
j->in_dbus_queue = false;
/* The job might be good to be GC once its pending signals have been sent */
job_add_to_gc_queue(j);
}
r = bus_foreach_bus(j->manager, j->bus_track, j->sent_dbus_new_signal ? send_changed_signal : send_new_signal, j);

View File

@@ -1648,6 +1648,9 @@ void bus_unit_send_change_signal(Unit *u) {
if (u->in_dbus_queue) {
LIST_REMOVE(dbus_queue, u->manager->dbus_unit_queue, u);
u->in_dbus_queue = false;
/* The unit might be good to be GC once its pending signals have been sent */
unit_add_to_gc_queue(u);
}
if (!u->id)

View File

@@ -1444,6 +1444,10 @@ bool job_may_gc(Job *j) {
if (!UNIT_VTABLE(j->unit)->gc_jobs)
return false;
/* Make sure to send out pending D-Bus events before we unload the unit */
if (j->in_dbus_queue)
return false;
if (sd_bus_track_count(j->bus_track) > 0)
return false;

View File

@@ -447,6 +447,10 @@ bool unit_may_gc(Unit *u) {
if (u->in_cgroup_empty_queue || u->in_cgroup_oom_queue)
return false;
/* Make sure to send out D-Bus events before we unload the unit */
if (u->in_dbus_queue)
return false;
if (sd_bus_track_count(u->bus_track) > 0)
return false;