diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bfd.c | 4 | ||||
| -rw-r--r-- | lib/event.c | 6 | ||||
| -rw-r--r-- | lib/event.h | 10 | ||||
| -rw-r--r-- | lib/wheel.c | 2 |
4 files changed, 11 insertions, 11 deletions
@@ -541,7 +541,7 @@ static void _bfd_sess_remove(struct bfd_session_params *bsp) /* Send request to remove any session. */ bsp->lastev = BSE_UNINSTALL; - thread_execute(bsglobal.tm, _bfd_sess_send, bsp, 0); + event_execute(bsglobal.tm, _bfd_sess_send, bsp, 0); } void bfd_sess_free(struct bfd_session_params **bsp) @@ -894,7 +894,7 @@ int zclient_bfd_session_replay(ZAPI_CALLBACK_ARGS) /* Ask for installation. */ bsp->lastev = BSE_INSTALL; - thread_execute(bsglobal.tm, _bfd_sess_send, bsp, 0); + event_execute(bsglobal.tm, _bfd_sess_send, bsp, 0); } return 0; diff --git a/lib/event.c b/lib/event.c index 5aea78186c..12b40e1121 100644 --- a/lib/event.c +++ b/lib/event.c @@ -2058,9 +2058,9 @@ void event_call(struct event *thread) } /* Execute thread */ -void _thread_execute(const struct xref_threadsched *xref, - struct thread_master *m, void (*func)(struct event *), - void *arg, int val) +void _event_execute(const struct xref_threadsched *xref, + struct thread_master *m, void (*func)(struct event *), + void *arg, int val) { struct event *thread; diff --git a/lib/event.h b/lib/event.h index c38b7b6c32..cdb2284815 100644 --- a/lib/event.h +++ b/lib/event.h @@ -195,7 +195,7 @@ struct cpu_thread_history { _xref_t_a(timer_tv, TIMER, m, f, a, v, t) #define event_add_event(m, f, a, v, t) _xref_t_a(event, EVENT, m, f, a, v, t) -#define thread_execute(m, f, a, v) \ +#define event_execute(m, f, a, v) \ ({ \ static const struct xref_threadsched _xref __attribute__( \ (used)) = { \ @@ -205,7 +205,7 @@ struct cpu_thread_history { .event_type = EVENT_EXECUTE, \ }; \ XREF_LINK(_xref.xref); \ - _thread_execute(&_xref, m, f, a, v); \ + _event_execute(&_xref, m, f, a, v); \ }) /* end */ /* Prototypes. */ @@ -239,9 +239,9 @@ extern void _event_add_event(const struct xref_threadsched *xref, void (*fn)(struct event *), void *arg, int val, struct event **tref); -extern void _thread_execute(const struct xref_threadsched *xref, - struct thread_master *master, - void (*fn)(struct event *), void *arg, int val); +extern void _event_execute(const struct xref_threadsched *xref, + struct thread_master *master, + void (*fn)(struct event *), void *arg, int val); extern void event_cancel(struct event **event); extern void event_cancel_async(struct thread_master *, struct event **, void *); diff --git a/lib/wheel.c b/lib/wheel.c index 27e087efc6..9ba122e826 100644 --- a/lib/wheel.c +++ b/lib/wheel.c @@ -57,7 +57,7 @@ static void wheel_timer_thread(struct event *t) wheel = THREAD_ARG(t); - thread_execute(wheel->master, wheel_timer_thread_helper, wheel, 0); + event_execute(wheel->master, wheel_timer_thread_helper, wheel, 0); } struct timer_wheel *wheel_init(struct thread_master *master, int period, |