We may end up calling remove()-d time waiters if the timeout expires as
we're processing an IO waiter. Instead of freeing the waiter in
waiter_remove, mark the waiter as inactive, and defer the free until the
end of waiter_poll().
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
#include <sys/time.h>
#include <talloc/talloc.h>
#include <sys/time.h>
#include <talloc/talloc.h>
struct timeval timeout;
waiter_cb callback;
void *arg;
struct timeval timeout;
waiter_cb callback;
void *arg;
+
+ bool active;
+ struct list_item list;
int n_io_waiters;
struct waiter **time_waiters;
int n_time_waiters;
int n_io_waiters;
struct waiter **time_waiters;
int n_time_waiters;
+
+ struct list free_list;
};
struct waitset *waitset_create(void *ctx)
{
struct waitset *set = talloc_zero(ctx, struct waitset);
};
struct waitset *waitset_create(void *ctx)
{
struct waitset *set = talloc_zero(ctx, struct waitset);
+ list_init(&set->free_list);
set->n_waiters++;
set->waiters[set->n_waiters - 1] = waiter;
set->n_waiters++;
set->waiters[set->n_waiters - 1] = waiter;
struct waiter *, set->n_waiters);
set->waiters_changed = true;
struct waiter *, set->n_waiters);
set->waiters_changed = true;
+ waiter->active = false;
+ list_add(&set->free_list, &waiter->list);
}
static void update_waiters(struct waitset *set)
}
static void update_waiters(struct waitset *set)
int waiter_poll(struct waitset *set)
{
struct timeval now, timeout;
int waiter_poll(struct waitset *set)
{
struct timeval now, timeout;
+ struct waiter *waiter, *tmp;
int timeout_ms;
int i, rc;
int timeout_ms;
int i, rc;
rc = poll(set->pollfds, set->n_io_waiters, timeout_ms);
if (rc < 0)
rc = poll(set->pollfds, set->n_io_waiters, timeout_ms);
if (rc < 0)
for (i = 0; i < set->n_io_waiters; i++) {
struct waiter *waiter = set->io_waiters[i];
for (i = 0; i < set->n_io_waiters; i++) {
struct waiter *waiter = set->io_waiters[i];
+ if (!waiter->active)
+ continue;
+
if (!set->pollfds[i].revents)
continue;
rc = waiter->callback(waiter->arg);
if (!set->pollfds[i].revents)
continue;
rc = waiter->callback(waiter->arg);
for (i = 0; i < set->n_time_waiters; i++) {
struct waiter *waiter = set->time_waiters[i];
for (i = 0; i < set->n_time_waiters; i++) {
struct waiter *waiter = set->time_waiters[i];
+ if (!waiter->active)
+ continue;
+
if (timercmp(&waiter->timeout, &now, >))
continue;
if (timercmp(&waiter->timeout, &now, >))
continue;
+ rc = 0;
+
+out:
+ /* free any waiters that have been removed */
+ list_for_each_entry_safe(&set->free_list, waiter, tmp, list)
+ talloc_free(waiter);
+ list_init(&set->free_list);
+
+ return rc;