picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

logind: log which process is delaying suspend and not closing locks

Browse source
This commit is contained in:
Lennart Poettering 2013-11-27 02:38:06 +01:00
parent fbb634117d
commit 85a428c694
5 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/login/logind-action.c
View file

@ -58,6 +58,7 @@ int manager_handle_action(
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
InhibitWhat inhibit_operation;
Inhibitor *offending = NULL;
bool supported;
int r;
@ -71,7 +72,7 @@ int manager_handle_action(
/* If the key handling is inhibited, don't do anything */
if (inhibit_key > 0) {
if (manager_is_inhibited(m, inhibit_key, INHIBIT_BLOCK, NULL, true, false, 0)) {
if (manager_is_inhibited(m, inhibit_key, INHIBIT_BLOCK, NULL, true, false, 0, NULL)) {
log_debug("Refusing operation, %s is inhibited.", inhibit_what_to_string(inhibit_key));
return 0;
}
@ -109,15 +110,26 @@ int manager_handle_action(
/* If the actual operation is inhibited, warn and fail */
if (!ignore_inhibited &&
manager_is_inhibited(m, inhibit_operation, INHIBIT_BLOCK, NULL, false, false, 0)) {
manager_is_inhibited(m, inhibit_operation, INHIBIT_BLOCK, NULL, false, false, 0, &offending)) {
_cleanup_free_ char *comm = NULL, *u = NULL;
get_process_comm(offending->pid, &comm);
u = uid_to_name(offending->uid);
/* If this is just a recheck of the lid switch then don't warn about anything */
if (!is_edge) {
log_debug("Refusing operation, %s is inhibited.", inhibit_what_to_string(inhibit_operation));
log_debug("Refusing operation, %s is inhibited by UID %lu/%s, PID %lu/%s.",
inhibit_what_to_string(inhibit_operation),
(unsigned long) offending->uid, strna(u),
(unsigned long) offending->pid, strna(comm));
return 0;
}
log_error("Refusing operation, %s is inhibited.", inhibit_what_to_string(inhibit_operation));
log_error("Refusing operation, %s is inhibited by UID %lu/%s, PID %lu/%s.",
inhibit_what_to_string(inhibit_operation),
(unsigned long) offending->uid, strna(u),
(unsigned long) offending->pid, strna(comm));
warn_melody();
return -EPERM;
}

2
src/login/logind-core.c
View file

@ -389,7 +389,7 @@ int manager_get_idle_hint(Manager *m, dual_timestamp *t) {
assert(m);
idle_hint = !manager_is_inhibited(m, INHIBIT_IDLE, INHIBIT_BLOCK, t, false, false, 0);
idle_hint = !manager_is_inhibited(m, INHIBIT_IDLE, INHIBIT_BLOCK, t, false, false, 0, NULL);
HASHMAP_FOREACH(s, m->sessions, i) {
dual_timestamp k;

17
src/login/logind-dbus.c
View file

@ -1399,7 +1399,7 @@ int bus_manager_shutdown_or_sleep_now_or_later(
delayed =
m->inhibit_delay_max > 0 &&
manager_is_inhibited(m, w, INHIBIT_DELAY, NULL, false, false, 0);
manager_is_inhibited(m, w, INHIBIT_DELAY, NULL, false, false, 0, NULL);
if (delayed)
/* Shutdown is delayed, keep in mind what we
@ -1465,7 +1465,7 @@ static int method_do_shutdown_or_sleep(
return r;
multiple_sessions = r > 0;
blocked = manager_is_inhibited(m, w, INHIBIT_BLOCK, NULL, false, true, uid);
blocked = manager_is_inhibited(m, w, INHIBIT_BLOCK, NULL, false, true, uid, NULL);
if (multiple_sessions) {
r = bus_verify_polkit_async(m->bus, &m->polkit_registry, message,
@ -1610,7 +1610,7 @@ static int method_can_shutdown_or_sleep(
return r;
multiple_sessions = r > 0;
blocked = manager_is_inhibited(m, w, INHIBIT_BLOCK, NULL, false, true, uid);
blocked = manager_is_inhibited(m, w, INHIBIT_BLOCK, NULL, false, true, uid, NULL);
if (multiple_sessions) {
r = bus_verify_polkit(m->bus, message, action_multiple_sessions, false, &challenge, error);
@ -2105,6 +2105,7 @@ int manager_send_changed(Manager *manager, const char *property, ...) {
int manager_dispatch_delayed(Manager *manager) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
Inhibitor *offending = NULL;
int r;
assert(manager);
@ -2113,12 +2114,18 @@ int manager_dispatch_delayed(Manager *manager) {
return 0;
/* Continue delay? */
if (manager_is_inhibited(manager, manager->action_what, INHIBIT_DELAY, NULL, false, false, 0)) {
if (manager_is_inhibited(manager, manager->action_what, INHIBIT_DELAY, NULL, false, false, 0, &offending)) {
_cleanup_free_ char *comm = NULL, *u = NULL;
get_process_comm(offending->pid, &comm);
u = uid_to_name(offending->uid);
if (manager->action_timestamp + manager->inhibit_delay_max > now(CLOCK_MONOTONIC))
return 0;
log_info("Delay lock is active but inhibitor timeout is reached.");
log_info("Delay lock is active (UID %lu/%s, PID %lu/%s) but inhibitor timeout is reached.",
(unsigned long) offending->uid, strna(u),
(unsigned long) offending->pid, strna(comm));
}
/* Actually do the operation */

6
src/login/logind-inhibit.c
View file

@ -372,7 +372,8 @@ bool manager_is_inhibited(
dual_timestamp *since,
bool ignore_inactive,
bool ignore_uid,
uid_t uid) {
uid_t uid,
Inhibitor **offending) {
Inhibitor *i;
Iterator j;
@ -400,6 +401,9 @@ bool manager_is_inhibited(
ts = i->since;
inhibited = true;
if (offending)
*offending = i;
}
if (since)

2
src/login/logind-inhibit.h
View file

@ -85,7 +85,7 @@ int inhibitor_create_fifo(Inhibitor *i);
void inhibitor_remove_fifo(Inhibitor *i);
InhibitWhat manager_inhibit_what(Manager *m, InhibitMode mm);
bool manager_is_inhibited(Manager *m, InhibitWhat w, InhibitMode mm, dual_timestamp *since, bool ignore_inactive, bool ignore_uid, uid_t uid);
bool manager_is_inhibited(Manager *m, InhibitWhat w, InhibitMode mm, dual_timestamp *since, bool ignore_inactive, bool ignore_uid, uid_t uid, Inhibitor **offending);
const char *inhibit_what_to_string(InhibitWhat k);
InhibitWhat inhibit_what_from_string(const char *s);