diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2023-08-15 11:52:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-15 11:52:49 -0400 |
| commit | 77014daf3a88f4a4e2874db93e4b3915937f20ee (patch) | |
| tree | 58461293771e230d31025f8e00b248deb6383ab8 /lib/event.c | |
| parent | 2bc2ff61c88286585bb86ae8f799872aaf0a0077 (diff) | |
| parent | adca5c22c573f17b09b96a0994953c8f643fd301 (diff) | |
Merge pull request #14016 from mjstapp/event_exec_ptr
* : include event ptr in event_execute api
Diffstat (limited to 'lib/event.c')
| -rw-r--r-- | lib/event.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/event.c b/lib/event.c index a8eb89f48d..b971bd70e6 100644 --- a/lib/event.c +++ b/lib/event.c @@ -1491,9 +1491,9 @@ void event_cancel(struct event **thread) cr->thread = *thread; listnode_add(master->cancel_req, cr); do_event_cancel(master); - } - *thread = NULL; + *thread = NULL; + } } /** @@ -2066,10 +2066,15 @@ void event_call(struct event *thread) /* Execute thread */ void _event_execute(const struct xref_eventsched *xref, struct event_loop *m, - void (*func)(struct event *), void *arg, int val) + void (*func)(struct event *), void *arg, int val, + struct event **eref) { struct event *thread; + /* Cancel existing scheduled task TODO -- nice to do in 1 lock cycle */ + if (eref) + event_cancel(eref); + /* Get or allocate new thread to execute. */ frr_with_mutex (&m->mtx) { thread = thread_get(m, EVENT_EVENT, func, arg, xref); |