core: rename queued_message → pending_reload_message
This field is only used for pending Reload() replies, hence let's rename it to be more descriptive and precise. No change in behaviour.
This commit is contained in:
parent
8724defeae
commit
209de5256b
|
@ -1354,8 +1354,8 @@ static int method_reload(sd_bus_message *message, void *userdata, sd_bus_error *
|
|||
* is finished. That way the caller knows when the reload
|
||||
* finished. */
|
||||
|
||||
assert(!m->queued_message);
|
||||
r = sd_bus_message_new_method_return(message, &m->queued_message);
|
||||
assert(!m->pending_reload_message);
|
||||
r = sd_bus_message_new_method_return(message, &m->pending_reload_message);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
|
|
@ -48,23 +48,23 @@
|
|||
|
||||
static void destroy_bus(Manager *m, sd_bus **bus);
|
||||
|
||||
int bus_send_queued_message(Manager *m) {
|
||||
int bus_send_pending_reload_message(Manager *m) {
|
||||
int r;
|
||||
|
||||
assert(m);
|
||||
|
||||
if (!m->queued_message)
|
||||
if (!m->pending_reload_message)
|
||||
return 0;
|
||||
|
||||
/* If we cannot get rid of this message we won't dispatch any
|
||||
* D-Bus messages, so that we won't end up wanting to queue
|
||||
* another message. */
|
||||
|
||||
r = sd_bus_send(NULL, m->queued_message, NULL);
|
||||
r = sd_bus_send(NULL, m->pending_reload_message, NULL);
|
||||
if (r < 0)
|
||||
log_warning_errno(r, "Failed to send queued message: %m");
|
||||
|
||||
m->queued_message = sd_bus_message_unref(m->queued_message);
|
||||
m->pending_reload_message = sd_bus_message_unref(m->pending_reload_message);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -1073,8 +1073,8 @@ static void destroy_bus(Manager *m, sd_bus **bus) {
|
|||
u->bus_track = sd_bus_track_unref(u->bus_track);
|
||||
|
||||
/* Get rid of queued message on this bus */
|
||||
if (m->queued_message && sd_bus_message_get_bus(m->queued_message) == *bus)
|
||||
m->queued_message = sd_bus_message_unref(m->queued_message);
|
||||
if (m->pending_reload_message && sd_bus_message_get_bus(m->pending_reload_message) == *bus)
|
||||
m->pending_reload_message = sd_bus_message_unref(m->pending_reload_message);
|
||||
|
||||
/* Possibly flush unwritten data, but only if we are
|
||||
* unprivileged, since we don't want to sync here */
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
#include "manager.h"
|
||||
|
||||
int bus_send_queued_message(Manager *m);
|
||||
int bus_send_pending_reload_message(Manager *m);
|
||||
|
||||
int bus_init_private(Manager *m);
|
||||
int bus_init_api(Manager *m);
|
||||
|
|
|
@ -2161,7 +2161,7 @@ static unsigned manager_dispatch_dbus_queue(Manager *m) {
|
|||
return 0;
|
||||
|
||||
/* Anything to do at all? */
|
||||
if (!m->dbus_unit_queue && !m->dbus_job_queue && !m->send_reloading_done && !m->queued_message)
|
||||
if (!m->dbus_unit_queue && !m->dbus_job_queue && !m->send_reloading_done && !m->pending_reload_message)
|
||||
return 0;
|
||||
|
||||
/* Do we have overly many messages queued at the moment? If so, let's not enqueue more on top, let's sit this
|
||||
|
@ -2206,8 +2206,8 @@ static unsigned manager_dispatch_dbus_queue(Manager *m) {
|
|||
n++, budget--;
|
||||
}
|
||||
|
||||
if (budget > 0 && m->queued_message) {
|
||||
bus_send_queued_message(m);
|
||||
if (budget > 0 && m->pending_reload_message) {
|
||||
bus_send_pending_reload_message(m);
|
||||
n++;
|
||||
}
|
||||
|
||||
|
|
|
@ -248,7 +248,7 @@ struct Manager {
|
|||
|
||||
/* This is used during reloading: before the reload we queue
|
||||
* the reply message here, and afterwards we send it */
|
||||
sd_bus_message *queued_message;
|
||||
sd_bus_message *pending_reload_message;
|
||||
|
||||
Hashmap *watch_bus; /* D-Bus names => Unit object n:1 */
|
||||
|
||||
|
|
Loading…
Reference in New Issue