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

module: remove module_run_context

Browse source 
Store abort_fd directly in the module struct instead. This then allows
us to pass the module pointer as-is to the modules' run functions.
This commit is contained in:
Daniel Eklöf 2019-01-13 15:34:59 +01:00
parent acdeff3b6e
commit 76d135e257
13 changed files with 57 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/battery.c
View file

@ -242,10 +242,10 @@ update_status(struct module *mod, int capacity_fd, int energy_fd, int power_fd,
}
static int
run(struct module_run_context *ctx)
run(struct module *mod)
{
const struct bar *bar = ctx->module->bar;
struct private *m = ctx->module->private;
const struct bar *bar = mod->bar;
struct private *m = mod->private;
int base_dir_fd = initialize(m);
if (base_dir_fd == -1)
@ -273,12 +273,12 @@ run(struct module_run_context *ctx)
udev_monitor_filter_add_match_subsystem_devtype(mon, "power_supply", NULL);
udev_monitor_enable_receiving(mon);
update_status(ctx->module, capacity_fd, energy_fd, power_fd, status_fd);
update_status(mod, capacity_fd, energy_fd, power_fd, status_fd);
bar->refresh(bar);
while (true) {
struct pollfd fds[] = {
{.fd = ctx->abort_fd, .events = POLLIN},
{.fd = mod->abort_fd, .events = POLLIN},
{.fd = udev_monitor_get_fd(mon), .events = POLLIN},
};
poll(fds, 2, m->poll_interval * 1000);
@ -299,7 +299,7 @@ run(struct module_run_context *ctx)
continue;
}
update_status(ctx->module, capacity_fd, energy_fd, power_fd, status_fd);
update_status(mod, capacity_fd, energy_fd, power_fd, status_fd);
bar->refresh(bar);
}