From: Lennart Poettering Date: Wed, 27 Nov 2013 01:38:06 +0000 (+0100) Subject: logind: log which process is delaying suspend and not closing locks X-Git-Tag: v209~1272 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=85a428c69465b047731b6abb5005f01824f1444e logind: log which process is delaying suspend and not closing locks --- diff --git a/src/login/logind-action.c b/src/login/logind-action.c index cb64df086..7744addf6 100644 --- a/src/login/logind-action.c +++ b/src/login/logind-action.c @@ -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; } diff --git a/src/login/logind-core.c b/src/login/logind-core.c index 9c31bf8a8..72ee9fe57 100644 --- a/src/login/logind-core.c +++ b/src/login/logind-core.c @@ -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; diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index a972d9377..e0333cd6b 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -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 */ diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c index 1b6f1362b..35e1abd72 100644 --- a/src/login/logind-inhibit.c +++ b/src/login/logind-inhibit.c @@ -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) diff --git a/src/login/logind-inhibit.h b/src/login/logind-inhibit.h index da3d7e736..f767876a4 100644 --- a/src/login/logind-inhibit.h +++ b/src/login/logind-inhibit.h @@ -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);