diff options
Diffstat (limited to 'zebra/zebra_opaque.c')
| -rw-r--r-- | zebra/zebra_opaque.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/zebra/zebra_opaque.c b/zebra/zebra_opaque.c index 7cfb3294eb..8ceb1f8dc5 100644 --- a/zebra/zebra_opaque.c +++ b/zebra/zebra_opaque.c @@ -77,10 +77,10 @@ static struct zebra_opaque_globals { struct frr_pthread *pthread; /* Event-delivery context 'master' for the module */ - struct thread_master *master; + struct event_loop *master; /* Event/'thread' pointer for queued zapi messages */ - struct thread *t_msgs; + struct event *t_msgs; /* Input fifo queue to the module, and lock to protect it. */ pthread_mutex_t mutex; @@ -94,7 +94,7 @@ static const char LOG_NAME[] = "Zebra Opaque"; /* Prototypes */ /* Main event loop, processing incoming message queue */ -static void process_messages(struct thread *event); +static void process_messages(struct event *event); static int handle_opq_registration(const struct zmsghdr *hdr, struct stream *msg); static int handle_opq_unregistration(const struct zmsghdr *hdr, @@ -148,8 +148,8 @@ void zebra_opaque_start(void) atomic_store_explicit(&zo_info.run, 1, memory_order_relaxed); /* Enqueue an initial event for the pthread */ - thread_add_event(zo_info.master, process_messages, NULL, 0, - &zo_info.t_msgs); + event_add_event(zo_info.master, process_messages, NULL, 0, + &zo_info.t_msgs); /* And start the pthread */ frr_pthread_run(zo_info.pthread, NULL); @@ -248,8 +248,8 @@ uint32_t zebra_opaque_enqueue_batch(struct stream_fifo *batch) if (IS_ZEBRA_DEBUG_RECV && IS_ZEBRA_DEBUG_DETAIL) zlog_debug("%s: received %u messages", __func__, counter); - thread_add_event(zo_info.master, process_messages, NULL, 0, - &zo_info.t_msgs); + event_add_event(zo_info.master, process_messages, NULL, 0, + &zo_info.t_msgs); } return counter; @@ -258,7 +258,7 @@ uint32_t zebra_opaque_enqueue_batch(struct stream_fifo *batch) /* * Pthread event loop, process the incoming message queue. */ -static void process_messages(struct thread *event) +static void process_messages(struct event *event) { struct stream_fifo fifo; struct stream *msg; @@ -317,8 +317,8 @@ done: if (need_resched) { atomic_fetch_add_explicit(&zo_info.yields, 1, memory_order_relaxed); - thread_add_event(zo_info.master, process_messages, NULL, 0, - &zo_info.t_msgs); + event_add_event(zo_info.master, process_messages, NULL, 0, + &zo_info.t_msgs); } /* This will also free any leftover messages, in the shutdown case */ |