This introduces a new SYSVIEW_EVENT_SETTLE notification that is sent after
initial scanning via sysview is done. This is very handy to let the
application raise warnings in case requested resources are not found
during startup.
The SETTLE event is sent after systemd-logind and udev enumerations are
done. This event does in no way guarantee that a given resource is
available. All it does is notify the application that scanning is done!
You must not react to SETTLE if you don't have external synchronization
with the resource you're waiting for.
The main use-case for SETTLE is to run applications _inside_ of logind
sessions and startup sysview. You really want to make sure that the own
session you're running in was found during enumeration. If not, something
is seriously wrong.
sd_bus *sysbus;
struct udev *ud;
uint64_t custom_sid;
sd_bus *sysbus;
struct udev *ud;
uint64_t custom_sid;
Hashmap *seat_map;
Hashmap *session_map;
Hashmap *seat_map;
Hashmap *session_map;
bool running : 1;
bool scanned : 1;
bool rescan : 1;
bool running : 1;
bool scanned : 1;
bool rescan : 1;
};
int sysview_context_rescan(sysview_context *c);
};
int sysview_context_rescan(sysview_context *c);
return c->running ? c->event_fn(c, c->userdata, event) : def;
}
return c->running ? c->event_fn(c, c->userdata, event) : def;
}
+static int context_raise_settle(sysview_context *c) {
+ sysview_event event = {
+ .type = SYSVIEW_EVENT_SETTLE,
+ };
+
+ return context_raise(c, &event, 0);
+}
+
static int context_raise_seat_add(sysview_context *c, sysview_seat *seat) {
sysview_event event = {
.type = SYSVIEW_EVENT_SEAT_ADD,
static int context_raise_seat_add(sysview_context *c, sysview_seat *seat) {
sysview_event event = {
.type = SYSVIEW_EVENT_SEAT_ADD,
return context_raise(c, &event, 0);
}
return context_raise(c, &event, 0);
}
+static void context_settle(sysview_context *c) {
+ int r;
+
+ if (c->n_probe <= 0 || --c->n_probe > 0)
+ return;
+
+ log_debug("sysview: settle");
+
+ c->settled = true;
+
+ r = context_raise_settle(c);
+ if (r < 0)
+ log_debug_errno(r, "sysview: callback failed on settle: %m");
+}
+
static void context_add_device(sysview_context *c, sysview_device *device) {
sysview_session *session;
Iterator i;
static void context_add_device(sysview_context *c, sysview_device *device) {
sysview_session *session;
Iterator i;
log_debug("sysview: ListSeats on logind failed: %s: %s",
error->name, error->message);
log_debug("sysview: ListSeats on logind failed: %s: %s",
error->name, error->message);
- return -sd_bus_error_get_errno(error);
+ r = -sd_bus_error_get_errno(error);
+ goto settle;
}
r = sd_bus_message_enter_container(reply, 'a', "(so)");
}
r = sd_bus_message_enter_container(reply, 'a', "(so)");
r = sd_bus_message_exit_container(reply);
if (r < 0)
r = sd_bus_message_exit_container(reply);
if (r < 0)
- return log_debug_errno(r, "sysview: erroneous ListSeats response from logind: %m");
+ log_debug_errno(r, "sysview: erroneous ListSeats response from logind: %m");
+settle:
+ context_settle(c);
+ return r;
}
static int context_ld_list_sessions_fn(sd_bus *bus,
}
static int context_ld_list_sessions_fn(sd_bus *bus,
log_debug("sysview: ListSessions on logind failed: %s: %s",
error->name, error->message);
log_debug("sysview: ListSessions on logind failed: %s: %s",
error->name, error->message);
- return -sd_bus_error_get_errno(error);
+ r = -sd_bus_error_get_errno(error);
+ goto settle;
}
r = sd_bus_message_enter_container(reply, 'a', "(susso)");
}
r = sd_bus_message_enter_container(reply, 'a', "(susso)");
r = sd_bus_message_exit_container(reply);
if (r < 0)
r = sd_bus_message_exit_container(reply);
if (r < 0)
- return log_debug_errno(r, "sysview: erroneous ListSessions response from logind: %m");
+ log_debug_errno(r, "sysview: erroneous ListSessions response from logind: %m");
+settle:
+ context_settle(c);
+ return r;
}
static int context_ld_scan(sysview_context *c) {
}
static int context_ld_scan(sysview_context *c) {
+ if (!c->settled)
+ ++c->n_probe;
+
/* request session list */
m = sd_bus_message_unref(m);
/* request session list */
m = sd_bus_message_unref(m);
+ if (!c->settled)
+ ++c->n_probe;
+
c->running = false;
c->scanned = false;
c->running = false;
c->scanned = false;
+ c->settled = false;
+ c->n_probe = 0;
c->event_fn = NULL;
c->userdata = NULL;
c->scan_src = sd_event_source_unref(c->scan_src);
c->event_fn = NULL;
c->userdata = NULL;
c->scan_src = sd_event_source_unref(c->scan_src);
if (!c->scanned) {
r = context_ld_scan(c);
if (r < 0)
if (!c->scanned) {
r = context_ld_scan(c);
if (r < 0)
if (!c->running)
return 0;
if (!c->running)
return 0;
+ if (!c->rescan) {
+ c->rescan = true;
+ if (!c->settled)
+ ++c->n_probe;
+ }
+
if (c->scan_src)
return sd_event_source_set_enabled(c->scan_src, SD_EVENT_ONESHOT);
else
if (c->scan_src)
return sd_event_source_set_enabled(c->scan_src, SD_EVENT_ONESHOT);
else
+ SYSVIEW_EVENT_SETTLE,
+
SYSVIEW_EVENT_SEAT_ADD,
SYSVIEW_EVENT_SEAT_REMOVE,
SYSVIEW_EVENT_SEAT_ADD,
SYSVIEW_EVENT_SEAT_REMOVE,