shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-31 14:50:15 +03:00
Code

core: drop dbus queue recursion check

Browse Source 
We don't dispatch the queue recursively anymore, hence let's simplify
things a bit.

As pointed out by @fbuihuu:

https://github.com/systemd/systemd/pull/10763#discussion_r233209550
This commit is contained in:
Lennart Poettering 2018-11-14 13:00:12 +01:00
parent 8755568681
commit 3dafa6bc76
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/manager.c
View File

@ -2157,10 +2157,6 @@ static unsigned manager_dispatch_dbus_queue(Manager *m) {
assert(m);
/* Avoid recursion */
if (m->dispatching_dbus_queue)
return 0;
/* When we are reloading, let's not wait with generating signals, since we need to exit the manager as quickly
* as we can. There's no point in throttling generation of signals in that case. */
if (MANAGER_IS_RELOADING(m) || m->send_reloading_done || m->pending_reload_message)
@ -2189,8 +2185,6 @@ static unsigned manager_dispatch_dbus_queue(Manager *m) {
budget = MANAGER_BUS_MESSAGE_BUDGET;
}
m->dispatching_dbus_queue = true;
while (budget != 0 && (u = m->dbus_unit_queue)) {
assert(u->in_dbus_queue);
@ -2212,8 +2206,6 @@ static unsigned manager_dispatch_dbus_queue(Manager *m) {
budget--;
}
m->dispatching_dbus_queue = false;
if (m->send_reloading_done) {
m->send_reloading_done = false;
bus_manager_send_reloading(m, false);

1
src/core/manager.h
View File

@ -287,7 +287,6 @@ struct Manager {
/* Flags */
bool dispatching_load_queue:1;
bool dispatching_dbus_queue:1;
bool taint_usr:1;