Skip to content

Commit 96d662f

Browse files
cerebro1cerebro1
committed
sleep: use current charge level to decide suspension
If battery current charge percentage is below 5% hibernate directly. Else initial suspend interval is set for HibernateDelaySec. On wakeup estimate battery discharge rate per hour and if battery charge percentage is not below 5% system is suspended else hibernated.
1 parent 9f3a3ac commit 96d662f

3 files changed

Lines changed: 103 additions & 28 deletions

File tree

‎src/shared/sleep-config.c‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,44 @@ int parse_sleep_config(SleepConfig **ret_sleep_config) {
102102
return 0;
103103
}
104104

105+
/* If battery percentage capacity is less than equal to 5% return success */
106+
int battery_is_low(void) {
107+
int r;
108+
109+
/* We have not used battery capacity_level since value is set to full
110+
* or Normal in case acpi is not working properly. In case of no battery
111+
* 0 will be returned and system will be suspended for 1st cycle then hibernated */
112+
113+
r = read_battery_capacity_percentage();
114+
if (r == -ENOENT)
115+
return false;
116+
if (r < 0)
117+
return r;
118+
119+
return r <= 5;
120+
}
121+
122+
/* Battery percentage capacity fetched from capacity file and if in range 0-100 then returned */
123+
int read_battery_capacity_percentage(void) {
124+
_cleanup_free_ char *bat_cap = NULL;
125+
int battery_capacity, r;
126+
127+
r = read_one_line_file("/sys/class/power_supply/BAT0/capacity", &bat_cap);
128+
if (r == -ENOENT)
129+
return log_debug_errno(r, "/sys/class/power_supply/BAT0/capacity is unavailable. Assuming no battery exists: %m");
130+
if (r < 0)
131+
return log_debug_errno(r, "Failed to read /sys/class/power_supply/BAT0/capacity: %m");
132+
133+
r = safe_atoi(bat_cap, &battery_capacity);
134+
if (r < 0)
135+
return log_debug_errno(r, "Failed to parse battery capacity: %m");
136+
137+
if (battery_capacity < 0 || battery_capacity > 100)
138+
return log_debug_errno(SYNTHETIC_ERRNO(ERANGE), "Invalid battery capacity");
139+
140+
return battery_capacity;
141+
}
142+
105143
int can_sleep_state(char **types) {
106144
_cleanup_free_ char *text = NULL;
107145
int r;

‎src/shared/sleep-config.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ int find_hibernate_location(HibernateLocation **ret_hibernate_location);
5555
int can_sleep(SleepOperation operation);
5656
int can_sleep_disk(char **types);
5757
int can_sleep_state(char **types);
58+
int read_battery_capacity_percentage(void);
59+
int battery_is_low(void);
5860

5961
const char* sleep_operation_to_string(SleepOperation s) _const_;
6062
SleepOperation sleep_operation_from_string(const char *s) _pure_;

‎src/sleep/sleep.c‎

Lines changed: 63 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -263,41 +263,76 @@ static int execute(
263263
}
264264

265265
static int execute_s2h(const SleepConfig *sleep_config) {
266-
_cleanup_close_ int tfd = -1;
267-
struct itimerspec ts = {};
268266
int r;
269267

270268
assert(sleep_config);
271269

272-
tfd = timerfd_create(CLOCK_BOOTTIME_ALARM, TFD_NONBLOCK|TFD_CLOEXEC);
273-
if (tfd < 0)
274-
return log_error_errno(errno, "Error creating timerfd: %m");
275-
276-
log_debug("Set timerfd wake alarm for %s",
277-
FORMAT_TIMESPAN(sleep_config->hibernate_delay_sec, USEC_PER_SEC));
278-
279-
timespec_store(&ts.it_value, sleep_config->hibernate_delay_sec);
280-
281-
r = timerfd_settime(tfd, 0, &ts, NULL);
282-
if (r < 0)
283-
return log_error_errno(errno, "Error setting hibernate timer: %m");
284-
285-
r = execute(sleep_config, SLEEP_SUSPEND, NULL);
286-
if (r < 0)
287-
return r;
288-
289-
r = fd_wait_for_event(tfd, POLLIN, 0);
290-
if (r < 0)
291-
return log_error_errno(r, "Error polling timerfd: %m");
292-
if (!FLAGS_SET(r, POLLIN)) /* We woke up before the alarm time, we are done. */
293-
return 0;
270+
while (battery_is_low() == 0) {
271+
_cleanup_close_ int tfd = -1;
272+
struct itimerspec ts = {};
273+
usec_t suspend_interval = sleep_config->hibernate_delay_sec, before_timestamp = 0, after_timestamp = 0;
274+
bool woken_by_timer;
275+
int last_capacity = 0, current_capacity = 0, estimated_discharge_rate = 0;
276+
277+
tfd = timerfd_create(CLOCK_BOOTTIME_ALARM, TFD_NONBLOCK|TFD_CLOEXEC);
278+
if (tfd < 0)
279+
return log_error_errno(errno, "Error creating timerfd: %m");
280+
281+
/* Store current battery capacity and current time before suspension */
282+
r = read_battery_capacity_percentage();
283+
if (r >= 0) {
284+
last_capacity = r;
285+
log_debug("Current battery charge percentage: %d%%", last_capacity);
286+
before_timestamp = now(CLOCK_BOOTTIME);
287+
} else if (r == -ENOENT)
288+
/* In case of no battery, system suspend interval will be set to HibernateDelaySec=. */
289+
log_debug_errno(r, "Suspend Interval value set to %s: %m", FORMAT_TIMESPAN(suspend_interval, USEC_PER_SEC));
290+
else
291+
return log_error_errno(r, "Error fetching battery capacity percentage: %m");
292+
293+
log_debug("Set timerfd wake alarm for %s", FORMAT_TIMESPAN(suspend_interval, USEC_PER_SEC));
294+
/* Wake alarm for system with or without battery to hibernate or estimate discharge rate whichever is applicable */
295+
timespec_store(&ts.it_value, suspend_interval);
296+
297+
if (timerfd_settime(tfd, 0, &ts, NULL) < 0)
298+
return log_error_errno(errno, "Error setting battery estimate timer: %m");
299+
300+
r = execute(sleep_config, SLEEP_SUSPEND, NULL);
301+
if (r < 0)
302+
return r;
294303

295-
tfd = safe_close(tfd);
304+
r = fd_wait_for_event(tfd, POLLIN, 0);
305+
if (r < 0)
306+
return log_error_errno(r, "Error polling timerfd: %m");
307+
/* Store fd_wait status */
308+
woken_by_timer = FLAGS_SET(r, POLLIN);
309+
310+
r = read_battery_capacity_percentage();
311+
if (r >= 0) {
312+
current_capacity = r;
313+
log_debug("Current battery charge percentage after wakeup: %d%%", current_capacity);
314+
} else if (r == -ENOENT) {
315+
/* In case of no battery, system will be hibernated after 1st cycle of suspend */
316+
log_debug_errno(r, "Battery capacity percentage unavailable, cannot estimate discharge rate: %m");
317+
break;
318+
} else
319+
return log_error_errno(r, "Error fetching battery capacity percentage: %m");
320+
321+
if (current_capacity >= last_capacity)
322+
log_debug("Battery was not discharged during suspension");
323+
else {
324+
after_timestamp = now(CLOCK_BOOTTIME);
325+
log_debug("Attempting to estimate battery discharge rate after wakeup from %s sleep", FORMAT_TIMESPAN(after_timestamp - before_timestamp, USEC_PER_HOUR));
326+
327+
estimated_discharge_rate = (last_capacity - current_capacity) * USEC_PER_HOUR / (after_timestamp - before_timestamp);
328+
}
296329

297-
/* If woken up after alarm time, hibernate */
298-
log_debug("Attempting to hibernate after waking from %s timer",
299-
FORMAT_TIMESPAN(sleep_config->hibernate_delay_sec, USEC_PER_SEC));
330+
if (!woken_by_timer)
331+
/* Return as manual wakeup done. This also will return in case battery was charged during suspension */
332+
return 0;
333+
}
300334

335+
log_debug("Attempting to hibernate");
301336
r = execute(sleep_config, SLEEP_HIBERNATE, NULL);
302337
if (r < 0) {
303338
log_notice("Couldn't hibernate, will try to suspend again.");

0 commit comments

Comments
 (0)