diff options
Diffstat (limited to 'src/sleep')
| -rw-r--r-- | src/sleep/sleep.c | 48 | ||||
| -rw-r--r-- | src/sleep/sleep.conf | 3 |
2 files changed, 36 insertions, 15 deletions
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c index d1c45e264d..0611cfb780 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -267,10 +267,13 @@ static int execute( } static int custom_timer_suspend(const SleepConfig *sleep_config) { + usec_t hibernate_timestamp; int r; assert(sleep_config); + hibernate_timestamp = usec_add(now(CLOCK_BOOTTIME), sleep_config->hibernate_delay_usec); + while (battery_is_low() == 0) { _cleanup_hashmap_free_ Hashmap *last_capacity = NULL, *current_capacity = NULL; _cleanup_close_ int tfd = -EBADF; @@ -287,14 +290,25 @@ static int custom_timer_suspend(const SleepConfig *sleep_config) { if (r < 0) return log_error_errno(r, "Error fetching battery capacity percentage: %m"); - r = get_total_suspend_interval(last_capacity, &suspend_interval); - if (r < 0) { - log_debug_errno(r, "Failed to estimate suspend interval using previous discharge rate, ignoring: %m"); - /* In case of no battery or any errors, system suspend interval will be set to HibernateDelaySec=. */ - suspend_interval = sleep_config->hibernate_delay_usec; + if (hashmap_isempty(last_capacity)) + /* In case of no battery, system suspend interval will be set to HibernateDelaySec= or 2 hours. */ + suspend_interval = timestamp_is_set(hibernate_timestamp) ? sleep_config->hibernate_delay_usec : DEFAULT_SUSPEND_ESTIMATION_USEC; + else { + r = get_total_suspend_interval(last_capacity, &suspend_interval); + if (r < 0) { + log_debug_errno(r, "Failed to estimate suspend interval using previous discharge rate, ignoring: %m"); + /* In case of any errors, especially when we do not know the battery + * discharging rate, system suspend interval will be set to + * SuspendEstimationSec=. */ + suspend_interval = sleep_config->suspend_estimation_usec; + } } + /* Do not suspend more than HibernateDelaySec= */ usec_t before_timestamp = now(CLOCK_BOOTTIME); + suspend_interval = MIN(suspend_interval, usec_sub_unsigned(hibernate_timestamp, before_timestamp)); + if (suspend_interval <= 0) + break; /* system should hibernate */ log_debug("Set timerfd wake alarm for %s", FORMAT_TIMESPAN(suspend_interval, USEC_PER_SEC)); /* Wake alarm for system with or without battery to hibernate or estimate discharge rate whichever is applicable */ @@ -380,7 +394,7 @@ static int freeze_thaw_user_slice(const char **method) { static int execute_s2h(const SleepConfig *sleep_config) { _unused_ _cleanup_(freeze_thaw_user_slice) const char *auto_method_thaw = "ThawUnit"; - int r, k; + int r; assert(sleep_config); @@ -388,15 +402,21 @@ static int execute_s2h(const SleepConfig *sleep_config) { if (r < 0) log_debug_errno(r, "Failed to freeze unit user.slice, ignoring: %m"); - r = check_wakeup_type(); - if (r < 0) - log_debug_errno(r, "Failed to check hardware wakeup type, ignoring: %m"); - - k = battery_trip_point_alarm_exists(); - if (k < 0) - log_debug_errno(k, "Failed to check whether acpi_btp support is enabled or not, ignoring: %m"); + /* Only check if we have automated battery alarms if HibernateDelaySec= is not set, as in that case + * we'll busy poll for the configured interval instead */ + if (!timestamp_is_set(sleep_config->hibernate_delay_usec)) { + r = check_wakeup_type(); + if (r < 0) + log_debug_errno(r, "Failed to check hardware wakeup type, ignoring: %m"); + else { + r = battery_trip_point_alarm_exists(); + if (r < 0) + log_debug_errno(r, "Failed to check whether acpi_btp support is enabled or not, ignoring: %m"); + } + } else + r = 0; /* Force fallback path */ - if (r >= 0 && k > 0) { + if (r > 0) { /* If we have both wakeup alarms and battery trip point support, use them */ log_debug("Attempting to suspend..."); r = execute(sleep_config, SLEEP_SUSPEND, NULL); if (r < 0) diff --git a/src/sleep/sleep.conf b/src/sleep/sleep.conf index a3d31140d8..4c8e8b9680 100644 --- a/src/sleep/sleep.conf +++ b/src/sleep/sleep.conf @@ -23,4 +23,5 @@ #HibernateState=disk #HybridSleepMode=suspend platform shutdown #HybridSleepState=disk -#HibernateDelaySec=120min +#HibernateDelaySec= +#SuspendEstimationSec=60min |