pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

module/battery: re-open /sys/class/power_supply/<battery>/ every update

Browse source
This commit is contained in:
Daniel Eklöf 2021-01-04 19:59:58 +01:00
parent 8f3de369ac
commit 524f93c997
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 40 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
modules/battery.c
View file

@ -171,21 +171,21 @@ readint_from_fd(int fd)
return ret; return ret;
} }
static int static bool
initialize(struct private *m) initialize(struct private *m)
{ {
int pw_fd = open("/sys/class/power_supply", O_RDONLY); int pw_fd = open("/sys/class/power_supply", O_RDONLY);
if (pw_fd == -1) { if (pw_fd < 0) {
LOG_ERRNO("/sys/class/power_supply"); LOG_ERRNO("/sys/class/power_supply");
return -1; return false;
} }
int base_dir_fd = openat(pw_fd, m->battery, O_RDONLY); int base_dir_fd = openat(pw_fd, m->battery, O_RDONLY);
close(pw_fd); close(pw_fd);
if (base_dir_fd == -1) { if (base_dir_fd < 0) {
LOG_ERRNO("%s", m->battery); LOG_ERRNO("/sys/class/power_supply/%s", m->battery);
return -1; return false;
} }
{ {
@ -268,29 +268,46 @@ initialize(struct private *m)
m->charge_full = m->charge_full_design = -1; m->charge_full = m->charge_full_design = -1;
} }
return base_dir_fd; close(base_dir_fd);
return true;
err: err:
close(base_dir_fd); close(base_dir_fd);
return -1; return false;
} }
static void static bool
update_status(struct module *mod, int base_dir_fd) update_status(struct module *mod)
{ {
struct private *m = mod->private; struct private *m = mod->private;
int pw_fd = open("/sys/class/power_supply", O_RDONLY);
if (pw_fd < 0) {
LOG_ERRNO("/sys/class/power_supply");
return false;
}
int base_dir_fd = openat(pw_fd, m->battery, O_RDONLY);
close(pw_fd);
if (base_dir_fd < 0) {
LOG_ERRNO("/sys/class/power_supply/%s", m->battery);
return false;
}
int status_fd = openat(base_dir_fd, "status", O_RDONLY); int status_fd = openat(base_dir_fd, "status", O_RDONLY);
if (status_fd < 0) { if (status_fd < 0) {
LOG_ERRNO("status: failed to open"); LOG_ERRNO("/sys/class/power_supply/%s/status", m->battery);
return; close(base_dir_fd);
return false;
} }
int capacity_fd = openat(base_dir_fd, "capacity", O_RDONLY); int capacity_fd = openat(base_dir_fd, "capacity", O_RDONLY);
if (capacity_fd < 0) { if (capacity_fd < 0) {
LOG_ERRNO("capacity: failed to open"); LOG_ERRNO("/sys/class/power_supply/%s/capacity", m->battery);
close(status_fd); close(status_fd);
return; close(base_dir_fd);
return false;
} }
int energy_fd = openat(base_dir_fd, "energy_now", O_RDONLY); int energy_fd = openat(base_dir_fd, "energy_now", O_RDONLY);
@ -322,6 +339,8 @@ update_status(struct module *mod, int base_dir_fd)
close(current_fd); close(current_fd);
if (time_to_empty_fd >= 0) if (time_to_empty_fd >= 0)
close(time_to_empty_fd); close(time_to_empty_fd);
if (base_dir_fd >= 0)
close(base_dir_fd);
enum state state; enum state state;
@ -356,7 +375,7 @@ update_status(struct module *mod, int base_dir_fd)
m->current = current; m->current = current;
m->time_to_empty = time_to_empty; m->time_to_empty = time_to_empty;
mtx_unlock(&mod->lock); mtx_unlock(&mod->lock);
return true;
} }
static int static int
@ -365,8 +384,7 @@ run(struct module *mod)
const struct bar *bar = mod->bar; const struct bar *bar = mod->bar;
struct private *m = mod->private; struct private *m = mod->private;
int base_dir_fd = initialize(m); if (!initialize(m))
if (base_dir_fd == -1)
return -1; return -1;
LOG_INFO("%s: %s %s (at %.1f%% of original capacity)", LOG_INFO("%s: %s %s (at %.1f%% of original capacity)",
@ -388,7 +406,9 @@ run(struct module *mod)
udev_monitor_filter_add_match_subsystem_devtype(mon, "power_supply", NULL); udev_monitor_filter_add_match_subsystem_devtype(mon, "power_supply", NULL);
udev_monitor_enable_receiving(mon); udev_monitor_enable_receiving(mon);
update_status(mod, base_dir_fd); if (!update_status(mod))
goto out;
bar->refresh(bar); bar->refresh(bar);
while (true) { while (true) {
@ -414,7 +434,8 @@ run(struct module *mod)
continue; continue;
} }
update_status(mod, base_dir_fd); if (!update_status(mod))
break;
bar->refresh(bar); bar->refresh(bar);
} }
@ -423,8 +444,6 @@ out:
udev_monitor_unref(mon); udev_monitor_unref(mon);
if (udev != NULL) if (udev != NULL)
udev_unref(udev); udev_unref(udev);
close(base_dir_fd);
return ret; return ret;
} }