This adds a slice to each poller which is acquired before the poller is executed. This allows us to run pollers inside of other pollers. Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> --- common/poller.c | 15 +++++++-------- include/poller.h | 2 ++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/common/poller.c b/common/poller.c index 95f828b439..cccffcb88d 100644 --- a/common/poller.c +++ b/common/poller.c @@ -14,7 +14,6 @@ #include <clock.h> static LIST_HEAD(poller_list); -static int poller_active; int poller_register(struct poller_struct *poller, const char *name) { @@ -22,6 +21,7 @@ int poller_register(struct poller_struct *poller, const char *name) return -EBUSY; poller->name = xstrdup(name); + slice_init(&poller->slice, poller->name); list_add_tail(&poller->list, &poller_list); poller->registered = 1; @@ -111,15 +111,14 @@ void poller_call(void) { struct poller_struct *poller, *tmp; - if (poller_active) - return; - - poller_active = 1; + list_for_each_entry_safe(poller, tmp, &poller_list, list) { + if (slice_acquired(&poller->slice)) + continue; - list_for_each_entry_safe(poller, tmp, &poller_list, list) + slice_acquire(&poller->slice); poller->func(poller); - - poller_active = 0; + slice_release(&poller->slice); + } } #if defined CONFIG_CMD_POLLER diff --git a/include/poller.h b/include/poller.h index 886557252b..c8b6829685 100644 --- a/include/poller.h +++ b/include/poller.h @@ -7,11 +7,13 @@ #define POLLER_H #include <linux/list.h> +#include <slice.h> struct poller_struct { void (*func)(struct poller_struct *poller); int registered; struct list_head list; + struct slice slice; char *name; }; -- 2.26.1 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox