diff --git a/babeld/babel_main.c b/babeld/babel_main.c index 0869c120ac..b6126d5b7d 100644 --- a/babeld/babel_main.c +++ b/babeld/babel_main.c @@ -8,7 +8,7 @@ Copyright 2011 by Matthieu Boutier and Juliusz Chroboczek #include "getopt.h" #include "if.h" #include "log.h" -#include "thread.h" +#include "frrevent.h" #include "privs.h" #include "sigevent.h" #include "lib/version.h" @@ -37,7 +37,7 @@ static void babel_exit_properly(void); static void babel_save_state_file(void); -struct thread_master *master; /* quagga's threads handler */ +struct event_loop *master; /* quagga's threads handler */ struct timeval babel_now; /* current time */ unsigned char myid[8]; /* unique id (mac address of an interface) */ diff --git a/babeld/babel_main.h b/babeld/babel_main.h index 659ddc70cf..0f9792b185 100644 --- a/babeld/babel_main.h +++ b/babeld/babel_main.h @@ -9,7 +9,7 @@ Copyright 2011 by Matthieu Boutier and Juliusz Chroboczek #include "vty.h" extern struct timeval babel_now; /* current time */ -extern struct thread_master *master; /* quagga's threads handler */ +extern struct event_loop *master; /* quagga's threads handler */ extern int debug; extern int resend_delay; diff --git a/babeld/babeld.c b/babeld/babeld.c index 5104155936..4ce92c5204 100644 --- a/babeld/babeld.c +++ b/babeld/babeld.c @@ -37,11 +37,11 @@ Copyright 2011 by Matthieu Boutier and Juliusz Chroboczek DEFINE_MGROUP(BABELD, "babeld"); DEFINE_MTYPE_STATIC(BABELD, BABEL, "Babel Structure"); -static void babel_init_routing_process(struct thread *thread); +static void babel_init_routing_process(struct event *thread); static void babel_get_myid(void); static void babel_initial_noise(void); -static void babel_read_protocol(struct thread *thread); -static void babel_main_loop(struct thread *thread); +static void babel_read_protocol(struct event *thread); +static void babel_main_loop(struct event *thread); static void babel_set_timer(struct timeval *timeout); static void babel_fill_with_next_timeout(struct timeval *tv); static void @@ -148,9 +148,11 @@ babel_create_routing_process (void) } /* Threads. */ - thread_add_read(master, babel_read_protocol, NULL, protocol_socket, &babel_routing_process->t_read); + event_add_read(master, babel_read_protocol, NULL, protocol_socket, + &babel_routing_process->t_read); /* wait a little: zebra will announce interfaces, addresses, routes... */ - thread_add_timer_msec(master, babel_init_routing_process, NULL, 200L, &babel_routing_process->t_update); + event_add_timer_msec(master, babel_init_routing_process, NULL, 200L, + &babel_routing_process->t_update); /* Distribute list install. */ babel_routing_process->distribute_ctx = distribute_list_ctx_create (vrf_lookup_by_id(VRF_DEFAULT)); @@ -163,7 +165,7 @@ fail: } /* thread reading entries form others babel daemons */ -static void babel_read_protocol(struct thread *thread) +static void babel_read_protocol(struct event *thread) { int rc; struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT); @@ -193,13 +195,14 @@ static void babel_read_protocol(struct thread *thread) } /* re-add thread */ - thread_add_read(master, &babel_read_protocol, NULL, protocol_socket, &babel_routing_process->t_read); + event_add_read(master, &babel_read_protocol, NULL, protocol_socket, + &babel_routing_process->t_read); } /* Zebra will give some information, especially about interfaces. This function must be call with a litte timeout wich may give zebra the time to do his job, making these inits have sense. */ -static void babel_init_routing_process(struct thread *thread) +static void babel_init_routing_process(struct event *thread) { myseqno = (frr_weak_random() & 0xFFFF); babel_get_myid(); @@ -303,15 +306,15 @@ babel_clean_routing_process(void) babel_interface_close_all(); /* cancel events */ - thread_cancel(&babel_routing_process->t_read); - thread_cancel(&babel_routing_process->t_update); + event_cancel(&babel_routing_process->t_read); + event_cancel(&babel_routing_process->t_update); distribute_list_delete(&babel_routing_process->distribute_ctx); XFREE(MTYPE_BABEL, babel_routing_process); } /* Function used with timeout. */ -static void babel_main_loop(struct thread *thread) +static void babel_main_loop(struct event *thread) { struct timeval tv; struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT); @@ -482,8 +485,9 @@ static void babel_set_timer(struct timeval *timeout) { long msecs = timeout->tv_sec * 1000 + timeout->tv_usec / 1000; - thread_cancel(&(babel_routing_process->t_update)); - thread_add_timer_msec(master, babel_main_loop, NULL, msecs, &babel_routing_process->t_update); + event_cancel(&(babel_routing_process->t_update)); + event_add_timer_msec(master, babel_main_loop, NULL, msecs, + &babel_routing_process->t_update); } void diff --git a/babeld/babeld.h b/babeld/babeld.h index a9ffb7ee43..6c51af48a8 100644 --- a/babeld/babeld.h +++ b/babeld/babeld.h @@ -84,8 +84,8 @@ Copyright 2011 by Matthieu Boutier and Juliusz Chroboczek struct babel { /* Babel threads. */ - struct thread *t_read; /* on Babel protocol's socket */ - struct thread *t_update; /* timers */ + struct event *t_read; /* on Babel protocol's socket */ + struct event *t_update; /* timers */ /* distribute_ctx */ struct distribute_ctx *distribute_ctx; }; diff --git a/babeld/kernel.c b/babeld/kernel.c index f89fe268df..4fe5bcfea6 100644 --- a/babeld/kernel.c +++ b/babeld/kernel.c @@ -29,7 +29,7 @@ Copyright 2011, 2012 by Matthieu Boutier and Juliusz Chroboczek #include "command.h" #include "vty.h" #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "nexthop.h" #include "util.h" diff --git a/bfdd/bfd.c b/bfdd/bfd.c index 2586c0b99c..3096f47d5c 100644 --- a/bfdd/bfd.c +++ b/bfdd/bfd.c @@ -618,25 +618,25 @@ struct bfd_session *ptm_bfd_sess_find(struct bfd_pkt *cp, return bfd_key_lookup(key); } -void bfd_xmt_cb(struct thread *t) +void bfd_xmt_cb(struct event *t) { - struct bfd_session *bs = THREAD_ARG(t); + struct bfd_session *bs = EVENT_ARG(t); ptm_bfd_xmt_TO(bs, 0); } -void bfd_echo_xmt_cb(struct thread *t) +void bfd_echo_xmt_cb(struct event *t) { - struct bfd_session *bs = THREAD_ARG(t); + struct bfd_session *bs = EVENT_ARG(t); if (bs->echo_xmt_TO > 0) ptm_bfd_echo_xmt_TO(bs); } /* Was ptm_bfd_detect_TO() */ -void bfd_recvtimer_cb(struct thread *t) +void bfd_recvtimer_cb(struct event *t) { - struct bfd_session *bs = THREAD_ARG(t); + struct bfd_session *bs = EVENT_ARG(t); switch (bs->ses_state) { case PTM_BFD_INIT: @@ -647,9 +647,9 @@ void bfd_recvtimer_cb(struct thread *t) } /* Was ptm_bfd_echo_detect_TO() */ -void bfd_echo_recvtimer_cb(struct thread *t) +void bfd_echo_recvtimer_cb(struct event *t) { - struct bfd_session *bs = THREAD_ARG(t); + struct bfd_session *bs = EVENT_ARG(t); switch (bs->ses_state) { case PTM_BFD_INIT: @@ -1957,23 +1957,23 @@ static int bfd_vrf_enable(struct vrf *vrf) bvrf->bg_echov6 = bp_echov6_socket(vrf); if (!bvrf->bg_ev[0] && bvrf->bg_shop != -1) - thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop, - &bvrf->bg_ev[0]); + event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop, + &bvrf->bg_ev[0]); if (!bvrf->bg_ev[1] && bvrf->bg_mhop != -1) - thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop, - &bvrf->bg_ev[1]); + event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop, + &bvrf->bg_ev[1]); if (!bvrf->bg_ev[2] && bvrf->bg_shop6 != -1) - thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop6, - &bvrf->bg_ev[2]); + event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop6, + &bvrf->bg_ev[2]); if (!bvrf->bg_ev[3] && bvrf->bg_mhop6 != -1) - thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop6, - &bvrf->bg_ev[3]); + event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop6, + &bvrf->bg_ev[3]); if (!bvrf->bg_ev[4] && bvrf->bg_echo != -1) - thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echo, - &bvrf->bg_ev[4]); + event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echo, + &bvrf->bg_ev[4]); if (!bvrf->bg_ev[5] && bvrf->bg_echov6 != -1) - thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echov6, - &bvrf->bg_ev[5]); + event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echov6, + &bvrf->bg_ev[5]); if (vrf->vrf_id != VRF_DEFAULT) { bfdd_zclient_register(vrf->vrf_id); @@ -1999,12 +1999,12 @@ static int bfd_vrf_disable(struct vrf *vrf) zlog_debug("VRF disable %s id %d", vrf->name, vrf->vrf_id); /* Disable read/write poll triggering. */ - THREAD_OFF(bvrf->bg_ev[0]); - THREAD_OFF(bvrf->bg_ev[1]); - THREAD_OFF(bvrf->bg_ev[2]); - THREAD_OFF(bvrf->bg_ev[3]); - THREAD_OFF(bvrf->bg_ev[4]); - THREAD_OFF(bvrf->bg_ev[5]); + EVENT_OFF(bvrf->bg_ev[0]); + EVENT_OFF(bvrf->bg_ev[1]); + EVENT_OFF(bvrf->bg_ev[2]); + EVENT_OFF(bvrf->bg_ev[3]); + EVENT_OFF(bvrf->bg_ev[4]); + EVENT_OFF(bvrf->bg_ev[5]); /* Close all descriptors. */ socket_close(&bvrf->bg_echo); diff --git a/bfdd/bfd.h b/bfdd/bfd.h index 97e45bb2c2..5451e66c23 100644 --- a/bfdd/bfd.h +++ b/bfdd/bfd.h @@ -265,12 +265,12 @@ struct bfd_session { struct bfd_config_timers timers; struct bfd_timers cur_timers; uint64_t detect_TO; - struct thread *echo_recvtimer_ev; - struct thread *recvtimer_ev; + struct event *echo_recvtimer_ev; + struct event *recvtimer_ev; uint64_t xmt_TO; uint64_t echo_xmt_TO; - struct thread *xmttimer_ev; - struct thread *echo_xmttimer_ev; + struct event *xmttimer_ev; + struct event *echo_xmttimer_ev; uint64_t echo_detect_TO; /* software object state */ @@ -401,8 +401,8 @@ struct bfd_control_socket { TAILQ_ENTRY(bfd_control_socket) bcs_entry; int bcs_sd; - struct thread *bcs_ev; - struct thread *bcs_outev; + struct event *bcs_ev; + struct event *bcs_outev; struct bcqueue bcs_bcqueue; /* Notification data */ @@ -422,7 +422,7 @@ int control_init(const char *path); void control_shutdown(void); int control_notify(struct bfd_session *bs, uint8_t notify_state); int control_notify_config(const char *op, struct bfd_session *bs); -void control_accept(struct thread *t); +void control_accept(struct event *t); /* @@ -439,7 +439,7 @@ struct bfd_vrf_global { int bg_echov6; struct vrf *vrf; - struct thread *bg_ev[6]; + struct event *bg_ev[6]; }; /* Forward declaration of data plane context struct. */ @@ -448,7 +448,7 @@ TAILQ_HEAD(dplane_queue, bfd_dplane_ctx); struct bfd_global { int bg_csock; - struct thread *bg_csockev; + struct event *bg_csockev; struct bcslist bg_bcslist; struct pllist bg_pllist; @@ -466,7 +466,7 @@ struct bfd_global { /* Distributed BFD items. */ bool bg_use_dplane; int bg_dplane_sock; - struct thread *bg_dplane_sockev; + struct event *bg_dplane_sockev; struct dplane_queue bg_dplaneq; /* Debug options. */ @@ -553,7 +553,7 @@ void ptm_bfd_snd(struct bfd_session *bfd, int fbit); void ptm_bfd_echo_snd(struct bfd_session *bfd); void ptm_bfd_echo_fp_snd(struct bfd_session *bfd); -void bfd_recv_cb(struct thread *t); +void bfd_recv_cb(struct event *t); /* @@ -561,7 +561,7 @@ void bfd_recv_cb(struct thread *t); * * Contains the code related with event loop. */ -typedef void (*bfd_ev_cb)(struct thread *t); +typedef void (*bfd_ev_cb)(struct event *t); void bfd_recvtimer_update(struct bfd_session *bs); void bfd_echo_recvtimer_update(struct bfd_session *bs); @@ -686,12 +686,12 @@ void bfd_key_iterate(hash_iter_func hif, void *arg); unsigned long bfd_get_session_count(void); /* Export callback functions for `event.c`. */ -extern struct thread_master *master; +extern struct event_loop *master; -void bfd_recvtimer_cb(struct thread *t); -void bfd_echo_recvtimer_cb(struct thread *t); -void bfd_xmt_cb(struct thread *t); -void bfd_echo_xmt_cb(struct thread *t); +void bfd_recvtimer_cb(struct event *t); +void bfd_echo_recvtimer_cb(struct event *t); +void bfd_xmt_cb(struct event *t); +void bfd_echo_xmt_cb(struct event *t); extern struct in6_addr zero_addr; diff --git a/bfdd/bfd_packet.c b/bfdd/bfd_packet.c index 88a9310bc6..311ce4d379 100644 --- a/bfdd/bfd_packet.c +++ b/bfdd/bfd_packet.c @@ -701,29 +701,29 @@ ssize_t bfd_recv_ipv6(int sd, uint8_t *msgbuf, size_t msgbuflen, uint8_t *ttl, static void bfd_sd_reschedule(struct bfd_vrf_global *bvrf, int sd) { if (sd == bvrf->bg_shop) { - THREAD_OFF(bvrf->bg_ev[0]); - thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop, - &bvrf->bg_ev[0]); + EVENT_OFF(bvrf->bg_ev[0]); + event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop, + &bvrf->bg_ev[0]); } else if (sd == bvrf->bg_mhop) { - THREAD_OFF(bvrf->bg_ev[1]); - thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop, - &bvrf->bg_ev[1]); + EVENT_OFF(bvrf->bg_ev[1]); + event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop, + &bvrf->bg_ev[1]); } else if (sd == bvrf->bg_shop6) { - THREAD_OFF(bvrf->bg_ev[2]); - thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop6, - &bvrf->bg_ev[2]); + EVENT_OFF(bvrf->bg_ev[2]); + event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop6, + &bvrf->bg_ev[2]); } else if (sd == bvrf->bg_mhop6) { - THREAD_OFF(bvrf->bg_ev[3]); - thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop6, - &bvrf->bg_ev[3]); + EVENT_OFF(bvrf->bg_ev[3]); + event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop6, + &bvrf->bg_ev[3]); } else if (sd == bvrf->bg_echo) { - THREAD_OFF(bvrf->bg_ev[4]); - thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echo, - &bvrf->bg_ev[4]); + EVENT_OFF(bvrf->bg_ev[4]); + event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echo, + &bvrf->bg_ev[4]); } else if (sd == bvrf->bg_echov6) { - THREAD_OFF(bvrf->bg_ev[5]); - thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echov6, - &bvrf->bg_ev[5]); + EVENT_OFF(bvrf->bg_ev[5]); + event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echov6, + &bvrf->bg_ev[5]); } } @@ -768,9 +768,9 @@ static void cp_debug(bool mhop, struct sockaddr_any *peer, mhop ? "yes" : "no", peerstr, localstr, portstr, vrfstr); } -void bfd_recv_cb(struct thread *t) +void bfd_recv_cb(struct event *t) { - int sd = THREAD_FD(t); + int sd = EVENT_FD(t); struct bfd_session *bfd; struct bfd_pkt *cp; bool is_mhop; @@ -781,7 +781,7 @@ void bfd_recv_cb(struct thread *t) struct sockaddr_any local, peer; uint8_t msgbuf[1516]; struct interface *ifp = NULL; - struct bfd_vrf_global *bvrf = THREAD_ARG(t); + struct bfd_vrf_global *bvrf = EVENT_ARG(t); /* Schedule next read. */ bfd_sd_reschedule(bvrf, sd); diff --git a/bfdd/bfdd.c b/bfdd/bfdd.c index a3751e4d33..5fbe2f48f6 100644 --- a/bfdd/bfdd.c +++ b/bfdd/bfdd.c @@ -32,7 +32,7 @@ DEFINE_MTYPE(BFDD, BFDD_CONTROL, "long-lived control socket memory"); DEFINE_MTYPE(BFDD, BFDD_NOTIFICATION, "short-lived control notification data"); /* Master of threads. */ -struct thread_master *master; +struct event_loop *master; /* BFDd privileges */ static zebra_capabilities_t _caps_p[] = {ZCAP_BIND, ZCAP_SYS_ADMIN, ZCAP_NET_RAW}; @@ -375,8 +375,8 @@ int main(int argc, char *argv[]) /* Initialize zebra connection. */ bfdd_zclient_init(&bglobal.bfdd_privs); - thread_add_read(master, control_accept, NULL, bglobal.bg_csock, - &bglobal.bg_csockev); + event_add_read(master, control_accept, NULL, bglobal.bg_csock, + &bglobal.bg_csockev); /* Install commands. */ bfdd_vty_init(); diff --git a/bfdd/control.c b/bfdd/control.c index a11ed3d895..f435358f33 100644 --- a/bfdd/control.c +++ b/bfdd/control.c @@ -39,8 +39,8 @@ struct bfd_notify_peer *control_notifypeer_find(struct bfd_control_socket *bcs, struct bfd_control_socket *control_new(int sd); static void control_free(struct bfd_control_socket *bcs); static void control_reset_buf(struct bfd_control_buffer *bcb); -static void control_read(struct thread *t); -static void control_write(struct thread *t); +static void control_read(struct event *t); +static void control_write(struct event *t); static void control_handle_request_add(struct bfd_control_socket *bcs, struct bfd_control_msg *bcm); @@ -132,7 +132,7 @@ void control_shutdown(void) { struct bfd_control_socket *bcs; - thread_cancel(&bglobal.bg_csockev); + event_cancel(&bglobal.bg_csockev); socket_close(&bglobal.bg_csock); @@ -142,9 +142,9 @@ void control_shutdown(void) } } -void control_accept(struct thread *t) +void control_accept(struct event *t) { - int csock, sd = THREAD_FD(t); + int csock, sd = EVENT_FD(t); csock = accept(sd, NULL, 0); if (csock == -1) { @@ -154,7 +154,7 @@ void control_accept(struct thread *t) control_new(csock); - thread_add_read(master, control_accept, NULL, sd, &bglobal.bg_csockev); + event_add_read(master, control_accept, NULL, sd, &bglobal.bg_csockev); } @@ -171,7 +171,7 @@ struct bfd_control_socket *control_new(int sd) bcs->bcs_notify = 0; bcs->bcs_sd = sd; - thread_add_read(master, control_read, bcs, sd, &bcs->bcs_ev); + event_add_read(master, control_read, bcs, sd, &bcs->bcs_ev); TAILQ_INIT(&bcs->bcs_bcqueue); TAILQ_INIT(&bcs->bcs_bnplist); @@ -185,8 +185,8 @@ static void control_free(struct bfd_control_socket *bcs) struct bfd_control_queue *bcq; struct bfd_notify_peer *bnp; - thread_cancel(&(bcs->bcs_ev)); - thread_cancel(&(bcs->bcs_outev)); + event_cancel(&(bcs->bcs_ev)); + event_cancel(&(bcs->bcs_outev)); close(bcs->bcs_sd); @@ -286,13 +286,13 @@ static int control_queue_dequeue(struct bfd_control_socket *bcs) bcs->bcs_bout = &bcq->bcq_bcb; bcs->bcs_outev = NULL; - thread_add_write(master, control_write, bcs, bcs->bcs_sd, - &bcs->bcs_outev); + event_add_write(master, control_write, bcs, bcs->bcs_sd, + &bcs->bcs_outev); return 1; empty_list: - thread_cancel(&(bcs->bcs_outev)); + event_cancel(&(bcs->bcs_outev)); bcs->bcs_bout = NULL; return 0; } @@ -315,8 +315,8 @@ static int control_queue_enqueue(struct bfd_control_socket *bcs, bcs->bcs_bout = bcb; /* New messages, active write events. */ - thread_add_write(master, control_write, bcs, bcs->bcs_sd, - &bcs->bcs_outev); + event_add_write(master, control_write, bcs, bcs->bcs_sd, + &bcs->bcs_outev); } return 0; @@ -379,9 +379,9 @@ static void control_reset_buf(struct bfd_control_buffer *bcb) bcb->bcb_left = 0; } -static void control_read(struct thread *t) +static void control_read(struct event *t) { - struct bfd_control_socket *bcs = THREAD_ARG(t); + struct bfd_control_socket *bcs = EVENT_ARG(t); struct bfd_control_buffer *bcb = &bcs->bcs_bin; int sd = bcs->bcs_sd; struct bfd_control_msg bcm; @@ -511,12 +511,12 @@ skip_header: schedule_next_read: bcs->bcs_ev = NULL; - thread_add_read(master, control_read, bcs, sd, &bcs->bcs_ev); + event_add_read(master, control_read, bcs, sd, &bcs->bcs_ev); } -static void control_write(struct thread *t) +static void control_write(struct event *t) { - struct bfd_control_socket *bcs = THREAD_ARG(t); + struct bfd_control_socket *bcs = EVENT_ARG(t); struct bfd_control_buffer *bcb = bcs->bcs_bout; int sd = bcs->bcs_sd; ssize_t bwrite; @@ -529,8 +529,8 @@ static void control_write(struct thread *t) if (bwrite < 0) { if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) { bcs->bcs_outev = NULL; - thread_add_write(master, control_write, bcs, - bcs->bcs_sd, &bcs->bcs_outev); + event_add_write(master, control_write, bcs, bcs->bcs_sd, + &bcs->bcs_outev); return; } @@ -543,8 +543,8 @@ static void control_write(struct thread *t) bcb->bcb_left -= bwrite; if (bcb->bcb_left > 0) { bcs->bcs_outev = NULL; - thread_add_write(master, control_write, bcs, bcs->bcs_sd, - &bcs->bcs_outev); + event_add_write(master, control_write, bcs, bcs->bcs_sd, + &bcs->bcs_outev); return; } diff --git a/bfdd/dplane.c b/bfdd/dplane.c index 99bd1886f4..d8539812e0 100644 --- a/bfdd/dplane.c +++ b/bfdd/dplane.c @@ -26,7 +26,7 @@ #include "lib/network.h" #include "lib/printfrr.h" #include "lib/stream.h" -#include "lib/thread.h" +#include "lib/frrevent.h" #include "bfd.h" #include "bfddp_packet.h" @@ -63,11 +63,11 @@ struct bfd_dplane_ctx { /** Output buffer data. */ struct stream *outbuf; /** Input event data. */ - struct thread *inbufev; + struct event *inbufev; /** Output event data. */ - struct thread *outbufev; + struct event *outbufev; /** Connection event. */ - struct thread *connectev; + struct event *connectev; /** Amount of bytes read. */ uint64_t in_bytes; @@ -94,7 +94,7 @@ struct bfd_dplane_ctx { */ typedef void (*bfd_dplane_expect_cb)(struct bfddp_message *msg, void *arg); -static void bfd_dplane_client_connect(struct thread *t); +static void bfd_dplane_client_connect(struct event *t); static bool bfd_dplane_client_connecting(struct bfd_dplane_ctx *bdc); static void bfd_dplane_ctx_free(struct bfd_dplane_ctx *bdc); static int _bfd_dplane_add_session(struct bfd_dplane_ctx *bdc, @@ -307,14 +307,14 @@ static ssize_t bfd_dplane_flush(struct bfd_dplane_ctx *bdc) stream_pulldown(bdc->outbuf); /* Disable write ready events. */ - THREAD_OFF(bdc->outbufev); + EVENT_OFF(bdc->outbufev); return total; } -static void bfd_dplane_write(struct thread *t) +static void bfd_dplane_write(struct event *t) { - struct bfd_dplane_ctx *bdc = THREAD_ARG(t); + struct bfd_dplane_ctx *bdc = EVENT_ARG(t); /* Handle connection stage. */ if (bdc->connecting && bfd_dplane_client_connecting(bdc)) @@ -429,8 +429,8 @@ static int bfd_dplane_enqueue(struct bfd_dplane_ctx *bdc, const void *buf, /* Schedule if it is not yet. */ if (bdc->outbufev == NULL) - thread_add_write(master, bfd_dplane_write, bdc, bdc->sock, - &bdc->outbufev); + event_add_write(master, bfd_dplane_write, bdc, bdc->sock, + &bdc->outbufev); return 0; } @@ -599,9 +599,9 @@ skip_read: return 0; } -static void bfd_dplane_read(struct thread *t) +static void bfd_dplane_read(struct event *t) { - struct bfd_dplane_ctx *bdc = THREAD_ARG(t); + struct bfd_dplane_ctx *bdc = EVENT_ARG(t); int rv; rv = bfd_dplane_expect(bdc, 0, bfd_dplane_handle_message, NULL); @@ -609,7 +609,7 @@ static void bfd_dplane_read(struct thread *t) return; stream_pulldown(bdc->inbuf); - thread_add_read(master, bfd_dplane_read, bdc, bdc->sock, &bdc->inbufev); + event_add_read(master, bfd_dplane_read, bdc, bdc->sock, &bdc->inbufev); } static void _bfd_session_register_dplane(struct hash_bucket *hb, void *arg) @@ -641,7 +641,7 @@ static struct bfd_dplane_ctx *bfd_dplane_ctx_new(int sock) if (sock == -1) return bdc; - thread_add_read(master, bfd_dplane_read, bdc, sock, &bdc->inbufev); + event_add_read(master, bfd_dplane_read, bdc, sock, &bdc->inbufev); /* Register all unattached sessions. */ bfd_key_iterate(_bfd_session_register_dplane, bdc); @@ -672,7 +672,7 @@ static void bfd_dplane_ctx_free(struct bfd_dplane_ctx *bdc) /* Client mode has special treatment. */ if (bdc->client) { /* Disable connection event if any. */ - THREAD_OFF(bdc->connectev); + EVENT_OFF(bdc->connectev); /* Normal treatment on shutdown. */ if (bglobal.bg_shutdown) @@ -680,10 +680,10 @@ static void bfd_dplane_ctx_free(struct bfd_dplane_ctx *bdc) /* Attempt reconnection. */ socket_close(&bdc->sock); - THREAD_OFF(bdc->inbufev); - THREAD_OFF(bdc->outbufev); - thread_add_timer(master, bfd_dplane_client_connect, bdc, 3, - &bdc->connectev); + EVENT_OFF(bdc->inbufev); + EVENT_OFF(bdc->outbufev); + event_add_timer(master, bfd_dplane_client_connect, bdc, 3, + &bdc->connectev); return; } @@ -699,8 +699,8 @@ free_resources: socket_close(&bdc->sock); stream_free(bdc->inbuf); stream_free(bdc->outbuf); - THREAD_OFF(bdc->inbufev); - THREAD_OFF(bdc->outbufev); + EVENT_OFF(bdc->inbufev); + EVENT_OFF(bdc->outbufev); XFREE(MTYPE_BFDD_DPLANE_CTX, bdc); } @@ -819,9 +819,9 @@ static uint16_t bfd_dplane_request_counters(const struct bfd_session *bs) /* * Data plane listening socket. */ -static void bfd_dplane_accept(struct thread *t) +static void bfd_dplane_accept(struct event *t) { - struct bfd_global *bg = THREAD_ARG(t); + struct bfd_global *bg = EVENT_ARG(t); struct bfd_dplane_ctx *bdc; int sock; @@ -840,8 +840,8 @@ static void bfd_dplane_accept(struct thread *t) zlog_debug("%s: new data plane client connected", __func__); reschedule_and_return: - thread_add_read(master, bfd_dplane_accept, bg, bg->bg_dplane_sock, - &bglobal.bg_dplane_sockev); + event_add_read(master, bfd_dplane_accept, bg, bg->bg_dplane_sock, + &bglobal.bg_dplane_sockev); } /* @@ -856,7 +856,7 @@ static void _bfd_dplane_client_bootstrap(struct bfd_dplane_ctx *bdc) stream_reset(bdc->outbuf); /* Ask for read notifications. */ - thread_add_read(master, bfd_dplane_read, bdc, bdc->sock, &bdc->inbufev); + event_add_read(master, bfd_dplane_read, bdc, bdc->sock, &bdc->inbufev); /* Remove all sessions then register again to send them all. */ bfd_key_iterate(_bfd_session_unregister_dplane, bdc); @@ -899,9 +899,9 @@ static bool bfd_dplane_client_connecting(struct bfd_dplane_ctx *bdc) } } -static void bfd_dplane_client_connect(struct thread *t) +static void bfd_dplane_client_connect(struct event *t) { - struct bfd_dplane_ctx *bdc = THREAD_ARG(t); + struct bfd_dplane_ctx *bdc = EVENT_ARG(t); int rv, sock; socklen_t rvlen = sizeof(rv); @@ -938,8 +938,8 @@ static void bfd_dplane_client_connect(struct thread *t) /* If we are not connected yet, ask for write notifications. */ bdc->connecting = true; - thread_add_write(master, bfd_dplane_write, bdc, bdc->sock, - &bdc->outbufev); + event_add_write(master, bfd_dplane_write, bdc, bdc->sock, + &bdc->outbufev); } else { if (bglobal.debug_dplane) zlog_debug("%s: server connection: %d", __func__, sock); @@ -949,11 +949,11 @@ static void bfd_dplane_client_connect(struct thread *t) } reschedule_connect: - THREAD_OFF(bdc->inbufev); - THREAD_OFF(bdc->outbufev); + EVENT_OFF(bdc->inbufev); + EVENT_OFF(bdc->outbufev); socket_close(&sock); - thread_add_timer(master, bfd_dplane_client_connect, bdc, 3, - &bdc->connectev); + event_add_timer(master, bfd_dplane_client_connect, bdc, 3, + &bdc->connectev); } static void bfd_dplane_client_init(const struct sockaddr *sa, socklen_t salen) @@ -974,8 +974,8 @@ static void bfd_dplane_client_init(const struct sockaddr *sa, socklen_t salen) bdc->client = true; - thread_add_timer(master, bfd_dplane_client_connect, bdc, 0, - &bdc->connectev); + event_add_timer(master, bfd_dplane_client_connect, bdc, 0, + &bdc->connectev); /* Insert into data plane lists. */ TAILQ_INSERT_TAIL(&bglobal.bg_dplaneq, bdc, entry); @@ -997,7 +997,7 @@ static int bfd_dplane_finish_late(void) bfd_dplane_ctx_free(bdc); /* Cancel accept thread and close socket. */ - THREAD_OFF(bglobal.bg_dplane_sockev); + EVENT_OFF(bglobal.bg_dplane_sockev); close(bglobal.bg_dplane_sock); return 0; @@ -1067,8 +1067,8 @@ void bfd_dplane_init(const struct sockaddr *sa, socklen_t salen, bool client) } bglobal.bg_dplane_sock = sock; - thread_add_read(master, bfd_dplane_accept, &bglobal, sock, - &bglobal.bg_dplane_sockev); + event_add_read(master, bfd_dplane_accept, &bglobal, sock, + &bglobal.bg_dplane_sockev); } int bfd_dplane_add_session(struct bfd_session *bs) diff --git a/bfdd/event.c b/bfdd/event.c index 5a9ae39c3e..e797e71f05 100644 --- a/bfdd/event.c +++ b/bfdd/event.c @@ -36,8 +36,8 @@ void bfd_recvtimer_update(struct bfd_session *bs) tv_normalize(&tv); - thread_add_timer_tv(master, bfd_recvtimer_cb, bs, &tv, - &bs->recvtimer_ev); + event_add_timer_tv(master, bfd_recvtimer_cb, bs, &tv, + &bs->recvtimer_ev); } void bfd_echo_recvtimer_update(struct bfd_session *bs) @@ -54,8 +54,8 @@ void bfd_echo_recvtimer_update(struct bfd_session *bs) tv_normalize(&tv); - thread_add_timer_tv(master, bfd_echo_recvtimer_cb, bs, &tv, - &bs->echo_recvtimer_ev); + event_add_timer_tv(master, bfd_echo_recvtimer_cb, bs, &tv, + &bs->echo_recvtimer_ev); } void bfd_xmttimer_update(struct bfd_session *bs, uint64_t jitter) @@ -72,7 +72,7 @@ void bfd_xmttimer_update(struct bfd_session *bs, uint64_t jitter) tv_normalize(&tv); - thread_add_timer_tv(master, bfd_xmt_cb, bs, &tv, &bs->xmttimer_ev); + event_add_timer_tv(master, bfd_xmt_cb, bs, &tv, &bs->xmttimer_ev); } void bfd_echo_xmttimer_update(struct bfd_session *bs, uint64_t jitter) @@ -89,26 +89,26 @@ void bfd_echo_xmttimer_update(struct bfd_session *bs, uint64_t jitter) tv_normalize(&tv); - thread_add_timer_tv(master, bfd_echo_xmt_cb, bs, &tv, - &bs->echo_xmttimer_ev); + event_add_timer_tv(master, bfd_echo_xmt_cb, bs, &tv, + &bs->echo_xmttimer_ev); } void bfd_recvtimer_delete(struct bfd_session *bs) { - THREAD_OFF(bs->recvtimer_ev); + EVENT_OFF(bs->recvtimer_ev); } void bfd_echo_recvtimer_delete(struct bfd_session *bs) { - THREAD_OFF(bs->echo_recvtimer_ev); + EVENT_OFF(bs->echo_recvtimer_ev); } void bfd_xmttimer_delete(struct bfd_session *bs) { - THREAD_OFF(bs->xmttimer_ev); + EVENT_OFF(bs->xmttimer_ev); } void bfd_echo_xmttimer_delete(struct bfd_session *bs) { - THREAD_OFF(bs->echo_xmttimer_ev); + EVENT_OFF(bs->echo_xmttimer_ev); } diff --git a/bgpd/bgp_advertise.c b/bgpd/bgp_advertise.c index 3469d129e4..9686b08a98 100644 --- a/bgpd/bgp_advertise.c +++ b/bgpd/bgp_advertise.c @@ -9,7 +9,7 @@ #include "memory.h" #include "prefix.h" #include "hash.h" -#include "thread.h" +#include "frrevent.h" #include "queue.h" #include "filter.h" diff --git a/bgpd/bgp_bfd.c b/bgpd/bgp_bfd.c index 4a81b69ced..a51bcb1a1a 100644 --- a/bgpd/bgp_bfd.c +++ b/bgpd/bgp_bfd.c @@ -11,7 +11,7 @@ #include "linklist.h" #include "memory.h" #include "prefix.h" -#include "thread.h" +#include "frrevent.h" #include "buffer.h" #include "stream.h" #include "vrf.h" @@ -609,7 +609,7 @@ DEFUN(no_neighbor_bfd_profile, no_neighbor_bfd_profile_cmd, } #endif /* HAVE_BFDD */ -void bgp_bfd_init(struct thread_master *tm) +void bgp_bfd_init(struct event_loop *tm) { /* Initialize BFD client functions */ bfd_protocol_integration_init(zclient, tm); diff --git a/bgpd/bgp_bfd.h b/bgpd/bgp_bfd.h index c4045d4745..61b4b76605 100644 --- a/bgpd/bgp_bfd.h +++ b/bgpd/bgp_bfd.h @@ -12,7 +12,7 @@ ((((peer)->sort == BGP_PEER_IBGP) && !(peer)->shared_network) \ || is_ebgp_multihop_configured((peer))) -extern void bgp_bfd_init(struct thread_master *tm); +extern void bgp_bfd_init(struct event_loop *tm); extern void bgp_bfd_peer_config_write(struct vty *vty, const struct peer *peer, const char *addr); diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c index 40a27cad70..73dbf4ab2b 100644 --- a/bgpd/bgp_bmp.c +++ b/bgpd/bgp_bmp.c @@ -11,7 +11,7 @@ #include "sockunion.h" #include "command.h" #include "prefix.h" -#include "thread.h" +#include "frrevent.h" #include "linklist.h" #include "queue.h" #include "pullwr.h" @@ -1335,17 +1335,17 @@ static void bmp_stat_put_u32(struct stream *s, size_t *cnt, uint16_t type, (*cnt)++; } -static void bmp_stats(struct thread *thread) +static void bmp_stats(struct event *thread) { - struct bmp_targets *bt = THREAD_ARG(thread); + struct bmp_targets *bt = EVENT_ARG(thread); struct stream *s; struct peer *peer; struct listnode *node; struct timeval tv; if (bt->stat_msec) - thread_add_timer_msec(bm->master, bmp_stats, bt, bt->stat_msec, - &bt->t_stats); + event_add_timer_msec(bm->master, bmp_stats, bt, bt->stat_msec, + &bt->t_stats); gettimeofday(&tv, NULL); @@ -1388,9 +1388,9 @@ static void bmp_stats(struct thread *thread) } /* read from the BMP socket to detect session termination */ -static void bmp_read(struct thread *t) +static void bmp_read(struct event *t) { - struct bmp *bmp = THREAD_ARG(t); + struct bmp *bmp = EVENT_ARG(t); char buf[1024]; ssize_t n; @@ -1409,7 +1409,7 @@ static void bmp_read(struct thread *t) return; } - thread_add_read(bm->master, bmp_read, bmp, bmp->socket, &bmp->t_read); + event_add_read(bm->master, bmp_read, bmp, bmp->socket, &bmp->t_read); } static struct bmp *bmp_open(struct bmp_targets *bt, int bmp_sock) @@ -1485,21 +1485,21 @@ static struct bmp *bmp_open(struct bmp_targets *bt, int bmp_sock) bmp->state = BMP_PeerUp; bmp->pullwr = pullwr_new(bm->master, bmp_sock, bmp, bmp_wrfill, bmp_wrerr); - thread_add_read(bm->master, bmp_read, bmp, bmp_sock, &bmp->t_read); + event_add_read(bm->master, bmp_read, bmp, bmp_sock, &bmp->t_read); bmp_send_initiation(bmp); return bmp; } /* Accept BMP connection. */ -static void bmp_accept(struct thread *thread) +static void bmp_accept(struct event *thread) { union sockunion su; - struct bmp_listener *bl = THREAD_ARG(thread); + struct bmp_listener *bl = EVENT_ARG(thread); int bmp_sock; /* We continue hearing BMP socket. */ - thread_add_read(bm->master, bmp_accept, bl, bl->sock, &bl->t_accept); + event_add_read(bm->master, bmp_accept, bl, bl->sock, &bl->t_accept); memset(&su, 0, sizeof(union sockunion)); @@ -1517,7 +1517,7 @@ static void bmp_close(struct bmp *bmp) struct bmp_queue_entry *bqe; struct bmp_mirrorq *bmq; - THREAD_OFF(bmp->t_read); + EVENT_OFF(bmp->t_read); if (bmp->active) bmp_active_disconnected(bmp->active); @@ -1529,7 +1529,7 @@ static void bmp_close(struct bmp *bmp) if (!bqe->refcount) XFREE(MTYPE_BMP_QUEUE, bqe); - THREAD_OFF(bmp->t_read); + EVENT_OFF(bmp->t_read); pullwr_del(bmp->pullwr); close(bmp->socket); } @@ -1644,7 +1644,7 @@ static void bmp_targets_put(struct bmp_targets *bt) struct bmp *bmp; struct bmp_active *ba; - THREAD_OFF(bt->t_stats); + EVENT_OFF(bt->t_stats); frr_each_safe (bmp_actives, &bt->actives, ba) bmp_active_put(ba); @@ -1721,7 +1721,7 @@ static void bmp_listener_start(struct bmp_listener *bl) goto out_sock; bl->sock = sock; - thread_add_read(bm->master, bmp_accept, bl, sock, &bl->t_accept); + event_add_read(bm->master, bmp_accept, bl, sock, &bl->t_accept); return; out_sock: close(sock); @@ -1729,7 +1729,7 @@ out_sock: static void bmp_listener_stop(struct bmp_listener *bl) { - THREAD_OFF(bl->t_accept); + EVENT_OFF(bl->t_accept); if (bl->sock != -1) close(bl->sock); @@ -1768,9 +1768,9 @@ static struct bmp_active *bmp_active_get(struct bmp_targets *bt, static void bmp_active_put(struct bmp_active *ba) { - THREAD_OFF(ba->t_timer); - THREAD_OFF(ba->t_read); - THREAD_OFF(ba->t_write); + EVENT_OFF(ba->t_timer); + EVENT_OFF(ba->t_read); + EVENT_OFF(ba->t_write); bmp_actives_del(&ba->targets->actives, ba); @@ -1902,18 +1902,18 @@ static void bmp_active_resolved(struct resolver_query *resq, const char *errstr, bmp_active_connect(ba); } -static void bmp_active_thread(struct thread *t) +static void bmp_active_thread(struct event *t) { - struct bmp_active *ba = THREAD_ARG(t); + struct bmp_active *ba = EVENT_ARG(t); socklen_t slen; int status, ret; vrf_id_t vrf_id; /* all 3 end up here, though only timer or read+write are active * at a time */ - THREAD_OFF(ba->t_timer); - THREAD_OFF(ba->t_read); - THREAD_OFF(ba->t_write); + EVENT_OFF(ba->t_timer); + EVENT_OFF(ba->t_read); + EVENT_OFF(ba->t_write); ba->last_err = NULL; @@ -1967,9 +1967,9 @@ static void bmp_active_disconnected(struct bmp_active *ba) static void bmp_active_setup(struct bmp_active *ba) { - THREAD_OFF(ba->t_timer); - THREAD_OFF(ba->t_read); - THREAD_OFF(ba->t_write); + EVENT_OFF(ba->t_timer); + EVENT_OFF(ba->t_read); + EVENT_OFF(ba->t_write); if (ba->bmp) return; @@ -1980,12 +1980,12 @@ static void bmp_active_setup(struct bmp_active *ba) ba->curretry = ba->maxretry; if (ba->socket == -1) - thread_add_timer_msec(bm->master, bmp_active_thread, ba, - ba->curretry, &ba->t_timer); + event_add_timer_msec(bm->master, bmp_active_thread, ba, + ba->curretry, &ba->t_timer); else { - thread_add_read(bm->master, bmp_active_thread, ba, ba->socket, - &ba->t_read); - thread_add_write(bm->master, bmp_active_thread, ba, ba->socket, + event_add_read(bm->master, bmp_active_thread, ba, ba->socket, + &ba->t_read); + event_add_write(bm->master, bmp_active_thread, ba, ba->socket, &ba->t_write); } } @@ -2190,7 +2190,7 @@ DEFPY(bmp_stats_cfg, { VTY_DECLVAR_CONTEXT_SUB(bmp_targets, bt); - THREAD_OFF(bt->t_stats); + EVENT_OFF(bt->t_stats); if (no) bt->stat_msec = 0; else if (interval_str) @@ -2199,8 +2199,8 @@ DEFPY(bmp_stats_cfg, bt->stat_msec = BMP_STAT_DEFAULT_TIMER; if (bt->stat_msec) - thread_add_timer_msec(bm->master, bmp_stats, bt, bt->stat_msec, - &bt->t_stats); + event_add_timer_msec(bm->master, bmp_stats, bt, bt->stat_msec, + &bt->t_stats); return CMD_SUCCESS; } @@ -2408,7 +2408,7 @@ DEFPY(show_bmp, uptime[0] = '\0'; if (ba->t_timer) { - long trem = thread_timer_remain_second( + long trem = event_timer_remain_second( ba->t_timer); peer_uptime(monotime(NULL) - trem, @@ -2526,7 +2526,7 @@ static int bmp_config_write(struct bgp *bgp, struct vty *vty) return 0; } -static int bgp_bmp_init(struct thread_master *tm) +static int bgp_bmp_init(struct event_loop *tm) { install_node(&bmp_node); install_default(BMP_NODE); diff --git a/bgpd/bgp_bmp.h b/bgpd/bgp_bmp.h index 0c909e139b..ab7463fadc 100644 --- a/bgpd/bgp_bmp.h +++ b/bgpd/bgp_bmp.h @@ -112,7 +112,7 @@ struct bmp { int socket; char remote[SU_ADDRSTRLEN + 6]; - struct thread *t_read; + struct event *t_read; struct pullwr *pullwr; @@ -176,7 +176,7 @@ struct bmp_active { union sockunion addrs[8]; int socket; const char *last_err; - struct thread *t_timer, *t_read, *t_write; + struct event *t_timer, *t_read, *t_write; }; /* config & state for passive / listening sockets */ @@ -190,7 +190,7 @@ struct bmp_listener { union sockunion addr; int port; - struct thread *t_accept; + struct event *t_accept; int sock; }; @@ -226,7 +226,7 @@ struct bmp_targets { struct bmp_actives_head actives; - struct thread *t_stats; + struct event *t_stats; struct bmp_session_head sessions; struct bmp_qhash_head updhash; diff --git a/bgpd/bgp_conditional_adv.c b/bgpd/bgp_conditional_adv.c index 051e336e52..53652f7dce 100644 --- a/bgpd/bgp_conditional_adv.c +++ b/bgpd/bgp_conditional_adv.c @@ -150,7 +150,7 @@ static void bgp_conditional_adv_routes(struct peer *peer, afi_t afi, /* Handler of conditional advertisement timer event. * Each route in the condition-map is evaluated. */ -static void bgp_conditional_adv_timer(struct thread *t) +static void bgp_conditional_adv_timer(struct event *t) { afi_t afi; safi_t safi; @@ -165,11 +165,11 @@ static void bgp_conditional_adv_timer(struct thread *t) route_map_result_t ret; bool advmap_table_changed = false; - bgp = THREAD_ARG(t); + bgp = EVENT_ARG(t); assert(bgp); - thread_add_timer(bm->master, bgp_conditional_adv_timer, bgp, - bgp->condition_check_period, &bgp->t_condition_check); + event_add_timer(bm->master, bgp_conditional_adv_timer, bgp, + bgp->condition_check_period, &bgp->t_condition_check); /* loop through each peer and check if we have peers with * advmap_table_change attribute set, to make sure we send @@ -328,9 +328,9 @@ void bgp_conditional_adv_enable(struct peer *peer, afi_t afi, safi_t safi) } /* Register for conditional routes polling timer */ - if (!thread_is_scheduled(bgp->t_condition_check)) - thread_add_timer(bm->master, bgp_conditional_adv_timer, bgp, 0, - &bgp->t_condition_check); + if (!event_is_scheduled(bgp->t_condition_check)) + event_add_timer(bm->master, bgp_conditional_adv_timer, bgp, 0, + &bgp->t_condition_check); } void bgp_conditional_adv_disable(struct peer *peer, afi_t afi, safi_t safi) @@ -351,7 +351,7 @@ void bgp_conditional_adv_disable(struct peer *peer, afi_t afi, safi_t safi) } /* Last filter removed. So cancel conditional routes polling thread. */ - THREAD_OFF(bgp->t_condition_check); + EVENT_OFF(bgp->t_condition_check); } static void peer_advertise_map_filter_update(struct peer *peer, afi_t afi, diff --git a/bgpd/bgp_damp.c b/bgpd/bgp_damp.c index 54bbf9b9ca..a6d0e74dc0 100644 --- a/bgpd/bgp_damp.c +++ b/bgpd/bgp_damp.c @@ -10,7 +10,7 @@ #include "memory.h" #include "command.h" #include "log.h" -#include "thread.h" +#include "frrevent.h" #include "queue.h" #include "filter.h" @@ -98,17 +98,17 @@ int bgp_damp_decay(time_t tdiff, int penalty, struct bgp_damp_config *bdc) /* Handler of reuse timer event. Each route in the current reuse-list is evaluated. RFC2439 Section 4.8.7. */ -static void bgp_reuse_timer(struct thread *t) +static void bgp_reuse_timer(struct event *t) { struct bgp_damp_info *bdi; struct bgp_damp_info *next; time_t t_now, t_diff; - struct bgp_damp_config *bdc = THREAD_ARG(t); + struct bgp_damp_config *bdc = EVENT_ARG(t); bdc->t_reuse = NULL; - thread_add_timer(bm->master, bgp_reuse_timer, bdc, DELTA_REUSE, - &bdc->t_reuse); + event_add_timer(bm->master, bgp_reuse_timer, bdc, DELTA_REUSE, + &bdc->t_reuse); t_now = monotime(NULL); @@ -395,8 +395,8 @@ int bgp_damp_enable(struct bgp *bgp, afi_t afi, safi_t safi, time_t half, bgp_damp_parameter_set(half, reuse, suppress, max, bdc); /* Register reuse timer. */ - thread_add_timer(bm->master, bgp_reuse_timer, bdc, DELTA_REUSE, - &bdc->t_reuse); + event_add_timer(bm->master, bgp_reuse_timer, bdc, DELTA_REUSE, + &bdc->t_reuse); return 0; } @@ -451,7 +451,7 @@ int bgp_damp_disable(struct bgp *bgp, afi_t afi, safi_t safi) return 0; /* Cancel reuse event. */ - THREAD_OFF(bdc->t_reuse); + EVENT_OFF(bdc->t_reuse); /* Clean BGP dampening information. */ bgp_damp_info_clean(afi, safi); diff --git a/bgpd/bgp_damp.h b/bgpd/bgp_damp.h index 129e444164..5708e6fd55 100644 --- a/bgpd/bgp_damp.h +++ b/bgpd/bgp_damp.h @@ -92,7 +92,7 @@ struct bgp_damp_config { struct bgp_damp_info *no_reuse_list; /* Reuse timer thread per-set base. */ - struct thread *t_reuse; + struct event *t_reuse; afi_t afi; safi_t safi; diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c index 794dd7b8b6..c78e740ec9 100644 --- a/bgpd/bgp_dump.c +++ b/bgpd/bgp_dump.c @@ -10,7 +10,7 @@ #include "sockunion.h" #include "command.h" #include "prefix.h" -#include "thread.h" +#include "frrevent.h" #include "linklist.h" #include "queue.h" #include "memory.h" @@ -69,11 +69,11 @@ struct bgp_dump { char *interval_str; - struct thread *t_interval; + struct event *t_interval; }; static int bgp_dump_unset(struct bgp_dump *bgp_dump); -static void bgp_dump_interval_func(struct thread *); +static void bgp_dump_interval_func(struct event *); /* BGP packet dump output buffer. */ struct stream *bgp_dump_obuf; @@ -154,13 +154,13 @@ static int bgp_dump_interval_add(struct bgp_dump *bgp_dump, int interval) interval = interval - secs_into_day % interval; /* always > 0 */ } - thread_add_timer(bm->master, bgp_dump_interval_func, bgp_dump, - interval, &bgp_dump->t_interval); + event_add_timer(bm->master, bgp_dump_interval_func, bgp_dump, + interval, &bgp_dump->t_interval); } else { /* One-off dump: execute immediately, don't affect any scheduled * dumps */ - thread_add_event(bm->master, bgp_dump_interval_func, bgp_dump, - 0, &bgp_dump->t_interval); + event_add_event(bm->master, bgp_dump_interval_func, bgp_dump, 0, + &bgp_dump->t_interval); } return 0; @@ -428,10 +428,10 @@ static unsigned int bgp_dump_routes_func(int afi, int first_run, return seq; } -static void bgp_dump_interval_func(struct thread *t) +static void bgp_dump_interval_func(struct event *t) { struct bgp_dump *bgp_dump; - bgp_dump = THREAD_ARG(t); + bgp_dump = EVENT_ARG(t); /* Reschedule dump even if file couldn't be opened this time... */ if (bgp_dump_open_file(bgp_dump) != NULL) { @@ -691,7 +691,7 @@ static int bgp_dump_unset(struct bgp_dump *bgp_dump) } /* Removing interval event. */ - THREAD_OFF(bgp_dump->t_interval); + EVENT_OFF(bgp_dump->t_interval); bgp_dump->interval = 0; diff --git a/bgpd/bgp_evpn_mh.c b/bgpd/bgp_evpn_mh.c index 1f3dfd656e..d821d4d582 100644 --- a/bgpd/bgp_evpn_mh.c +++ b/bgpd/bgp_evpn_mh.c @@ -65,7 +65,7 @@ static void bgp_evpn_mac_update_on_es_local_chg(struct bgp_evpn_es *es, bool is_local); esi_t zero_esi_buf, *zero_esi = &zero_esi_buf; -static void bgp_evpn_run_consistency_checks(struct thread *t); +static void bgp_evpn_run_consistency_checks(struct event *t); static void bgp_evpn_path_nh_info_free(struct bgp_path_evpn_nh_info *nh_info); static void bgp_evpn_path_nh_unlink(struct bgp_path_evpn_nh_info *nh_info); @@ -4174,9 +4174,9 @@ static void bgp_evpn_es_cons_checks_timer_start(void) if (BGP_DEBUG(evpn_mh, EVPN_MH_ES)) zlog_debug("periodic consistency checking started"); - thread_add_timer(bm->master, bgp_evpn_run_consistency_checks, NULL, - BGP_EVPN_CONS_CHECK_INTERVAL, - &bgp_mh_info->t_cons_check); + event_add_timer(bm->master, bgp_evpn_run_consistency_checks, NULL, + BGP_EVPN_CONS_CHECK_INTERVAL, + &bgp_mh_info->t_cons_check); } /* queue up the es for background consistency checks */ @@ -4360,7 +4360,7 @@ static uint32_t bgp_evpn_es_run_consistency_checks(struct bgp_evpn_es *es) return proc_cnt; } -static void bgp_evpn_run_consistency_checks(struct thread *t) +static void bgp_evpn_run_consistency_checks(struct event *t) { int proc_cnt = 0; struct listnode *node; @@ -4380,7 +4380,7 @@ static void bgp_evpn_run_consistency_checks(struct thread *t) } /* restart the timer */ - thread_add_timer(bm->master, bgp_evpn_run_consistency_checks, NULL, + event_add_timer(bm->master, bgp_evpn_run_consistency_checks, NULL, BGP_EVPN_CONS_CHECK_INTERVAL, &bgp_mh_info->t_cons_check); } @@ -4936,7 +4936,7 @@ void bgp_evpn_mh_finish(void) bgp_evpn_es_local_info_clear(es, true); } if (bgp_mh_info->t_cons_check) - THREAD_OFF(bgp_mh_info->t_cons_check); + EVENT_OFF(bgp_mh_info->t_cons_check); list_delete(&bgp_mh_info->local_es_list); list_delete(&bgp_mh_info->pend_es_list); list_delete(&bgp_mh_info->ead_es_export_rtl); diff --git a/bgpd/bgp_evpn_mh.h b/bgpd/bgp_evpn_mh.h index 613fece4d4..ee1f74989b 100644 --- a/bgpd/bgp_evpn_mh.h +++ b/bgpd/bgp_evpn_mh.h @@ -299,7 +299,7 @@ struct bgp_evpn_mh_info { /* List of ESs with pending/periodic processing */ struct list *pend_es_list; /* periodic timer for running background consistency checks */ - struct thread *t_cons_check; + struct event *t_cons_check; /* config knobs for optimizing or interop */ /* Generate EAD-EVI routes even if the ES is oper-down. This can be diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c index aa9a6a8602..a289d3d67a 100644 --- a/bgpd/bgp_fsm.c +++ b/bgpd/bgp_fsm.c @@ -9,7 +9,7 @@ #include "linklist.h" #include "prefix.h" #include "sockunion.h" -#include "thread.h" +#include "frrevent.h" #include "log.h" #include "stream.h" #include "ringbuf.h" @@ -82,13 +82,13 @@ static const char *const bgp_event_str[] = { function. */ /* BGP event function. */ -void bgp_event(struct thread *); +void bgp_event(struct event *event); /* BGP thread functions. */ -static void bgp_start_timer(struct thread *); -static void bgp_connect_timer(struct thread *); -static void bgp_holdtime_timer(struct thread *); -static void bgp_delayopen_timer(struct thread *); +static void bgp_start_timer(struct event *event); +static void bgp_connect_timer(struct event *event); +static void bgp_holdtime_timer(struct event *event); +static void bgp_delayopen_timer(struct event *event); /* BGP FSM functions. */ static enum bgp_fsm_state_progress bgp_start(struct peer *); @@ -169,17 +169,17 @@ static struct peer *peer_xfer_conn(struct peer *from_peer) */ bgp_keepalives_off(from_peer); - THREAD_OFF(peer->t_routeadv); - THREAD_OFF(peer->t_connect); - THREAD_OFF(peer->t_delayopen); - THREAD_OFF(peer->t_connect_check_r); - THREAD_OFF(peer->t_connect_check_w); - THREAD_OFF(from_peer->t_routeadv); - THREAD_OFF(from_peer->t_connect); - THREAD_OFF(from_peer->t_delayopen); - THREAD_OFF(from_peer->t_connect_check_r); - THREAD_OFF(from_peer->t_connect_check_w); - THREAD_OFF(from_peer->t_process_packet); + EVENT_OFF(peer->t_routeadv); + EVENT_OFF(peer->t_connect); + EVENT_OFF(peer->t_delayopen); + EVENT_OFF(peer->t_connect_check_r); + EVENT_OFF(peer->t_connect_check_w); + EVENT_OFF(from_peer->t_routeadv); + EVENT_OFF(from_peer->t_connect); + EVENT_OFF(from_peer->t_delayopen); + EVENT_OFF(from_peer->t_connect_check_r); + EVENT_OFF(from_peer->t_connect_check_w); + EVENT_OFF(from_peer->t_process_packet); /* * At this point in time, it is possible that there are packets pending @@ -343,8 +343,8 @@ static struct peer *peer_xfer_conn(struct peer *from_peer) bgp_reads_on(peer); bgp_writes_on(peer); - thread_add_event(bm->master, bgp_process_packet, peer, 0, - &peer->t_process_packet); + event_add_event(bm->master, bgp_process_packet, peer, 0, + &peer->t_process_packet); return (peer); } @@ -364,23 +364,23 @@ void bgp_timer_set(struct peer *peer) inactive. All other timer must be turned off */ if (BGP_PEER_START_SUPPRESSED(peer) || !peer_active(peer) || peer->bgp->vrf_id == VRF_UNKNOWN) { - THREAD_OFF(peer->t_start); + EVENT_OFF(peer->t_start); } else { BGP_TIMER_ON(peer->t_start, bgp_start_timer, peer->v_start); } - THREAD_OFF(peer->t_connect); - THREAD_OFF(peer->t_holdtime); + EVENT_OFF(peer->t_connect); + EVENT_OFF(peer->t_holdtime); bgp_keepalives_off(peer); - THREAD_OFF(peer->t_routeadv); - THREAD_OFF(peer->t_delayopen); + EVENT_OFF(peer->t_routeadv); + EVENT_OFF(peer->t_delayopen); break; case Connect: /* After start timer is expired, the peer moves to Connect status. Make sure start timer is off and connect timer is on. */ - THREAD_OFF(peer->t_start); + EVENT_OFF(peer->t_start); if (CHECK_FLAG(peer->flags, PEER_FLAG_TIMER_DELAYOPEN)) BGP_TIMER_ON(peer->t_connect, bgp_connect_timer, (peer->v_delayopen + peer->v_connect)); @@ -388,19 +388,19 @@ void bgp_timer_set(struct peer *peer) BGP_TIMER_ON(peer->t_connect, bgp_connect_timer, peer->v_connect); - THREAD_OFF(peer->t_holdtime); + EVENT_OFF(peer->t_holdtime); bgp_keepalives_off(peer); - THREAD_OFF(peer->t_routeadv); + EVENT_OFF(peer->t_routeadv); break; case Active: /* Active is waiting connection from remote peer. And if connect timer is expired, change status to Connect. */ - THREAD_OFF(peer->t_start); + EVENT_OFF(peer->t_start); /* If peer is passive mode, do not set connect timer. */ if (CHECK_FLAG(peer->flags, PEER_FLAG_PASSIVE) || CHECK_FLAG(peer->sflags, PEER_STATUS_NSF_WAIT)) { - THREAD_OFF(peer->t_connect); + EVENT_OFF(peer->t_connect); } else { if (CHECK_FLAG(peer->flags, PEER_FLAG_TIMER_DELAYOPEN)) BGP_TIMER_ON( @@ -410,30 +410,30 @@ void bgp_timer_set(struct peer *peer) BGP_TIMER_ON(peer->t_connect, bgp_connect_timer, peer->v_connect); } - THREAD_OFF(peer->t_holdtime); + EVENT_OFF(peer->t_holdtime); bgp_keepalives_off(peer); - THREAD_OFF(peer->t_routeadv); + EVENT_OFF(peer->t_routeadv); break; case OpenSent: /* OpenSent status. */ - THREAD_OFF(peer->t_start); - THREAD_OFF(peer->t_connect); + EVENT_OFF(peer->t_start); + EVENT_OFF(peer->t_connect); if (peer->v_holdtime != 0) { BGP_TIMER_ON(peer->t_holdtime, bgp_holdtime_timer, peer->v_holdtime); } else { - THREAD_OFF(peer->t_holdtime); + EVENT_OFF(peer->t_holdtime); } bgp_keepalives_off(peer); - THREAD_OFF(peer->t_routeadv); - THREAD_OFF(peer->t_delayopen); + EVENT_OFF(peer->t_routeadv); + EVENT_OFF(peer->t_delayopen); break; case OpenConfirm: /* OpenConfirm status. */ - THREAD_OFF(peer->t_start); - THREAD_OFF(peer->t_connect); + EVENT_OFF(peer->t_start); + EVENT_OFF(peer->t_connect); /* * If the negotiated Hold Time value is zero, then the Hold Time @@ -441,7 +441,7 @@ void bgp_timer_set(struct peer *peer) * Additionally if a different hold timer has been negotiated * than we must stop then start the timer again */ - THREAD_OFF(peer->t_holdtime); + EVENT_OFF(peer->t_holdtime); if (peer->v_holdtime == 0) bgp_keepalives_off(peer); else { @@ -449,16 +449,16 @@ void bgp_timer_set(struct peer *peer) peer->v_holdtime); bgp_keepalives_on(peer); } - THREAD_OFF(peer->t_routeadv); - THREAD_OFF(peer->t_delayopen); + EVENT_OFF(peer->t_routeadv); + EVENT_OFF(peer->t_delayopen); break; case Established: /* In Established status start and connect timer is turned off. */ - THREAD_OFF(peer->t_start); - THREAD_OFF(peer->t_connect); - THREAD_OFF(peer->t_delayopen); + EVENT_OFF(peer->t_start); + EVENT_OFF(peer->t_connect); + EVENT_OFF(peer->t_delayopen); /* * Same as OpenConfirm, if holdtime is zero then both holdtime @@ -466,7 +466,7 @@ void bgp_timer_set(struct peer *peer) * Additionally if a different hold timer has been negotiated * then we must stop then start the timer again */ - THREAD_OFF(peer->t_holdtime); + EVENT_OFF(peer->t_holdtime); if (peer->v_holdtime == 0) bgp_keepalives_off(peer); else { @@ -476,22 +476,22 @@ void bgp_timer_set(struct peer *peer) } break; case Deleted: - THREAD_OFF(peer->t_gr_restart); - THREAD_OFF(peer->t_gr_stale); + EVENT_OFF(peer->t_gr_restart); + EVENT_OFF(peer->t_gr_stale); FOREACH_AFI_SAFI (afi, safi) - THREAD_OFF(peer->t_llgr_stale[afi][safi]); + EVENT_OFF(peer->t_llgr_stale[afi][safi]); - THREAD_OFF(peer->t_pmax_restart); - THREAD_OFF(peer->t_refresh_stalepath); + EVENT_OFF(peer->t_pmax_restart); + EVENT_OFF(peer->t_refresh_stalepath); /* fallthru */ case Clearing: - THREAD_OFF(peer->t_start); - THREAD_OFF(peer->t_connect); - THREAD_OFF(peer->t_holdtime); + EVENT_OFF(peer->t_start); + EVENT_OFF(peer->t_connect); + EVENT_OFF(peer->t_holdtime); bgp_keepalives_off(peer); - THREAD_OFF(peer->t_routeadv); - THREAD_OFF(peer->t_delayopen); + EVENT_OFF(peer->t_routeadv); + EVENT_OFF(peer->t_delayopen); break; case BGP_STATUS_MAX: flog_err(EC_LIB_DEVELOPMENT, @@ -502,28 +502,28 @@ void bgp_timer_set(struct peer *peer) /* BGP start timer. This function set BGP_Start event to thread value and process event. */ -static void bgp_start_timer(struct thread *thread) +static void bgp_start_timer(struct event *thread) { struct peer *peer; - peer = THREAD_ARG(thread); + peer = EVENT_ARG(thread); if (bgp_debug_neighbor_events(peer)) zlog_debug("%s [FSM] Timer (start timer expire).", peer->host); - THREAD_VAL(thread) = BGP_Start; + EVENT_VAL(thread) = BGP_Start; bgp_event(thread); /* bgp_event unlocks peer */ } /* BGP connect retry timer. */ -static void bgp_connect_timer(struct thread *thread) +static void bgp_connect_timer(struct event *thread) { struct peer *peer; - peer = THREAD_ARG(thread); + peer = EVENT_ARG(thread); /* stop the DelayOpenTimer if it is running */ - THREAD_OFF(peer->t_delayopen); + EVENT_OFF(peer->t_delayopen); assert(!peer->t_write); assert(!peer->t_read); @@ -534,18 +534,18 @@ static void bgp_connect_timer(struct thread *thread) if (CHECK_FLAG(peer->sflags, PEER_STATUS_ACCEPT_PEER)) bgp_stop(peer); else { - THREAD_VAL(thread) = ConnectRetry_timer_expired; + EVENT_VAL(thread) = ConnectRetry_timer_expired; bgp_event(thread); /* bgp_event unlocks peer */ } } /* BGP holdtime timer. */ -static void bgp_holdtime_timer(struct thread *thread) +static void bgp_holdtime_timer(struct event *thread) { atomic_size_t inq_count; struct peer *peer; - peer = THREAD_ARG(thread); + peer = EVENT_ARG(thread); if (bgp_debug_neighbor_events(peer)) zlog_debug("%s [FSM] Timer (holdtime timer expire)", @@ -567,15 +567,15 @@ static void bgp_holdtime_timer(struct thread *thread) BGP_TIMER_ON(peer->t_holdtime, bgp_holdtime_timer, peer->v_holdtime); - THREAD_VAL(thread) = Hold_Timer_expired; + EVENT_VAL(thread) = Hold_Timer_expired; bgp_event(thread); /* bgp_event unlocks peer */ } -void bgp_routeadv_timer(struct thread *thread) +void bgp_routeadv_timer(struct event *thread) { struct peer *peer; - peer = THREAD_ARG(thread); + peer = EVENT_ARG(thread); if (bgp_debug_neighbor_events(peer)) zlog_debug("%s [FSM] Timer (routeadv timer expire)", @@ -583,8 +583,8 @@ void bgp_routeadv_timer(struct thread *thread) peer->synctime = monotime(NULL); - thread_add_timer_msec(bm->master, bgp_generate_updgrp_packets, peer, 0, - &peer->t_generate_updgrp_packets); + event_add_timer_msec(bm->master, bgp_generate_updgrp_packets, peer, 0, + &peer->t_generate_updgrp_packets); /* MRAI timer will be started again when FIFO is built, no need to * do it here. @@ -592,17 +592,17 @@ void bgp_routeadv_timer(struct thread *thread) } /* RFC 4271 DelayOpenTimer */ -void bgp_delayopen_timer(struct thread *thread) +void bgp_delayopen_timer(struct event *thread) { struct peer *peer; - peer = THREAD_ARG(thread); + peer = EVENT_ARG(thread); if (bgp_debug_neighbor_events(peer)) zlog_debug("%s [FSM] Timer (DelayOpentimer expire)", peer->host); - THREAD_VAL(thread) = DelayOpen_timer_expired; + EVENT_VAL(thread) = DelayOpen_timer_expired; bgp_event(thread); /* bgp_event unlocks peer */ } @@ -655,7 +655,7 @@ static void bgp_graceful_restart_timer_off(struct peer *peer) return; UNSET_FLAG(peer->sflags, PEER_STATUS_NSF_WAIT); - THREAD_OFF(peer->t_gr_stale); + EVENT_OFF(peer->t_gr_stale); if (peer_dynamic_neighbor(peer) && !(CHECK_FLAG(peer->flags, PEER_FLAG_DELETE))) { @@ -668,14 +668,14 @@ static void bgp_graceful_restart_timer_off(struct peer *peer) bgp_timer_set(peer); } -static void bgp_llgr_stale_timer_expire(struct thread *thread) +static void bgp_llgr_stale_timer_expire(struct event *thread) { struct peer_af *paf; struct peer *peer; afi_t afi; safi_t safi; - paf = THREAD_ARG(thread); + paf = EVENT_ARG(thread); peer = paf->peer; afi = paf->afi; @@ -770,7 +770,7 @@ static void bgp_set_llgr_stale(struct peer *peer, afi_t afi, safi_t safi) } } -static void bgp_graceful_restart_timer_expire(struct thread *thread) +static void bgp_graceful_restart_timer_expire(struct event *thread) { struct peer *peer, *tmp_peer; struct listnode *node, *nnode; @@ -778,7 +778,7 @@ static void bgp_graceful_restart_timer_expire(struct thread *thread) afi_t afi; safi_t safi; - peer = THREAD_ARG(thread); + peer = EVENT_ARG(thread); if (bgp_debug_neighbor_events(peer)) { zlog_debug("%pBP graceful restart timer expired", peer); @@ -820,10 +820,9 @@ static void bgp_graceful_restart_timer_expire(struct thread *thread) bgp_set_llgr_stale(peer, afi, safi); bgp_clear_stale_route(peer, afi, safi); - thread_add_timer(bm->master, - bgp_llgr_stale_timer_expire, paf, - peer->llgr[afi][safi].stale_time, - &peer->t_llgr_stale[afi][safi]); + event_add_timer(bm->master, bgp_llgr_stale_timer_expire, + paf, peer->llgr[afi][safi].stale_time, + &peer->t_llgr_stale[afi][safi]); for (ALL_LIST_ELEMENTS(peer->bgp->peer, node, nnode, tmp_peer)) @@ -836,13 +835,13 @@ static void bgp_graceful_restart_timer_expire(struct thread *thread) bgp_graceful_restart_timer_off(peer); } -static void bgp_graceful_stale_timer_expire(struct thread *thread) +static void bgp_graceful_stale_timer_expire(struct event *thread) { struct peer *peer; afi_t afi; safi_t safi; - peer = THREAD_ARG(thread); + peer = EVENT_ARG(thread); if (bgp_debug_neighbor_events(peer)) zlog_debug("%pBP graceful restart stalepath timer expired", @@ -855,14 +854,14 @@ static void bgp_graceful_stale_timer_expire(struct thread *thread) } /* Selection deferral timer processing function */ -static void bgp_graceful_deferral_timer_expire(struct thread *thread) +static void bgp_graceful_deferral_timer_expire(struct event *thread) { struct afi_safi_info *info; afi_t afi; safi_t safi; struct bgp *bgp; - info = THREAD_ARG(thread); + info = EVENT_ARG(thread); afi = info->afi; safi = info->safi; bgp = info->bgp; @@ -909,8 +908,8 @@ bool bgp_update_delay_configured(struct bgp *bgp) on ending the update delay. */ void bgp_update_delay_end(struct bgp *bgp) { - THREAD_OFF(bgp->t_update_delay); - THREAD_OFF(bgp->t_establish_wait); + EVENT_OFF(bgp->t_update_delay); + EVENT_OFF(bgp->t_establish_wait); /* Reset update-delay related state */ bgp->update_delay_over = 1; @@ -973,7 +972,7 @@ void bgp_start_routeadv(struct bgp *bgp) for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) { if (!peer_established(peer)) continue; - THREAD_OFF(peer->t_routeadv); + EVENT_OFF(peer->t_routeadv); BGP_TIMER_ON(peer->t_routeadv, bgp_routeadv_timer, 0); } } @@ -993,7 +992,7 @@ void bgp_adjust_routeadv(struct peer *peer) * different * duration and schedule write thread immediately. */ - THREAD_OFF(peer->t_routeadv); + EVENT_OFF(peer->t_routeadv); peer->synctime = monotime(NULL); /* If suppress fib pending is enabled, route is advertised to @@ -1025,7 +1024,7 @@ void bgp_adjust_routeadv(struct peer *peer) */ diff = difftime(nowtime, peer->last_update); if (diff > (double)peer->v_routeadv) { - THREAD_OFF(peer->t_routeadv); + EVENT_OFF(peer->t_routeadv); BGP_TIMER_ON(peer->t_routeadv, bgp_routeadv_timer, 0); return; } @@ -1047,12 +1046,12 @@ void bgp_adjust_routeadv(struct peer *peer) * (MRAI - m) < r */ if (peer->t_routeadv) - remain = thread_timer_remain_second(peer->t_routeadv); + remain = event_timer_remain_second(peer->t_routeadv); else remain = peer->v_routeadv; diff = peer->v_routeadv - diff; if (diff <= (double)remain) { - THREAD_OFF(peer->t_routeadv); + EVENT_OFF(peer->t_routeadv); BGP_TIMER_ON(peer->t_routeadv, bgp_routeadv_timer, diff); } } @@ -1125,14 +1124,14 @@ int bgp_fsm_error_subcode(int status) } /* The maxmed onstartup timer expiry callback. */ -static void bgp_maxmed_onstartup_timer(struct thread *thread) +static void bgp_maxmed_onstartup_timer(struct event *thread) { struct bgp *bgp; zlog_info("Max med on startup ended - timer expired."); - bgp = THREAD_ARG(thread); - THREAD_OFF(bgp->t_maxmed_onstartup); + bgp = EVENT_ARG(thread); + EVENT_OFF(bgp->t_maxmed_onstartup); bgp->maxmed_onstartup_over = 1; bgp_maxmed_update(bgp); @@ -1147,8 +1146,8 @@ static void bgp_maxmed_onstartup_begin(struct bgp *bgp) zlog_info("Begin maxmed onstartup mode - timer %d seconds", bgp->v_maxmed_onstartup); - thread_add_timer(bm->master, bgp_maxmed_onstartup_timer, bgp, - bgp->v_maxmed_onstartup, &bgp->t_maxmed_onstartup); + event_add_timer(bm->master, bgp_maxmed_onstartup_timer, bgp, + bgp->v_maxmed_onstartup, &bgp->t_maxmed_onstartup); if (!bgp->v_maxmed_admin) { bgp->maxmed_active = 1; @@ -1167,26 +1166,26 @@ static void bgp_maxmed_onstartup_process_status_change(struct peer *peer) } /* The update delay timer expiry callback. */ -static void bgp_update_delay_timer(struct thread *thread) +static void bgp_update_delay_timer(struct event *thread) { struct bgp *bgp; zlog_info("Update delay ended - timer expired."); - bgp = THREAD_ARG(thread); - THREAD_OFF(bgp->t_update_delay); + bgp = EVENT_ARG(thread); + EVENT_OFF(bgp->t_update_delay); bgp_update_delay_end(bgp); } /* The establish wait timer expiry callback. */ -static void bgp_establish_wait_timer(struct thread *thread) +static void bgp_establish_wait_timer(struct event *thread) { struct bgp *bgp; zlog_info("Establish wait - timer expired."); - bgp = THREAD_ARG(thread); - THREAD_OFF(bgp->t_establish_wait); + bgp = EVENT_ARG(thread); + EVENT_OFF(bgp->t_establish_wait); bgp_check_update_delay(bgp); } @@ -1206,12 +1205,12 @@ static void bgp_update_delay_begin(struct bgp *bgp) peer->update_delay_over = 0; /* Start the update-delay timer */ - thread_add_timer(bm->master, bgp_update_delay_timer, bgp, - bgp->v_update_delay, &bgp->t_update_delay); + event_add_timer(bm->master, bgp_update_delay_timer, bgp, + bgp->v_update_delay, &bgp->t_update_delay); if (bgp->v_establish_wait != bgp->v_update_delay) - thread_add_timer(bm->master, bgp_establish_wait_timer, bgp, - bgp->v_establish_wait, &bgp->t_establish_wait); + event_add_timer(bm->master, bgp_establish_wait_timer, bgp, + bgp->v_establish_wait, &bgp->t_establish_wait); frr_timestamp(3, bgp->update_delay_begin_time, sizeof(bgp->update_delay_begin_time)); @@ -1413,7 +1412,7 @@ enum bgp_fsm_state_progress bgp_stop(struct peer *peer) /* graceful restart */ if (peer->t_gr_stale) { - THREAD_OFF(peer->t_gr_stale); + EVENT_OFF(peer->t_gr_stale); if (bgp_debug_neighbor_events(peer)) zlog_debug( "%pBP graceful restart stalepath timer stopped", @@ -1443,7 +1442,7 @@ enum bgp_fsm_state_progress bgp_stop(struct peer *peer) /* Stop route-refresh stalepath timer */ if (peer->t_refresh_stalepath) { - THREAD_OFF(peer->t_refresh_stalepath); + EVENT_OFF(peer->t_refresh_stalepath); if (bgp_debug_neighbor_events(peer)) zlog_debug( @@ -1477,11 +1476,11 @@ enum bgp_fsm_state_progress bgp_stop(struct peer *peer) /* There is no pending EOR message */ if (gr_info->eor_required == 0) { if (gr_info->t_select_deferral) { - void *info = THREAD_ARG( + void *info = EVENT_ARG( gr_info->t_select_deferral); XFREE(MTYPE_TMP, info); } - THREAD_OFF(gr_info->t_select_deferral); + EVENT_OFF(gr_info->t_select_deferral); gr_info->eor_received = 0; } } @@ -1506,15 +1505,15 @@ enum bgp_fsm_state_progress bgp_stop(struct peer *peer) bgp_writes_off(peer); bgp_reads_off(peer); - THREAD_OFF(peer->t_connect_check_r); - THREAD_OFF(peer->t_connect_check_w); + EVENT_OFF(peer->t_connect_check_r); + EVENT_OFF(peer->t_connect_check_w); /* Stop all timers. */ - THREAD_OFF(peer->t_start); - THREAD_OFF(peer->t_connect); - THREAD_OFF(peer->t_holdtime); - THREAD_OFF(peer->t_routeadv); - THREAD_OFF(peer->t_delayopen); + EVENT_OFF(peer->t_start); + EVENT_OFF(peer->t_connect); + EVENT_OFF(peer->t_holdtime); + EVENT_OFF(peer->t_routeadv); + EVENT_OFF(peer->t_delayopen); /* Clear input and output buffer. */ frr_with_mutex (&peer->io_mtx) { @@ -1654,21 +1653,21 @@ bgp_stop_with_notify(struct peer *peer, uint8_t code, uint8_t sub_code) * when the connection is established. A read event is triggered when the * connection is closed. Thus we need to cancel whichever one did not occur. */ -static void bgp_connect_check(struct thread *thread) +static void bgp_connect_check(struct event *thread) { int status; socklen_t slen; int ret; struct peer *peer; - peer = THREAD_ARG(thread); + peer = EVENT_ARG(thread); assert(!CHECK_FLAG(peer->thread_flags, PEER_THREAD_READS_ON)); assert(!CHECK_FLAG(peer->thread_flags, PEER_THREAD_WRITES_ON)); assert(!peer->t_read); assert(!peer->t_write); - THREAD_OFF(peer->t_connect_check_r); - THREAD_OFF(peer->t_connect_check_w); + EVENT_OFF(peer->t_connect_check_r); + EVENT_OFF(peer->t_connect_check_w); /* Check file descriptor. */ slen = sizeof(status); @@ -1941,10 +1940,10 @@ enum bgp_fsm_state_progress bgp_start(struct peer *peer) * bgp_connect_check() as the handler for each and cancel the * unused event in that function. */ - thread_add_read(bm->master, bgp_connect_check, peer, peer->fd, - &peer->t_connect_check_r); - thread_add_write(bm->master, bgp_connect_check, peer, peer->fd, - &peer->t_connect_check_w); + event_add_read(bm->master, bgp_connect_check, peer, peer->fd, + &peer->t_connect_check_r); + event_add_write(bm->master, bgp_connect_check, peer, peer->fd, + &peer->t_connect_check_w); break; } return BGP_FSM_SUCCESS; @@ -2013,7 +2012,7 @@ static enum bgp_fsm_state_progress bgp_fsm_delayopen_timer_expire(struct peer *peer) { /* Stop the DelayOpenTimer */ - THREAD_OFF(peer->t_delayopen); + EVENT_OFF(peer->t_delayopen); /* Send open message to peer */ bgp_open_send(peer); @@ -2046,9 +2045,9 @@ static int bgp_start_deferral_timer(struct bgp *bgp, afi_t afi, safi_t safi, thread_info->safi = safi; thread_info->bgp = bgp; - thread_add_timer(bm->master, bgp_graceful_deferral_timer_expire, - thread_info, bgp->select_defer_time, - &gr_info->t_select_deferral); + event_add_timer(bm->master, bgp_graceful_deferral_timer_expire, + thread_info, bgp->select_defer_time, + &gr_info->t_select_deferral); } gr_info->eor_required++; /* Send message to RIB indicating route update pending */ @@ -2226,7 +2225,7 @@ static enum bgp_fsm_state_progress bgp_establish(struct peer *peer) else { UNSET_FLAG(peer->sflags, PEER_STATUS_NSF_MODE); if (peer->t_gr_stale) { - THREAD_OFF(peer->t_gr_stale); + EVENT_OFF(peer->t_gr_stale); if (bgp_debug_neighbor_events(peer)) zlog_debug( "%pBP graceful restart stalepath timer stopped", @@ -2235,7 +2234,7 @@ static enum bgp_fsm_state_progress bgp_establish(struct peer *peer) } if (peer->t_gr_restart) { - THREAD_OFF(peer->t_gr_restart); + EVENT_OFF(peer->t_gr_restart); if (bgp_debug_neighbor_events(peer)) zlog_debug("%pBP graceful restart timer stopped", peer); } @@ -2251,7 +2250,7 @@ static enum bgp_fsm_state_progress bgp_establish(struct peer *peer) */ FOREACH_AFI_SAFI (afi, safi) { if (peer->t_llgr_stale[afi][safi]) { - THREAD_OFF(peer->t_llgr_stale[afi][safi]); + EVENT_OFF(peer->t_llgr_stale[afi][safi]); if (bgp_debug_neighbor_events(peer)) zlog_debug( "%pBP Long-lived stale timer stopped for afi/safi: %d/%d", @@ -2296,7 +2295,7 @@ static enum bgp_fsm_state_progress bgp_establish(struct peer *peer) * of read-only mode. */ if (!bgp_update_delay_active(peer->bgp)) { - THREAD_OFF(peer->t_routeadv); + EVENT_OFF(peer->t_routeadv); BGP_TIMER_ON(peer->t_routeadv, bgp_routeadv_timer, 0); } @@ -2331,14 +2330,14 @@ static enum bgp_fsm_state_progress bgp_establish(struct peer *peer) /* Keepalive packet is received. */ static enum bgp_fsm_state_progress bgp_fsm_keepalive(struct peer *peer) { - THREAD_OFF(peer->t_holdtime); + EVENT_OFF(peer->t_holdtime); return BGP_FSM_SUCCESS; } /* Update packet is received. */ static enum bgp_fsm_state_progress bgp_fsm_update(struct peer *peer) { - THREAD_OFF(peer->t_holdtime); + EVENT_OFF(peer->t_holdtime); return BGP_FSM_SUCCESS; } @@ -2380,13 +2379,13 @@ void bgp_fsm_nht_update(struct peer *peer, bool has_valid_nexthops) break; case Connect: if (!has_valid_nexthops) { - THREAD_OFF(peer->t_connect); + EVENT_OFF(peer->t_connect); BGP_EVENT_ADD(peer, TCP_fatal_error); } break; case Active: if (has_valid_nexthops) { - THREAD_OFF(peer->t_connect); + EVENT_OFF(peer->t_connect); BGP_EVENT_ADD(peer, ConnectRetry_timer_expired); } break; @@ -2572,13 +2571,13 @@ static const struct { }; /* Execute event process. */ -void bgp_event(struct thread *thread) +void bgp_event(struct event *thread) { enum bgp_fsm_events event; struct peer *peer; - peer = THREAD_ARG(thread); - event = THREAD_VAL(thread); + peer = EVENT_ARG(thread); + event = EVENT_VAL(thread); peer_lock(peer); bgp_event_update(peer, event); diff --git a/bgpd/bgp_fsm.h b/bgpd/bgp_fsm.h index bd1a6adfe8..e3cfd0c893 100644 --- a/bgpd/bgp_fsm.h +++ b/bgpd/bgp_fsm.h @@ -11,33 +11,34 @@ #define BGP_TIMER_ON(T, F, V) \ do { \ if ((peer->status != Deleted)) \ - thread_add_timer(bm->master, (F), peer, (V), &(T)); \ + event_add_timer(bm->master, (F), peer, (V), &(T)); \ } while (0) #define BGP_EVENT_ADD(P, E) \ do { \ if ((P)->status != Deleted) \ - thread_add_event(bm->master, bgp_event, (P), (E), \ - NULL); \ + event_add_event(bm->master, bgp_event, (P), (E), \ + NULL); \ } while (0) #define BGP_EVENT_FLUSH(P) \ do { \ assert(peer); \ - thread_cancel_event_ready(bm->master, (P)); \ + event_cancel_event_ready(bm->master, (P)); \ } while (0) -#define BGP_UPDATE_GROUP_TIMER_ON(T, F) \ - do { \ - if (BGP_SUPPRESS_FIB_ENABLED(peer->bgp) && \ - PEER_ROUTE_ADV_DELAY(peer)) \ - thread_add_timer_msec(bm->master, (F), peer, \ - (BGP_DEFAULT_UPDATE_ADVERTISEMENT_TIME * 1000),\ - (T)); \ - else \ - thread_add_timer_msec(bm->master, (F), peer, \ - 0, (T)); \ - } while (0) \ +#define BGP_UPDATE_GROUP_TIMER_ON(T, F) \ + do { \ + if (BGP_SUPPRESS_FIB_ENABLED(peer->bgp) && \ + PEER_ROUTE_ADV_DELAY(peer)) \ + event_add_timer_msec( \ + bm->master, (F), peer, \ + (BGP_DEFAULT_UPDATE_ADVERTISEMENT_TIME * \ + 1000), \ + (T)); \ + else \ + event_add_timer_msec(bm->master, (F), peer, 0, (T)); \ + } while (0) #define BGP_MSEC_JITTER 10 @@ -105,11 +106,11 @@ * Update FSM for peer based on whether we have valid nexthops or not. */ extern void bgp_fsm_nht_update(struct peer *peer, bool has_valid_nexthops); -extern void bgp_event(struct thread *); +extern void bgp_event(struct event *event); extern int bgp_event_update(struct peer *, enum bgp_fsm_events event); extern int bgp_stop(struct peer *peer); extern void bgp_timer_set(struct peer *); -extern void bgp_routeadv_timer(struct thread *); +extern void bgp_routeadv_timer(struct event *event); extern void bgp_fsm_change_status(struct peer *peer, enum bgp_fsm_status status); extern const char *const peer_down_str[]; diff --git a/bgpd/bgp_io.c b/bgpd/bgp_io.c index 530b77987d..650adc1c9a 100644 --- a/bgpd/bgp_io.c +++ b/bgpd/bgp_io.c @@ -17,7 +17,7 @@ #include "network.h" // for ERRNO_IO_RETRY #include "stream.h" // for stream_get_endp, stream_getw_from, str... #include "ringbuf.h" // for ringbuf_remain, ringbuf_peek, ringbuf_... -#include "thread.h" // for THREAD_OFF, THREAD_ARG, thread... +#include "frrevent.h" // for EVENT_OFF, EVENT_ARG, thread... #include "bgpd/bgp_io.h" #include "bgpd/bgp_debug.h" // for bgp_debug_neighbor_events, bgp_type_str @@ -31,8 +31,8 @@ /* forward declarations */ static uint16_t bgp_write(struct peer *); static uint16_t bgp_read(struct peer *peer, int *code_p); -static void bgp_process_writes(struct thread *); -static void bgp_process_reads(struct thread *); +static void bgp_process_writes(struct event *event); +static void bgp_process_reads(struct event *event); static bool validate_header(struct peer *); /* generic i/o status codes */ @@ -55,8 +55,8 @@ void bgp_writes_on(struct peer *peer) assert(!peer->t_connect_check_w); assert(peer->fd); - thread_add_write(fpt->master, bgp_process_writes, peer, peer->fd, - &peer->t_write); + event_add_write(fpt->master, bgp_process_writes, peer, peer->fd, + &peer->t_write); SET_FLAG(peer->thread_flags, PEER_THREAD_WRITES_ON); } @@ -65,8 +65,8 @@ void bgp_writes_off(struct peer *peer) struct frr_pthread *fpt = bgp_pth_io; assert(fpt->running); - thread_cancel_async(fpt->master, &peer->t_write, NULL); - THREAD_OFF(peer->t_generate_updgrp_packets); + event_cancel_async(fpt->master, &peer->t_write, NULL); + EVENT_OFF(peer->t_generate_updgrp_packets); UNSET_FLAG(peer->thread_flags, PEER_THREAD_WRITES_ON); } @@ -85,8 +85,8 @@ void bgp_reads_on(struct peer *peer) assert(!peer->t_connect_check_w); assert(peer->fd); - thread_add_read(fpt->master, bgp_process_reads, peer, peer->fd, - &peer->t_read); + event_add_read(fpt->master, bgp_process_reads, peer, peer->fd, + &peer->t_read); SET_FLAG(peer->thread_flags, PEER_THREAD_READS_ON); } @@ -96,9 +96,9 @@ void bgp_reads_off(struct peer *peer) struct frr_pthread *fpt = bgp_pth_io; assert(fpt->running); - thread_cancel_async(fpt->master, &peer->t_read, NULL); - THREAD_OFF(peer->t_process_packet); - THREAD_OFF(peer->t_process_packet_error); + event_cancel_async(fpt->master, &peer->t_read, NULL); + EVENT_OFF(peer->t_process_packet); + EVENT_OFF(peer->t_process_packet_error); UNSET_FLAG(peer->thread_flags, PEER_THREAD_READS_ON); } @@ -108,10 +108,10 @@ void bgp_reads_off(struct peer *peer) /* * Called from I/O pthread when a file descriptor has become ready for writing. */ -static void bgp_process_writes(struct thread *thread) +static void bgp_process_writes(struct event *thread) { static struct peer *peer; - peer = THREAD_ARG(thread); + peer = EVENT_ARG(thread); uint16_t status; bool reschedule; bool fatal = false; @@ -142,8 +142,8 @@ static void bgp_process_writes(struct thread *thread) * sent in the update message */ if (reschedule) { - thread_add_write(fpt->master, bgp_process_writes, peer, - peer->fd, &peer->t_write); + event_add_write(fpt->master, bgp_process_writes, peer, peer->fd, + &peer->t_write); } else if (!fatal) { BGP_UPDATE_GROUP_TIMER_ON(&peer->t_generate_updgrp_packets, bgp_generate_updgrp_packets); @@ -210,7 +210,7 @@ static int read_ibuf_work(struct peer *peer) * We read as much data as possible, process as many packets as we can and * place them on peer->ibuf for secondary processing by the main thread. */ -static void bgp_process_reads(struct thread *thread) +static void bgp_process_reads(struct event *thread) { /* clang-format off */ static struct peer *peer; /* peer to read from */ @@ -223,7 +223,7 @@ static void bgp_process_reads(struct thread *thread) int ret = 1; /* clang-format on */ - peer = THREAD_ARG(thread); + peer = EVENT_ARG(thread); if (peer->fd < 0 || bm->terminating) return; @@ -247,8 +247,8 @@ static void bgp_process_reads(struct thread *thread) /* Handle the error in the main pthread, include the * specific state change from 'bgp_read'. */ - thread_add_event(bm->master, bgp_packet_process_error, - peer, code, &peer->t_process_packet_error); + event_add_event(bm->master, bgp_packet_process_error, peer, + code, &peer->t_process_packet_error); goto done; } @@ -292,11 +292,11 @@ done: if (!ibuf_full) assert(ringbuf_space(peer->ibuf_work) >= peer->max_packet_size); - thread_add_read(fpt->master, bgp_process_reads, peer, peer->fd, - &peer->t_read); + event_add_read(fpt->master, bgp_process_reads, peer, peer->fd, + &peer->t_read); if (added_pkt) - thread_add_event(bm->master, bgp_process_packet, peer, 0, - &peer->t_process_packet); + event_add_event(bm->master, bgp_process_packet, peer, 0, + &peer->t_process_packet); } /* diff --git a/bgpd/bgp_keepalives.c b/bgpd/bgp_keepalives.c index 4e58773645..48bde1220d 100644 --- a/bgpd/bgp_keepalives.c +++ b/bgpd/bgp_keepalives.c @@ -15,7 +15,7 @@ #include "memory.h" // for MTYPE_TMP, XFREE, XCALLOC, XMALLOC #include "monotime.h" // for monotime, monotime_since -#include "bgpd/bgpd.h" // for peer, PEER_THREAD_KEEPALIVES_ON, peer... +#include "bgpd/bgpd.h" // for peer, PEER_EVENT_KEEPALIVES_ON, peer... #include "bgpd/bgp_debug.h" // for bgp_debug_neighbor_events #include "bgpd/bgp_packet.h" // for bgp_keepalive_send #include "bgpd/bgp_keepalives.h" @@ -162,7 +162,7 @@ void *bgp_keepalives_start(void *arg) /* * The RCU mechanism for each pthread is initialized in a "locked" * state. That's ok for pthreads using the frr_pthread, - * thread_fetch event loop, because that event loop unlocks regularly. + * event_fetch event loop, because that event loop unlocks regularly. * For foreign pthreads, the lock needs to be unlocked so that the * background rcu pthread can run. */ diff --git a/bgpd/bgp_label.c b/bgpd/bgp_label.c index 414dafebd4..0f3faeb297 100644 --- a/bgpd/bgp_label.c +++ b/bgpd/bgp_label.c @@ -6,7 +6,7 @@ #include #include "command.h" -#include "thread.h" +#include "frrevent.h" #include "prefix.h" #include "zclient.h" #include "stream.h" diff --git a/bgpd/bgp_labelpool.c b/bgpd/bgp_labelpool.c index f0f207442e..9943f57fb3 100644 --- a/bgpd/bgp_labelpool.c +++ b/bgpd/bgp_labelpool.c @@ -177,7 +177,7 @@ static void lp_chunk_free(void *goner) XFREE(MTYPE_BGP_LABEL_CHUNK, goner); } -void bgp_lp_init(struct thread_master *master, struct labelpool *pool) +void bgp_lp_init(struct event_loop *master, struct labelpool *pool) { if (BGP_DEBUG(labelpool, LABELPOOL)) zlog_debug("%s: entry", __func__); @@ -1091,7 +1091,7 @@ struct lp_test { struct timeval starttime; struct skiplist *timestamps_alloc; struct skiplist *timestamps_dealloc; - struct thread *event_thread; + struct event *event_thread; unsigned int counter[LPT_STAT_MAX]; }; @@ -1150,7 +1150,7 @@ static int test_cb(mpls_label_t label, void *labelid, bool allocated) return 0; } -static void labelpool_test_event_handler(struct thread *thread) +static void labelpool_test_event_handler(struct event *thread) { struct lp_test *tcb; @@ -1202,7 +1202,7 @@ static void lptest_stop(void) } if (tcb->event_thread) - thread_cancel(&tcb->event_thread); + event_cancel(&tcb->event_thread); lpt_inprogress = false; } @@ -1491,7 +1491,7 @@ static void lptest_delete(void *val) } if (tcb->event_thread) - thread_cancel(&tcb->event_thread); + event_cancel(&tcb->event_thread); memset(tcb, 0, sizeof(*tcb)); diff --git a/bgpd/bgp_labelpool.h b/bgpd/bgp_labelpool.h index 955ab2d697..9526cba0ce 100644 --- a/bgpd/bgp_labelpool.h +++ b/bgpd/bgp_labelpool.h @@ -31,7 +31,7 @@ struct labelpool { uint32_t next_chunksize; /* request this many labels */ }; -extern void bgp_lp_init(struct thread_master *master, struct labelpool *pool); +extern void bgp_lp_init(struct event_loop *master, struct labelpool *pool); extern void bgp_lp_finish(void); extern void bgp_lp_get(int type, void *labelid, int (*cbfunc)(mpls_label_t label, void *labelid, bool allocated)); diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index 85e4904372..074059c146 100644 --- a/bgpd/bgp_main.c +++ b/bgpd/bgp_main.c @@ -9,7 +9,7 @@ #include "vector.h" #include "command.h" #include "getopt.h" -#include "thread.h" +#include "frrevent.h" #include #include "memory.h" #include "prefix.h" diff --git a/bgpd/bgp_mplsvpn_snmp.c b/bgpd/bgp_mplsvpn_snmp.c index 8453133dff..20fec6d77b 100644 --- a/bgpd/bgp_mplsvpn_snmp.c +++ b/bgpd/bgp_mplsvpn_snmp.c @@ -12,7 +12,7 @@ #include "log.h" #include "prefix.h" #include "command.h" -#include "thread.h" +#include "frrevent.h" #include "smux.h" #include "filter.h" #include "hook.h" diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c index 6f035358f1..78da7a42b5 100644 --- a/bgpd/bgp_network.c +++ b/bgpd/bgp_network.c @@ -5,7 +5,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "sockunion.h" #include "sockopt.h" #include "memory.h" @@ -338,12 +338,12 @@ static void bgp_socket_set_buffer_size(const int fd) } /* Accept bgp connection. */ -static void bgp_accept(struct thread *thread) +static void bgp_accept(struct event *thread) { int bgp_sock; int accept_sock; union sockunion su; - struct bgp_listener *listener = THREAD_ARG(thread); + struct bgp_listener *listener = EVENT_ARG(thread); struct peer *peer; struct peer *peer1; char buf[SU_ADDRSTRLEN]; @@ -354,7 +354,7 @@ static void bgp_accept(struct thread *thread) bgp = bgp_lookup_by_name(listener->name); /* Register accept thread. */ - accept_sock = THREAD_FD(thread); + accept_sock = EVENT_FD(thread); if (accept_sock < 0) { flog_err_sys(EC_LIB_SOCKET, "[Error] BGP accept socket fd is negative: %d", @@ -362,8 +362,8 @@ static void bgp_accept(struct thread *thread) return; } - thread_add_read(bm->master, bgp_accept, listener, accept_sock, - &listener->thread); + event_add_read(bm->master, bgp_accept, listener, accept_sock, + &listener->thread); /* Accept client connection. */ bgp_sock = sockunion_accept(accept_sock, &su); @@ -391,7 +391,7 @@ static void bgp_accept(struct thread *thread) "[Error] accept() failed with error \"%s\" on BGP listener socket %d for BGP instance in VRF \"%s\"; refreshing socket", safe_strerror(save_errno), accept_sock, VRF_LOGNAME(vrf)); - THREAD_OFF(listener->thread); + EVENT_OFF(listener->thread); } else { flog_err_sys( EC_LIB_SOCKET, @@ -436,7 +436,7 @@ static void bgp_accept(struct thread *thread) sockopt_tcp_mss_set(bgp_sock, peer1->tcp_mss); bgp_fsm_change_status(peer1, Active); - THREAD_OFF( + EVENT_OFF( peer1->t_start); /* created in peer_create() */ if (peer_active(peer1)) { @@ -569,7 +569,7 @@ static void bgp_accept(struct thread *thread) } bgp_peer_reg_with_nht(peer); bgp_fsm_change_status(peer, Active); - THREAD_OFF(peer->t_start); /* created in peer_create() */ + EVENT_OFF(peer->t_start); /* created in peer_create() */ SET_FLAG(peer->sflags, PEER_STATUS_ACCEPT_PEER); /* Make dummy peer until read Open packet. */ @@ -861,8 +861,8 @@ static int bgp_listener(int sock, struct sockaddr *sa, socklen_t salen, listener->bgp = bgp; memcpy(&listener->su, sa, salen); - thread_add_read(bm->master, bgp_accept, listener, sock, - &listener->thread); + event_add_read(bm->master, bgp_accept, listener, sock, + &listener->thread); listnode_add(bm->listen_sockets, listener); return 0; @@ -961,7 +961,7 @@ void bgp_close_vrf_socket(struct bgp *bgp) for (ALL_LIST_ELEMENTS(bm->listen_sockets, node, next, listener)) { if (listener->bgp == bgp) { - THREAD_OFF(listener->thread); + EVENT_OFF(listener->thread); close(listener->fd); listnode_delete(bm->listen_sockets, listener); XFREE(MTYPE_BGP_LISTENER, listener->name); @@ -983,7 +983,7 @@ void bgp_close(void) for (ALL_LIST_ELEMENTS(bm->listen_sockets, node, next, listener)) { if (listener->bgp) continue; - THREAD_OFF(listener->thread); + EVENT_OFF(listener->thread); close(listener->fd); listnode_delete(bm->listen_sockets, listener); XFREE(MTYPE_BGP_LISTENER, listener->name); diff --git a/bgpd/bgp_network.h b/bgpd/bgp_network.h index f21b219e29..cf0b4362c5 100644 --- a/bgpd/bgp_network.h +++ b/bgpd/bgp_network.h @@ -11,7 +11,7 @@ struct bgp_listener { int fd; union sockunion su; - struct thread *thread; + struct event *thread; struct bgp *bgp; char *name; }; diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c index f1f6b031a9..c4b832ee59 100644 --- a/bgpd/bgp_nexthop.c +++ b/bgpd/bgp_nexthop.c @@ -6,7 +6,7 @@ #include #include "command.h" -#include "thread.h" +#include "frrevent.h" #include "prefix.h" #include "lib/json.h" #include "zclient.h" diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c index 473c95071c..a294ebcc63 100644 --- a/bgpd/bgp_nht.c +++ b/bgpd/bgp_nht.c @@ -6,7 +6,7 @@ #include #include "command.h" -#include "thread.h" +#include "frrevent.h" #include "prefix.h" #include "zclient.h" #include "stream.h" @@ -37,7 +37,7 @@ extern struct zclient *zclient; static void register_zebra_rnh(struct bgp_nexthop_cache *bnc); static void unregister_zebra_rnh(struct bgp_nexthop_cache *bnc); static int make_prefix(int afi, struct bgp_path_info *pi, struct prefix *p); -static void bgp_nht_ifp_initial(struct thread *thread); +static void bgp_nht_ifp_initial(struct event *thread); static int bgp_isvalid_nexthop(struct bgp_nexthop_cache *bnc) { @@ -756,10 +756,10 @@ void bgp_nht_ifp_down(struct interface *ifp) bgp_nht_ifp_handle(ifp, false); } -static void bgp_nht_ifp_initial(struct thread *thread) +static void bgp_nht_ifp_initial(struct event *thread) { - ifindex_t ifindex = THREAD_VAL(thread); - struct bgp *bgp = THREAD_ARG(thread); + ifindex_t ifindex = EVENT_VAL(thread); + struct bgp *bgp = EVENT_ARG(thread); struct interface *ifp = if_lookup_by_index(ifindex, bgp->vrf_id); if (!ifp) @@ -811,8 +811,8 @@ void bgp_nht_interface_events(struct peer *peer) return; if (bnc->ifindex) - thread_add_event(bm->master, bgp_nht_ifp_initial, bnc->bgp, - bnc->ifindex, NULL); + event_add_event(bm->master, bgp_nht_ifp_initial, bnc->bgp, + bnc->ifindex, NULL); } void bgp_parse_nexthop_update(int command, vrf_id_t vrf_id) diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c index 4814d69c33..0dd5463979 100644 --- a/bgpd/bgp_open.c +++ b/bgpd/bgp_open.c @@ -8,7 +8,7 @@ #include "linklist.h" #include "prefix.h" #include "stream.h" -#include "thread.h" +#include "frrevent.h" #include "log.h" #include "command.h" #include "memory.h" diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c index 93672d29f1..1c76828a2f 100644 --- a/bgpd/bgp_packet.c +++ b/bgpd/bgp_packet.c @@ -8,7 +8,7 @@ #include #include -#include "thread.h" +#include "frrevent.h" #include "stream.h" #include "network.h" #include "prefix.h" @@ -442,9 +442,9 @@ static void bgp_write_proceed_actions(struct peer *peer) * update group a peer belongs to, encode this information into packets, and * enqueue the packets onto the peer's output buffer. */ -void bgp_generate_updgrp_packets(struct thread *thread) +void bgp_generate_updgrp_packets(struct event *thread) { - struct peer *peer = THREAD_ARG(thread); + struct peer *peer = EVENT_ARG(thread); struct stream *s; struct peer_af *paf; @@ -1792,11 +1792,11 @@ static int bgp_keepalive_receive(struct peer *peer, bgp_size_t size) return Receive_KEEPALIVE_message; } -static void bgp_refresh_stalepath_timer_expire(struct thread *thread) +static void bgp_refresh_stalepath_timer_expire(struct event *thread) { struct peer_af *paf; - paf = THREAD_ARG(thread); + paf = EVENT_ARG(thread); afi_t afi = paf->afi; safi_t safi = paf->safi; @@ -2106,11 +2106,11 @@ static int bgp_update_receive(struct peer *peer, bgp_size_t size) "EOR RCV", gr_info->eor_received); if (gr_info->t_select_deferral) { - void *info = THREAD_ARG( + void *info = EVENT_ARG( gr_info->t_select_deferral); XFREE(MTYPE_TMP, info); } - THREAD_OFF(gr_info->t_select_deferral); + EVENT_OFF(gr_info->t_select_deferral); gr_info->eor_required = 0; gr_info->eor_received = 0; /* Best path selection */ @@ -2595,10 +2595,10 @@ static int bgp_route_refresh_receive(struct peer *peer, bgp_size_t size) } if (peer_established(peer)) - thread_add_timer(bm->master, - bgp_refresh_stalepath_timer_expire, - paf, peer->bgp->stalepath_time, - &peer->t_refresh_stalepath); + event_add_timer(bm->master, + bgp_refresh_stalepath_timer_expire, paf, + peer->bgp->stalepath_time, + &peer->t_refresh_stalepath); if (bgp_debug_neighbor_events(peer)) zlog_debug( @@ -2613,7 +2613,7 @@ static int bgp_route_refresh_receive(struct peer *peer, bgp_size_t size) return BGP_PACKET_NOOP; } - THREAD_OFF(peer->t_refresh_stalepath); + EVENT_OFF(peer->t_refresh_stalepath); SET_FLAG(peer->af_sflags[afi][safi], PEER_STATUS_EORR_RECEIVED); UNSET_FLAG(peer->af_sflags[afi][safi], @@ -2863,11 +2863,11 @@ int bgp_capability_receive(struct peer *peer, bgp_size_t size) * would not, making event flow difficult to understand. Please think twice * before hacking this. * - * Thread type: THREAD_EVENT + * Thread type: EVENT_EVENT * @param thread * @return 0 */ -void bgp_process_packet(struct thread *thread) +void bgp_process_packet(struct event *thread) { /* Yes first of all get peer pointer. */ struct peer *peer; // peer @@ -2875,7 +2875,7 @@ void bgp_process_packet(struct thread *thread) int fsm_update_result; // return code of bgp_event_update() int mprc; // message processing return code - peer = THREAD_ARG(thread); + peer = EVENT_ARG(thread); rpkt_quanta_old = atomic_load_explicit(&peer->bgp->rpkt_quanta, memory_order_relaxed); fsm_update_result = 0; @@ -3021,9 +3021,9 @@ void bgp_process_packet(struct thread *thread) frr_with_mutex (&peer->io_mtx) { // more work to do, come back later if (peer->ibuf->count > 0) - thread_add_event( - bm->master, bgp_process_packet, peer, 0, - &peer->t_process_packet); + event_add_event(bm->master, bgp_process_packet, + peer, 0, + &peer->t_process_packet); } } } @@ -3044,13 +3044,13 @@ void bgp_send_delayed_eor(struct bgp *bgp) * having the io pthread try to enqueue fsm events or mess with the peer * struct. */ -void bgp_packet_process_error(struct thread *thread) +void bgp_packet_process_error(struct event *thread) { struct peer *peer; int code; - peer = THREAD_ARG(thread); - code = THREAD_VAL(thread); + peer = EVENT_ARG(thread); + code = EVENT_VAL(thread); if (bgp_debug_neighbor_events(peer)) zlog_debug("%s [Event] BGP error %d on fd %d", diff --git a/bgpd/bgp_packet.h b/bgpd/bgp_packet.h index 2eb5693ae2..c072bbc235 100644 --- a/bgpd/bgp_packet.h +++ b/bgpd/bgp_packet.h @@ -66,13 +66,13 @@ extern void bgp_check_update_delay(struct bgp *); extern int bgp_packet_set_marker(struct stream *s, uint8_t type); extern void bgp_packet_set_size(struct stream *s); -extern void bgp_generate_updgrp_packets(struct thread *); -extern void bgp_process_packet(struct thread *); +extern void bgp_generate_updgrp_packets(struct event *event); +extern void bgp_process_packet(struct event *event); extern void bgp_send_delayed_eor(struct bgp *bgp); /* Task callback to handle socket error encountered in the io pthread */ -void bgp_packet_process_error(struct thread *thread); +void bgp_packet_process_error(struct event *thread); extern struct bgp_notify bgp_notify_decapsulate_hard_reset(struct bgp_notify *notify); extern bool bgp_has_graceful_restart_notification(struct peer *peer); diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 14ce4e6bc9..07bec23b29 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -20,7 +20,7 @@ #include "buffer.h" #include "sockunion.h" #include "plist.h" -#include "thread.h" +#include "frrevent.h" #include "workqueue.h" #include "queue.h" #include "memory.h" @@ -2618,14 +2618,14 @@ bool subgroup_announce_check(struct bgp_dest *dest, struct bgp_path_info *pi, return true; } -static void bgp_route_select_timer_expire(struct thread *thread) +static void bgp_route_select_timer_expire(struct event *thread) { struct afi_safi_info *info; afi_t afi; safi_t safi; struct bgp *bgp; - info = THREAD_ARG(thread); + info = EVENT_ARG(thread); afi = info->afi; safi = info->safi; bgp = info->bgp; @@ -3281,7 +3281,7 @@ static void bgp_process_main_one(struct bgp *bgp, struct bgp_dest *dest, if (!bgp->t_rmap_def_originate_eval) { bgp_lock(bgp); - thread_add_timer( + event_add_timer( bm->master, update_group_refresh_default_originate_route_map, bgp, RMAP_DEFAULT_ORIGINATE_EVAL_TIMER, @@ -3381,11 +3381,11 @@ void bgp_best_path_select_defer(struct bgp *bgp, afi_t afi, safi_t safi) struct afi_safi_info *thread_info; if (bgp->gr_info[afi][safi].t_route_select) { - struct thread *t = bgp->gr_info[afi][safi].t_route_select; + struct event *t = bgp->gr_info[afi][safi].t_route_select; - thread_info = THREAD_ARG(t); + thread_info = EVENT_ARG(t); XFREE(MTYPE_TMP, thread_info); - THREAD_OFF(bgp->gr_info[afi][safi].t_route_select); + EVENT_OFF(bgp->gr_info[afi][safi].t_route_select); } if (BGP_DEBUG(update, UPDATE_OUT)) { @@ -3433,7 +3433,7 @@ void bgp_best_path_select_defer(struct bgp *bgp, afi_t afi, safi_t safi) /* If there are more routes to be processed, start the * selection timer */ - thread_add_timer(bm->master, bgp_route_select_timer_expire, thread_info, + event_add_timer(bm->master, bgp_route_select_timer_expire, thread_info, BGP_ROUTE_SELECT_DELAY, &bgp->gr_info[afi][safi].t_route_select); } @@ -3585,11 +3585,11 @@ void bgp_add_eoiu_mark(struct bgp *bgp) work_queue_add(bgp->process_queue, pqnode); } -static void bgp_maximum_prefix_restart_timer(struct thread *thread) +static void bgp_maximum_prefix_restart_timer(struct event *thread) { struct peer *peer; - peer = THREAD_ARG(thread); + peer = EVENT_ARG(thread); peer->t_pmax_restart = NULL; if (bgp_debug_neighbor_events(peer)) @@ -5046,7 +5046,7 @@ void bgp_stop_announce_route_timer(struct peer_af *paf) if (!paf->t_announce_route) return; - THREAD_OFF(paf->t_announce_route); + EVENT_OFF(paf->t_announce_route); } /* @@ -5055,12 +5055,12 @@ void bgp_stop_announce_route_timer(struct peer_af *paf) * Callback that is invoked when the route announcement timer for a * peer_af expires. */ -static void bgp_announce_route_timer_expired(struct thread *t) +static void bgp_announce_route_timer_expired(struct event *t) { struct peer_af *paf; struct peer *peer; - paf = THREAD_ARG(t); + paf = EVENT_ARG(t); peer = paf->peer; if (!peer_established(peer)) @@ -5109,11 +5109,11 @@ void bgp_announce_route(struct peer *peer, afi_t afi, safi_t safi, bool force) * multiple peers and the announcement doesn't happen in the * vty context. */ - thread_add_timer_msec(bm->master, bgp_announce_route_timer_expired, paf, - (subgrp->peer_count == 1) - ? BGP_ANNOUNCE_ROUTE_SHORT_DELAY_MS - : BGP_ANNOUNCE_ROUTE_DELAY_MS, - &paf->t_announce_route); + event_add_timer_msec(bm->master, bgp_announce_route_timer_expired, paf, + (subgrp->peer_count == 1) + ? BGP_ANNOUNCE_ROUTE_SHORT_DELAY_MS + : BGP_ANNOUNCE_ROUTE_DELAY_MS, + &paf->t_announce_route); } /* @@ -5215,7 +5215,7 @@ static void bgp_soft_reconfig_table(struct peer *peer, afi_t afi, safi_t safi, * Without splitting the full job into several part, * vtysh waits for the job to finish before responding to a BGP command */ -static void bgp_soft_reconfig_table_task(struct thread *thread) +static void bgp_soft_reconfig_table_task(struct event *thread) { uint32_t iter, max_iter; struct bgp_dest *dest; @@ -5225,7 +5225,7 @@ static void bgp_soft_reconfig_table_task(struct thread *thread) struct prefix_rd *prd; struct listnode *node, *nnode; - table = THREAD_ARG(thread); + table = EVENT_ARG(thread); prd = NULL; max_iter = SOFT_RECONFIG_TASK_MAX_PREFIX; @@ -5263,8 +5263,8 @@ static void bgp_soft_reconfig_table_task(struct thread *thread) */ if (dest || table->soft_reconfig_init) { table->soft_reconfig_init = false; - thread_add_event(bm->master, bgp_soft_reconfig_table_task, - table, 0, &table->soft_reconfig_thread); + event_add_event(bm->master, bgp_soft_reconfig_table_task, table, + 0, &table->soft_reconfig_thread); return; } /* we're done, clean up the background iteration context info and @@ -5319,7 +5319,7 @@ void bgp_soft_reconfig_table_task_cancel(const struct bgp *bgp, list_delete(&ntable->soft_reconfig_peers); bgp_soft_reconfig_table_flag(ntable, false); - THREAD_OFF(ntable->soft_reconfig_thread); + EVENT_OFF(ntable->soft_reconfig_thread); } } @@ -5365,9 +5365,9 @@ bool bgp_soft_reconfig_in(struct peer *peer, afi_t afi, safi_t safi) bgp_soft_reconfig_table_flag(table, true); if (!table->soft_reconfig_thread) - thread_add_event(bm->master, - bgp_soft_reconfig_table_task, table, 0, - &table->soft_reconfig_thread); + event_add_event(bm->master, + bgp_soft_reconfig_table_task, table, 0, + &table->soft_reconfig_thread); /* Cancel bgp_announce_route_timer_expired threads. * bgp_announce_route_timer_expired threads have been scheduled * to announce routes as soon as the soft_reconfigure process @@ -11105,7 +11105,7 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp, struct bgp_dest *bn, if (path->peer->t_gr_restart && CHECK_FLAG(path->flags, BGP_PATH_STALE)) { unsigned long gr_remaining = - thread_timer_remain_second(path->peer->t_gr_restart); + event_timer_remain_second(path->peer->t_gr_restart); if (json_paths) { json_object_int_add(json_path, @@ -11121,7 +11121,7 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp, struct bgp_dest *bn, bgp_attr_get_community(attr) && community_include(bgp_attr_get_community(attr), COMMUNITY_LLGR_STALE)) { - unsigned long llgr_remaining = thread_timer_remain_second( + unsigned long llgr_remaining = event_timer_remain_second( path->peer->t_llgr_stale[afi][safi]); if (json_paths) { @@ -13342,11 +13342,11 @@ static void bgp_table_stats_rn(struct bgp_dest *dest, struct bgp_dest *top, } } -static void bgp_table_stats_walker(struct thread *t) +static void bgp_table_stats_walker(struct event *t) { struct bgp_dest *dest, *ndest; struct bgp_dest *top; - struct bgp_table_stats *ts = THREAD_ARG(t); + struct bgp_table_stats *ts = EVENT_ARG(t); unsigned int space = 0; if (!(top = bgp_table_top(ts->table))) @@ -13441,7 +13441,7 @@ static int bgp_table_stats_single(struct vty *vty, struct bgp *bgp, afi_t afi, memset(&ts, 0, sizeof(ts)); ts.table = bgp->rib[afi][safi]; - thread_execute(bm->master, bgp_table_stats_walker, &ts, 0); + event_execute(bm->master, bgp_table_stats_walker, &ts, 0); for (i = 0; i < BGP_STATS_MAX; i++) { if ((!json && !table_stats_strs[i][TABLE_STATS_IDX_VTY]) @@ -13739,11 +13739,11 @@ static void bgp_peer_count_proc(struct bgp_dest *rn, struct peer_pcounts *pc) } } -static void bgp_peer_count_walker(struct thread *t) +static void bgp_peer_count_walker(struct event *t) { struct bgp_dest *rn, *rm; const struct bgp_table *table; - struct peer_pcounts *pc = THREAD_ARG(t); + struct peer_pcounts *pc = EVENT_ARG(t); if (pc->safi == SAFI_MPLS_VPN || pc->safi == SAFI_ENCAP || pc->safi == SAFI_EVPN) { @@ -13798,7 +13798,7 @@ static int bgp_peer_counts(struct vty *vty, struct peer *peer, afi_t afi, * stats for the thread-walk (i.e. ensure this can't be blamed on * on just vty_read()). */ - thread_execute(bm->master, bgp_peer_count_walker, &pcounts, 0); + event_execute(bm->master, bgp_peer_count_walker, &pcounts, 0); if (use_json) { json_object_string_add(json, "prefixCountsFor", peer->host); diff --git a/bgpd/bgp_route.h b/bgpd/bgp_route.h index c45dcaa516..b48e8eda11 100644 --- a/bgpd/bgp_route.h +++ b/bgpd/bgp_route.h @@ -182,7 +182,7 @@ struct bgp_path_info_extra { } export; struct { - struct thread *timer; + struct event *timer; void *hme; /* encap monitor, if this is a VPN route */ struct prefix_rd rd; /* import: route's route-distinguisher */ diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c index fa9d23874c..4faf4a9f15 100644 --- a/bgpd/bgp_routemap.c +++ b/bgpd/bgp_routemap.c @@ -4344,7 +4344,7 @@ static void bgp_route_map_process_update_cb(char *rmap_name) vpn_policy_routemap_event(rmap_name); } -void bgp_route_map_update_timer(struct thread *thread) +void bgp_route_map_update_timer(struct event *thread) { route_map_walk_update_list(bgp_route_map_process_update_cb); } @@ -4357,13 +4357,12 @@ static void bgp_route_map_mark_update(const char *rmap_name) /* If new update is received before the current timer timed out, * turn it off and start a new timer. */ - THREAD_OFF(bm->t_rmap_update); + EVENT_OFF(bm->t_rmap_update); /* rmap_update_timer of 0 means don't do route updates */ if (bm->rmap_update_timer) { - thread_add_timer(bm->master, bgp_route_map_update_timer, - NULL, bm->rmap_update_timer, - &bm->t_rmap_update); + event_add_timer(bm->master, bgp_route_map_update_timer, NULL, + bm->rmap_update_timer, &bm->t_rmap_update); /* Signal the groups that a route-map update event has * started */ diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c index 32ca909fe6..c6e3131e02 100644 --- a/bgpd/bgp_rpki.c +++ b/bgpd/bgp_rpki.c @@ -23,7 +23,7 @@ #include "command.h" #include "linklist.h" #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "filter.h" #include "bgpd/bgpd.h" #include "bgpd/bgp_table.h" @@ -36,7 +36,6 @@ #include "northbound_cli.h" #include "lib/network.h" -#include "lib/thread.h" #include "rtrlib/rtrlib.h" #include "hook.h" #include "libfrr.h" @@ -54,7 +53,7 @@ DEFINE_MTYPE_STATIC(BGPD, BGP_RPKI_REVALIDATE, "BGP RPKI Revalidation"); #define RETRY_INTERVAL_DEFAULT 600 #define BGP_RPKI_CACHE_SERVER_SYNC_RETRY_TIMEOUT 3 -static struct thread *t_rpki_sync; +static struct event *t_rpki_sync; #define RPKI_DEBUG(...) \ if (rpki_debug) { \ @@ -382,9 +381,9 @@ struct rpki_revalidate_prefix { safi_t safi; }; -static void rpki_revalidate_prefix(struct thread *thread) +static void rpki_revalidate_prefix(struct event *thread) { - struct rpki_revalidate_prefix *rrp = THREAD_ARG(thread); + struct rpki_revalidate_prefix *rrp = EVENT_ARG(thread); struct bgp_dest *match, *node; match = bgp_table_subtree_lookup(rrp->bgp->rib[rrp->afi][rrp->safi], @@ -403,15 +402,15 @@ static void rpki_revalidate_prefix(struct thread *thread) XFREE(MTYPE_BGP_RPKI_REVALIDATE, rrp); } -static void bgpd_sync_callback(struct thread *thread) +static void bgpd_sync_callback(struct event *thread) { struct bgp *bgp; struct listnode *node; struct prefix prefix; struct pfx_record rec; - thread_add_read(bm->master, bgpd_sync_callback, NULL, - rpki_sync_socket_bgpd, NULL); + event_add_read(bm->master, bgpd_sync_callback, NULL, + rpki_sync_socket_bgpd, NULL); if (atomic_load_explicit(&rtr_update_overflow, memory_order_seq_cst)) { while (read(rpki_sync_socket_bgpd, &rec, @@ -449,8 +448,8 @@ static void bgpd_sync_callback(struct thread *thread) rrp->prefix = prefix; rrp->afi = afi; rrp->safi = safi; - thread_add_event(bm->master, rpki_revalidate_prefix, - rrp, 0, &bgp->t_revalidate[afi][safi]); + event_add_event(bm->master, rpki_revalidate_prefix, rrp, + 0, &bgp->t_revalidate[afi][safi]); } } } @@ -490,9 +489,9 @@ struct rpki_revalidate_peer { struct peer *peer; }; -static void bgp_rpki_revalidate_peer(struct thread *thread) +static void bgp_rpki_revalidate_peer(struct event *thread) { - struct rpki_revalidate_peer *rvp = THREAD_ARG(thread); + struct rpki_revalidate_peer *rvp = EVENT_ARG(thread); /* * Here's the expensive bit of gnomish deviousness @@ -530,7 +529,7 @@ static void revalidate_all_routes(void) rvp->afi = afi; rvp->safi = safi; - thread_add_event( + event_add_event( bm->master, bgp_rpki_revalidate_peer, rvp, 0, &peer->t_revalidate_all[afi][safi]); @@ -581,8 +580,8 @@ static void rpki_init_sync_socket(void) } - thread_add_read(bm->master, bgpd_sync_callback, NULL, - rpki_sync_socket_bgpd, NULL); + event_add_read(bm->master, bgpd_sync_callback, NULL, + rpki_sync_socket_bgpd, NULL); return; @@ -592,7 +591,7 @@ err: } -static int bgp_rpki_init(struct thread_master *master) +static int bgp_rpki_init(struct event_loop *master) { rpki_debug = false; rtr_is_running = false; @@ -632,13 +631,13 @@ static int bgp_rpki_module_init(void) return 0; } -static void sync_expired(struct thread *thread) +static void sync_expired(struct event *thread) { if (!rtr_mgr_conf_in_sync(rtr_config)) { RPKI_DEBUG("rtr_mgr is not synced, retrying."); - thread_add_timer(bm->master, sync_expired, NULL, - BGP_RPKI_CACHE_SERVER_SYNC_RETRY_TIMEOUT, - &t_rpki_sync); + event_add_timer(bm->master, sync_expired, NULL, + BGP_RPKI_CACHE_SERVER_SYNC_RETRY_TIMEOUT, + &t_rpki_sync); return; } @@ -681,7 +680,7 @@ static int start(void) return ERROR; } - thread_add_timer(bm->master, sync_expired, NULL, 0, &t_rpki_sync); + event_add_timer(bm->master, sync_expired, NULL, 0, &t_rpki_sync); XFREE(MTYPE_BGP_RPKI_CACHE_GROUP, groups); @@ -694,7 +693,7 @@ static void stop(void) { rtr_is_stopping = true; if (is_running()) { - THREAD_OFF(t_rpki_sync); + EVENT_OFF(t_rpki_sync); rtr_mgr_stop(rtr_config); rtr_mgr_free(rtr_config); rtr_is_running = false; diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c index 5aa5e14288..ce9442c1e0 100644 --- a/bgpd/bgp_snmp.c +++ b/bgpd/bgp_snmp.c @@ -12,7 +12,7 @@ #include "log.h" #include "prefix.h" #include "command.h" -#include "thread.h" +#include "frrevent.h" #include "smux.h" #include "filter.h" #include "hook.h" @@ -30,7 +30,7 @@ #include "bgpd/bgp_snmp_bgp4v2.h" #include "bgpd/bgp_mplsvpn_snmp.h" -static int bgp_snmp_init(struct thread_master *tm) +static int bgp_snmp_init(struct event_loop *tm) { smux_init(tm); bgp_snmp_bgp4_init(tm); diff --git a/bgpd/bgp_snmp_bgp4.c b/bgpd/bgp_snmp_bgp4.c index 186c9e2846..123d33bd14 100644 --- a/bgpd/bgp_snmp_bgp4.c +++ b/bgpd/bgp_snmp_bgp4.c @@ -12,7 +12,7 @@ #include "log.h" #include "prefix.h" #include "command.h" -#include "thread.h" +#include "frrevent.h" #include "smux.h" #include "filter.h" #include "hook.h" @@ -791,7 +791,7 @@ int bgpTrapBackwardTransition(struct peer *peer) return 0; } -int bgp_snmp_bgp4_init(struct thread_master *tm) +int bgp_snmp_bgp4_init(struct event_loop *tm) { REGISTER_MIB("mibII/bgp", bgp_variables, variable, bgp_oid); return 0; diff --git a/bgpd/bgp_snmp_bgp4.h b/bgpd/bgp_snmp_bgp4.h index dffbf5fecf..ccf00d6b7c 100644 --- a/bgpd/bgp_snmp_bgp4.h +++ b/bgpd/bgp_snmp_bgp4.h @@ -71,6 +71,6 @@ extern int bgpTrapEstablished(struct peer *peer); extern int bgpTrapBackwardTransition(struct peer *peer); -extern int bgp_snmp_bgp4_init(struct thread_master *tm); +extern int bgp_snmp_bgp4_init(struct event_loop *tm); #endif /* _FRR_BGP_SNMP_BGP4_H_ */ diff --git a/bgpd/bgp_snmp_bgp4v2.c b/bgpd/bgp_snmp_bgp4v2.c index 9c2599d5f4..712b5d4af8 100644 --- a/bgpd/bgp_snmp_bgp4v2.c +++ b/bgpd/bgp_snmp_bgp4v2.c @@ -13,7 +13,7 @@ #include "log.h" #include "prefix.h" #include "command.h" -#include "thread.h" +#include "frrevent.h" #include "smux.h" #include "filter.h" #include "hook.h" @@ -1394,7 +1394,7 @@ static struct variable bgpv2_variables[] = { {1, 9, 1, BGP4V2_NLRI_PATH_ATTR_UNKNOWN, 2, 16}}, }; -int bgp_snmp_bgp4v2_init(struct thread_master *tm) +int bgp_snmp_bgp4v2_init(struct event_loop *tm) { REGISTER_MIB("mibII/bgpv2", bgpv2_variables, variable, bgpv2_oid); return 0; diff --git a/bgpd/bgp_snmp_bgp4v2.h b/bgpd/bgp_snmp_bgp4v2.h index 67f45a6173..7cdad586bc 100644 --- a/bgpd/bgp_snmp_bgp4v2.h +++ b/bgpd/bgp_snmp_bgp4v2.h @@ -81,6 +81,6 @@ #define BGP4V2_ESTABLISHED_NOTIFICATION 1 #define BGP4V2_BACKWARD_TRANSITION_NOTIFICATION 2 -extern int bgp_snmp_bgp4v2_init(struct thread_master *tm); +extern int bgp_snmp_bgp4v2_init(struct event_loop *tm); #endif /* _FRR_BGP_SNMP_BGP4V2_H_ */ diff --git a/bgpd/bgp_table.h b/bgpd/bgp_table.h index 997efee9f3..9027af5ba3 100644 --- a/bgpd/bgp_table.h +++ b/bgpd/bgp_table.h @@ -29,7 +29,7 @@ struct bgp_table { /* soft_reconfig_table in progress */ bool soft_reconfig_init; - struct thread *soft_reconfig_thread; + struct event *soft_reconfig_thread; /* list of peers on which soft_reconfig_table has to run */ struct list *soft_reconfig_peers; diff --git a/bgpd/bgp_updgrp.c b/bgpd/bgp_updgrp.c index 204b8092e5..72dca9f702 100644 --- a/bgpd/bgp_updgrp.c +++ b/bgpd/bgp_updgrp.c @@ -12,7 +12,7 @@ #include #include "prefix.h" -#include "thread.h" +#include "frrevent.h" #include "buffer.h" #include "stream.h" #include "command.h" @@ -1099,8 +1099,8 @@ static void update_subgroup_delete(struct update_subgroup *subgrp) if (subgrp->update_group) UPDGRP_INCR_STAT(subgrp->update_group, subgrps_deleted); - THREAD_OFF(subgrp->t_merge_check); - THREAD_OFF(subgrp->t_coalesce); + EVENT_OFF(subgrp->t_merge_check); + EVENT_OFF(subgrp->t_coalesce); bpacket_queue_cleanup(SUBGRP_PKTQ(subgrp)); subgroup_clear_table(subgrp); @@ -1418,11 +1418,11 @@ bool update_subgroup_check_merge(struct update_subgroup *subgrp, /* * update_subgroup_merge_check_thread_cb */ -static void update_subgroup_merge_check_thread_cb(struct thread *thread) +static void update_subgroup_merge_check_thread_cb(struct event *thread) { struct update_subgroup *subgrp; - subgrp = THREAD_ARG(thread); + subgrp = EVENT_ARG(thread); subgrp->t_merge_check = NULL; @@ -1449,8 +1449,8 @@ bool update_subgroup_trigger_merge_check(struct update_subgroup *subgrp, return false; subgrp->t_merge_check = NULL; - thread_add_timer_msec(bm->master, update_subgroup_merge_check_thread_cb, - subgrp, 0, &subgrp->t_merge_check); + event_add_timer_msec(bm->master, update_subgroup_merge_check_thread_cb, + subgrp, 0, &subgrp->t_merge_check); SUBGRP_INCR_STAT(subgrp, merge_checks_triggered); @@ -2107,15 +2107,15 @@ update_group_default_originate_route_map_walkcb(struct update_group *updgrp, return UPDWALK_CONTINUE; } -void update_group_refresh_default_originate_route_map(struct thread *thread) +void update_group_refresh_default_originate_route_map(struct event *thread) { struct bgp *bgp; char reason[] = "refresh default-originate route-map"; - bgp = THREAD_ARG(thread); + bgp = EVENT_ARG(thread); update_group_walk(bgp, update_group_default_originate_route_map_walkcb, reason); - THREAD_OFF(bgp->t_rmap_def_originate_eval); + EVENT_OFF(bgp->t_rmap_def_originate_eval); bgp_unlock(bgp); } @@ -2215,7 +2215,7 @@ void subgroup_trigger_write(struct update_subgroup *subgrp) */ SUBGRP_FOREACH_PEER (subgrp, paf) if (peer_established(paf->peer)) - thread_add_timer_msec( + event_add_timer_msec( bm->master, bgp_generate_updgrp_packets, paf->peer, 0, &paf->peer->t_generate_updgrp_packets); diff --git a/bgpd/bgp_updgrp.h b/bgpd/bgp_updgrp.h index 2b2fadcdf4..67c384ba02 100644 --- a/bgpd/bgp_updgrp.h +++ b/bgpd/bgp_updgrp.h @@ -197,10 +197,10 @@ struct update_subgroup { /* announcement attribute hash */ struct hash *hash; - struct thread *t_coalesce; + struct event *t_coalesce; uint32_t v_coalesce; - struct thread *t_merge_check; + struct event *t_merge_check; /* table version that the subgroup has caught up to. */ uint64_t version; @@ -373,7 +373,7 @@ extern void update_group_af_walk(struct bgp *bgp, afi_t afi, safi_t safi, extern void update_group_walk(struct bgp *bgp, updgrp_walkcb cb, void *ctx); extern void update_group_periodic_merge(struct bgp *bgp); extern void -update_group_refresh_default_originate_route_map(struct thread *thread); +update_group_refresh_default_originate_route_map(struct event *thread); extern void update_group_start_advtimer(struct bgp *bgp); extern void update_subgroup_inherit_info(struct update_subgroup *to, diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c index d8e0e7875c..e4bc0176d1 100644 --- a/bgpd/bgp_updgrp_adv.c +++ b/bgpd/bgp_updgrp_adv.c @@ -17,7 +17,7 @@ #include "memory.h" #include "prefix.h" #include "hash.h" -#include "thread.h" +#include "frrevent.h" #include "queue.h" #include "routemap.h" #include "filter.h" @@ -298,12 +298,12 @@ static void updgrp_show_adj(struct bgp *bgp, afi_t afi, safi_t safi, update_group_af_walk(bgp, afi, safi, updgrp_show_adj_walkcb, &ctx); } -static void subgroup_coalesce_timer(struct thread *thread) +static void subgroup_coalesce_timer(struct event *thread) { struct update_subgroup *subgrp; struct bgp *bgp; - subgrp = THREAD_ARG(thread); + subgrp = EVENT_ARG(thread); if (bgp_debug_update(NULL, NULL, subgrp->update_group, 0)) zlog_debug("u%" PRIu64 ":s%" PRIu64" announcing routes upon coalesce timer expiry(%u ms)", (SUBGRP_UPDGRP(subgrp))->id, subgrp->id, @@ -329,7 +329,7 @@ static void subgroup_coalesce_timer(struct thread *thread) SUBGRP_FOREACH_PEER (subgrp, paf) { peer = PAF_PEER(paf); - THREAD_OFF(peer->t_routeadv); + EVENT_OFF(peer->t_routeadv); BGP_TIMER_ON(peer->t_routeadv, bgp_routeadv_timer, 0); } } @@ -1021,9 +1021,9 @@ void subgroup_announce_all(struct update_subgroup *subgrp) * We should wait for the coalesce timer. Arm the timer if not done. */ if (!subgrp->t_coalesce) { - thread_add_timer_msec(bm->master, subgroup_coalesce_timer, - subgrp, subgrp->v_coalesce, - &subgrp->t_coalesce); + event_add_timer_msec(bm->master, subgroup_coalesce_timer, + subgrp, subgrp->v_coalesce, + &subgrp->t_coalesce); } } diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c index 5106dcf354..e04d5ae245 100644 --- a/bgpd/bgp_updgrp_packet.c +++ b/bgpd/bgp_updgrp_packet.c @@ -12,7 +12,7 @@ #include #include "prefix.h" -#include "thread.h" +#include "frrevent.h" #include "buffer.h" #include "stream.h" #include "command.h" diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 93b412240a..4bbbced806 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -16,7 +16,7 @@ #include "buffer.h" #include "linklist.h" #include "stream.h" -#include "thread.h" +#include "frrevent.h" #include "log.h" #include "memory.h" #include "lib_vty.h" @@ -2194,7 +2194,7 @@ DEFUN (no_bgp_maxmed_onstartup, /* Cancel max-med onstartup if its on */ if (bgp->t_maxmed_onstartup) { - THREAD_OFF(bgp->t_maxmed_onstartup); + EVENT_OFF(bgp->t_maxmed_onstartup); bgp->maxmed_onstartup_over = 1; } @@ -7518,9 +7518,9 @@ DEFUN (bgp_set_route_map_delay_timer, * fired. */ if (!rmap_delay_timer && bm->t_rmap_update) { - THREAD_OFF(bm->t_rmap_update); - thread_execute(bm->master, bgp_route_map_update_timer, - NULL, 0); + EVENT_OFF(bm->t_rmap_update); + event_execute(bm->master, bgp_route_map_update_timer, + NULL, 0); } return CMD_SUCCESS; } else { @@ -12330,7 +12330,7 @@ static void bgp_show_neighbor_graceful_restart_capability_per_afi_safi( if (peer->t_gr_stale != NULL) { json_object_int_add(json_timer, "stalePathTimerRemaining", - thread_timer_remain_second( + event_timer_remain_second( peer->t_gr_stale)); } @@ -12351,7 +12351,7 @@ static void bgp_show_neighbor_graceful_restart_capability_per_afi_safi( json_object_int_add( json_timer, "selectionDeferralTimerRemaining", - thread_timer_remain_second( + event_timer_remain_second( peer->bgp->gr_info[afi][safi] .t_select_deferral)); } @@ -12364,7 +12364,7 @@ static void bgp_show_neighbor_graceful_restart_capability_per_afi_safi( if (peer->t_gr_stale != NULL) vty_out(vty, " Stale Path Remaining(sec): %ld\n", - thread_timer_remain_second( + event_timer_remain_second( peer->t_gr_stale)); /* Display Configured Selection * Deferral only when when @@ -12379,7 +12379,7 @@ static void bgp_show_neighbor_graceful_restart_capability_per_afi_safi( NULL) vty_out(vty, " Selection Deferral Time Remaining(sec): %ld\n", - thread_timer_remain_second( + event_timer_remain_second( peer->bgp->gr_info[afi][safi] .t_select_deferral)); } @@ -12413,7 +12413,7 @@ static void bgp_show_neighbor_graceful_restart_time(struct vty *vty, if (p->t_gr_restart != NULL) json_object_int_add( json_timer, "restartTimerRemaining", - thread_timer_remain_second(p->t_gr_restart)); + event_timer_remain_second(p->t_gr_restart)); json_object_object_add(json, "timers", json_timer); } else { @@ -12426,10 +12426,10 @@ static void bgp_show_neighbor_graceful_restart_time(struct vty *vty, p->v_gr_restart); if (p->t_gr_restart != NULL) vty_out(vty, " Restart Time Remaining(sec): %ld\n", - thread_timer_remain_second(p->t_gr_restart)); + event_timer_remain_second(p->t_gr_restart)); if (p->t_gr_restart != NULL) { vty_out(vty, " Restart Time Remaining(sec): %ld\n", - thread_timer_remain_second(p->t_gr_restart)); + event_timer_remain_second(p->t_gr_restart)); } } } @@ -13460,11 +13460,11 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json, json_neigh, "bgpTimerConfiguredConditionalAdvertisementsSec", bgp->condition_check_period); - if (thread_is_scheduled(bgp->t_condition_check)) + if (event_is_scheduled(bgp->t_condition_check)) json_object_int_add( json_neigh, "bgpTimerUntilConditionalAdvertisementsSec", - thread_timer_remain_second( + event_timer_remain_second( bgp->t_condition_check)); } else { /* Administrative shutdown. */ @@ -13541,10 +13541,10 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json, vty_out(vty, " Configured conditional advertisements interval is %d seconds\n", bgp->condition_check_period); - if (thread_is_scheduled(bgp->t_condition_check)) + if (event_is_scheduled(bgp->t_condition_check)) vty_out(vty, " Time until conditional advertisements begin is %lu seconds\n", - thread_timer_remain_second( + event_timer_remain_second( bgp->t_condition_check)); } /* Capability. */ @@ -14481,13 +14481,13 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json, if (p->t_gr_restart) json_object_int_add( json_grace, "gracefulRestartTimerMsecs", - thread_timer_remain_second(p->t_gr_restart) * + event_timer_remain_second(p->t_gr_restart) * 1000); if (p->t_gr_stale) json_object_int_add( json_grace, "gracefulStalepathTimerMsecs", - thread_timer_remain_second(p->t_gr_stale) * + event_timer_remain_second(p->t_gr_stale) * 1000); /* more gr info in new format */ BGP_SHOW_PEER_GR_CAPABILITY(vty, p, json_grace); @@ -14528,12 +14528,12 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json, if (p->t_gr_restart) vty_out(vty, " The remaining time of restart timer is %ld\n", - thread_timer_remain_second(p->t_gr_restart)); + event_timer_remain_second(p->t_gr_restart)); if (p->t_gr_stale) vty_out(vty, " The remaining time of stalepath timer is %ld\n", - thread_timer_remain_second(p->t_gr_stale)); + event_timer_remain_second(p->t_gr_stale)); /* more gr info in new format */ BGP_SHOW_PEER_GR_CAPABILITY(vty, p, NULL); @@ -14767,14 +14767,15 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json, json_neigh, "reducePrefixNumFrom"); json_object_int_add(json_neigh, "restartInTimerMsec", - thread_timer_remain_second( - p->t_pmax_restart) - * 1000); + event_timer_remain_second( + p->t_pmax_restart) * + 1000); } else vty_out(vty, " Reduce the no. of prefix from %s, will restart in %ld seconds\n", - p->host, thread_timer_remain_second( - p->t_pmax_restart)); + p->host, + event_timer_remain_second( + p->t_pmax_restart)); } else { if (use_json) json_object_boolean_true_add( @@ -14926,19 +14927,18 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json, if (p->t_start) json_object_int_add( json_neigh, "nextStartTimerDueInMsecs", - thread_timer_remain_second(p->t_start) * 1000); + event_timer_remain_second(p->t_start) * 1000); if (p->t_connect) json_object_int_add( json_neigh, "nextConnectTimerDueInMsecs", - thread_timer_remain_second(p->t_connect) - * 1000); + event_timer_remain_second(p->t_connect) * 1000); if (p->t_routeadv) { json_object_int_add(json_neigh, "mraiInterval", p->v_routeadv); json_object_int_add( json_neigh, "mraiTimerExpireInMsecs", - thread_timer_remain_second(p->t_routeadv) - * 1000); + event_timer_remain_second(p->t_routeadv) * + 1000); } if (p->password) json_object_int_add(json_neigh, "authenticationEnabled", @@ -14967,15 +14967,15 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json, } if (p->t_start) vty_out(vty, "Next start timer due in %ld seconds\n", - thread_timer_remain_second(p->t_start)); + event_timer_remain_second(p->t_start)); if (p->t_connect) vty_out(vty, "Next connect timer due in %ld seconds\n", - thread_timer_remain_second(p->t_connect)); + event_timer_remain_second(p->t_connect)); if (p->t_routeadv) vty_out(vty, "MRAI (interval %u) timer expires in %ld seconds\n", p->v_routeadv, - thread_timer_remain_second(p->t_routeadv)); + event_timer_remain_second(p->t_routeadv)); if (p->password) vty_out(vty, "Peer Authentication Enabled\n"); @@ -18764,14 +18764,14 @@ static const struct cmd_variable_handler bgp_var_peergroup[] = { DEFINE_HOOK(bgp_config_end, (struct bgp *bgp), (bgp)); -static struct thread *t_bgp_cfg; +static struct event *t_bgp_cfg; bool bgp_config_inprocess(void) { - return thread_is_scheduled(t_bgp_cfg); + return event_is_scheduled(t_bgp_cfg); } -static void bgp_config_finish(struct thread *t) +static void bgp_config_finish(struct event *t) { struct listnode *node; struct bgp *bgp; @@ -18783,9 +18783,9 @@ static void bgp_config_finish(struct thread *t) static void bgp_config_start(void) { #define BGP_PRE_CONFIG_MAX_WAIT_SECONDS 600 - THREAD_OFF(t_bgp_cfg); - thread_add_timer(bm->master, bgp_config_finish, NULL, - BGP_PRE_CONFIG_MAX_WAIT_SECONDS, &t_bgp_cfg); + EVENT_OFF(t_bgp_cfg); + event_add_timer(bm->master, bgp_config_finish, NULL, + BGP_PRE_CONFIG_MAX_WAIT_SECONDS, &t_bgp_cfg); } /* When we receive a hook the configuration is read, @@ -18797,8 +18797,8 @@ static void bgp_config_end(void) { #define BGP_POST_CONFIG_DELAY_SECONDS 1 uint32_t bgp_post_config_delay = - thread_is_scheduled(bm->t_rmap_update) - ? thread_timer_remain_second(bm->t_rmap_update) + event_is_scheduled(bm->t_rmap_update) + ? event_timer_remain_second(bm->t_rmap_update) : BGP_POST_CONFIG_DELAY_SECONDS; /* If BGP config processing thread isn't running, then @@ -18807,13 +18807,13 @@ static void bgp_config_end(void) if (!bgp_config_inprocess()) return; - THREAD_OFF(t_bgp_cfg); + EVENT_OFF(t_bgp_cfg); /* Start a new timer to make sure we don't send EoR * before route-maps are processed. */ - thread_add_timer(bm->master, bgp_config_finish, NULL, - bgp_post_config_delay, &t_bgp_cfg); + event_add_timer(bm->master, bgp_config_finish, NULL, + bgp_post_config_delay, &t_bgp_cfg); } static int config_write_interface_one(struct vty *vty, struct vrf *vrf) diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index da598993d1..3b17c99d6d 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -13,7 +13,7 @@ #include "sockunion.h" #include "zclient.h" #include "routemap.h" -#include "thread.h" +#include "frrevent.h" #include "queue.h" #include "memory.h" #include "lib/json.h" @@ -1046,19 +1046,19 @@ static bool bgp_table_map_apply(struct route_map *map, const struct prefix *p, return false; } -static struct thread *bgp_tm_thread_connect; +static struct event *bgp_tm_thread_connect; static bool bgp_tm_status_connected; static bool bgp_tm_chunk_obtained; #define BGP_FLOWSPEC_TABLE_CHUNK 100000 static uint32_t bgp_tm_min, bgp_tm_max, bgp_tm_chunk_size; struct bgp *bgp_tm_bgp; -static void bgp_zebra_tm_connect(struct thread *t) +static void bgp_zebra_tm_connect(struct event *t) { struct zclient *zclient; int delay = 10, ret = 0; - zclient = THREAD_ARG(t); + zclient = EVENT_ARG(t); if (bgp_tm_status_connected && zclient->sock > 0) delay = 60; else { @@ -1082,8 +1082,8 @@ static void bgp_zebra_tm_connect(struct thread *t) } } } - thread_add_timer(bm->master, bgp_zebra_tm_connect, zclient, delay, - &bgp_tm_thread_connect); + event_add_timer(bm->master, bgp_zebra_tm_connect, zclient, delay, + &bgp_tm_thread_connect); } bool bgp_zebra_tm_chunk_obtained(void) @@ -1113,8 +1113,8 @@ void bgp_zebra_init_tm_connect(struct bgp *bgp) bgp_tm_min = bgp_tm_max = 0; bgp_tm_chunk_size = BGP_FLOWSPEC_TABLE_CHUNK; bgp_tm_bgp = bgp; - thread_add_timer(bm->master, bgp_zebra_tm_connect, zclient, delay, - &bgp_tm_thread_connect); + event_add_timer(bm->master, bgp_zebra_tm_connect, zclient, delay, + &bgp_tm_thread_connect); } int bgp_zebra_get_table_range(uint32_t chunk_size, @@ -3443,7 +3443,7 @@ void bgp_if_init(void) hook_register_prio(if_del, 0, bgp_if_delete_hook); } -void bgp_zebra_init(struct thread_master *master, unsigned short instance) +void bgp_zebra_init(struct event_loop *master, unsigned short instance) { zclient_num_connects = 0; diff --git a/bgpd/bgp_zebra.h b/bgpd/bgp_zebra.h index 6f28f7b900..b09be890e5 100644 --- a/bgpd/bgp_zebra.h +++ b/bgpd/bgp_zebra.h @@ -18,8 +18,7 @@ /* Default weight for next hop, if doing weighted ECMP. */ #define BGP_ZEBRA_DEFAULT_NHOP_WEIGHT 1 -extern void bgp_zebra_init(struct thread_master *master, - unsigned short instance); +extern void bgp_zebra_init(struct event_loop *master, unsigned short instance); extern void bgp_if_init(void); extern void bgp_zebra_init_tm_connect(struct bgp *bgp); extern uint32_t bgp_zebra_tm_get_id(void); diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 96c6a111ce..cbed52068f 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -6,7 +6,7 @@ #include #include "prefix.h" -#include "thread.h" +#include "frrevent.h" #include "buffer.h" #include "stream.h" #include "ringbuf.h" @@ -1126,9 +1126,9 @@ static void peer_free(struct peer *peer) bgp_timer_set(peer); bgp_reads_off(peer); bgp_writes_off(peer); - thread_cancel_event_ready(bm->master, peer); + event_cancel_event_ready(bm->master, peer); FOREACH_AFI_SAFI (afi, safi) - THREAD_OFF(peer->t_revalidate_all[afi][safi]); + EVENT_OFF(peer->t_revalidate_all[afi][safi]); assert(!peer->t_write); assert(!peer->t_read); BGP_EVENT_FLUSH(peer); @@ -2467,16 +2467,16 @@ void peer_nsf_stop(struct peer *peer) FOREACH_AFI_SAFI_NSF (afi, safi) { peer->nsf[afi][safi] = 0; - THREAD_OFF(peer->t_llgr_stale[afi][safi]); + EVENT_OFF(peer->t_llgr_stale[afi][safi]); } if (peer->t_gr_restart) { - THREAD_OFF(peer->t_gr_restart); + EVENT_OFF(peer->t_gr_restart); if (bgp_debug_neighbor_events(peer)) zlog_debug("%pBP graceful restart timer stopped", peer); } if (peer->t_gr_stale) { - THREAD_OFF(peer->t_gr_stale); + EVENT_OFF(peer->t_gr_stale); if (bgp_debug_neighbor_events(peer)) zlog_debug( "%pBP graceful restart stalepath timer stopped", @@ -2516,9 +2516,9 @@ int peer_delete(struct peer *peer) bgp_keepalives_off(peer); bgp_reads_off(peer); bgp_writes_off(peer); - thread_cancel_event_ready(bm->master, peer); + event_cancel_event_ready(bm->master, peer); FOREACH_AFI_SAFI (afi, safi) - THREAD_OFF(peer->t_revalidate_all[afi][safi]); + EVENT_OFF(peer->t_revalidate_all[afi][safi]); assert(!CHECK_FLAG(peer->thread_flags, PEER_THREAD_WRITES_ON)); assert(!CHECK_FLAG(peer->thread_flags, PEER_THREAD_READS_ON)); assert(!CHECK_FLAG(peer->thread_flags, PEER_THREAD_KEEPALIVES_ON)); @@ -3197,11 +3197,11 @@ int peer_group_bind(struct bgp *bgp, union sockunion *su, struct peer *peer, return 0; } -static void bgp_startup_timer_expire(struct thread *thread) +static void bgp_startup_timer_expire(struct event *thread) { struct bgp *bgp; - bgp = THREAD_ARG(thread); + bgp = EVENT_ARG(thread); bgp->t_startup = NULL; } @@ -3355,8 +3355,8 @@ static struct bgp *bgp_create(as_t *as, const char *name, if (name) bgp->name = XSTRDUP(MTYPE_BGP, name); - thread_add_timer(bm->master, bgp_startup_timer_expire, bgp, - bgp->restart_time, &bgp->t_startup); + event_add_timer(bm->master, bgp_startup_timer_expire, bgp, + bgp->restart_time, &bgp->t_startup); /* printable name we can use in debug messages */ if (inst_type == BGP_INSTANCE_TYPE_DEFAULT) { @@ -3696,7 +3696,7 @@ void bgp_instance_down(struct bgp *bgp) /* Stop timers. */ if (bgp->t_rmap_def_originate_eval) { - THREAD_OFF(bgp->t_rmap_def_originate_eval); + EVENT_OFF(bgp->t_rmap_def_originate_eval); bgp_unlock(bgp); /* TODO - This timer is started with a lock - why? */ } @@ -3748,39 +3748,39 @@ int bgp_delete(struct bgp *bgp) hook_call(bgp_inst_delete, bgp); FOREACH_AFI_SAFI (afi, safi) - THREAD_OFF(bgp->t_revalidate[afi][safi]); + EVENT_OFF(bgp->t_revalidate[afi][safi]); - THREAD_OFF(bgp->t_condition_check); - THREAD_OFF(bgp->t_startup); - THREAD_OFF(bgp->t_maxmed_onstartup); - THREAD_OFF(bgp->t_update_delay); - THREAD_OFF(bgp->t_establish_wait); + EVENT_OFF(bgp->t_condition_check); + EVENT_OFF(bgp->t_startup); + EVENT_OFF(bgp->t_maxmed_onstartup); + EVENT_OFF(bgp->t_update_delay); + EVENT_OFF(bgp->t_establish_wait); /* Set flag indicating bgp instance delete in progress */ SET_FLAG(bgp->flags, BGP_FLAG_DELETE_IN_PROGRESS); /* Delete the graceful restart info */ FOREACH_AFI_SAFI (afi, safi) { - struct thread *t; + struct event *t; gr_info = &bgp->gr_info[afi][safi]; if (!gr_info) continue; t = gr_info->t_select_deferral; if (t) { - void *info = THREAD_ARG(t); + void *info = EVENT_ARG(t); XFREE(MTYPE_TMP, info); } - THREAD_OFF(gr_info->t_select_deferral); + EVENT_OFF(gr_info->t_select_deferral); t = gr_info->t_route_select; if (t) { - void *info = THREAD_ARG(t); + void *info = EVENT_ARG(t); XFREE(MTYPE_TMP, info); } - THREAD_OFF(gr_info->t_route_select); + EVENT_OFF(gr_info->t_route_select); } if (BGP_DEBUG(zebra, ZEBRA)) { @@ -3803,7 +3803,7 @@ int bgp_delete(struct bgp *bgp) /* Stop timers. */ if (bgp->t_rmap_def_originate_eval) { - THREAD_OFF(bgp->t_rmap_def_originate_eval); + EVENT_OFF(bgp->t_rmap_def_originate_eval); bgp_unlock(bgp); /* TODO - This timer is started with a lock - why? */ } @@ -3897,7 +3897,7 @@ int bgp_delete(struct bgp *bgp) if (bgp->process_queue) work_queue_free_and_null(&bgp->process_queue); - thread_master_free_unused(bm->master); + event_master_free_unused(bm->master); bgp_unlock(bgp); /* initial reference */ return 0; @@ -4528,7 +4528,7 @@ static void peer_flag_modify_action(struct peer *peer, uint64_t flag) UNSET_FLAG(peer->sflags, PEER_STATUS_PREFIX_OVERFLOW); if (peer->t_pmax_restart) { - THREAD_OFF(peer->t_pmax_restart); + EVENT_OFF(peer->t_pmax_restart); if (bgp_debug_neighbor_events(peer)) zlog_debug( "%pBP Maximum-prefix restart timer canceled", @@ -7398,7 +7398,7 @@ static bool peer_maximum_prefix_clear_overflow(struct peer *peer) UNSET_FLAG(peer->sflags, PEER_STATUS_PREFIX_OVERFLOW); if (peer->t_pmax_restart) { - THREAD_OFF(peer->t_pmax_restart); + EVENT_OFF(peer->t_pmax_restart); if (bgp_debug_neighbor_events(peer)) zlog_debug( "%pBP Maximum-prefix restart timer cancelled", @@ -8010,7 +8010,7 @@ char *peer_uptime(time_t uptime2, char *buf, size_t len, bool use_json, return buf; } -void bgp_master_init(struct thread_master *master, const int buffer_size, +void bgp_master_init(struct event_loop *master, const int buffer_size, struct list *addresses) { qobj_init(); @@ -8276,7 +8276,7 @@ void bgp_terminate(void) if (bm->listen_sockets) list_delete(&bm->listen_sockets); - THREAD_OFF(bm->t_rmap_update); + EVENT_OFF(bm->t_rmap_update); bgp_mac_finish(); } diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h index c0dd8d5ef4..a08a2870ee 100644 --- a/bgpd/bgpd.h +++ b/bgpd/bgpd.h @@ -98,7 +98,7 @@ struct bgp_master { struct list *bgp; /* BGP thread master. */ - struct thread_master *master; + struct event_loop *master; /* Listening sockets */ struct list *listen_sockets; @@ -126,7 +126,7 @@ struct bgp_master { uint64_t subgrp_idspace; /* timer to dampen route map changes */ - struct thread *t_rmap_update; /* Handle route map updates */ + struct event *t_rmap_update; /* Handle route map updates */ uint32_t rmap_update_timer; /* Route map update timer */ #define RMAP_DEFAULT_UPDATE_TIMER 5 /* disabled by default */ @@ -266,11 +266,11 @@ struct graceful_restart_info { /* Count of EOR received */ uint32_t eor_received; /* Deferral Timer */ - struct thread *t_select_deferral; + struct event *t_select_deferral; /* Routes Deferred */ uint32_t gr_deferred; /* Best route select */ - struct thread *t_route_select; + struct event *t_route_select; /* AFI, SAFI enabled */ bool af_enabled[AFI_MAX][SAFI_MAX]; /* Route update completed */ @@ -406,15 +406,16 @@ struct bgp { struct as_confed *confed_peers; int confed_peers_cnt; - struct thread - *t_startup; /* start-up timer on only once at the beginning */ + /* start-up timer on only once at the beginning */ + struct event *t_startup; uint32_t v_maxmed_onstartup; /* Duration of max-med on start-up */ #define BGP_MAXMED_ONSTARTUP_UNCONFIGURED 0 /* 0 means off, its the default */ uint32_t maxmed_onstartup_value; /* Max-med value when active on start-up */ - struct thread - *t_maxmed_onstartup; /* non-null when max-med onstartup is on */ + + /* non-null when max-med onstartup is on */ + struct event *t_maxmed_onstartup; uint8_t maxmed_onstartup_over; /* Flag to make it effective only once */ bool v_maxmed_admin; /* true/false if max-med administrative is on/off @@ -428,9 +429,9 @@ struct bgp { uint32_t maxmed_value; /* Max-med value when its active */ /* BGP update delay on startup */ - struct thread *t_update_delay; - struct thread *t_establish_wait; - struct thread *t_revalidate[AFI_MAX][SAFI_MAX]; + struct event *t_update_delay; + struct event *t_establish_wait; + struct event *t_revalidate[AFI_MAX][SAFI_MAX]; uint8_t update_delay_over; uint8_t main_zebra_update_hold; @@ -590,7 +591,7 @@ struct bgp { struct hash *pbr_action_hash; /* timer to re-evaluate neighbor default-originate route-maps */ - struct thread *t_rmap_def_originate_eval; + struct event *t_rmap_def_originate_eval; #define RMAP_DEFAULT_ORIGINATE_EVAL_TIMER 5 /* BGP distance configuration. */ @@ -769,7 +770,7 @@ struct bgp { /* BGP Conditional advertisement */ uint32_t condition_check_period; uint32_t condition_filter_count; - struct thread *t_condition_check; + struct event *t_condition_check; /* BGP VPN SRv6 backend */ bool srv6_enabled; @@ -978,7 +979,7 @@ struct peer_af { /* * Trigger timer for bgp_announce_route(). */ - struct thread *t_announce_route; + struct event *t_announce_route; afi_t afi; safi_t safi; @@ -1509,24 +1510,24 @@ struct peer { _Atomic uint32_t v_gr_restart; /* Threads. */ - struct thread *t_read; - struct thread *t_write; - struct thread *t_start; - struct thread *t_connect_check_r; - struct thread *t_connect_check_w; - struct thread *t_connect; - struct thread *t_holdtime; - struct thread *t_routeadv; - struct thread *t_delayopen; - struct thread *t_pmax_restart; - struct thread *t_gr_restart; - struct thread *t_gr_stale; - struct thread *t_llgr_stale[AFI_MAX][SAFI_MAX]; - struct thread *t_revalidate_all[AFI_MAX][SAFI_MAX]; - struct thread *t_generate_updgrp_packets; - struct thread *t_process_packet; - struct thread *t_process_packet_error; - struct thread *t_refresh_stalepath; + struct event *t_read; + struct event *t_write; + struct event *t_start; + struct event *t_connect_check_r; + struct event *t_connect_check_w; + struct event *t_connect; + struct event *t_holdtime; + struct event *t_routeadv; + struct event *t_delayopen; + struct event *t_pmax_restart; + struct event *t_gr_restart; + struct event *t_gr_stale; + struct event *t_llgr_stale[AFI_MAX][SAFI_MAX]; + struct event *t_revalidate_all[AFI_MAX][SAFI_MAX]; + struct event *t_generate_updgrp_packets; + struct event *t_process_packet; + struct event *t_process_packet_error; + struct event *t_refresh_stalepath; /* Thread flags. */ _Atomic uint32_t thread_flags; @@ -2155,7 +2156,7 @@ extern char *peer_uptime(time_t uptime2, char *buf, size_t len, bool use_json, extern int bgp_config_write(struct vty *); -extern void bgp_master_init(struct thread_master *master, const int buffer_size, +extern void bgp_master_init(struct event_loop *master, const int buffer_size, struct list *addresses); extern void bgp_init(unsigned short instance); @@ -2363,7 +2364,7 @@ extern int peer_ttl_security_hops_unset(struct peer *); extern void peer_tx_shutdown_message_set(struct peer *, const char *msg); extern void peer_tx_shutdown_message_unset(struct peer *); -extern void bgp_route_map_update_timer(struct thread *thread); +extern void bgp_route_map_update_timer(struct event *thread); extern const char *bgp_get_name_by_role(uint8_t role); extern enum asnotation_mode bgp_get_asnotation(struct bgp *bgp); diff --git a/bgpd/rfapi/rfapi.h b/bgpd/rfapi/rfapi.h index 44f7507d55..3f61d5be19 100644 --- a/bgpd/rfapi/rfapi.h +++ b/bgpd/rfapi/rfapi.h @@ -335,8 +335,7 @@ struct rfapi_rfp_cfg { * return value: * rfp_start_val rfp returned value passed on rfp_stop and other rfapi calls --------------------------------------------*/ -extern void *rfp_start(struct thread_master *master, - struct rfapi_rfp_cfg **cfgp, +extern void *rfp_start(struct event_loop *master, struct rfapi_rfp_cfg **cfgp, struct rfapi_rfp_cb_methods **cbmp); /*------------------------------------------ diff --git a/bgpd/rfapi/rfapi_backend.h b/bgpd/rfapi/rfapi_backend.h index 3870c31fca..32ea0a2821 100644 --- a/bgpd/rfapi/rfapi_backend.h +++ b/bgpd/rfapi/rfapi_backend.h @@ -14,7 +14,7 @@ #include "bgpd/bgp_nexthop.h" extern void rfapi_init(void); -extern void vnc_zebra_init(struct thread_master *master); +extern void vnc_zebra_init(struct event_loop *master); extern void vnc_zebra_destroy(void); extern void rfapi_delete(struct bgp *); diff --git a/bgpd/rfapi/rfapi_import.c b/bgpd/rfapi/rfapi_import.c index 25a4403040..e6da79fafb 100644 --- a/bgpd/rfapi/rfapi_import.c +++ b/bgpd/rfapi/rfapi_import.c @@ -15,7 +15,7 @@ #include "lib/memory.h" #include "lib/log.h" #include "lib/skiplist.h" -#include "lib/thread.h" +#include "frrevent.h" #include "lib/stream.h" #include "lib/lib_errors.h" @@ -848,10 +848,10 @@ static void rfapiBgpInfoChainFree(struct bgp_path_info *bpi) if (CHECK_FLAG(bpi->flags, BGP_PATH_REMOVED) && bpi->extra->vnc.import.timer) { struct rfapi_withdraw *wcb = - THREAD_ARG(bpi->extra->vnc.import.timer); + EVENT_ARG(bpi->extra->vnc.import.timer); XFREE(MTYPE_RFAPI_WITHDRAW, wcb); - THREAD_OFF(bpi->extra->vnc.import.timer); + EVENT_OFF(bpi->extra->vnc.import.timer); } next = bpi->next; @@ -2345,9 +2345,9 @@ static void rfapiMonitorEncapDelete(struct bgp_path_info *vpn_bpi) /* * Timer callback for withdraw */ -static void rfapiWithdrawTimerVPN(struct thread *t) +static void rfapiWithdrawTimerVPN(struct event *t) { - struct rfapi_withdraw *wcb = THREAD_ARG(t); + struct rfapi_withdraw *wcb = EVENT_ARG(t); struct bgp_path_info *bpi = wcb->info; struct bgp *bgp = bgp_get_default(); const struct prefix *p; @@ -2654,9 +2654,9 @@ rfapiWithdrawEncapUpdateCachedUn(struct rfapi_import_table *import_table, return 0; } -static void rfapiWithdrawTimerEncap(struct thread *t) +static void rfapiWithdrawTimerEncap(struct event *t) { - struct rfapi_withdraw *wcb = THREAD_ARG(t); + struct rfapi_withdraw *wcb = EVENT_ARG(t); struct bgp_path_info *bpi = wcb->info; int was_first_route = 0; struct rfapi_monitor_encap *em; @@ -2739,7 +2739,7 @@ static void rfapiBiStartWithdrawTimer(struct rfapi_import_table *import_table, struct agg_node *rn, struct bgp_path_info *bpi, afi_t afi, safi_t safi, - void (*timer_service_func)(struct thread *)) + void (*timer_service_func)(struct event *)) { uint32_t lifetime; struct rfapi_withdraw *wcb; @@ -2789,8 +2789,8 @@ rfapiBiStartWithdrawTimer(struct rfapi_import_table *import_table, if (lifetime > UINT32_MAX / 1001) { /* sub-optimal case, but will probably never happen */ bpi->extra->vnc.import.timer = NULL; - thread_add_timer(bm->master, timer_service_func, wcb, lifetime, - &bpi->extra->vnc.import.timer); + event_add_timer(bm->master, timer_service_func, wcb, lifetime, + &bpi->extra->vnc.import.timer); } else { static uint32_t jitter; uint32_t lifetime_msec; @@ -2805,9 +2805,9 @@ rfapiBiStartWithdrawTimer(struct rfapi_import_table *import_table, lifetime_msec = (lifetime * 1000) + jitter; bpi->extra->vnc.import.timer = NULL; - thread_add_timer_msec(bm->master, timer_service_func, wcb, - lifetime_msec, - &bpi->extra->vnc.import.timer); + event_add_timer_msec(bm->master, timer_service_func, wcb, + lifetime_msec, + &bpi->extra->vnc.import.timer); } /* re-sort route list (BGP_PATH_REMOVED routes are last) */ @@ -2831,7 +2831,7 @@ static void rfapiExpireEncapNow(struct rfapi_import_table *it, struct agg_node *rn, struct bgp_path_info *bpi) { struct rfapi_withdraw *wcb; - struct thread t; + struct event t; /* * pretend we're an expiring timer @@ -3076,12 +3076,11 @@ static void rfapiBgpInfoFilteredImportEncap( */ if (CHECK_FLAG(bpi->flags, BGP_PATH_REMOVED) && bpi->extra->vnc.import.timer) { - struct rfapi_withdraw *wcb = THREAD_ARG( + struct rfapi_withdraw *wcb = EVENT_ARG( bpi->extra->vnc.import.timer); XFREE(MTYPE_RFAPI_WITHDRAW, wcb); - THREAD_OFF( - bpi->extra->vnc.import.timer); + EVENT_OFF(bpi->extra->vnc.import.timer); } if (action == FIF_ACTION_UPDATE) { @@ -3094,7 +3093,7 @@ static void rfapiBgpInfoFilteredImportEncap( * bpi */ struct rfapi_withdraw *wcb; - struct thread t; + struct event t; /* * pretend we're an expiring timer @@ -3169,10 +3168,10 @@ static void rfapiBgpInfoFilteredImportEncap( __func__); if (bpi->extra->vnc.import.timer) { struct rfapi_withdraw *wcb = - THREAD_ARG(bpi->extra->vnc.import.timer); + EVENT_ARG(bpi->extra->vnc.import.timer); XFREE(MTYPE_RFAPI_WITHDRAW, wcb); - THREAD_OFF(bpi->extra->vnc.import.timer); + EVENT_OFF(bpi->extra->vnc.import.timer); } rfapiExpireEncapNow(import_table, rn, bpi); } @@ -3305,7 +3304,7 @@ static void rfapiExpireVpnNow(struct rfapi_import_table *it, int lockoffset) { struct rfapi_withdraw *wcb; - struct thread t; + struct event t; /* * pretend we're an expiring timer @@ -3529,12 +3528,11 @@ void rfapiBgpInfoFilteredImportVPN( */ if (CHECK_FLAG(bpi->flags, BGP_PATH_REMOVED) && bpi->extra->vnc.import.timer) { - struct rfapi_withdraw *wcb = THREAD_ARG( + struct rfapi_withdraw *wcb = EVENT_ARG( bpi->extra->vnc.import.timer); XFREE(MTYPE_RFAPI_WITHDRAW, wcb); - THREAD_OFF( - bpi->extra->vnc.import.timer); + EVENT_OFF(bpi->extra->vnc.import.timer); import_table->holddown_count[afi] -= 1; RFAPI_UPDATE_ITABLE_COUNT( @@ -3748,10 +3746,10 @@ void rfapiBgpInfoFilteredImportVPN( __func__); if (bpi->extra->vnc.import.timer) { struct rfapi_withdraw *wcb = - THREAD_ARG(bpi->extra->vnc.import.timer); + EVENT_ARG(bpi->extra->vnc.import.timer); XFREE(MTYPE_RFAPI_WITHDRAW, wcb); - THREAD_OFF(bpi->extra->vnc.import.timer); + EVENT_OFF(bpi->extra->vnc.import.timer); } rfapiExpireVpnNow(import_table, rn, bpi, 0); } @@ -4046,7 +4044,7 @@ static void rfapiProcessPeerDownRt(struct peer *peer, struct agg_node *rn; struct bgp_path_info *bpi; struct agg_table *rt = NULL; - void (*timer_service_func)(struct thread *) = NULL; + void (*timer_service_func)(struct event *) = NULL; assert(afi == AFI_IP || afi == AFI_IP6); @@ -4485,7 +4483,7 @@ static void rfapiDeleteRemotePrefixesIt( continue; if (bpi->extra->vnc.import.timer) { struct rfapi_withdraw *wcb = - THREAD_ARG( + EVENT_ARG( bpi->extra->vnc .import .timer); @@ -4498,9 +4496,8 @@ static void rfapiDeleteRemotePrefixesIt( afi, 1); XFREE(MTYPE_RFAPI_WITHDRAW, wcb); - THREAD_OFF( - bpi->extra->vnc.import - .timer); + EVENT_OFF(bpi->extra->vnc.import + .timer); } } else { if (!delete_active) diff --git a/bgpd/rfapi/rfapi_import.h b/bgpd/rfapi/rfapi_import.h index 3bec225f65..dd06afe7e2 100644 --- a/bgpd/rfapi/rfapi_import.h +++ b/bgpd/rfapi/rfapi_import.h @@ -13,7 +13,7 @@ #ifndef QUAGGA_HGP_RFAPI_IMPORT_H #define QUAGGA_HGP_RFAPI_IMPORT_H -#include "lib/thread.h" +#include "frrevent.h" /* * These are per-rt-import-list diff --git a/bgpd/rfapi/rfapi_monitor.c b/bgpd/rfapi/rfapi_monitor.c index f169a7808c..3fe957ba4d 100644 --- a/bgpd/rfapi/rfapi_monitor.c +++ b/bgpd/rfapi/rfapi_monitor.c @@ -619,7 +619,7 @@ void rfapiMonitorDel(struct bgp *bgp, struct rfapi_descriptor *rfd, rfapiMonitorDetachImport(m); } - THREAD_OFF(m->timer); + EVENT_OFF(m->timer); /* * remove from rfd list @@ -656,7 +656,7 @@ int rfapiMonitorDelHd(struct rfapi_descriptor *rfd) rfapiMonitorDetachImport(m); } - THREAD_OFF(m->timer); + EVENT_OFF(m->timer); XFREE(MTYPE_RFAPI_MONITOR, m); rn->info = NULL; @@ -690,7 +690,7 @@ int rfapiMonitorDelHd(struct rfapi_descriptor *rfd) #endif } - THREAD_OFF(mon_eth->timer); + EVENT_OFF(mon_eth->timer); /* * remove from rfd list @@ -730,9 +730,9 @@ void rfapiMonitorResponseRemovalOn(struct bgp *bgp) bgp->rfapi_cfg->flags &= ~BGP_VNC_CONFIG_RESPONSE_REMOVAL_DISABLE; } -static void rfapiMonitorTimerExpire(struct thread *t) +static void rfapiMonitorTimerExpire(struct event *t) { - struct rfapi_monitor_vpn *m = THREAD_ARG(t); + struct rfapi_monitor_vpn *m = EVENT_ARG(t); /* forget reference to thread, it's gone */ m->timer = NULL; @@ -743,7 +743,7 @@ static void rfapiMonitorTimerExpire(struct thread *t) static void rfapiMonitorTimerRestart(struct rfapi_monitor_vpn *m) { - unsigned long remain = thread_timer_remain_second(m->timer); + unsigned long remain = event_timer_remain_second(m->timer); /* unexpected case, but avoid wraparound problems below */ if (remain > m->rfd->response_lifetime) @@ -753,7 +753,7 @@ static void rfapiMonitorTimerRestart(struct rfapi_monitor_vpn *m) if (m->rfd->response_lifetime - remain < 2) return; - THREAD_OFF(m->timer); + EVENT_OFF(m->timer); { char buf[BUFSIZ]; @@ -764,8 +764,8 @@ static void rfapiMonitorTimerRestart(struct rfapi_monitor_vpn *m) m->rfd->response_lifetime); } - thread_add_timer(bm->master, rfapiMonitorTimerExpire, m, - m->rfd->response_lifetime, &m->timer); + event_add_timer(bm->master, rfapiMonitorTimerExpire, m, + m->rfd->response_lifetime, &m->timer); } /* @@ -1036,9 +1036,9 @@ void rfapiMonitorMovedUp(struct rfapi_import_table *import_table, } } -static void rfapiMonitorEthTimerExpire(struct thread *t) +static void rfapiMonitorEthTimerExpire(struct event *t) { - struct rfapi_monitor_eth *m = THREAD_ARG(t); + struct rfapi_monitor_eth *m = EVENT_ARG(t); /* forget reference to thread, it's gone */ m->timer = NULL; @@ -1051,7 +1051,7 @@ static void rfapiMonitorEthTimerExpire(struct thread *t) static void rfapiMonitorEthTimerRestart(struct rfapi_monitor_eth *m) { - unsigned long remain = thread_timer_remain_second(m->timer); + unsigned long remain = event_timer_remain_second(m->timer); /* unexpected case, but avoid wraparound problems below */ if (remain > m->rfd->response_lifetime) @@ -1061,7 +1061,7 @@ static void rfapiMonitorEthTimerRestart(struct rfapi_monitor_eth *m) if (m->rfd->response_lifetime - remain < 2) return; - THREAD_OFF(m->timer); + EVENT_OFF(m->timer); { char buf[BUFSIZ]; @@ -1072,8 +1072,8 @@ static void rfapiMonitorEthTimerRestart(struct rfapi_monitor_eth *m) m->rfd->response_lifetime); } - thread_add_timer(bm->master, rfapiMonitorEthTimerExpire, m, - m->rfd->response_lifetime, &m->timer); + event_add_timer(bm->master, rfapiMonitorEthTimerExpire, m, + m->rfd->response_lifetime, &m->timer); } static int mon_eth_cmp(const void *a, const void *b) @@ -1399,7 +1399,7 @@ void rfapiMonitorEthDel(struct bgp *bgp, struct rfapi_descriptor *rfd, rfapiMonitorEthDetachImport(bgp, val); } - THREAD_OFF(val->timer); + EVENT_OFF(val->timer); /* * remove from rfd list diff --git a/bgpd/rfapi/rfapi_monitor.h b/bgpd/rfapi/rfapi_monitor.h index 68ba5a48d8..3200079b39 100644 --- a/bgpd/rfapi/rfapi_monitor.h +++ b/bgpd/rfapi/rfapi_monitor.h @@ -25,7 +25,7 @@ struct rfapi_monitor_vpn { #define RFAPI_MON_FLAG_NEEDCALLBACK 0x00000001 /* deferred callback */ // int dcount; /* debugging counter */ - struct thread *timer; + struct event *timer; }; struct rfapi_monitor_encap { @@ -41,7 +41,7 @@ struct rfapi_monitor_eth { struct rfapi_descriptor *rfd; /* which NVE requested the route */ struct ethaddr macaddr; uint32_t logical_net_id; - struct thread *timer; + struct event *timer; }; /* diff --git a/bgpd/rfapi/rfapi_rib.c b/bgpd/rfapi/rfapi_rib.c index f727f24f1d..4dc3139ed1 100644 --- a/bgpd/rfapi/rfapi_rib.c +++ b/bgpd/rfapi/rfapi_rib.c @@ -255,8 +255,8 @@ static void rfapi_info_free(struct rfapi_info *goner) if (goner->timer) { struct rfapi_rib_tcb *tcb; - tcb = THREAD_ARG(goner->timer); - THREAD_OFF(goner->timer); + tcb = EVENT_ARG(goner->timer); + EVENT_OFF(goner->timer); XFREE(MTYPE_RFAPI_RECENT_DELETE, tcb); } XFREE(MTYPE_RFAPI_INFO, goner); @@ -278,9 +278,9 @@ struct rfapi_rib_tcb { /* * remove route from rib */ -static void rfapiRibExpireTimer(struct thread *t) +static void rfapiRibExpireTimer(struct event *t) { - struct rfapi_rib_tcb *tcb = THREAD_ARG(t); + struct rfapi_rib_tcb *tcb = EVENT_ARG(t); RFAPI_RIB_CHECK_COUNTS(1, 0); @@ -325,8 +325,8 @@ static void rfapiRibStartTimer(struct rfapi_descriptor *rfd, struct rfapi_rib_tcb *tcb = NULL; if (ri->timer) { - tcb = THREAD_ARG(ri->timer); - THREAD_OFF(ri->timer); + tcb = EVENT_ARG(ri->timer); + EVENT_OFF(ri->timer); } else { tcb = XCALLOC(MTYPE_RFAPI_RECENT_DELETE, sizeof(struct rfapi_rib_tcb)); @@ -345,8 +345,8 @@ static void rfapiRibStartTimer(struct rfapi_descriptor *rfd, vnc_zlog_debug_verbose("%s: rfd %p pfx %pRN life %u", __func__, rfd, rn, ri->lifetime); - thread_add_timer(bm->master, rfapiRibExpireTimer, tcb, ri->lifetime, - &ri->timer); + event_add_timer(bm->master, rfapiRibExpireTimer, tcb, ri->lifetime, + &ri->timer); } extern void rfapi_rib_key_init(struct prefix *prefix, /* may be NULL */ @@ -900,8 +900,8 @@ static void process_pending_node(struct bgp *bgp, struct rfapi_descriptor *rfd, if (ri->timer) { struct rfapi_rib_tcb *tcb; - tcb = THREAD_ARG(ri->timer); - THREAD_OFF(ri->timer); + tcb = EVENT_ARG(ri->timer); + EVENT_OFF(ri->timer); XFREE(MTYPE_RFAPI_RECENT_DELETE, tcb); } @@ -985,8 +985,8 @@ static void process_pending_node(struct bgp *bgp, struct rfapi_descriptor *rfd, if (ori->timer) { struct rfapi_rib_tcb *tcb; - tcb = THREAD_ARG(ori->timer); - THREAD_OFF(ori->timer); + tcb = EVENT_ARG(ori->timer); + EVENT_OFF(ori->timer); XFREE(MTYPE_RFAPI_RECENT_DELETE, tcb); } @@ -1319,8 +1319,8 @@ callback: if (ri->timer) { struct rfapi_rib_tcb *tcb; - tcb = THREAD_ARG(ri->timer); - THREAD_OFF(ri->timer); + tcb = EVENT_ARG(ri->timer); + EVENT_OFF(ri->timer); XFREE(MTYPE_RFAPI_RECENT_DELETE, tcb); } RFAPI_RIB_CHECK_COUNTS(0, delete_list->count); diff --git a/bgpd/rfapi/rfapi_rib.h b/bgpd/rfapi/rfapi_rib.h index 1b626bd2e1..5fa838bd34 100644 --- a/bgpd/rfapi/rfapi_rib.h +++ b/bgpd/rfapi/rfapi_rib.h @@ -61,7 +61,7 @@ struct rfapi_info { struct bgp_tea_options *tea_options; struct rfapi_un_option *un_options; struct rfapi_vn_option *vn_options; - struct thread *timer; + struct event *timer; }; /* diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c index 2b768b8f8d..94c77d826e 100644 --- a/bgpd/rfapi/rfapi_vty.c +++ b/bgpd/rfapi/rfapi_vty.c @@ -516,10 +516,10 @@ void rfapiPrintBi(void *stream, struct bgp_path_info *bpi) if (CHECK_FLAG(bpi->flags, BGP_PATH_REMOVED) && bpi->extra && bpi->extra->vnc.import.timer) { - struct thread *t = - (struct thread *)bpi->extra->vnc.import.timer; + struct event *t = (struct event *)bpi->extra->vnc.import.timer; + r = snprintf(p, REMAIN, " [%4lu] ", - thread_timer_remain_second(t)); + event_timer_remain_second(t)); INCP; } else { @@ -910,7 +910,7 @@ int rfapiShowVncQueries(void *stream, struct prefix *pfx_match) fp(out, "%-15s %-15s", "", ""); buf_remain[0] = 0; rfapiFormatSeconds( - thread_timer_remain_second(m->timer), + event_timer_remain_second(m->timer), buf_remain, BUFSIZ); fp(out, " %-15s %-10s\n", inet_ntop(m->p.family, &m->p.u.prefix, @@ -983,7 +983,7 @@ int rfapiShowVncQueries(void *stream, struct prefix *pfx_match) } else fp(out, "%-15s %-15s", "", ""); buf_remain[0] = 0; - rfapiFormatSeconds(thread_timer_remain_second( + rfapiFormatSeconds(event_timer_remain_second( mon_eth->timer), buf_remain, BUFSIZ); fp(out, " %-17s %10d %-10s\n", @@ -1114,9 +1114,8 @@ static int rfapiPrintRemoteRegBi(struct bgp *bgp, void *stream, time_t age; char buf_age[BUFSIZ]; - struct thread *t = - (struct thread *)bpi->extra->vnc.import.timer; - remaining = thread_timer_remain_second(t); + struct event *t = (struct event *)bpi->extra->vnc.import.timer; + remaining = event_timer_remain_second(t); #ifdef RFAPI_REGISTRATIONS_REPORT_AGE /* @@ -1174,6 +1173,7 @@ static int rfapiPrintRemoteRegBi(struct bgp *bgp, void *stream, } if (tun_type != BGP_ENCAP_TYPE_MPLS && bpi->extra) { uint32_t l = decode_label(&bpi->extra->label[0]); + if (!MPLS_LABEL_IS_NULL(l)) { fp(out, " Label: %d", l); if (nlines == 1) diff --git a/bgpd/rfapi/vnc_export_bgp.c b/bgpd/rfapi/vnc_export_bgp.c index 5449220448..7decb75782 100644 --- a/bgpd/rfapi/vnc_export_bgp.c +++ b/bgpd/rfapi/vnc_export_bgp.c @@ -1692,7 +1692,7 @@ void vnc_direct_bgp_rh_add_route(struct bgp *bgp, afi_t afi, * export expiration timer is already running on * this route: cancel it */ - THREAD_OFF(eti->timer); + EVENT_OFF(eti->timer); bgp_update(peer, prefix, /* prefix */ 0, /* addpath_id */ @@ -1704,9 +1704,9 @@ void vnc_direct_bgp_rh_add_route(struct bgp *bgp, afi_t afi, bgp_attr_unintern(&iattr); } -static void vncExportWithdrawTimer(struct thread *t) +static void vncExportWithdrawTimer(struct event *t) { - struct vnc_export_info *eti = THREAD_ARG(t); + struct vnc_export_info *eti = EVENT_ARG(t); const struct prefix *p = agg_node_get_prefix(eti->node); /* @@ -1765,8 +1765,8 @@ void vnc_direct_bgp_rh_del_route(struct bgp *bgp, afi_t afi, if (!eti->timer && eti->lifetime <= INT32_MAX) { eti->timer = NULL; - thread_add_timer(bm->master, vncExportWithdrawTimer, eti, - eti->lifetime, &eti->timer); + event_add_timer(bm->master, vncExportWithdrawTimer, eti, + eti->lifetime, &eti->timer); vnc_zlog_debug_verbose( "%s: set expiration timer for %u seconds", __func__, eti->lifetime); @@ -1922,7 +1922,7 @@ void vnc_direct_bgp_rh_vpn_enable(struct bgp *bgp, afi_t afi) * already running on * this route: cancel it */ - THREAD_OFF(eti->timer); + EVENT_OFF(eti->timer); vnc_zlog_debug_verbose( "%s: calling bgp_update", @@ -1991,7 +1991,7 @@ void vnc_direct_bgp_rh_vpn_disable(struct bgp *bgp, afi_t afi) ZEBRA_ROUTE_VNC_DIRECT_RH, BGP_ROUTE_REDISTRIBUTE); if (eti) { - THREAD_OFF(eti->timer); + EVENT_OFF(eti->timer); vnc_eti_delete(eti); } diff --git a/bgpd/rfapi/vnc_export_table.h b/bgpd/rfapi/vnc_export_table.h index 42c04f0c79..f715de0857 100644 --- a/bgpd/rfapi/vnc_export_table.h +++ b/bgpd/rfapi/vnc_export_table.h @@ -9,7 +9,7 @@ #define _QUAGGA_VNC_VNC_EXPORT_TABLE_H_ #include "lib/table.h" -#include "lib/thread.h" +#include "frrevent.h" #include "lib/vty.h" #include "bgpd/bgpd.h" @@ -29,7 +29,7 @@ struct vnc_export_info { uint8_t type; uint8_t subtype; uint32_t lifetime; - struct thread *timer; + struct event *timer; }; extern struct agg_node *vnc_etn_get(struct bgp *bgp, vnc_export_type_t type, diff --git a/bgpd/rfapi/vnc_zebra.c b/bgpd/rfapi/vnc_zebra.c index 4dab0bc333..4c55c2f633 100644 --- a/bgpd/rfapi/vnc_zebra.c +++ b/bgpd/rfapi/vnc_zebra.c @@ -890,7 +890,7 @@ static zclient_handler *const vnc_handlers[] = { * Modeled after bgp_zebra.c'bgp_zebra_init() * Charriere asks, "Is it possible to carry two?" */ -void vnc_zebra_init(struct thread_master *master) +void vnc_zebra_init(struct event_loop *master) { /* Set default values. */ zclient_vnc = zclient_new(master, &zclient_options_default, diff --git a/bgpd/rfp-example/librfp/rfp_example.c b/bgpd/rfp-example/librfp/rfp_example.c index 3a512902e0..1ada36bbc0 100644 --- a/bgpd/rfp-example/librfp/rfp_example.c +++ b/bgpd/rfp-example/librfp/rfp_example.c @@ -17,7 +17,7 @@ struct rfp_instance_t { struct rfapi_rfp_cfg rfapi_config; struct rfapi_rfp_cb_methods rfapi_callbacks; - struct thread_master *master; + struct event_loop *master; uint32_t config_var; }; @@ -271,7 +271,7 @@ static int rfp_cfg_write_cb(struct vty *vty, void *rfp_start_val) * rfp_start_val rfp returned value passed on rfp_stop and rfp_cfg_write * --------------------------------------------*/ -void *rfp_start(struct thread_master *master, struct rfapi_rfp_cfg **cfgp, +void *rfp_start(struct event_loop *master, struct rfapi_rfp_cfg **cfgp, struct rfapi_rfp_cb_methods **cbmp) { memset(&global_rfi, 0, sizeof(global_rfi)); diff --git a/doc/developer/logging.rst b/doc/developer/logging.rst index e262f6af94..b7021b69a1 100644 --- a/doc/developer/logging.rst +++ b/doc/developer/logging.rst @@ -335,16 +335,16 @@ Time/interval formats FRR library helper formats ^^^^^^^^^^^^^^^^^^^^^^^^^^ -.. frrfmt:: %pTH (struct thread *) +.. frrfmt:: %pTH (struct event *) - Print remaining time on timer thread. Interval-printing flag characters + Print remaining time on timer event. Interval-printing flag characters listed above for ``%pTV`` can be added, e.g. ``%pTHtx``. ``NULL`` pointers are printed as ``-``. -.. frrfmt:: %pTHD (struct thread *) +.. frrfmt:: %pTHD (struct event *) - Print debugging information for given thread. Sample output: + Print debugging information for given event. Sample output: .. code-block:: none diff --git a/doc/developer/modules.rst b/doc/developer/modules.rst index e95f8a1b4a..0feac8e738 100644 --- a/doc/developer/modules.rst +++ b/doc/developer/modules.rst @@ -56,9 +56,9 @@ Basic boilerplate: #include "hook.h" #include "module.h" #include "libfrr.h" - #include "thread.h" + #include "frrevent.h" - static int module_late_init(struct thread_master *master) + static int module_late_init(struct event_loop *master) { /* Do initialization stuff here */ return 0; diff --git a/doc/developer/path-internals-pcep.rst b/doc/developer/path-internals-pcep.rst index ca318314f1..a6b22204c2 100644 --- a/doc/developer/path-internals-pcep.rst +++ b/doc/developer/path-internals-pcep.rst @@ -182,7 +182,7 @@ The controller is defined and implemented in `path_pcep_controller.[hc]`. Part of the controller code runs in FRR main thread and part runs in its own FRR pthread started to isolate the main thread from the PCCs' event loop. To communicate between the threads it uses FRR events, timers and -`thread_execute` calls. +`event_execute` calls. PCC diff --git a/doc/developer/process-architecture.rst b/doc/developer/process-architecture.rst index 37bd620f24..33ef278c4d 100644 --- a/doc/developer/process-architecture.rst +++ b/doc/developer/process-architecture.rst @@ -28,7 +28,7 @@ within the event system are variations on the term "thread". The primary datastructure that holds the state of an event loop in this system is called a "threadmaster". Events scheduled on the event loop - what would today be called an 'event' or 'task' in systems such as libevent - are called "threads" and the -datastructure for them is ``struct thread``. To add to the confusion, these +datastructure for them is ``struct event``. To add to the confusion, these "threads" have various types, one of which is "event". To hopefully avoid some of this confusion, this document refers to these "threads" as a 'task' except where the datastructures are explicitly named. When they are explicitly named, @@ -47,7 +47,7 @@ section. For now it provides basic information necessary to understand the interplay between the event system and kernel threads. The core event system is implemented in :file:`lib/thread.[ch]`. The primary -structure is ``struct thread_master``, hereafter referred to as a +structure is ``struct event_loop``, hereafter referred to as a ``threadmaster``. A ``threadmaster`` is a global state object, or context, that holds all the tasks currently pending execution as well as statistics on tasks that have already executed. The event system is driven by adding tasks to this @@ -57,7 +57,7 @@ execute. At initialization, a daemon will typically create one fetch each task and execute it. These tasks have various types corresponding to their general action. The types -are given by integer macros in :file:`thread.h` and are: +are given by integer macros in :file:`event.h` and are: ``THREAD_READ`` Task which waits for a file descriptor to become ready for reading and then @@ -80,8 +80,8 @@ are given by integer macros in :file:`thread.h` and are: Type used internally for tasks on the ready queue. ``THREAD_UNUSED`` - Type used internally for ``struct thread`` objects that aren't being used. - The event system pools ``struct thread`` to avoid heap allocations; this is + Type used internally for ``struct event`` objects that aren't being used. + The event system pools ``struct event`` to avoid heap allocations; this is the type they have when they're in the pool. ``THREAD_EXECUTE`` @@ -95,9 +95,9 @@ irrelevant for the time being) for the specific type. For example, to add a :: - thread_add_read(struct thread_master *master, int (*handler)(struct thread *), void *arg, int fd, struct thread **ref); + event_add_read(struct event_loop *master, int (*handler)(struct event *), void *arg, int fd, struct event **ref); -The ``struct thread`` is then created and added to the appropriate internal +The ``struct event`` is then created and added to the appropriate internal datastructure within the ``threadmaster``. Note that the ``READ`` and ``WRITE`` tasks are independent - a ``READ`` task only tests for readability, for example. @@ -111,13 +111,13 @@ program. When no more tasks are available, the program dies. Typically at startup the first task added is an I/O task for VTYSH as well as any network sockets needed for peerings or IPC. -To retrieve the next task to run the program calls ``thread_fetch()``. -``thread_fetch()`` internally computes which task to execute next based on +To retrieve the next task to run the program calls ``event_fetch()``. +``event_fetch()`` internally computes which task to execute next based on rudimentary priority logic. Events (type ``THREAD_EVENT``) execute with the highest priority, followed by expired timers and finally I/O tasks (type ``THREAD_READ`` and ``THREAD_WRITE``). When scheduling a task a function and an -arbitrary argument are provided. The task returned from ``thread_fetch()`` is -then executed with ``thread_call()``. +arbitrary argument are provided. The task returned from ``event_fetch()`` is +then executed with ``event_call()``. The following diagram illustrates a simplified version of this infrastructure. @@ -133,18 +133,18 @@ illustrated at the bottom. Mapping the general names used in the figure to specific FRR functions: -- ``task`` is ``struct thread *`` -- ``fetch`` is ``thread_fetch()`` -- ``exec()`` is ``thread_call`` -- ``cancel()`` is ``thread_cancel()`` -- ``schedule()`` is any of the various task-specific ``thread_add_*`` functions +- ``task`` is ``struct event *`` +- ``fetch`` is ``event_fetch()`` +- ``exec()`` is ``event_call`` +- ``cancel()`` is ``event_cancel()`` +- ``schedule()`` is any of the various task-specific ``event_add_*`` functions Adding tasks is done with various task-specific function-like macros. These macros wrap underlying functions in :file:`thread.c` to provide additional information added at compile time, such as the line number the task was scheduled from, that can be accessed at runtime for debugging, logging and informational purposes. Each task type has its own specific scheduling function -that follow the naming convention ``thread_add_``; see :file:`thread.h` +that follow the naming convention ``event_add_``; see :file:`event.h` for details. There are some gotchas to keep in mind: @@ -228,7 +228,7 @@ well as *any other pthread*. This serves as the basis for inter-thread communication and boils down to a slightly more complicated method of message passing, where the messages are the regular task events as used in the event-driven model. The only difference is thread cancellation, which requires -calling ``thread_cancel_async()`` instead of ``thread_cancel`` to cancel a task +calling ``event_cancel_async()`` instead of ``event_cancel`` to cancel a task currently scheduled on a ``threadmaster`` belonging to a different pthread. This is necessary to avoid race conditions in the specific case where one pthread wants to guarantee that a task on another pthread is cancelled before diff --git a/doc/developer/rcu.rst b/doc/developer/rcu.rst index ac4405121e..4fd56587ae 100644 --- a/doc/developer/rcu.rst +++ b/doc/developer/rcu.rst @@ -120,7 +120,7 @@ atomic ops & datastructures with other types of locking, e.g. rwlocks. The ``thread_master`` code currently always holds RCU everywhere, except while doing the actual ``poll()`` syscall. This is both an optimization as well as an "easement" into getting RCU going. The current implementation - contract is that any ``struct thread *`` callback is called with a RCU + contract is that any ``struct event *`` callback is called with a RCU holding depth of 1, and that this is owned by the thread so it may (should) drop and reacquire it when doing some longer-running work. diff --git a/doc/developer/tracing.rst b/doc/developer/tracing.rst index 63b04585f1..76f6004034 100644 --- a/doc/developer/tracing.rst +++ b/doc/developer/tracing.rst @@ -150,8 +150,8 @@ Example:: frr_libfrr:frr_pthread_stop (loglevel: TRACE_DEBUG_LINE (13)) (type: tracepoint) frr_libfrr:frr_pthread_run (loglevel: TRACE_DEBUG_LINE (13)) (type: tracepoint) frr_libfrr:thread_call (loglevel: TRACE_INFO (6)) (type: tracepoint) - frr_libfrr:thread_cancel_async (loglevel: TRACE_INFO (6)) (type: tracepoint) - frr_libfrr:thread_cancel (loglevel: TRACE_INFO (6)) (type: tracepoint) + frr_libfrr:event_cancel_async (loglevel: TRACE_INFO (6)) (type: tracepoint) + frr_libfrr:event_cancel (loglevel: TRACE_INFO (6)) (type: tracepoint) frr_libfrr:schedule_write (loglevel: TRACE_INFO (6)) (type: tracepoint) frr_libfrr:schedule_read (loglevel: TRACE_INFO (6)) (type: tracepoint) frr_libfrr:schedule_event (loglevel: TRACE_INFO (6)) (type: tracepoint) diff --git a/eigrpd/eigrp_dump.c b/eigrpd/eigrp_dump.c index 489b3bd1c5..2ebabd0efa 100644 --- a/eigrpd/eigrp_dump.c +++ b/eigrpd/eigrp_dump.c @@ -13,7 +13,7 @@ #include #include "linklist.h" -#include "thread.h" +#include "frrevent.h" #include "prefix.h" #include "command.h" #include "stream.h" @@ -192,7 +192,7 @@ void show_ip_eigrp_neighbor_sub(struct vty *vty, struct eigrp_neighbor *nbr, vty_out(vty, "%-3u %-17pI4 %-21s", 0, &nbr->src, IF_NAME(nbr->ei)); if (nbr->t_holddown) vty_out(vty, "%-7lu", - thread_timer_remain_second(nbr->t_holddown)); + event_timer_remain_second(nbr->t_holddown)); else vty_out(vty, "- "); vty_out(vty, "%-8u %-6u %-5u", 0, 0, EIGRP_PACKET_RETRANS_TIME); diff --git a/eigrpd/eigrp_filter.c b/eigrpd/eigrp_filter.c index 09ae6be6dc..eceef6b8a7 100644 --- a/eigrpd/eigrp_filter.c +++ b/eigrpd/eigrp_filter.c @@ -21,7 +21,7 @@ #include "command.h" #include "prefix.h" #include "table.h" -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "log.h" #include "stream.h" @@ -111,11 +111,11 @@ void eigrp_distribute_update(struct distribute_ctx *ctx, // TODO: check Graceful restart after 10sec /* cancel GR scheduled */ - thread_cancel(&(e->t_distribute)); + event_cancel(&(e->t_distribute)); /* schedule Graceful restart for whole process in 10sec */ - thread_add_timer(master, eigrp_distribute_timer_process, e, - (10), &e->t_distribute); + event_add_timer(master, eigrp_distribute_timer_process, e, (10), + &e->t_distribute); return; } @@ -186,10 +186,10 @@ void eigrp_distribute_update(struct distribute_ctx *ctx, // TODO: check Graceful restart after 10sec /* Cancel GR scheduled */ - thread_cancel(&(ei->t_distribute)); + event_cancel(&(ei->t_distribute)); /* schedule Graceful restart for interface in 10sec */ - thread_add_timer(master, eigrp_distribute_timer_interface, ei, 10, - &ei->t_distribute); + event_add_timer(master, eigrp_distribute_timer_interface, ei, 10, + &ei->t_distribute); } /* @@ -242,11 +242,11 @@ void eigrp_distribute_update_all_wrapper(struct access_list *notused) * Called when 10sec waiting time expire and * executes Graceful restart for whole process */ -void eigrp_distribute_timer_process(struct thread *thread) +void eigrp_distribute_timer_process(struct event *thread) { struct eigrp *eigrp; - eigrp = THREAD_ARG(thread); + eigrp = EVENT_ARG(thread); /* execute GR for whole process */ eigrp_update_send_process_GR(eigrp, EIGRP_GR_FILTER, NULL); @@ -263,11 +263,11 @@ void eigrp_distribute_timer_process(struct thread *thread) * Called when 10sec waiting time expire and * executes Graceful restart for interface */ -void eigrp_distribute_timer_interface(struct thread *thread) +void eigrp_distribute_timer_interface(struct event *thread) { struct eigrp_interface *ei; - ei = THREAD_ARG(thread); + ei = EVENT_ARG(thread); ei->t_distribute = NULL; /* execute GR for interface */ diff --git a/eigrpd/eigrp_filter.h b/eigrpd/eigrp_filter.h index 493ba08f7d..dc8af8f535 100644 --- a/eigrpd/eigrp_filter.h +++ b/eigrpd/eigrp_filter.h @@ -23,7 +23,7 @@ extern void eigrp_distribute_update(struct distribute_ctx *ctx, extern void eigrp_distribute_update_interface(struct interface *ifp); extern void eigrp_distribute_update_all(struct prefix_list *plist); extern void eigrp_distribute_update_all_wrapper(struct access_list *alist); -extern void eigrp_distribute_timer_process(struct thread *thread); -extern void eigrp_distribute_timer_interface(struct thread *thread); +extern void eigrp_distribute_timer_process(struct event *thread); +extern void eigrp_distribute_timer_interface(struct event *thread); #endif /* EIGRPD_EIGRP_FILTER_H_ */ diff --git a/eigrpd/eigrp_fsm.c b/eigrpd/eigrp_fsm.c index d065af0cb9..6d8061e572 100644 --- a/eigrpd/eigrp_fsm.c +++ b/eigrpd/eigrp_fsm.c @@ -53,8 +53,8 @@ */ #include -#include +#include "frrevent.h" #include "prefix.h" #include "table.h" #include "memory.h" diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c index f62f54b680..662c750e96 100644 --- a/eigrpd/eigrp_hello.c +++ b/eigrpd/eigrp_hello.c @@ -16,7 +16,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" @@ -66,11 +66,11 @@ static const struct message eigrp_general_tlv_type_str[] = { * Sends hello packet via multicast for all interfaces eigrp * is configured for */ -void eigrp_hello_timer(struct thread *thread) +void eigrp_hello_timer(struct event *thread) { struct eigrp_interface *ei; - ei = THREAD_ARG(thread); + ei = EVENT_ARG(thread); if (IS_DEBUG_EIGRP(0, TIMERS)) zlog_debug("Start Hello Timer (%s) Expire [%u]", IF_NAME(ei), @@ -80,8 +80,8 @@ void eigrp_hello_timer(struct thread *thread) eigrp_hello_send(ei, EIGRP_HELLO_NORMAL, NULL); /* Hello timer set. */ - thread_add_timer(master, eigrp_hello_timer, ei, ei->params.v_hello, - &ei->t_hello); + event_add_timer(master, eigrp_hello_timer, ei, ei->params.v_hello, + &ei->t_hello); } /** @@ -726,8 +726,8 @@ void eigrp_hello_send_ack(struct eigrp_neighbor *nbr) listnode_add(nbr->ei->eigrp->oi_write_q, nbr->ei); nbr->ei->on_write_q = 1; } - thread_add_write(master, eigrp_write, nbr->ei->eigrp, - nbr->ei->eigrp->fd, &nbr->ei->eigrp->t_write); + event_add_write(master, eigrp_write, nbr->ei->eigrp, + nbr->ei->eigrp->fd, &nbr->ei->eigrp->t_write); } } @@ -771,12 +771,12 @@ void eigrp_hello_send(struct eigrp_interface *ei, uint8_t flags, if (ei->eigrp->t_write == NULL) { if (flags & EIGRP_HELLO_GRACEFUL_SHUTDOWN) { - thread_execute(master, eigrp_write, ei->eigrp, - ei->eigrp->fd); + event_execute(master, eigrp_write, ei->eigrp, + ei->eigrp->fd); } else { - thread_add_write(master, eigrp_write, ei->eigrp, - ei->eigrp->fd, - &ei->eigrp->t_write); + event_add_write(master, eigrp_write, ei->eigrp, + ei->eigrp->fd, + &ei->eigrp->t_write); } } } diff --git a/eigrpd/eigrp_interface.c b/eigrpd/eigrp_interface.c index 8d98dcf5a1..2381977dba 100644 --- a/eigrpd/eigrp_interface.c +++ b/eigrpd/eigrp_interface.c @@ -16,7 +16,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "linklist.h" #include "prefix.h" #include "if.h" @@ -251,7 +251,7 @@ int eigrp_if_up(struct eigrp_interface *ei) /* Set multicast memberships appropriately for new state. */ eigrp_if_set_multicast(ei); - thread_add_event(master, eigrp_hello_timer, ei, (1), &ei->t_hello); + event_add_event(master, eigrp_hello_timer, ei, (1), &ei->t_hello); /*Prepare metrics*/ metric.bandwidth = eigrp_bandwidth_to_scaled(ei->params.bandwidth); @@ -333,7 +333,7 @@ int eigrp_if_down(struct eigrp_interface *ei) return 0; /* Shutdown packet reception and sending */ - THREAD_OFF(ei->t_hello); + EVENT_OFF(ei->t_hello); eigrp_if_stream_unset(ei); @@ -360,7 +360,7 @@ void eigrp_if_stream_unset(struct eigrp_interface *ei) if (ei->on_write_q) { listnode_delete(eigrp->oi_write_q, ei); if (list_isempty(eigrp->oi_write_q)) - thread_cancel(&(eigrp->t_write)); + event_cancel(&(eigrp->t_write)); ei->on_write_q = 0; } } @@ -422,7 +422,7 @@ void eigrp_if_free(struct eigrp_interface *ei, int source) struct eigrp *eigrp = ei->eigrp; if (source == INTERFACE_DOWN_BY_VTY) { - thread_cancel(&ei->t_hello); + event_cancel(&ei->t_hello); eigrp_hello_send(ei, EIGRP_HELLO_GRACEFUL_SHUTDOWN, NULL); } diff --git a/eigrpd/eigrp_macros.h b/eigrpd/eigrp_macros.h index b7cd22fee1..75f1d7e133 100644 --- a/eigrpd/eigrp_macros.h +++ b/eigrpd/eigrp_macros.h @@ -27,6 +27,6 @@ /* FSM macros*/ #define EIGRP_FSM_EVENT_SCHEDULE(I, E) \ - thread_add_event(master, eigrp_fsm_event, (I), (E)) + event_add_event(master, eigrp_fsm_event, (I), (E)) #endif /* _ZEBRA_EIGRP_MACROS_H_ */ diff --git a/eigrpd/eigrp_main.c b/eigrpd/eigrp_main.c index 3c1e5da340..6d7443b791 100644 --- a/eigrpd/eigrp_main.c +++ b/eigrpd/eigrp_main.c @@ -17,7 +17,7 @@ #include #include "getopt.h" -#include "thread.h" +#include "frrevent.h" #include "prefix.h" #include "linklist.h" #include "if.h" @@ -76,7 +76,7 @@ struct zebra_privs_t eigrpd_privs = { struct option longopts[] = {{0}}; /* Master of threads. */ -struct thread_master *master; +struct event_loop *master; /* Forward declaration of daemon info structure. */ static struct frr_daemon_info eigrpd_di; diff --git a/eigrpd/eigrp_neighbor.c b/eigrpd/eigrp_neighbor.c index 9288b0f1cd..25209c3bb3 100644 --- a/eigrpd/eigrp_neighbor.c +++ b/eigrpd/eigrp_neighbor.c @@ -20,7 +20,7 @@ #include "prefix.h" #include "memory.h" #include "command.h" -#include "thread.h" +#include "frrevent.h" #include "stream.h" #include "table.h" #include "log.h" @@ -164,19 +164,19 @@ void eigrp_nbr_delete(struct eigrp_neighbor *nbr) eigrp_topology_neighbor_down(nbr->ei->eigrp, nbr); /* Cancel all events. */ /* Thread lookup cost would be negligible. */ - thread_cancel_event(master, nbr); + event_cancel_event(master, nbr); eigrp_fifo_free(nbr->multicast_queue); eigrp_fifo_free(nbr->retrans_queue); - THREAD_OFF(nbr->t_holddown); + EVENT_OFF(nbr->t_holddown); if (nbr->ei) listnode_delete(nbr->ei->nbrs, nbr); XFREE(MTYPE_EIGRP_NEIGHBOR, nbr); } -void holddown_timer_expired(struct thread *thread) +void holddown_timer_expired(struct event *thread) { - struct eigrp_neighbor *nbr = THREAD_ARG(thread); + struct eigrp_neighbor *nbr = EVENT_ARG(thread); struct eigrp *eigrp = nbr->ei->eigrp; zlog_info("Neighbor %pI4 (%s) is down: holding time expired", &nbr->src, @@ -210,7 +210,7 @@ void eigrp_nbr_state_set(struct eigrp_neighbor *nbr, uint8_t state) // hold time.. nbr->v_holddown = EIGRP_HOLD_INTERVAL_DEFAULT; - THREAD_OFF(nbr->t_holddown); + EVENT_OFF(nbr->t_holddown); /* out with the old */ if (nbr->multicast_queue) @@ -252,24 +252,24 @@ void eigrp_nbr_state_update(struct eigrp_neighbor *nbr) switch (nbr->state) { case EIGRP_NEIGHBOR_DOWN: { /*Start Hold Down Timer for neighbor*/ - // THREAD_OFF(nbr->t_holddown); - // THREAD_TIMER_ON(master, nbr->t_holddown, + // EVENT_OFF(nbr->t_holddown); + // EVENT_TIMER_ON(master, nbr->t_holddown, // holddown_timer_expired, // nbr, nbr->v_holddown); break; } case EIGRP_NEIGHBOR_PENDING: { /*Reset Hold Down Timer for neighbor*/ - THREAD_OFF(nbr->t_holddown); - thread_add_timer(master, holddown_timer_expired, nbr, - nbr->v_holddown, &nbr->t_holddown); + EVENT_OFF(nbr->t_holddown); + event_add_timer(master, holddown_timer_expired, nbr, + nbr->v_holddown, &nbr->t_holddown); break; } case EIGRP_NEIGHBOR_UP: { /*Reset Hold Down Timer for neighbor*/ - THREAD_OFF(nbr->t_holddown); - thread_add_timer(master, holddown_timer_expired, nbr, - nbr->v_holddown, &nbr->t_holddown); + EVENT_OFF(nbr->t_holddown); + event_add_timer(master, holddown_timer_expired, nbr, + nbr->v_holddown, &nbr->t_holddown); break; } } diff --git a/eigrpd/eigrp_neighbor.h b/eigrpd/eigrp_neighbor.h index 5c9e44e2b9..2ccc89cf3a 100644 --- a/eigrpd/eigrp_neighbor.h +++ b/eigrpd/eigrp_neighbor.h @@ -24,7 +24,7 @@ extern struct eigrp_neighbor *eigrp_nbr_get(struct eigrp_interface *ei, extern struct eigrp_neighbor *eigrp_nbr_new(struct eigrp_interface *ei); extern void eigrp_nbr_delete(struct eigrp_neighbor *neigh); -extern void holddown_timer_expired(struct thread *thread); +extern void holddown_timer_expired(struct event *thread); extern int eigrp_neighborship_check(struct eigrp_neighbor *neigh, struct TLV_Parameter_Type *tlv); diff --git a/eigrpd/eigrp_network.c b/eigrpd/eigrp_network.c index 68edd0898a..ef567fe4ef 100644 --- a/eigrpd/eigrp_network.c +++ b/eigrpd/eigrp_network.c @@ -12,7 +12,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "linklist.h" #include "prefix.h" #include "if.h" diff --git a/eigrpd/eigrp_network.h b/eigrpd/eigrp_network.h index 33d91c2fbf..ac5c47f6f9 100644 --- a/eigrpd/eigrp_network.h +++ b/eigrpd/eigrp_network.h @@ -20,7 +20,7 @@ extern int eigrp_if_ipmulticast(struct eigrp *, struct prefix *, unsigned int); extern int eigrp_network_set(struct eigrp *eigrp, struct prefix *p); extern int eigrp_network_unset(struct eigrp *eigrp, struct prefix *p); -extern void eigrp_hello_timer(struct thread *thread); +extern void eigrp_hello_timer(struct event *thread); extern void eigrp_if_update(struct interface *); extern int eigrp_if_add_allspfrouters(struct eigrp *, struct prefix *, unsigned int); diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c index e00d62fb08..963d229bc1 100644 --- a/eigrpd/eigrp_packet.c +++ b/eigrpd/eigrp_packet.c @@ -12,7 +12,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "vty.h" @@ -305,9 +305,9 @@ int eigrp_check_sha256_digest(struct stream *s, return 1; } -void eigrp_write(struct thread *thread) +void eigrp_write(struct event *thread) { - struct eigrp *eigrp = THREAD_ARG(thread); + struct eigrp *eigrp = EVENT_ARG(thread); struct eigrp_header *eigrph; struct eigrp_interface *ei; struct eigrp_packet *ep; @@ -453,13 +453,13 @@ out: /* If packets still remain in queue, call write thread. */ if (!list_isempty(eigrp->oi_write_q)) { - thread_add_write(master, eigrp_write, eigrp, eigrp->fd, - &eigrp->t_write); + event_add_write(master, eigrp_write, eigrp, eigrp->fd, + &eigrp->t_write); } } /* Starting point of packet process function. */ -void eigrp_read(struct thread *thread) +void eigrp_read(struct event *thread) { int ret; struct stream *ibuf; @@ -474,10 +474,10 @@ void eigrp_read(struct thread *thread) uint16_t length = 0; /* first of all get interface pointer. */ - eigrp = THREAD_ARG(thread); + eigrp = EVENT_ARG(thread); /* prepare for next packet. */ - thread_add_read(master, eigrp_read, eigrp, eigrp->fd, &eigrp->t_read); + event_add_read(master, eigrp_read, eigrp, eigrp->fd, &eigrp->t_read); stream_reset(eigrp->ibuf); if (!(ibuf = eigrp_recv_packet(eigrp, eigrp->fd, &ifp, eigrp->ibuf))) { @@ -828,9 +828,9 @@ void eigrp_send_packet_reliably(struct eigrp_neighbor *nbr) eigrp_fifo_push(nbr->ei->obuf, duplicate); /*Start retransmission timer*/ - thread_add_timer(master, eigrp_unack_packet_retrans, nbr, - EIGRP_PACKET_RETRANS_TIME, - &ep->t_retrans_timer); + event_add_timer(master, eigrp_unack_packet_retrans, nbr, + EIGRP_PACKET_RETRANS_TIME, + &ep->t_retrans_timer); /*Increment sequence number counter*/ nbr->ei->eigrp->sequence_number++; @@ -840,8 +840,8 @@ void eigrp_send_packet_reliably(struct eigrp_neighbor *nbr) listnode_add(nbr->ei->eigrp->oi_write_q, nbr->ei); nbr->ei->on_write_q = 1; } - thread_add_write(master, eigrp_write, nbr->ei->eigrp, - nbr->ei->eigrp->fd, &nbr->ei->eigrp->t_write); + event_add_write(master, eigrp_write, nbr->ei->eigrp, + nbr->ei->eigrp->fd, &nbr->ei->eigrp->t_write); } } @@ -923,7 +923,7 @@ void eigrp_packet_free(struct eigrp_packet *ep) if (ep->s) stream_free(ep->s); - THREAD_OFF(ep->t_retrans_timer); + EVENT_OFF(ep->t_retrans_timer); XFREE(MTYPE_EIGRP_PACKET, ep); } @@ -970,10 +970,10 @@ static int eigrp_check_network_mask(struct eigrp_interface *ei, return 0; } -void eigrp_unack_packet_retrans(struct thread *thread) +void eigrp_unack_packet_retrans(struct event *thread) { struct eigrp_neighbor *nbr; - nbr = (struct eigrp_neighbor *)THREAD_ARG(thread); + nbr = (struct eigrp_neighbor *)EVENT_ARG(thread); struct eigrp_packet *ep; ep = eigrp_fifo_next(nbr->retrans_queue); @@ -992,24 +992,24 @@ void eigrp_unack_packet_retrans(struct thread *thread) } /*Start retransmission timer*/ - thread_add_timer(master, eigrp_unack_packet_retrans, nbr, - EIGRP_PACKET_RETRANS_TIME, - &ep->t_retrans_timer); + event_add_timer(master, eigrp_unack_packet_retrans, nbr, + EIGRP_PACKET_RETRANS_TIME, + &ep->t_retrans_timer); /* Hook thread to write packet. */ if (nbr->ei->on_write_q == 0) { listnode_add(nbr->ei->eigrp->oi_write_q, nbr->ei); nbr->ei->on_write_q = 1; } - thread_add_write(master, eigrp_write, nbr->ei->eigrp, - nbr->ei->eigrp->fd, &nbr->ei->eigrp->t_write); + event_add_write(master, eigrp_write, nbr->ei->eigrp, + nbr->ei->eigrp->fd, &nbr->ei->eigrp->t_write); } } -void eigrp_unack_multicast_packet_retrans(struct thread *thread) +void eigrp_unack_multicast_packet_retrans(struct event *thread) { struct eigrp_neighbor *nbr; - nbr = (struct eigrp_neighbor *)THREAD_ARG(thread); + nbr = (struct eigrp_neighbor *)EVENT_ARG(thread); struct eigrp_packet *ep; ep = eigrp_fifo_next(nbr->multicast_queue); @@ -1027,17 +1027,17 @@ void eigrp_unack_multicast_packet_retrans(struct thread *thread) } /*Start retransmission timer*/ - thread_add_timer(master, eigrp_unack_multicast_packet_retrans, - nbr, EIGRP_PACKET_RETRANS_TIME, - &ep->t_retrans_timer); + event_add_timer(master, eigrp_unack_multicast_packet_retrans, + nbr, EIGRP_PACKET_RETRANS_TIME, + &ep->t_retrans_timer); /* Hook thread to write packet. */ if (nbr->ei->on_write_q == 0) { listnode_add(nbr->ei->eigrp->oi_write_q, nbr->ei); nbr->ei->on_write_q = 1; } - thread_add_write(master, eigrp_write, nbr->ei->eigrp, - nbr->ei->eigrp->fd, &nbr->ei->eigrp->t_write); + event_add_write(master, eigrp_write, nbr->ei->eigrp, + nbr->ei->eigrp->fd, &nbr->ei->eigrp->t_write); } } diff --git a/eigrpd/eigrp_packet.h b/eigrpd/eigrp_packet.h index 4c1cfd4828..6a0360ed80 100644 --- a/eigrpd/eigrp_packet.h +++ b/eigrpd/eigrp_packet.h @@ -18,8 +18,8 @@ #define _ZEBRA_EIGRP_PACKET_H /*Prototypes*/ -extern void eigrp_read(struct thread *thread); -extern void eigrp_write(struct thread *thread); +extern void eigrp_read(struct event *thread); +extern void eigrp_write(struct event *thread); extern struct eigrp_packet *eigrp_packet_new(size_t size, struct eigrp_neighbor *nbr); @@ -51,8 +51,8 @@ extern uint16_t eigrp_add_authTLV_MD5_to_stream(struct stream *s, extern uint16_t eigrp_add_authTLV_SHA256_to_stream(struct stream *s, struct eigrp_interface *ei); -extern void eigrp_unack_packet_retrans(struct thread *thread); -extern void eigrp_unack_multicast_packet_retrans(struct thread *thread); +extern void eigrp_unack_packet_retrans(struct event *thread); +extern void eigrp_unack_multicast_packet_retrans(struct event *thread); /* * untill there is reason to have their own header, these externs are found in @@ -65,7 +65,7 @@ extern void eigrp_hello_send_ack(struct eigrp_neighbor *nbr); extern void eigrp_hello_receive(struct eigrp *eigrp, struct ip *iph, struct eigrp_header *eigrph, struct stream *s, struct eigrp_interface *ei, int size); -extern void eigrp_hello_timer(struct thread *thread); +extern void eigrp_hello_timer(struct event *thread); /* * These externs are found in eigrp_update.c @@ -81,7 +81,7 @@ extern void eigrp_update_send_all(struct eigrp *eigrp, struct eigrp_interface *exception); extern void eigrp_update_send_init(struct eigrp_neighbor *nbr); extern void eigrp_update_send_EOT(struct eigrp_neighbor *nbr); -extern void eigrp_update_send_GR_thread(struct thread *thread); +extern void eigrp_update_send_GR_thread(struct event *thread); extern void eigrp_update_send_GR(struct eigrp_neighbor *nbr, enum GR_type gr_type, struct vty *vty); extern void eigrp_update_send_interface_GR(struct eigrp_interface *ei, diff --git a/eigrpd/eigrp_query.c b/eigrpd/eigrp_query.c index 56498ed674..0e206cded6 100644 --- a/eigrpd/eigrp_query.c +++ b/eigrpd/eigrp_query.c @@ -12,7 +12,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_reply.c b/eigrpd/eigrp_reply.c index a1413fe9c7..aae89e832b 100644 --- a/eigrpd/eigrp_reply.c +++ b/eigrpd/eigrp_reply.c @@ -16,7 +16,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_siaquery.c b/eigrpd/eigrp_siaquery.c index 1c2ec3731f..71486a1f6f 100644 --- a/eigrpd/eigrp_siaquery.c +++ b/eigrpd/eigrp_siaquery.c @@ -12,7 +12,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_siareply.c b/eigrpd/eigrp_siareply.c index 37cca67373..6c8c1ef58d 100644 --- a/eigrpd/eigrp_siareply.c +++ b/eigrpd/eigrp_siareply.c @@ -11,7 +11,7 @@ */ #include -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_snmp.c b/eigrpd/eigrp_snmp.c index f159415ccb..492ef3e713 100644 --- a/eigrpd/eigrp_snmp.c +++ b/eigrpd/eigrp_snmp.c @@ -16,7 +16,7 @@ #include #include -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_structs.h b/eigrpd/eigrp_structs.h index 9c88e34f6c..8735c48661 100644 --- a/eigrpd/eigrp_structs.h +++ b/eigrpd/eigrp_structs.h @@ -71,9 +71,9 @@ struct eigrp { struct list *oi_write_q; /*Threads*/ - struct thread *t_write; - struct thread *t_read; - struct thread *t_distribute; /* timer for distribute list */ + struct event *t_write; + struct event *t_read; + struct event *t_distribute; /* timer for distribute list */ struct route_table *networks; /* EIGRP config networks. */ @@ -165,8 +165,8 @@ struct eigrp_interface { struct list *nbrs; /* EIGRP Neighbor List */ /* Threads. */ - struct thread *t_hello; /* timer */ - struct thread *t_distribute; /* timer for distribute list */ + struct event *t_hello; /* timer */ + struct event *t_distribute; /* timer for distribute list */ int on_write_q; @@ -240,8 +240,8 @@ struct eigrp_neighbor { uint16_t v_holddown; /* Threads. */ - struct thread *t_holddown; - struct thread *t_nbr_send_gr; /* thread for sending multiple GR packet + struct event *t_holddown; + struct event *t_nbr_send_gr; /* thread for sending multiple GR packet chunks */ struct eigrp_fifo *retrans_queue; @@ -271,7 +271,7 @@ struct eigrp_packet { struct in_addr dst; /*Packet retransmission thread*/ - struct thread *t_retrans_timer; + struct event *t_retrans_timer; /*Packet retransmission counter*/ uint8_t retrans_counter; diff --git a/eigrpd/eigrp_update.c b/eigrpd/eigrp_update.c index 49acf30695..2237a611e8 100644 --- a/eigrpd/eigrp_update.c +++ b/eigrpd/eigrp_update.c @@ -16,7 +16,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" @@ -895,19 +895,19 @@ static void eigrp_update_send_GR_part(struct eigrp_neighbor *nbr) * * Uses nbr_gr_packet_type and t_nbr_send_gr from neighbor. */ -void eigrp_update_send_GR_thread(struct thread *thread) +void eigrp_update_send_GR_thread(struct event *thread) { struct eigrp_neighbor *nbr; /* get argument from thread */ - nbr = THREAD_ARG(thread); + nbr = EVENT_ARG(thread); /* remove this thread pointer */ /* if there is packet waiting in queue, * schedule this thread again with small delay */ if (nbr->retrans_queue->count > 0) { - thread_add_timer_msec(master, eigrp_update_send_GR_thread, nbr, - 10, &nbr->t_nbr_send_gr); + event_add_timer_msec(master, eigrp_update_send_GR_thread, nbr, + 10, &nbr->t_nbr_send_gr); return; } @@ -916,7 +916,7 @@ void eigrp_update_send_GR_thread(struct thread *thread) /* if it wasn't last chunk, schedule this thread again */ if (nbr->nbr_gr_packet_type != EIGRP_PACKET_PART_LAST) { - thread_execute(master, eigrp_update_send_GR_thread, nbr, 0); + event_execute(master, eigrp_update_send_GR_thread, nbr, 0); } } @@ -982,7 +982,7 @@ void eigrp_update_send_GR(struct eigrp_neighbor *nbr, enum GR_type gr_type, /* indicate, that this is first GR Update packet chunk */ nbr->nbr_gr_packet_type = EIGRP_PACKET_PART_FIRST; /* execute packet sending in thread */ - thread_execute(master, eigrp_update_send_GR_thread, nbr, 0); + event_execute(master, eigrp_update_send_GR_thread, nbr, 0); } /** diff --git a/eigrpd/eigrp_vty.c b/eigrpd/eigrp_vty.c index 33f728ec4b..88510e75af 100644 --- a/eigrpd/eigrp_vty.c +++ b/eigrpd/eigrp_vty.c @@ -17,7 +17,7 @@ #include #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "prefix.h" #include "table.h" #include "vty.h" diff --git a/eigrpd/eigrp_zebra.c b/eigrpd/eigrp_zebra.c index 179c2d0f2a..94c2bcab71 100644 --- a/eigrpd/eigrp_zebra.c +++ b/eigrpd/eigrp_zebra.c @@ -12,7 +12,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "command.h" #include "network.h" #include "prefix.h" @@ -49,7 +49,7 @@ static int eigrp_zebra_read_route(ZAPI_CALLBACK_ARGS); struct zclient *zclient = NULL; /* For registering threads. */ -extern struct thread_master *master; +extern struct event_loop *master; struct in_addr router_id_zebra; /* Router-id update message from zebra. */ diff --git a/eigrpd/eigrpd.c b/eigrpd/eigrpd.c index a382862e3d..c7dd96bfff 100644 --- a/eigrpd/eigrpd.c +++ b/eigrpd/eigrpd.c @@ -12,7 +12,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "linklist.h" @@ -157,7 +157,7 @@ static struct eigrp *eigrp_new(uint16_t as, vrf_id_t vrf_id) eigrp->ibuf = stream_new(EIGRP_PACKET_MAX_LEN + 1); - thread_add_read(master, eigrp_read, eigrp, eigrp->fd, &eigrp->t_read); + event_add_read(master, eigrp_read, eigrp, eigrp->fd, &eigrp->t_read); eigrp->oi_write_q = list_new(); eigrp->topology_table = route_table_init(); @@ -260,8 +260,8 @@ void eigrp_finish_final(struct eigrp *eigrp) eigrp_if_free(ei, INTERFACE_DOWN_BY_FINAL); } - THREAD_OFF(eigrp->t_write); - THREAD_OFF(eigrp->t_read); + EVENT_OFF(eigrp->t_write); + EVENT_OFF(eigrp->t_read); close(eigrp->fd); list_delete(&eigrp->eiflist); diff --git a/eigrpd/eigrpd.h b/eigrpd/eigrpd.h index 6e5d5d13dc..a6a4e39a59 100644 --- a/eigrpd/eigrpd.h +++ b/eigrpd/eigrpd.h @@ -35,7 +35,7 @@ struct eigrp_master { struct list *eigrp; /* EIGRP thread master. */ - struct thread_master *master; + struct event_loop *master; /* Zebra interface list. */ struct list *iflist; @@ -51,7 +51,7 @@ struct eigrp_master { /* Extern variables. */ extern struct zclient *zclient; -extern struct thread_master *master; +extern struct event_loop *master; extern struct eigrp_master *eigrp_om; extern struct zebra_privs_t eigrpd_privs; diff --git a/gdb/lib.txt b/gdb/lib.txt index b44c237985..5d22321b62 100644 --- a/gdb/lib.txt +++ b/gdb/lib.txt @@ -157,7 +157,7 @@ document walk_route_table Walk through a routing table (or subset thereof) and dump all the non-null (struct route_node *)->info pointers. -Argument: A lib/thread.h::(struct route_node *) pointing to the route_node +Argument: A lib/hread.h::(struct route_node *) pointing to the route_node under which all data should be dumped end diff --git a/isisd/fabricd.c b/isisd/fabricd.c index 64734f8628..4fd39498a0 100644 --- a/isisd/fabricd.c +++ b/isisd/fabricd.c @@ -40,7 +40,7 @@ struct fabricd { enum fabricd_sync_state initial_sync_state; time_t initial_sync_start; struct isis_circuit *initial_sync_circuit; - struct thread *initial_sync_timeout; + struct event *initial_sync_timeout; struct isis_spftree *spftree; struct skiplist *neighbors; @@ -49,8 +49,8 @@ struct fabricd { uint8_t tier; uint8_t tier_config; uint8_t tier_pending; - struct thread *tier_calculation_timer; - struct thread *tier_set_timer; + struct event *tier_calculation_timer; + struct event *tier_set_timer; int csnp_delay; bool always_send_csnp; @@ -225,11 +225,11 @@ struct fabricd *fabricd_new(struct isis_area *area) void fabricd_finish(struct fabricd *f) { - THREAD_OFF(f->initial_sync_timeout); + EVENT_OFF(f->initial_sync_timeout); - THREAD_OFF(f->tier_calculation_timer); + EVENT_OFF(f->tier_calculation_timer); - THREAD_OFF(f->tier_set_timer); + EVENT_OFF(f->tier_set_timer); isis_spftree_del(f->spftree); neighbor_lists_clear(f); @@ -237,9 +237,9 @@ void fabricd_finish(struct fabricd *f) hash_free(f->neighbors_neighbors); } -static void fabricd_initial_sync_timeout(struct thread *thread) +static void fabricd_initial_sync_timeout(struct event *thread) { - struct fabricd *f = THREAD_ARG(thread); + struct fabricd *f = EVENT_ARG(thread); if (IS_DEBUG_ADJ_PACKETS) zlog_debug( @@ -267,8 +267,8 @@ void fabricd_initial_sync_hello(struct isis_circuit *circuit) if (f->initial_sync_timeout) return; - thread_add_timer(master, fabricd_initial_sync_timeout, f, - timeout, &f->initial_sync_timeout); + event_add_timer(master, fabricd_initial_sync_timeout, f, timeout, + &f->initial_sync_timeout); f->initial_sync_start = monotime(NULL); if (IS_DEBUG_ADJ_PACKETS) @@ -325,7 +325,7 @@ void fabricd_initial_sync_finish(struct isis_area *area) f->initial_sync_circuit->interface->name); f->initial_sync_state = FABRICD_SYNC_COMPLETE; f->initial_sync_circuit = NULL; - THREAD_OFF(f->initial_sync_timeout); + EVENT_OFF(f->initial_sync_timeout); } static void fabricd_bump_tier_calculation_timer(struct fabricd *f); @@ -389,16 +389,16 @@ static uint8_t fabricd_calculate_fabric_tier(struct isis_area *area) return tier; } -static void fabricd_tier_set_timer(struct thread *thread) +static void fabricd_tier_set_timer(struct event *thread) { - struct fabricd *f = THREAD_ARG(thread); + struct fabricd *f = EVENT_ARG(thread); fabricd_set_tier(f, f->tier_pending); } -static void fabricd_tier_calculation_cb(struct thread *thread) +static void fabricd_tier_calculation_cb(struct event *thread) { - struct fabricd *f = THREAD_ARG(thread); + struct fabricd *f = EVENT_ARG(thread); uint8_t tier = ISIS_TIER_UNDEFINED; tier = fabricd_calculate_fabric_tier(f->area); @@ -408,28 +408,27 @@ static void fabricd_tier_calculation_cb(struct thread *thread) zlog_info("OpenFabric: Got tier %hhu from algorithm. Arming timer.", tier); f->tier_pending = tier; - thread_add_timer(master, fabricd_tier_set_timer, f, - f->area->lsp_gen_interval[ISIS_LEVEL2 - 1], - &f->tier_set_timer); - + event_add_timer(master, fabricd_tier_set_timer, f, + f->area->lsp_gen_interval[ISIS_LEVEL2 - 1], + &f->tier_set_timer); } static void fabricd_bump_tier_calculation_timer(struct fabricd *f) { /* Cancel timer if we already know our tier */ if (f->tier != ISIS_TIER_UNDEFINED || f->tier_set_timer) { - THREAD_OFF(f->tier_calculation_timer); + EVENT_OFF(f->tier_calculation_timer); return; } /* If we need to calculate the tier, wait some * time for the topology to settle before running * the calculation */ - THREAD_OFF(f->tier_calculation_timer); + EVENT_OFF(f->tier_calculation_timer); - thread_add_timer(master, fabricd_tier_calculation_cb, f, - 2 * f->area->lsp_gen_interval[ISIS_LEVEL2 - 1], - &f->tier_calculation_timer); + event_add_timer(master, fabricd_tier_calculation_cb, f, + 2 * f->area->lsp_gen_interval[ISIS_LEVEL2 - 1], + &f->tier_calculation_timer); } static void fabricd_set_tier(struct fabricd *f, uint8_t tier) @@ -710,10 +709,10 @@ void fabricd_trigger_csnp(struct isis_area *area, bool circuit_scoped) if (!circuit->t_send_csnp[1]) continue; - THREAD_OFF(circuit->t_send_csnp[ISIS_LEVEL2 - 1]); - thread_add_timer_msec(master, send_l2_csnp, circuit, - isis_jitter(f->csnp_delay, CSNP_JITTER), - &circuit->t_send_csnp[ISIS_LEVEL2 - 1]); + EVENT_OFF(circuit->t_send_csnp[ISIS_LEVEL2 - 1]); + event_add_timer_msec(master, send_l2_csnp, circuit, + isis_jitter(f->csnp_delay, CSNP_JITTER), + &circuit->t_send_csnp[ISIS_LEVEL2 - 1]); } } diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c index cb2cf8f611..1871078cc1 100644 --- a/isisd/isis_adjacency.c +++ b/isisd/isis_adjacency.c @@ -15,7 +15,7 @@ #include "hash.h" #include "vty.h" #include "linklist.h" -#include "thread.h" +#include "frrevent.h" #include "if.h" #include "stream.h" #include "bfd.h" @@ -148,7 +148,7 @@ void isis_delete_adj(void *arg) /* Remove self from snmp list without walking the list*/ list_delete_node(adj->circuit->snmp_adj_list, adj->snmp_list_node); - THREAD_OFF(adj->t_expire); + EVENT_OFF(adj->t_expire); if (adj->adj_state != ISIS_ADJ_DOWN) adj->adj_state = ISIS_ADJ_DOWN; @@ -396,13 +396,13 @@ void isis_adj_state_change(struct isis_adjacency **padj, adj->flaps++; if (level == IS_LEVEL_1) { - thread_add_timer(master, send_l1_csnp, - circuit, 0, - &circuit->t_send_csnp[0]); + event_add_timer( + master, send_l1_csnp, circuit, + 0, &circuit->t_send_csnp[0]); } else { - thread_add_timer(master, send_l2_csnp, - circuit, 0, - &circuit->t_send_csnp[1]); + event_add_timer( + master, send_l2_csnp, circuit, + 0, &circuit->t_send_csnp[1]); } } else if (old_state == ISIS_ADJ_UP) { circuit->upadjcount[level - 1]--; @@ -478,14 +478,14 @@ const char *isis_adj_yang_state(enum isis_adj_state state) assert(!"Reached end of function where we are not expecting to"); } -void isis_adj_expire(struct thread *thread) +void isis_adj_expire(struct event *thread) { struct isis_adjacency *adj; /* * Get the adjacency */ - adj = THREAD_ARG(thread); + adj = EVENT_ARG(thread); assert(adj); adj->t_expire = NULL; diff --git a/isisd/isis_adjacency.h b/isisd/isis_adjacency.h index c260ce78de..f02f7a68ea 100644 --- a/isisd/isis_adjacency.h +++ b/isisd/isis_adjacency.h @@ -90,7 +90,7 @@ struct isis_adjacency { enum isis_threeway_state threeway_state; uint32_t ext_circuit_id; int flaps; /* number of adjacency flaps */ - struct thread *t_expire; /* expire after hold_time */ + struct event *t_expire; /* expire after hold_time */ struct isis_circuit *circuit; /* back pointer */ uint16_t *mt_set; /* Topologies this adjacency is valid for */ unsigned int mt_count; /* Number of entries in mt_set */ @@ -128,7 +128,7 @@ void isis_adj_state_change(struct isis_adjacency **adj, enum isis_adj_state state, const char *reason); void isis_adj_print(struct isis_adjacency *adj); const char *isis_adj_yang_state(enum isis_adj_state state); -void isis_adj_expire(struct thread *thread); +void isis_adj_expire(struct event *thread); void isis_adj_print_vty(struct isis_adjacency *adj, struct vty *vty, char detail); void isis_adj_print_json(struct isis_adjacency *adj, struct json_object *json, @@ -136,6 +136,6 @@ void isis_adj_print_json(struct isis_adjacency *adj, struct json_object *json, void isis_adj_build_neigh_list(struct list *adjdb, struct list *list); void isis_adj_build_up_list(struct list *adjdb, struct list *list); int isis_adj_usage2levels(enum isis_adj_usage usage); -void isis_bfd_startup_timer(struct thread *thread); +void isis_bfd_startup_timer(struct event *thread); const char *isis_adj_name(const struct isis_adjacency *adj); #endif /* ISIS_ADJACENCY_H */ diff --git a/isisd/isis_bfd.c b/isisd/isis_bfd.c index b973dd493d..5e24e35210 100644 --- a/isisd/isis_bfd.c +++ b/isisd/isis_bfd.c @@ -209,7 +209,7 @@ static int bfd_handle_circuit_add_addr(struct isis_circuit *circuit) return 0; } -void isis_bfd_init(struct thread_master *tm) +void isis_bfd_init(struct event_loop *tm) { bfd_protocol_integration_init(zclient, tm); diff --git a/isisd/isis_bfd.h b/isisd/isis_bfd.h index 30248ccece..3cf0ed5219 100644 --- a/isisd/isis_bfd.h +++ b/isisd/isis_bfd.h @@ -7,10 +7,10 @@ #define ISIS_BFD_H struct isis_circuit; -struct thread_master; +struct event_loop; void isis_bfd_circuit_cmd(struct isis_circuit *circuit); -void isis_bfd_init(struct thread_master *tm); +void isis_bfd_init(struct event_loop *tm); #endif diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index 1ee7f4451d..124dcdd86d 100644 --- a/isisd/isis_circuit.c +++ b/isisd/isis_circuit.c @@ -19,7 +19,7 @@ #include "if.h" #include "linklist.h" #include "command.h" -#include "thread.h" +#include "frrevent.h" #include "vty.h" #include "hash.h" #include "prefix.h" @@ -627,12 +627,12 @@ void isis_circuit_stream(struct isis_circuit *circuit, struct stream **stream) void isis_circuit_prepare(struct isis_circuit *circuit) { #if ISIS_METHOD != ISIS_METHOD_DLPI - thread_add_read(master, isis_receive, circuit, circuit->fd, - &circuit->t_read); + event_add_read(master, isis_receive, circuit, circuit->fd, + &circuit->t_read); #else - thread_add_timer_msec(master, isis_receive, circuit, - listcount(circuit->area->circuit_list) * 100, - &circuit->t_read); + event_add_timer_msec(master, isis_receive, circuit, + listcount(circuit->area->circuit_list) * 100, + &circuit->t_read); #endif } @@ -722,10 +722,10 @@ int isis_circuit_up(struct isis_circuit *circuit) send_hello_sched(circuit, level, TRIGGERED_IIH_DELAY); circuit->u.bc.lan_neighs[level - 1] = list_new(); - thread_add_timer(master, isis_run_dr, - &circuit->level_arg[level - 1], - 2 * circuit->hello_interval[level - 1], - &circuit->u.bc.t_run_dr[level - 1]); + event_add_timer(master, isis_run_dr, + &circuit->level_arg[level - 1], + 2 * circuit->hello_interval[level - 1], + &circuit->u.bc.t_run_dr[level - 1]); } /* 8.4.1 b) FIXME: solicit ES - 8.4.6 */ @@ -740,13 +740,13 @@ int isis_circuit_up(struct isis_circuit *circuit) /* initializing PSNP timers */ if (circuit->is_type & IS_LEVEL_1) - thread_add_timer( + event_add_timer( master, send_l1_psnp, circuit, isis_jitter(circuit->psnp_interval[0], PSNP_JITTER), &circuit->t_send_psnp[0]); if (circuit->is_type & IS_LEVEL_2) - thread_add_timer( + event_add_timer( master, send_l2_psnp, circuit, isis_jitter(circuit->psnp_interval[1], PSNP_JITTER), &circuit->t_send_psnp[1]); @@ -863,12 +863,12 @@ void isis_circuit_down(struct isis_circuit *circuit) memset(circuit->u.bc.l2_desig_is, 0, ISIS_SYS_ID_LEN + 1); memset(circuit->u.bc.snpa, 0, ETH_ALEN); - THREAD_OFF(circuit->u.bc.t_send_lan_hello[0]); - THREAD_OFF(circuit->u.bc.t_send_lan_hello[1]); - THREAD_OFF(circuit->u.bc.t_run_dr[0]); - THREAD_OFF(circuit->u.bc.t_run_dr[1]); - THREAD_OFF(circuit->u.bc.t_refresh_pseudo_lsp[0]); - THREAD_OFF(circuit->u.bc.t_refresh_pseudo_lsp[1]); + EVENT_OFF(circuit->u.bc.t_send_lan_hello[0]); + EVENT_OFF(circuit->u.bc.t_send_lan_hello[1]); + EVENT_OFF(circuit->u.bc.t_run_dr[0]); + EVENT_OFF(circuit->u.bc.t_run_dr[1]); + EVENT_OFF(circuit->u.bc.t_refresh_pseudo_lsp[0]); + EVENT_OFF(circuit->u.bc.t_refresh_pseudo_lsp[1]); circuit->lsp_regenerate_pending[0] = 0; circuit->lsp_regenerate_pending[1] = 0; @@ -878,7 +878,7 @@ void isis_circuit_down(struct isis_circuit *circuit) } else if (circuit->circ_type == CIRCUIT_T_P2P) { isis_delete_adj(circuit->u.p2p.neighbor); circuit->u.p2p.neighbor = NULL; - THREAD_OFF(circuit->u.p2p.t_send_p2p_hello); + EVENT_OFF(circuit->u.p2p.t_send_p2p_hello); } /* @@ -891,11 +891,11 @@ void isis_circuit_down(struct isis_circuit *circuit) circuit->snmp_adj_idx_gen = 0; /* Cancel all active threads */ - THREAD_OFF(circuit->t_send_csnp[0]); - THREAD_OFF(circuit->t_send_csnp[1]); - THREAD_OFF(circuit->t_send_psnp[0]); - THREAD_OFF(circuit->t_send_psnp[1]); - THREAD_OFF(circuit->t_read); + EVENT_OFF(circuit->t_send_csnp[0]); + EVENT_OFF(circuit->t_send_csnp[1]); + EVENT_OFF(circuit->t_send_psnp[0]); + EVENT_OFF(circuit->t_send_psnp[1]); + EVENT_OFF(circuit->t_read); if (circuit->tx_queue) { isis_tx_queue_free(circuit->tx_queue); @@ -929,7 +929,7 @@ void isis_circuit_down(struct isis_circuit *circuit) circuit->snd_stream = NULL; } - thread_cancel_event(master, circuit); + event_cancel_event(master, circuit); return; } diff --git a/isisd/isis_circuit.h b/isisd/isis_circuit.h index df977893ee..7acde419fc 100644 --- a/isisd/isis_circuit.h +++ b/isisd/isis_circuit.h @@ -41,21 +41,21 @@ struct metric { struct isis_bcast_info { uint8_t snpa[ETH_ALEN]; /* SNPA of this circuit */ char run_dr_elect[ISIS_LEVELS]; /* Should we run dr election ? */ - struct thread *t_run_dr[ISIS_LEVELS]; /* DR election thread */ - struct thread *t_send_lan_hello[ISIS_LEVELS]; /* send LAN IIHs in this - thread */ + struct event *t_run_dr[ISIS_LEVELS]; /* DR election thread */ + struct event *t_send_lan_hello[ISIS_LEVELS]; /* send LAN IIHs in this + thread */ struct list *adjdb[ISIS_LEVELS]; /* adjacency dbs */ struct list *lan_neighs[ISIS_LEVELS]; /* list of lx neigh snpa */ char is_dr[ISIS_LEVELS]; /* Are we level x DR ? */ uint8_t l1_desig_is[ISIS_SYS_ID_LEN + 1]; /* level-1 DR */ uint8_t l2_desig_is[ISIS_SYS_ID_LEN + 1]; /* level-2 DR */ - struct thread *t_refresh_pseudo_lsp[ISIS_LEVELS]; /* refresh pseudo-node + struct event *t_refresh_pseudo_lsp[ISIS_LEVELS]; /* refresh pseudo-node LSPs */ }; struct isis_p2p_info { struct isis_adjacency *neighbor; - struct thread *t_send_p2p_hello; /* send P2P IIHs in this thread */ + struct event *t_send_p2p_hello; /* send P2P IIHs in this thread */ }; struct isis_circuit_arg { @@ -85,9 +85,9 @@ struct isis_circuit { /* * Threads */ - struct thread *t_read; - struct thread *t_send_csnp[ISIS_LEVELS]; - struct thread *t_send_psnp[ISIS_LEVELS]; + struct event *t_read; + struct event *t_send_csnp[ISIS_LEVELS]; + struct event *t_send_psnp[ISIS_LEVELS]; struct isis_tx_queue *tx_queue; struct isis_circuit_arg level_arg[ISIS_LEVELS]; /* used as argument for threads */ diff --git a/isisd/isis_csm.c b/isisd/isis_csm.c index 95bbc077a3..9e278d47f8 100644 --- a/isisd/isis_csm.c +++ b/isisd/isis_csm.c @@ -14,7 +14,7 @@ #include "if.h" #include "linklist.h" #include "command.h" -#include "thread.h" +#include "frrevent.h" #include "hash.h" #include "prefix.h" #include "stream.h" diff --git a/isisd/isis_dr.c b/isisd/isis_dr.c index b1a4215813..3b92160809 100644 --- a/isisd/isis_dr.c +++ b/isisd/isis_dr.c @@ -13,7 +13,7 @@ #include "log.h" #include "hash.h" -#include "thread.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "stream.h" @@ -48,9 +48,9 @@ const char *isis_disflag2string(int disflag) return NULL; /* not reached */ } -void isis_run_dr(struct thread *thread) +void isis_run_dr(struct event *thread) { - struct isis_circuit_arg *arg = THREAD_ARG(thread); + struct isis_circuit_arg *arg = EVENT_ARG(thread); assert(arg); @@ -211,8 +211,8 @@ int isis_dr_resign(struct isis_circuit *circuit, int level) circuit->u.bc.is_dr[level - 1] = 0; circuit->u.bc.run_dr_elect[level - 1] = 0; - THREAD_OFF(circuit->u.bc.t_run_dr[level - 1]); - THREAD_OFF(circuit->u.bc.t_refresh_pseudo_lsp[level - 1]); + EVENT_OFF(circuit->u.bc.t_run_dr[level - 1]); + EVENT_OFF(circuit->u.bc.t_refresh_pseudo_lsp[level - 1]); circuit->lsp_regenerate_pending[level - 1] = 0; memcpy(id, circuit->isis->sysid, ISIS_SYS_ID_LEN); @@ -223,29 +223,27 @@ int isis_dr_resign(struct isis_circuit *circuit, int level) if (level == 1) { memset(circuit->u.bc.l1_desig_is, 0, ISIS_SYS_ID_LEN + 1); - thread_add_timer(master, send_l1_psnp, circuit, - isis_jitter(circuit->psnp_interval[level - 1], - PSNP_JITTER), - &circuit->t_send_psnp[0]); + event_add_timer(master, send_l1_psnp, circuit, + isis_jitter(circuit->psnp_interval[level - 1], + PSNP_JITTER), + &circuit->t_send_psnp[0]); } else { memset(circuit->u.bc.l2_desig_is, 0, ISIS_SYS_ID_LEN + 1); - thread_add_timer(master, send_l2_psnp, circuit, - isis_jitter(circuit->psnp_interval[level - 1], - PSNP_JITTER), - &circuit->t_send_psnp[1]); + event_add_timer(master, send_l2_psnp, circuit, + isis_jitter(circuit->psnp_interval[level - 1], + PSNP_JITTER), + &circuit->t_send_psnp[1]); } - THREAD_OFF(circuit->t_send_csnp[level - 1]); + EVENT_OFF(circuit->t_send_csnp[level - 1]); - thread_add_timer(master, isis_run_dr, - &circuit->level_arg[level - 1], - 2 * circuit->hello_interval[level - 1], - &circuit->u.bc.t_run_dr[level - 1]); + event_add_timer(master, isis_run_dr, &circuit->level_arg[level - 1], + 2 * circuit->hello_interval[level - 1], + &circuit->u.bc.t_run_dr[level - 1]); - thread_add_event(master, isis_event_dis_status_change, circuit, 0, - NULL); + event_add_event(master, isis_event_dis_status_change, circuit, 0, NULL); return ISIS_OK; } @@ -276,10 +274,10 @@ int isis_dr_commence(struct isis_circuit *circuit, int level) assert(circuit->circuit_id); /* must be non-zero */ lsp_generate_pseudo(circuit, 1); - thread_add_timer(master, send_l1_csnp, circuit, - isis_jitter(circuit->csnp_interval[level - 1], - CSNP_JITTER), - &circuit->t_send_csnp[0]); + event_add_timer(master, send_l1_csnp, circuit, + isis_jitter(circuit->csnp_interval[level - 1], + CSNP_JITTER), + &circuit->t_send_csnp[0]); } else { memcpy(old_dr, circuit->u.bc.l2_desig_is, ISIS_SYS_ID_LEN + 1); @@ -296,18 +294,16 @@ int isis_dr_commence(struct isis_circuit *circuit, int level) assert(circuit->circuit_id); /* must be non-zero */ lsp_generate_pseudo(circuit, 2); - thread_add_timer(master, send_l2_csnp, circuit, - isis_jitter(circuit->csnp_interval[level - 1], - CSNP_JITTER), - &circuit->t_send_csnp[1]); + event_add_timer(master, send_l2_csnp, circuit, + isis_jitter(circuit->csnp_interval[level - 1], + CSNP_JITTER), + &circuit->t_send_csnp[1]); } - thread_add_timer(master, isis_run_dr, - &circuit->level_arg[level - 1], - 2 * circuit->hello_interval[level - 1], - &circuit->u.bc.t_run_dr[level - 1]); - thread_add_event(master, isis_event_dis_status_change, circuit, 0, - NULL); + event_add_timer(master, isis_run_dr, &circuit->level_arg[level - 1], + 2 * circuit->hello_interval[level - 1], + &circuit->u.bc.t_run_dr[level - 1]); + event_add_event(master, isis_event_dis_status_change, circuit, 0, NULL); return ISIS_OK; } diff --git a/isisd/isis_dr.h b/isisd/isis_dr.h index 2b9bf60ffa..135916a4cb 100644 --- a/isisd/isis_dr.h +++ b/isisd/isis_dr.h @@ -11,7 +11,7 @@ #ifndef _ZEBRA_ISIS_DR_H #define _ZEBRA_ISIS_DR_H -void isis_run_dr(struct thread *thread); +void isis_run_dr(struct event *thread); int isis_dr_elect(struct isis_circuit *circuit, int level); int isis_dr_resign(struct isis_circuit *circuit, int level); int isis_dr_commence(struct isis_circuit *circuit, int level); diff --git a/isisd/isis_dynhn.c b/isisd/isis_dynhn.c index ef21de327e..446e522019 100644 --- a/isisd/isis_dynhn.c +++ b/isisd/isis_dynhn.c @@ -16,7 +16,7 @@ #include "stream.h" #include "command.h" #include "if.h" -#include "thread.h" +#include "frrevent.h" #include "isisd/isis_constants.h" #include "isisd/isis_common.h" @@ -29,14 +29,14 @@ DEFINE_MTYPE_STATIC(ISISD, ISIS_DYNHN, "ISIS dyn hostname"); -static void dyn_cache_cleanup(struct thread *); +static void dyn_cache_cleanup(struct event *); void dyn_cache_init(struct isis *isis) { isis->dyn_cache = list_new(); if (!CHECK_FLAG(im->options, F_ISIS_UNIT_TEST)) - thread_add_timer(master, dyn_cache_cleanup, isis, 120, - &isis->t_dync_clean); + event_add_timer(master, dyn_cache_cleanup, isis, 120, + &isis->t_dync_clean); } void dyn_cache_finish(struct isis *isis) @@ -44,7 +44,7 @@ void dyn_cache_finish(struct isis *isis) struct listnode *node, *nnode; struct isis_dynhn *dyn; - THREAD_OFF(isis->t_dync_clean); + EVENT_OFF(isis->t_dync_clean); for (ALL_LIST_ELEMENTS(isis->dyn_cache, node, nnode, dyn)) { list_delete_node(isis->dyn_cache, node); @@ -54,14 +54,14 @@ void dyn_cache_finish(struct isis *isis) list_delete(&isis->dyn_cache); } -static void dyn_cache_cleanup(struct thread *thread) +static void dyn_cache_cleanup(struct event *thread) { struct listnode *node, *nnode; struct isis_dynhn *dyn; time_t now = time(NULL); struct isis *isis = NULL; - isis = THREAD_ARG(thread); + isis = EVENT_ARG(thread); isis->t_dync_clean = NULL; @@ -72,7 +72,7 @@ static void dyn_cache_cleanup(struct thread *thread) XFREE(MTYPE_ISIS_DYNHN, dyn); } - thread_add_timer(master, dyn_cache_cleanup, isis, 120, + event_add_timer(master, dyn_cache_cleanup, isis, 120, &isis->t_dync_clean); } diff --git a/isisd/isis_events.c b/isisd/isis_events.c index d7b3969114..8a2a2ab971 100644 --- a/isisd/isis_events.c +++ b/isisd/isis_events.c @@ -13,7 +13,7 @@ #include "if.h" #include "linklist.h" #include "command.h" -#include "thread.h" +#include "frrevent.h" #include "hash.h" #include "prefix.h" #include "stream.h" @@ -63,23 +63,23 @@ static void circuit_commence_level(struct isis_circuit *circuit, int level) if (!circuit->is_passive) { if (level == 1) { - thread_add_timer(master, send_l1_psnp, circuit, - isis_jitter(circuit->psnp_interval[0], - PSNP_JITTER), - &circuit->t_send_psnp[0]); + event_add_timer(master, send_l1_psnp, circuit, + isis_jitter(circuit->psnp_interval[0], + PSNP_JITTER), + &circuit->t_send_psnp[0]); } else { - thread_add_timer(master, send_l2_psnp, circuit, - isis_jitter(circuit->psnp_interval[1], - PSNP_JITTER), - &circuit->t_send_psnp[1]); + event_add_timer(master, send_l2_psnp, circuit, + isis_jitter(circuit->psnp_interval[1], + PSNP_JITTER), + &circuit->t_send_psnp[1]); } } if (circuit->circ_type == CIRCUIT_T_BROADCAST) { - thread_add_timer(master, isis_run_dr, - &circuit->level_arg[level - 1], - 2 * circuit->hello_interval[level - 1], - &circuit->u.bc.t_run_dr[level - 1]); + event_add_timer(master, isis_run_dr, + &circuit->level_arg[level - 1], + 2 * circuit->hello_interval[level - 1], + &circuit->u.bc.t_run_dr[level - 1]); send_hello_sched(circuit, level, TRIGGERED_IIH_DELAY); circuit->u.bc.lan_neighs[level - 1] = list_new(); @@ -96,13 +96,13 @@ static void circuit_resign_level(struct isis_circuit *circuit, int level) circuit->area->area_tag, circuit->circuit_id, circuit->interface->name, level); - THREAD_OFF(circuit->t_send_csnp[idx]); - THREAD_OFF(circuit->t_send_psnp[idx]); + EVENT_OFF(circuit->t_send_csnp[idx]); + EVENT_OFF(circuit->t_send_psnp[idx]); if (circuit->circ_type == CIRCUIT_T_BROADCAST) { - THREAD_OFF(circuit->u.bc.t_send_lan_hello[idx]); - THREAD_OFF(circuit->u.bc.t_run_dr[idx]); - THREAD_OFF(circuit->u.bc.t_refresh_pseudo_lsp[idx]); + EVENT_OFF(circuit->u.bc.t_send_lan_hello[idx]); + EVENT_OFF(circuit->u.bc.t_run_dr[idx]); + EVENT_OFF(circuit->u.bc.t_refresh_pseudo_lsp[idx]); circuit->lsp_regenerate_pending[idx] = 0; circuit->u.bc.run_dr_elect[idx] = 0; circuit->u.bc.is_dr[idx] = 0; @@ -196,11 +196,11 @@ void isis_circuit_is_type_set(struct isis_circuit *circuit, int newtype) /* events supporting code */ -void isis_event_dis_status_change(struct thread *thread) +void isis_event_dis_status_change(struct event *thread) { struct isis_circuit *circuit; - circuit = THREAD_ARG(thread); + circuit = EVENT_ARG(thread); /* invalid arguments */ if (!circuit || !circuit->area) diff --git a/isisd/isis_events.h b/isisd/isis_events.h index e827f75a83..a0ac964fab 100644 --- a/isisd/isis_events.h +++ b/isisd/isis_events.h @@ -18,7 +18,7 @@ void isis_event_circuit_type_change(struct isis_circuit *circuit, int newtype); /* * Events related to adjacencies */ -void isis_event_dis_status_change(struct thread *thread); +void isis_event_dis_status_change(struct event *thread); /* * Error events diff --git a/isisd/isis_ldp_sync.c b/isisd/isis_ldp_sync.c index 817e2a2015..53676ffe36 100644 --- a/isisd/isis_ldp_sync.c +++ b/isisd/isis_ldp_sync.c @@ -9,7 +9,7 @@ #include "monotime.h" #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "prefix.h" #include "table.h" #include "vty.h" @@ -171,7 +171,7 @@ void isis_ldp_sync_if_complete(struct isis_circuit *circuit) if (ldp_sync_info->state == LDP_IGP_SYNC_STATE_REQUIRED_NOT_UP) ldp_sync_info->state = LDP_IGP_SYNC_STATE_REQUIRED_UP; - THREAD_OFF(ldp_sync_info->t_holddown); + EVENT_OFF(ldp_sync_info->t_holddown); isis_ldp_sync_set_if_metric(circuit, true); } @@ -191,7 +191,7 @@ void isis_ldp_sync_ldp_fail(struct isis_circuit *circuit) if (ldp_sync_info && ldp_sync_info->enabled == LDP_IGP_SYNC_ENABLED && ldp_sync_info->state != LDP_IGP_SYNC_STATE_NOT_REQUIRED) { - THREAD_OFF(ldp_sync_info->t_holddown); + EVENT_OFF(ldp_sync_info->t_holddown); ldp_sync_info->state = LDP_IGP_SYNC_STATE_REQUIRED_NOT_UP; isis_ldp_sync_set_if_metric(circuit, true); } @@ -331,7 +331,7 @@ void isis_ldp_sync_set_if_metric(struct isis_circuit *circuit, bool run_regen) /* * LDP-SYNC holddown timer routines */ -static void isis_ldp_sync_holddown_timer(struct thread *thread) +static void isis_ldp_sync_holddown_timer(struct event *thread) { struct isis_circuit *circuit; struct ldp_sync_info *ldp_sync_info; @@ -340,7 +340,7 @@ static void isis_ldp_sync_holddown_timer(struct thread *thread) * didn't receive msg from LDP indicating sync-complete * restore interface cost to original value */ - circuit = THREAD_ARG(thread); + circuit = EVENT_ARG(thread); if (circuit->ldp_sync_info == NULL) return; @@ -373,9 +373,8 @@ void isis_ldp_sync_holddown_timer_add(struct isis_circuit *circuit) ils_debug("%s: start holddown timer for %s time %d", __func__, circuit->interface->name, ldp_sync_info->holddown); - thread_add_timer(master, isis_ldp_sync_holddown_timer, - circuit, ldp_sync_info->holddown, - &ldp_sync_info->t_holddown); + event_add_timer(master, isis_ldp_sync_holddown_timer, circuit, + ldp_sync_info->holddown, &ldp_sync_info->t_holddown); } /* @@ -517,7 +516,7 @@ void isis_if_ldp_sync_disable(struct isis_circuit *circuit) if (!CHECK_FLAG(area->ldp_sync_cmd.flags, LDP_SYNC_FLAG_ENABLE)) return; - THREAD_OFF(ldp_sync_info->t_holddown); + EVENT_OFF(ldp_sync_info->t_holddown); ldp_sync_info->state = LDP_IGP_SYNC_STATE_NOT_REQUIRED; isis_ldp_sync_set_if_metric(circuit, true); } @@ -576,8 +575,8 @@ static void isis_circuit_ldp_sync_print_vty(struct isis_circuit *circuit, break; case LDP_IGP_SYNC_STATE_REQUIRED_NOT_UP: if (ldp_sync_info->t_holddown != NULL) { - struct timeval remain = thread_timer_remain( - ldp_sync_info->t_holddown); + struct timeval remain = + event_timer_remain(ldp_sync_info->t_holddown); vty_out(vty, " Holddown timer is running %lld.%03lld remaining\n", (long long)remain.tv_sec, diff --git a/isisd/isis_lfa.c b/isisd/isis_lfa.c index 599dca1298..7a25a92535 100644 --- a/isisd/isis_lfa.c +++ b/isisd/isis_lfa.c @@ -1388,9 +1388,9 @@ static struct rlfa *rlfa_lookup(struct isis_spftree *spftree, return rlfa_tree_find(&spftree->lfa.remote.rlfas, &s); } -static void isis_area_verify_routes_cb(struct thread *thread) +static void isis_area_verify_routes_cb(struct event *thread) { - struct isis_area *area = THREAD_ARG(thread); + struct isis_area *area = EVENT_ARG(thread); if (IS_DEBUG_LFA) zlog_debug("ISIS-LFA: updating RLFAs in the RIB"); @@ -1506,9 +1506,9 @@ int isis_rlfa_activate(struct isis_spftree *spftree, struct rlfa *rlfa, spftree->route_table_backup); spftree->lfa.protection_counters.rlfa[vertex->N.ip.priority] += 1; - THREAD_OFF(area->t_rlfa_rib_update); - thread_add_timer(master, isis_area_verify_routes_cb, area, 2, - &area->t_rlfa_rib_update); + EVENT_OFF(area->t_rlfa_rib_update); + event_add_timer(master, isis_area_verify_routes_cb, area, 2, + &area->t_rlfa_rib_update); return 0; } @@ -1525,9 +1525,9 @@ void isis_rlfa_deactivate(struct isis_spftree *spftree, struct rlfa *rlfa) isis_route_delete(area, rn, spftree->route_table_backup); spftree->lfa.protection_counters.rlfa[vertex->N.ip.priority] -= 1; - THREAD_OFF(area->t_rlfa_rib_update); - thread_add_timer(master, isis_area_verify_routes_cb, area, 2, - &area->t_rlfa_rib_update); + EVENT_OFF(area->t_rlfa_rib_update); + event_add_timer(master, isis_area_verify_routes_cb, area, 2, + &area->t_rlfa_rib_update); } void isis_rlfa_list_init(struct isis_spftree *spftree) diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c index 4a332d0aed..d569f6bd5b 100644 --- a/isisd/isis_lsp.c +++ b/isisd/isis_lsp.c @@ -12,7 +12,7 @@ #include #include "linklist.h" -#include "thread.h" +#include "frrevent.h" #include "vty.h" #include "stream.h" #include "memory.h" @@ -49,9 +49,9 @@ DEFINE_MTYPE_STATIC(ISISD, ISIS_LSP, "ISIS LSP"); -static void lsp_refresh(struct thread *thread); -static void lsp_l1_refresh_pseudo(struct thread *thread); -static void lsp_l2_refresh_pseudo(struct thread *thread); +static void lsp_refresh(struct event *thread); +static void lsp_l1_refresh_pseudo(struct event *thread); +static void lsp_l2_refresh_pseudo(struct event *thread); static void lsp_destroy(struct isis_lsp *lsp); @@ -429,9 +429,9 @@ bool isis_level2_adj_up(struct isis_area *area) /* * Unset the overload bit after the timer expires */ -void set_overload_on_start_timer(struct thread *thread) +void set_overload_on_start_timer(struct event *thread) { - struct isis_area *area = THREAD_ARG(thread); + struct isis_area *area = EVENT_ARG(thread); assert(area); area->t_overload_on_startup_timer = NULL; @@ -1372,7 +1372,7 @@ int lsp_generate(struct isis_area *area, int level) return ISIS_ERROR; /* Check if config is still being processed */ - if (thread_is_scheduled(t_isis_cfg)) + if (event_is_scheduled(t_isis_cfg)) return ISIS_OK; memset(&lspid, 0, ISIS_SYS_ID_LEN + 2); @@ -1384,9 +1384,9 @@ int lsp_generate(struct isis_area *area, int level) overload_time = isis_restart_read_overload_time(area); if (overload_time > 0) { isis_area_overload_bit_set(area, true); - thread_add_timer(master, set_overload_on_start_timer, - area, overload_time, - &area->t_overload_on_startup_timer); + event_add_timer(master, set_overload_on_start_timer, + area, overload_time, + &area->t_overload_on_startup_timer); } device_startup = false; } @@ -1418,11 +1418,10 @@ int lsp_generate(struct isis_area *area, int level) refresh_time = lsp_refresh_time(newlsp, rem_lifetime); - THREAD_OFF(area->t_lsp_refresh[level - 1]); + EVENT_OFF(area->t_lsp_refresh[level - 1]); area->lsp_regenerate_pending[level - 1] = 0; - thread_add_timer(master, lsp_refresh, - &area->lsp_refresh_arg[level - 1], refresh_time, - &area->t_lsp_refresh[level - 1]); + event_add_timer(master, lsp_refresh, &area->lsp_refresh_arg[level - 1], + refresh_time, &area->t_lsp_refresh[level - 1]); if (IS_DEBUG_UPDATE_PACKETS) { zlog_debug("ISIS-Upd (%s): Building L%d LSP %s, len %hu, seq 0x%08x, cksum 0x%04hx, lifetime %hus refresh %hus", @@ -1501,9 +1500,8 @@ static int lsp_regenerate(struct isis_area *area, int level) lsp_seqno_update(lsp); refresh_time = lsp_refresh_time(lsp, rem_lifetime); - thread_add_timer(master, lsp_refresh, - &area->lsp_refresh_arg[level - 1], refresh_time, - &area->t_lsp_refresh[level - 1]); + event_add_timer(master, lsp_refresh, &area->lsp_refresh_arg[level - 1], + refresh_time, &area->t_lsp_refresh[level - 1]); area->lsp_regenerate_pending[level - 1] = 0; if (IS_DEBUG_UPDATE_PACKETS) { @@ -1523,9 +1521,9 @@ static int lsp_regenerate(struct isis_area *area, int level) /* * Something has changed or periodic refresh -> regenerate LSP */ -static void lsp_refresh(struct thread *thread) +static void lsp_refresh(struct event *thread) { - struct lsp_refresh_arg *arg = THREAD_ARG(thread); + struct lsp_refresh_arg *arg = EVENT_ARG(thread); assert(arg); @@ -1605,7 +1603,7 @@ int _lsp_regenerate_schedule(struct isis_area *area, int level, * Note: in case of a BFD 'down' message the refresh is * scheduled once again just to be sure */ - struct timeval remain = thread_timer_remain( + struct timeval remain = event_timer_remain( area->t_lsp_refresh[lvl - 1]); sched_debug( "ISIS (%s): Regeneration is already pending, nothing todo. (Due in %lld.%03lld seconds)", @@ -1629,7 +1627,7 @@ int _lsp_regenerate_schedule(struct isis_area *area, int level, "ISIS (%s): Will schedule regen timer. Last run was: %lld, Now is: %lld", area->area_tag, (long long)lsp->last_generated, (long long)now); - THREAD_OFF(area->t_lsp_refresh[lvl - 1]); + EVENT_OFF(area->t_lsp_refresh[lvl - 1]); diff = now - lsp->last_generated; if (diff < area->lsp_gen_interval[lvl - 1] && !(area->bfd_signalled_down)) { @@ -1668,10 +1666,9 @@ int _lsp_regenerate_schedule(struct isis_area *area, int level, } area->lsp_regenerate_pending[lvl - 1] = 1; - thread_add_timer_msec(master, lsp_refresh, - &area->lsp_refresh_arg[lvl - 1], - timeout, - &area->t_lsp_refresh[lvl - 1]); + event_add_timer_msec(master, lsp_refresh, + &area->lsp_refresh_arg[lvl - 1], timeout, + &area->t_lsp_refresh[lvl - 1]); } if (all_pseudo) { @@ -1822,16 +1819,16 @@ int lsp_generate_pseudo(struct isis_circuit *circuit, int level) lsp_flood(lsp, NULL); refresh_time = lsp_refresh_time(lsp, rem_lifetime); - THREAD_OFF(circuit->u.bc.t_refresh_pseudo_lsp[level - 1]); + EVENT_OFF(circuit->u.bc.t_refresh_pseudo_lsp[level - 1]); circuit->lsp_regenerate_pending[level - 1] = 0; if (level == IS_LEVEL_1) - thread_add_timer( - master, lsp_l1_refresh_pseudo, circuit, refresh_time, - &circuit->u.bc.t_refresh_pseudo_lsp[level - 1]); + event_add_timer(master, lsp_l1_refresh_pseudo, circuit, + refresh_time, + &circuit->u.bc.t_refresh_pseudo_lsp[level - 1]); else if (level == IS_LEVEL_2) - thread_add_timer( - master, lsp_l2_refresh_pseudo, circuit, refresh_time, - &circuit->u.bc.t_refresh_pseudo_lsp[level - 1]); + event_add_timer(master, lsp_l2_refresh_pseudo, circuit, + refresh_time, + &circuit->u.bc.t_refresh_pseudo_lsp[level - 1]); if (IS_DEBUG_UPDATE_PACKETS) { zlog_debug( @@ -1880,13 +1877,13 @@ static int lsp_regenerate_pseudo(struct isis_circuit *circuit, int level) refresh_time = lsp_refresh_time(lsp, rem_lifetime); if (level == IS_LEVEL_1) - thread_add_timer( - master, lsp_l1_refresh_pseudo, circuit, refresh_time, - &circuit->u.bc.t_refresh_pseudo_lsp[level - 1]); + event_add_timer(master, lsp_l1_refresh_pseudo, circuit, + refresh_time, + &circuit->u.bc.t_refresh_pseudo_lsp[level - 1]); else if (level == IS_LEVEL_2) - thread_add_timer( - master, lsp_l2_refresh_pseudo, circuit, refresh_time, - &circuit->u.bc.t_refresh_pseudo_lsp[level - 1]); + event_add_timer(master, lsp_l2_refresh_pseudo, circuit, + refresh_time, + &circuit->u.bc.t_refresh_pseudo_lsp[level - 1]); if (IS_DEBUG_UPDATE_PACKETS) { zlog_debug( @@ -1903,12 +1900,12 @@ static int lsp_regenerate_pseudo(struct isis_circuit *circuit, int level) /* * Something has changed or periodic refresh -> regenerate pseudo LSP */ -static void lsp_l1_refresh_pseudo(struct thread *thread) +static void lsp_l1_refresh_pseudo(struct event *thread) { struct isis_circuit *circuit; uint8_t id[ISIS_SYS_ID_LEN + 2]; - circuit = THREAD_ARG(thread); + circuit = EVENT_ARG(thread); circuit->u.bc.t_refresh_pseudo_lsp[0] = NULL; circuit->lsp_regenerate_pending[0] = 0; @@ -1925,12 +1922,12 @@ static void lsp_l1_refresh_pseudo(struct thread *thread) lsp_regenerate_pseudo(circuit, IS_LEVEL_1); } -static void lsp_l2_refresh_pseudo(struct thread *thread) +static void lsp_l2_refresh_pseudo(struct event *thread) { struct isis_circuit *circuit; uint8_t id[ISIS_SYS_ID_LEN + 2]; - circuit = THREAD_ARG(thread); + circuit = EVENT_ARG(thread); circuit->u.bc.t_refresh_pseudo_lsp[1] = NULL; circuit->lsp_regenerate_pending[1] = 0; @@ -1989,7 +1986,7 @@ int lsp_regenerate_schedule_pseudo(struct isis_circuit *circuit, int level) } if (circuit->lsp_regenerate_pending[lvl - 1]) { - struct timeval remain = thread_timer_remain( + struct timeval remain = event_timer_remain( circuit->u.bc.t_refresh_pseudo_lsp[lvl - 1]); sched_debug( "ISIS (%s): Regenerate is already pending, nothing todo. (Due in %lld.%03lld seconds)", @@ -2013,7 +2010,7 @@ int lsp_regenerate_schedule_pseudo(struct isis_circuit *circuit, int level) "ISIS (%s): Will schedule PSN regen timer. Last run was: %lld, Now is: %lld", area->area_tag, (long long)lsp->last_generated, (long long)now); - THREAD_OFF(circuit->u.bc.t_refresh_pseudo_lsp[lvl - 1]); + EVENT_OFF(circuit->u.bc.t_refresh_pseudo_lsp[lvl - 1]); diff = now - lsp->last_generated; if (diff < circuit->area->lsp_gen_interval[lvl - 1]) { timeout = @@ -2032,11 +2029,11 @@ int lsp_regenerate_schedule_pseudo(struct isis_circuit *circuit, int level) circuit->lsp_regenerate_pending[lvl - 1] = 1; if (lvl == IS_LEVEL_1) { - thread_add_timer_msec( + event_add_timer_msec( master, lsp_l1_refresh_pseudo, circuit, timeout, &circuit->u.bc.t_refresh_pseudo_lsp[lvl - 1]); } else if (lvl == IS_LEVEL_2) { - thread_add_timer_msec( + event_add_timer_msec( master, lsp_l2_refresh_pseudo, circuit, timeout, &circuit->u.bc.t_refresh_pseudo_lsp[lvl - 1]); } @@ -2049,7 +2046,7 @@ int lsp_regenerate_schedule_pseudo(struct isis_circuit *circuit, int level) * Walk through LSPs for an area * - set remaining lifetime */ -void lsp_tick(struct thread *thread) +void lsp_tick(struct event *thread) { struct isis_area *area; struct isis_lsp *lsp; @@ -2057,10 +2054,10 @@ void lsp_tick(struct thread *thread) uint16_t rem_lifetime; bool fabricd_sync_incomplete = false; - area = THREAD_ARG(thread); + area = EVENT_ARG(thread); assert(area); area->t_tick = NULL; - thread_add_timer(master, lsp_tick, area, 1, &area->t_tick); + event_add_timer(master, lsp_tick, area, 1, &area->t_tick); struct isis_circuit *fabricd_init_c = fabricd_initial_sync_circuit(area); diff --git a/isisd/isis_lsp.h b/isisd/isis_lsp.h index 5bb2b949c7..3839a9504c 100644 --- a/isisd/isis_lsp.h +++ b/isisd/isis_lsp.h @@ -52,8 +52,8 @@ DECLARE_RBTREE_UNIQ(lspdb, struct isis_lsp, dbe, lspdb_compare); void lsp_db_init(struct lspdb_head *head); void lsp_db_fini(struct lspdb_head *head); -void lsp_tick(struct thread *thread); -void set_overload_on_start_timer(struct thread *thread); +void lsp_tick(struct event *thread); +void set_overload_on_start_timer(struct event *thread); int lsp_generate(struct isis_area *area, int level); #define lsp_regenerate_schedule(area, level, all_pseudo) \ diff --git a/isisd/isis_main.c b/isisd/isis_main.c index 25ea187492..2f4e4e0bd6 100644 --- a/isisd/isis_main.c +++ b/isisd/isis_main.c @@ -10,7 +10,7 @@ #include #include "getopt.h" -#include "thread.h" +#include "frrevent.h" #include "log.h" #include #include "command.h" @@ -77,7 +77,7 @@ static const struct option longopts[] = { {0}}; /* Master of threads. */ -struct thread_master *master; +struct event_loop *master; /* * Prototypes. @@ -169,7 +169,7 @@ static const struct frr_yang_module_info *const isisd_yang_modules[] = { /* clang-format on */ -static void isis_config_finish(struct thread *t) +static void isis_config_finish(struct event *t) { struct listnode *node, *inode; struct isis *isis; @@ -185,9 +185,9 @@ static void isis_config_start(void) { /* Max wait time for config to load before generating lsp */ #define ISIS_PRE_CONFIG_MAX_WAIT_SECONDS 600 - THREAD_OFF(t_isis_cfg); - thread_add_timer(im->master, isis_config_finish, NULL, - ISIS_PRE_CONFIG_MAX_WAIT_SECONDS, &t_isis_cfg); + EVENT_OFF(t_isis_cfg); + event_add_timer(im->master, isis_config_finish, NULL, + ISIS_PRE_CONFIG_MAX_WAIT_SECONDS, &t_isis_cfg); } static void isis_config_end(void) @@ -195,10 +195,10 @@ static void isis_config_end(void) /* If ISIS config processing thread isn't running, then * we can return and rely it's properly handled. */ - if (!thread_is_scheduled(t_isis_cfg)) + if (!event_is_scheduled(t_isis_cfg)) return; - THREAD_OFF(t_isis_cfg); + EVENT_OFF(t_isis_cfg); isis_config_finish(t_isis_cfg); } diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c index f659f3abc3..dd442840d0 100644 --- a/isisd/isis_pdu.c +++ b/isisd/isis_pdu.c @@ -11,7 +11,7 @@ #include #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "linklist.h" #include "log.h" #include "stream.h" @@ -192,9 +192,9 @@ static int process_p2p_hello(struct iih_info *iih) adj); /* lets take care of the expiry */ - THREAD_OFF(adj->t_expire); - thread_add_timer(master, isis_adj_expire, adj, (long)adj->hold_time, - &adj->t_expire); + EVENT_OFF(adj->t_expire); + event_add_timer(master, isis_adj_expire, adj, (long)adj->hold_time, + &adj->t_expire); /* While fabricds initial sync is in progress, ignore hellos from other * interfaces than the one we are performing the initial sync on. */ @@ -466,8 +466,8 @@ static int process_lan_hello(struct iih_info *iih) : iih->circuit->u.bc.l2_desig_is; if (memcmp(dis, iih->dis, ISIS_SYS_ID_LEN + 1)) { - thread_add_event(master, isis_event_dis_status_change, - iih->circuit, 0, NULL); + event_add_event(master, isis_event_dis_status_change, + iih->circuit, 0, NULL); memcpy(dis, iih->dis, ISIS_SYS_ID_LEN + 1); } } @@ -484,9 +484,9 @@ static int process_lan_hello(struct iih_info *iih) adj); /* lets take care of the expiry */ - THREAD_OFF(adj->t_expire); - thread_add_timer(master, isis_adj_expire, adj, (long)adj->hold_time, - &adj->t_expire); + EVENT_OFF(adj->t_expire); + event_add_timer(master, isis_adj_expire, adj, (long)adj->hold_time, + &adj->t_expire); /* * If the snpa for this circuit is found from LAN Neighbours TLV @@ -1780,7 +1780,7 @@ int isis_handle_pdu(struct isis_circuit *circuit, uint8_t *ssnpa) return retval; } -void isis_receive(struct thread *thread) +void isis_receive(struct event *thread) { struct isis_circuit *circuit; uint8_t ssnpa[ETH_ALEN]; @@ -1788,7 +1788,7 @@ void isis_receive(struct thread *thread) /* * Get the circuit */ - circuit = THREAD_ARG(thread); + circuit = EVENT_ARG(thread); assert(circuit); circuit->t_read = NULL; @@ -2009,9 +2009,9 @@ int send_hello(struct isis_circuit *circuit, int level) return retval; } -static void send_hello_cb(struct thread *thread) +static void send_hello_cb(struct event *thread) { - struct isis_circuit_arg *arg = THREAD_ARG(thread); + struct isis_circuit_arg *arg = EVENT_ARG(thread); assert(arg); struct isis_circuit *circuit = arg->circuit; @@ -2050,20 +2050,18 @@ static void send_hello_cb(struct thread *thread) } static void _send_hello_sched(struct isis_circuit *circuit, - struct thread **threadp, - int level, long delay) + struct event **threadp, int level, long delay) { if (*threadp) { - if (thread_timer_remain_msec(*threadp) < (unsigned long)delay) + if (event_timer_remain_msec(*threadp) < (unsigned long)delay) return; - THREAD_OFF(*threadp); + EVENT_OFF(*threadp); } - thread_add_timer_msec(master, send_hello_cb, - &circuit->level_arg[level - 1], - isis_jitter(delay, IIH_JITTER), - threadp); + event_add_timer_msec(master, send_hello_cb, + &circuit->level_arg[level - 1], + isis_jitter(delay, IIH_JITTER), threadp); } void send_hello_sched(struct isis_circuit *circuit, int level, long delay) @@ -2240,11 +2238,11 @@ int send_csnp(struct isis_circuit *circuit, int level) return ISIS_OK; } -void send_l1_csnp(struct thread *thread) +void send_l1_csnp(struct event *thread) { struct isis_circuit *circuit; - circuit = THREAD_ARG(thread); + circuit = EVENT_ARG(thread); assert(circuit); circuit->t_send_csnp[0] = NULL; @@ -2255,16 +2253,16 @@ void send_l1_csnp(struct thread *thread) send_csnp(circuit, 1); } /* set next timer thread */ - thread_add_timer(master, send_l1_csnp, circuit, - isis_jitter(circuit->csnp_interval[0], CSNP_JITTER), - &circuit->t_send_csnp[0]); + event_add_timer(master, send_l1_csnp, circuit, + isis_jitter(circuit->csnp_interval[0], CSNP_JITTER), + &circuit->t_send_csnp[0]); } -void send_l2_csnp(struct thread *thread) +void send_l2_csnp(struct event *thread) { struct isis_circuit *circuit; - circuit = THREAD_ARG(thread); + circuit = EVENT_ARG(thread); assert(circuit); circuit->t_send_csnp[1] = NULL; @@ -2275,9 +2273,9 @@ void send_l2_csnp(struct thread *thread) send_csnp(circuit, 2); } /* set next timer thread */ - thread_add_timer(master, send_l2_csnp, circuit, - isis_jitter(circuit->csnp_interval[1], CSNP_JITTER), - &circuit->t_send_csnp[1]); + event_add_timer(master, send_l2_csnp, circuit, + isis_jitter(circuit->csnp_interval[1], CSNP_JITTER), + &circuit->t_send_csnp[1]); } /* @@ -2394,32 +2392,32 @@ static int send_psnp(int level, struct isis_circuit *circuit) return ISIS_OK; } -void send_l1_psnp(struct thread *thread) +void send_l1_psnp(struct event *thread) { struct isis_circuit *circuit; - circuit = THREAD_ARG(thread); + circuit = EVENT_ARG(thread); assert(circuit); circuit->t_send_psnp[0] = NULL; send_psnp(1, circuit); /* set next timer thread */ - thread_add_timer(master, send_l1_psnp, circuit, - isis_jitter(circuit->psnp_interval[0], PSNP_JITTER), - &circuit->t_send_psnp[0]); + event_add_timer(master, send_l1_psnp, circuit, + isis_jitter(circuit->psnp_interval[0], PSNP_JITTER), + &circuit->t_send_psnp[0]); } /* * 7.3.15.4 action on expiration of partial SNP interval * level 2 */ -void send_l2_psnp(struct thread *thread) +void send_l2_psnp(struct event *thread) { struct isis_circuit *circuit; - circuit = THREAD_ARG(thread); + circuit = EVENT_ARG(thread); assert(circuit); circuit->t_send_psnp[1] = NULL; @@ -2427,9 +2425,9 @@ void send_l2_psnp(struct thread *thread) send_psnp(2, circuit); /* set next timer thread */ - thread_add_timer(master, send_l2_psnp, circuit, - isis_jitter(circuit->psnp_interval[1], PSNP_JITTER), - &circuit->t_send_psnp[1]); + event_add_timer(master, send_l2_psnp, circuit, + isis_jitter(circuit->psnp_interval[1], PSNP_JITTER), + &circuit->t_send_psnp[1]); } /* diff --git a/isisd/isis_pdu.h b/isisd/isis_pdu.h index 5124394000..ccd89a70f1 100644 --- a/isisd/isis_pdu.h +++ b/isisd/isis_pdu.h @@ -182,7 +182,7 @@ struct isis_partial_seqnum_hdr { /* * Function for receiving IS-IS PDUs */ -void isis_receive(struct thread *thread); +void isis_receive(struct event *thread); /* * calling arguments for snp_process () @@ -197,10 +197,10 @@ void isis_receive(struct thread *thread); */ void send_hello_sched(struct isis_circuit *circuit, int level, long delay); int send_csnp(struct isis_circuit *circuit, int level); -void send_l1_csnp(struct thread *thread); -void send_l2_csnp(struct thread *thread); -void send_l1_psnp(struct thread *thread); -void send_l2_psnp(struct thread *thread); +void send_l1_csnp(struct event *thread); +void send_l2_csnp(struct event *thread); +void send_l1_psnp(struct event *thread); +void send_l2_psnp(struct event *thread); void send_lsp(struct isis_circuit *circuit, struct isis_lsp *lsp, enum isis_tx_type tx_type); void fill_fixed_hdr(uint8_t pdu_type, struct stream *stream); diff --git a/isisd/isis_route.c b/isisd/isis_route.c index 711d5cbed9..3b653194bf 100644 --- a/isisd/isis_route.c +++ b/isisd/isis_route.c @@ -11,7 +11,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "log.h" diff --git a/isisd/isis_routemap.c b/isisd/isis_routemap.c index 632b4ff95e..9be133c788 100644 --- a/isisd/isis_routemap.c +++ b/isisd/isis_routemap.c @@ -18,7 +18,7 @@ #include "plist.h" #include "routemap.h" #include "table.h" -#include "thread.h" +#include "frrevent.h" #include "vty.h" #include "isis_constants.h" diff --git a/isisd/isis_snmp.c b/isisd/isis_snmp.c index e0bcb180b0..fa566c5470 100644 --- a/isisd/isis_snmp.c +++ b/isisd/isis_snmp.c @@ -2797,7 +2797,7 @@ static uint8_t *isis_snmp_find_isadj_prot_supp(struct variable *v, oid *name, /* Register ISIS-MIB. */ -static int isis_snmp_init(struct thread_master *tm) +static int isis_snmp_init(struct event_loop *tm) { struct isis_func_to_prefix *h2f = isis_func_to_prefix_arr; struct variable *v; diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c index 9229f0a77d..bfe3758cd8 100644 --- a/isisd/isis_spf.c +++ b/isisd/isis_spf.c @@ -11,7 +11,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "log.h" @@ -1853,9 +1853,9 @@ void isis_spf_switchover_routes(struct isis_area *area, family, nexthop_ip, ifindex); } -static void isis_run_spf_cb(struct thread *thread) +static void isis_run_spf_cb(struct event *thread) { - struct isis_spf_run *run = THREAD_ARG(thread); + struct isis_spf_run *run = EVENT_ARG(thread); struct isis_area *area = run->area; int level = run->level; int have_run = 0; @@ -1950,7 +1950,7 @@ int _isis_spf_schedule(struct isis_area *area, int level, area->area_tag, level, diff, func, file, line); } - THREAD_OFF(area->t_rlfa_rib_update); + EVENT_OFF(area->t_rlfa_rib_update); if (area->spf_delay_ietf[level - 1]) { /* Need to call schedule function also if spf delay is running * to @@ -1961,9 +1961,9 @@ int _isis_spf_schedule(struct isis_area *area, int level, if (area->spf_timer[level - 1]) return ISIS_OK; - thread_add_timer_msec(master, isis_run_spf_cb, - isis_run_spf_arg(area, level), delay, - &area->spf_timer[level - 1]); + event_add_timer_msec(master, isis_run_spf_cb, + isis_run_spf_arg(area, level), delay, + &area->spf_timer[level - 1]); return ISIS_OK; } @@ -1990,8 +1990,8 @@ int _isis_spf_schedule(struct isis_area *area, int level, timer = area->min_spf_interval[level - 1] - diff; } - thread_add_timer(master, isis_run_spf_cb, isis_run_spf_arg(area, level), - timer, &area->spf_timer[level - 1]); + event_add_timer(master, isis_run_spf_cb, isis_run_spf_arg(area, level), + timer, &area->spf_timer[level - 1]); if (IS_DEBUG_SPF_EVENTS) zlog_debug("ISIS-SPF (%s) L%d SPF scheduled %ld sec from now", diff --git a/isisd/isis_sr.c b/isisd/isis_sr.c index 4293991654..cb330603e4 100644 --- a/isisd/isis_sr.c +++ b/isisd/isis_sr.c @@ -1081,11 +1081,11 @@ DEFUN(show_sr_node, show_sr_node_cmd, * * @return 1 on success */ -static void sr_start_label_manager(struct thread *start) +static void sr_start_label_manager(struct event *start) { struct isis_area *area; - area = THREAD_ARG(start); + area = EVENT_ARG(start); /* re-attempt to start SR & Label Manager connection */ isis_sr_start(area); @@ -1108,8 +1108,8 @@ int isis_sr_start(struct isis_area *area) if (!isis_zebra_label_manager_ready()) if (isis_zebra_label_manager_connect() < 0) { /* Re-attempt to connect to Label Manager in 1 sec. */ - thread_add_timer(master, sr_start_label_manager, area, - 1, &srdb->t_start_lm); + event_add_timer(master, sr_start_label_manager, area, 1, + &srdb->t_start_lm); return -1; } @@ -1168,7 +1168,7 @@ void isis_sr_stop(struct isis_area *area) area->area_tag); /* Disable any re-attempt to connect to Label Manager */ - THREAD_OFF(srdb->t_start_lm); + EVENT_OFF(srdb->t_start_lm); /* Uninstall all local Adjacency-SIDs. */ for (ALL_LIST_ELEMENTS(area->srdb.adj_sids, node, nnode, sra)) diff --git a/isisd/isis_sr.h b/isisd/isis_sr.h index 627f1fb748..4ced5f4e83 100644 --- a/isisd/isis_sr.h +++ b/isisd/isis_sr.h @@ -155,7 +155,7 @@ struct isis_sr_db { bool enabled; /* Thread timer to start Label Manager */ - struct thread *t_start_lm; + struct event *t_start_lm; /* List of local Adjacency-SIDs. */ struct list *adj_sids; diff --git a/isisd/isis_te.c b/isisd/isis_te.c index 3659f4e07c..45d763fd69 100644 --- a/isisd/isis_te.c +++ b/isisd/isis_te.c @@ -13,7 +13,7 @@ #include #include "linklist.h" -#include "thread.h" +#include "frrevent.h" #include "vty.h" #include "stream.h" #include "memory.h" diff --git a/isisd/isis_tx_queue.c b/isisd/isis_tx_queue.c index eada0d5521..ec2d50d60a 100644 --- a/isisd/isis_tx_queue.c +++ b/isisd/isis_tx_queue.c @@ -32,7 +32,7 @@ struct isis_tx_queue_entry { struct isis_lsp *lsp; enum isis_tx_type type; bool is_retry; - struct thread *retry; + struct event *retry; struct isis_tx_queue *queue; }; @@ -79,7 +79,7 @@ static void tx_queue_element_free(void *element) { struct isis_tx_queue_entry *e = element; - THREAD_OFF(e->retry); + EVENT_OFF(e->retry); XFREE(MTYPE_TX_QUEUE_ENTRY, e); } @@ -100,12 +100,12 @@ static struct isis_tx_queue_entry *tx_queue_find(struct isis_tx_queue *queue, return hash_lookup(queue->hash, &e); } -static void tx_queue_send_event(struct thread *thread) +static void tx_queue_send_event(struct event *thread) { - struct isis_tx_queue_entry *e = THREAD_ARG(thread); + struct isis_tx_queue_entry *e = EVENT_ARG(thread); struct isis_tx_queue *queue = e->queue; - thread_add_timer(master, tx_queue_send_event, e, 5, &e->retry); + event_add_timer(master, tx_queue_send_event, e, 5, &e->retry); if (e->is_retry) queue->circuit->area->lsp_rxmt_count++; @@ -147,8 +147,8 @@ void _isis_tx_queue_add(struct isis_tx_queue *queue, e->type = type; - THREAD_OFF(e->retry); - thread_add_event(master, tx_queue_send_event, e, 0, &e->retry); + EVENT_OFF(e->retry); + event_add_event(master, tx_queue_send_event, e, 0, &e->retry); e->is_retry = false; } @@ -170,7 +170,7 @@ void _isis_tx_queue_del(struct isis_tx_queue *queue, struct isis_lsp *lsp, func, file, line); } - THREAD_OFF(e->retry); + EVENT_OFF(e->retry); hash_release(queue->hash, e); XFREE(MTYPE_TX_QUEUE_ENTRY, e); diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c index 7e85576c7a..8cd8f57c47 100644 --- a/isisd/isis_zebra.c +++ b/isisd/isis_zebra.c @@ -10,7 +10,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "command.h" #include "memory.h" #include "log.h" @@ -828,7 +828,7 @@ static zclient_handler *const isis_handlers[] = { [ZEBRA_CLIENT_CLOSE_NOTIFY] = isis_zebra_client_close_notify, }; -void isis_zebra_init(struct thread_master *master, int instance) +void isis_zebra_init(struct event_loop *master, int instance) { /* Initialize asynchronous zclient. */ zclient = zclient_new(master, &zclient_options_default, isis_handlers, diff --git a/isisd/isis_zebra.h b/isisd/isis_zebra.h index f34088f98e..359e39b59d 100644 --- a/isisd/isis_zebra.h +++ b/isisd/isis_zebra.h @@ -20,7 +20,7 @@ struct label_chunk { }; #define CHUNK_SIZE 64 -void isis_zebra_init(struct thread_master *master, int instance); +void isis_zebra_init(struct event_loop *master, int instance); void isis_zebra_stop(void); struct isis_route_info; diff --git a/isisd/isisd.c b/isisd/isisd.c index 586785b05f..d216d100e1 100644 --- a/isisd/isisd.c +++ b/isisd/isisd.c @@ -9,7 +9,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "log.h" @@ -88,7 +88,7 @@ static struct isis_master isis_master; struct isis_master *im; /* ISIS config processing thread */ -struct thread *t_isis_cfg; +struct event *t_isis_cfg; #ifndef FABRICD DEFINE_HOOK(isis_hook_db_overload, (const struct isis_area *area), (area)); @@ -166,7 +166,7 @@ struct isis *isis_lookup_by_sysid(const uint8_t *sysid) return NULL; } -void isis_master_init(struct thread_master *master) +void isis_master_init(struct event_loop *master) { memset(&isis_master, 0, sizeof(isis_master)); im = &isis_master; @@ -325,7 +325,7 @@ struct isis_area *isis_area_create(const char *area_tag, const char *vrf_name) area->area_addrs->del = delete_area_addr; if (!CHECK_FLAG(im->options, F_ISIS_UNIT_TEST)) - thread_add_timer(master, lsp_tick, area, 1, &area->t_tick); + event_add_timer(master, lsp_tick, area, 1, &area->t_tick); flags_initialize(&area->flags); isis_sr_area_init(area); @@ -519,11 +519,11 @@ void isis_area_destroy(struct isis_area *area) spftree_area_del(area); if (area->spf_timer[0]) - isis_spf_timer_free(THREAD_ARG(area->spf_timer[0])); - THREAD_OFF(area->spf_timer[0]); + isis_spf_timer_free(EVENT_ARG(area->spf_timer[0])); + EVENT_OFF(area->spf_timer[0]); if (area->spf_timer[1]) - isis_spf_timer_free(THREAD_ARG(area->spf_timer[1])); - THREAD_OFF(area->spf_timer[1]); + isis_spf_timer_free(EVENT_ARG(area->spf_timer[1])); + EVENT_OFF(area->spf_timer[1]); spf_backoff_free(area->spf_delay_ietf[0]); spf_backoff_free(area->spf_delay_ietf[1]); @@ -543,12 +543,12 @@ void isis_area_destroy(struct isis_area *area) isis_lfa_tiebreakers_clear(area, ISIS_LEVEL1); isis_lfa_tiebreakers_clear(area, ISIS_LEVEL2); - THREAD_OFF(area->t_tick); - THREAD_OFF(area->t_lsp_refresh[0]); - THREAD_OFF(area->t_lsp_refresh[1]); - THREAD_OFF(area->t_rlfa_rib_update); + EVENT_OFF(area->t_tick); + EVENT_OFF(area->t_lsp_refresh[0]); + EVENT_OFF(area->t_lsp_refresh[1]); + EVENT_OFF(area->t_rlfa_rib_update); - thread_cancel_event(master, area); + event_cancel_event(master, area); listnode_delete(area->isis->area_list, area); @@ -2250,7 +2250,7 @@ static void isis_spf_ietf_common(struct vty *vty, struct isis *isis) vty_out(vty, " Level-%d:\n", level); vty_out(vty, " SPF delay status: "); if (area->spf_timer[level - 1]) { - struct timeval remain = thread_timer_remain( + struct timeval remain = event_timer_remain( area->spf_timer[level - 1]); vty_out(vty, "Pending, due in %lld msec\n", (long long)remain.tv_sec * 1000 @@ -3119,14 +3119,14 @@ static void area_resign_level(struct isis_area *area, int level) } if (area->spf_timer[level - 1]) - isis_spf_timer_free(THREAD_ARG(area->spf_timer[level - 1])); + isis_spf_timer_free(EVENT_ARG(area->spf_timer[level - 1])); - THREAD_OFF(area->spf_timer[level - 1]); + EVENT_OFF(area->spf_timer[level - 1]); sched_debug( "ISIS (%s): Resigned from L%d - canceling LSP regeneration timer.", area->area_tag, level); - THREAD_OFF(area->t_lsp_refresh[level - 1]); + EVENT_OFF(area->t_lsp_refresh[level - 1]); area->lsp_regenerate_pending[level - 1] = 0; } @@ -3215,7 +3215,7 @@ void isis_area_overload_bit_set(struct isis_area *area, bool overload_bit) } else { /* Cancel overload on startup timer if it's running */ if (area->t_overload_on_startup_timer) { - THREAD_OFF(area->t_overload_on_startup_timer); + EVENT_OFF(area->t_overload_on_startup_timer); area->t_overload_on_startup_timer = NULL; } } diff --git a/isisd/isisd.h b/isisd/isisd.h index 37a36fd37a..a06dc46a38 100644 --- a/isisd/isisd.h +++ b/isisd/isisd.h @@ -71,7 +71,7 @@ struct isis_master { /* ISIS instance. */ struct list *isis; /* ISIS thread master. */ - struct thread_master *master; + struct event_loop *master; uint8_t options; }; #define F_ISIS_UNIT_TEST 0x01 @@ -89,7 +89,7 @@ struct isis { uint8_t max_area_addrs; /* maximumAreaAdresses */ struct area_addr *man_area_addrs; /* manualAreaAddresses */ time_t uptime; /* when did we start */ - struct thread *t_dync_clean; /* dynamic hostname cache cleanup thread */ + struct event *t_dync_clean; /* dynamic hostname cache cleanup thread */ uint32_t circuit_ids_used[8]; /* 256 bits to track circuit ids 1 through 255 */ int snmp_notifications; struct list *dyn_cache; @@ -99,7 +99,7 @@ struct isis { extern struct isis_master *im; -extern struct thread *t_isis_cfg; +extern struct event *t_isis_cfg; enum spf_tree_id { SPFTREE_IPV4 = 0, @@ -129,11 +129,11 @@ struct isis_area { struct list *circuit_list; /* IS-IS circuits */ struct list *adjacency_list; /* IS-IS adjacencies */ struct flags flags; - struct thread *t_tick; /* LSP walker */ - struct thread *t_lsp_refresh[ISIS_LEVELS]; - struct thread *t_overload_on_startup_timer; + struct event *t_tick; /* LSP walker */ + struct event *t_lsp_refresh[ISIS_LEVELS]; + struct event *t_overload_on_startup_timer; struct timeval last_lsp_refresh_event[ISIS_LEVELS]; - struct thread *t_rlfa_rib_update; + struct event *t_rlfa_rib_update; /* t_lsp_refresh is used in two ways: * a) regular refresh of LSPs * b) (possibly throttled) updates to LSPs @@ -226,7 +226,7 @@ struct isis_area { struct spf_backoff *spf_delay_ietf[ISIS_LEVELS]; /*Structure with IETF SPF algo parameters*/ - struct thread *spf_timer[ISIS_LEVELS]; + struct event *spf_timer[ISIS_LEVELS]; struct lsp_refresh_arg lsp_refresh_arg[ISIS_LEVELS]; @@ -252,7 +252,7 @@ DECLARE_MTYPE(ISIS_PLIST_NAME); DECLARE_HOOK(isis_area_overload_bit_update, (struct isis_area * area), (area)); void isis_terminate(void); -void isis_master_init(struct thread_master *master); +void isis_master_init(struct event_loop *master); void isis_vrf_link(struct isis *isis, struct vrf *vrf); void isis_vrf_unlink(struct isis *isis, struct vrf *vrf); struct isis *isis_lookup_by_vrfid(vrf_id_t vrf_id); @@ -329,7 +329,7 @@ void config_end_lsp_generate(struct isis_area *area); #define ISIS_SR "/frr-isisd:isis/instance/segment-routing" /* Master of threads. */ -extern struct thread_master *master; +extern struct event_loop *master; extern unsigned long debug_adj_pkt; extern unsigned long debug_snp_pkt; diff --git a/ldpd/accept.c b/ldpd/accept.c index 170c079b52..8e881e78ae 100644 --- a/ldpd/accept.c +++ b/ldpd/accept.c @@ -13,21 +13,21 @@ struct accept_ev { LIST_ENTRY(accept_ev) entry; - struct thread *ev; - void (*accept_cb)(struct thread *); + struct event *ev; + void (*accept_cb)(struct event *); void *arg; int fd; }; struct { LIST_HEAD(, accept_ev) queue; - struct thread *evt; + struct event *evt; } accept_queue; static void accept_arm(void); static void accept_unarm(void); -static void accept_cb(struct thread *); -static void accept_timeout(struct thread *); +static void accept_cb(struct event *); +static void accept_timeout(struct event *); void accept_init(void) @@ -35,7 +35,7 @@ accept_init(void) LIST_INIT(&accept_queue.queue); } -int accept_add(int fd, void (*cb)(struct thread *), void *arg) +int accept_add(int fd, void (*cb)(struct event *), void *arg) { struct accept_ev *av; @@ -46,7 +46,7 @@ int accept_add(int fd, void (*cb)(struct thread *), void *arg) av->arg = arg; LIST_INSERT_HEAD(&accept_queue.queue, av, entry); - thread_add_read(master, accept_cb, av, av->fd, &av->ev); + event_add_read(master, accept_cb, av, av->fd, &av->ev); log_debug("%s: accepting on fd %d", __func__, fd); @@ -61,7 +61,7 @@ accept_del(int fd) LIST_FOREACH(av, &accept_queue.queue, entry) if (av->fd == fd) { log_debug("%s: %d removed from queue", __func__, fd); - THREAD_OFF(av->ev); + EVENT_OFF(av->ev); LIST_REMOVE(av, entry); free(av); return; @@ -73,7 +73,7 @@ accept_pause(void) { log_debug(__func__); accept_unarm(); - thread_add_timer(master, accept_timeout, NULL, 1, &accept_queue.evt); + event_add_timer(master, accept_timeout, NULL, 1, &accept_queue.evt); } void @@ -81,7 +81,7 @@ accept_unpause(void) { if (accept_queue.evt != NULL) { log_debug(__func__); - THREAD_OFF(accept_queue.evt); + EVENT_OFF(accept_queue.evt); accept_arm(); } } @@ -91,7 +91,7 @@ accept_arm(void) { struct accept_ev *av; LIST_FOREACH(av, &accept_queue.queue, entry) { - thread_add_read(master, accept_cb, av, av->fd, &av->ev); + event_add_read(master, accept_cb, av, av->fd, &av->ev); } } @@ -100,17 +100,17 @@ accept_unarm(void) { struct accept_ev *av; LIST_FOREACH(av, &accept_queue.queue, entry) - THREAD_OFF(av->ev); + EVENT_OFF(av->ev); } -static void accept_cb(struct thread *thread) +static void accept_cb(struct event *thread) { - struct accept_ev *av = THREAD_ARG(thread); - thread_add_read(master, accept_cb, av, av->fd, &av->ev); + struct accept_ev *av = EVENT_ARG(thread); + event_add_read(master, accept_cb, av, av->fd, &av->ev); av->accept_cb(thread); } -static void accept_timeout(struct thread *thread) +static void accept_timeout(struct event *thread) { accept_queue.evt = NULL; diff --git a/ldpd/adjacency.c b/ldpd/adjacency.c index 42c3ef0535..0108af8044 100644 --- a/ldpd/adjacency.c +++ b/ldpd/adjacency.c @@ -15,12 +15,12 @@ #include "log.h" static __inline int adj_compare(const struct adj *, const struct adj *); -static void adj_itimer(struct thread *); +static void adj_itimer(struct event *); static __inline int tnbr_compare(const struct tnbr *, const struct tnbr *); static void tnbr_del(struct ldpd_conf *, struct tnbr *); static void tnbr_start(struct tnbr *); static void tnbr_stop(struct tnbr *); -static void tnbr_hello_timer(struct thread *); +static void tnbr_hello_timer(struct event *); static void tnbr_start_hello_timer(struct tnbr *); static void tnbr_stop_hello_timer(struct tnbr *); @@ -161,9 +161,9 @@ adj_get_af(const struct adj *adj) /* adjacency timers */ /* ARGSUSED */ -static void adj_itimer(struct thread *thread) +static void adj_itimer(struct event *thread) { - struct adj *adj = THREAD_ARG(thread); + struct adj *adj = EVENT_ARG(thread); adj->inactivity_timer = NULL; @@ -185,16 +185,16 @@ static void adj_itimer(struct thread *thread) void adj_start_itimer(struct adj *adj) { - THREAD_OFF(adj->inactivity_timer); + EVENT_OFF(adj->inactivity_timer); adj->inactivity_timer = NULL; - thread_add_timer(master, adj_itimer, adj, adj->holdtime, - &adj->inactivity_timer); + event_add_timer(master, adj_itimer, adj, adj->holdtime, + &adj->inactivity_timer); } void adj_stop_itimer(struct adj *adj) { - THREAD_OFF(adj->inactivity_timer); + EVENT_OFF(adj->inactivity_timer); } /* targeted neighbors */ @@ -331,9 +331,9 @@ tnbr_get_hello_interval(struct tnbr *tnbr) /* target neighbors timers */ /* ARGSUSED */ -static void tnbr_hello_timer(struct thread *thread) +static void tnbr_hello_timer(struct event *thread) { - struct tnbr *tnbr = THREAD_ARG(thread); + struct tnbr *tnbr = EVENT_ARG(thread); tnbr->hello_timer = NULL; send_hello(HELLO_TARGETED, NULL, tnbr); @@ -343,16 +343,16 @@ static void tnbr_hello_timer(struct thread *thread) static void tnbr_start_hello_timer(struct tnbr *tnbr) { - THREAD_OFF(tnbr->hello_timer); + EVENT_OFF(tnbr->hello_timer); tnbr->hello_timer = NULL; - thread_add_timer(master, tnbr_hello_timer, tnbr, tnbr_get_hello_interval(tnbr), - &tnbr->hello_timer); + event_add_timer(master, tnbr_hello_timer, tnbr, + tnbr_get_hello_interval(tnbr), &tnbr->hello_timer); } static void tnbr_stop_hello_timer(struct tnbr *tnbr) { - THREAD_OFF(tnbr->hello_timer); + EVENT_OFF(tnbr->hello_timer); } struct ctl_adj * @@ -375,7 +375,7 @@ adj_to_ctl(struct adj *adj) } actl.holdtime = adj->holdtime; actl.holdtime_remaining = - thread_timer_remain_second(adj->inactivity_timer); + event_timer_remain_second(adj->inactivity_timer); actl.trans_addr = adj->trans_addr; actl.ds_tlv = adj->ds_tlv; diff --git a/ldpd/control.c b/ldpd/control.c index b1260feb68..6bb5204d13 100644 --- a/ldpd/control.c +++ b/ldpd/control.c @@ -15,11 +15,11 @@ #define CONTROL_BACKLOG 5 -static void control_accept(struct thread *); +static void control_accept(struct event *); static struct ctl_conn *control_connbyfd(int); static struct ctl_conn *control_connbypid(pid_t); static void control_close(int); -static void control_dispatch_imsg(struct thread *); +static void control_dispatch_imsg(struct event *); struct ctl_conns ctl_conns; @@ -90,7 +90,7 @@ control_cleanup(char *path) } /* ARGSUSED */ -static void control_accept(struct thread *thread) +static void control_accept(struct event *thread) { int connfd; socklen_t len; @@ -98,8 +98,8 @@ static void control_accept(struct thread *thread) struct ctl_conn *c; len = sizeof(s_un); - if ((connfd = accept(THREAD_FD(thread), (struct sockaddr *)&s_un, - &len)) == -1) { + if ((connfd = accept(EVENT_FD(thread), (struct sockaddr *)&s_un, + &len)) == -1) { /* * Pause accept if we are out of file descriptors, or * libevent will haunt us here too. @@ -122,8 +122,8 @@ static void control_accept(struct thread *thread) imsg_init(&c->iev.ibuf, connfd); c->iev.handler_read = control_dispatch_imsg; c->iev.ev_read = NULL; - thread_add_read(master, c->iev.handler_read, &c->iev, c->iev.ibuf.fd, - &c->iev.ev_read); + event_add_read(master, c->iev.handler_read, &c->iev, c->iev.ibuf.fd, + &c->iev.ev_read); c->iev.handler_write = ldp_write_handler; c->iev.ev_write = NULL; @@ -169,17 +169,17 @@ control_close(int fd) msgbuf_clear(&c->iev.ibuf.w); TAILQ_REMOVE(&ctl_conns, c, entry); - THREAD_OFF(c->iev.ev_read); - THREAD_OFF(c->iev.ev_write); + EVENT_OFF(c->iev.ev_read); + EVENT_OFF(c->iev.ev_write); close(c->iev.ibuf.fd); accept_unpause(); free(c); } /* ARGSUSED */ -static void control_dispatch_imsg(struct thread *thread) +static void control_dispatch_imsg(struct event *thread) { - int fd = THREAD_FD(thread); + int fd = EVENT_FD(thread); struct ctl_conn *c; struct imsg imsg; ssize_t n; diff --git a/ldpd/interface.c b/ldpd/interface.c index 5d1859298e..ad5d853b65 100644 --- a/ldpd/interface.c +++ b/ldpd/interface.c @@ -22,7 +22,7 @@ static struct if_addr *if_addr_lookup(struct if_addr_head *, struct kaddr *); static int if_start(struct iface *, int); static int if_reset(struct iface *, int); static void if_update_af(struct iface_af *); -static void if_hello_timer(struct thread *thread); +static void if_hello_timer(struct event *thread); static void if_start_hello_timer(struct iface_af *); static void if_stop_hello_timer(struct iface_af *); static int if_join_ipv4_group(struct iface *, struct in_addr *); @@ -32,7 +32,7 @@ static int if_leave_ipv6_group(struct iface *, struct in6_addr *); static int ldp_sync_fsm_init(struct iface *iface, int state); static int ldp_sync_act_iface_start_sync(struct iface *iface); -static void iface_wait_for_ldp_sync_timer(struct thread *thread); +static void iface_wait_for_ldp_sync_timer(struct event *thread); static void start_wait_for_ldp_sync_timer(struct iface *iface); static void stop_wait_for_ldp_sync_timer(struct iface *iface); static int ldp_sync_act_ldp_start_sync(struct iface *iface); @@ -444,9 +444,9 @@ if_get_wait_for_sync_interval(void) /* timers */ /* ARGSUSED */ -static void if_hello_timer(struct thread *thread) +static void if_hello_timer(struct event *thread) { - struct iface_af *ia = THREAD_ARG(thread); + struct iface_af *ia = EVENT_ARG(thread); ia->hello_timer = NULL; send_hello(HELLO_LINK, ia, NULL); @@ -456,15 +456,15 @@ static void if_hello_timer(struct thread *thread) static void if_start_hello_timer(struct iface_af *ia) { - THREAD_OFF(ia->hello_timer); - thread_add_timer(master, if_hello_timer, ia, if_get_hello_interval(ia), - &ia->hello_timer); + EVENT_OFF(ia->hello_timer); + event_add_timer(master, if_hello_timer, ia, if_get_hello_interval(ia), + &ia->hello_timer); } static void if_stop_hello_timer(struct iface_af *ia) { - THREAD_OFF(ia->hello_timer); + EVENT_OFF(ia->hello_timer); } struct ctl_iface * @@ -533,7 +533,7 @@ ldp_sync_to_ctl(struct iface *iface) ictl.timer_running = iface->ldp_sync.wait_for_sync_timer ? true : false; ictl.wait_time_remaining = - thread_timer_remain_second(iface->ldp_sync.wait_for_sync_timer); + event_timer_remain_second(iface->ldp_sync.wait_for_sync_timer); memset(&ictl.peer_ldp_id, 0, sizeof(ictl.peer_ldp_id)); @@ -720,9 +720,9 @@ ldp_sync_act_iface_start_sync(struct iface *iface) return (0); } -static void iface_wait_for_ldp_sync_timer(struct thread *thread) +static void iface_wait_for_ldp_sync_timer(struct event *thread) { - struct iface *iface = THREAD_ARG(thread); + struct iface *iface = EVENT_ARG(thread); ldp_sync_fsm(iface, LDP_SYNC_EVT_LDP_SYNC_COMPLETE); } @@ -732,15 +732,15 @@ static void start_wait_for_ldp_sync_timer(struct iface *iface) if (iface->ldp_sync.wait_for_sync_timer) return; - THREAD_OFF(iface->ldp_sync.wait_for_sync_timer); - thread_add_timer(master, iface_wait_for_ldp_sync_timer, iface, + EVENT_OFF(iface->ldp_sync.wait_for_sync_timer); + event_add_timer(master, iface_wait_for_ldp_sync_timer, iface, if_get_wait_for_sync_interval(), &iface->ldp_sync.wait_for_sync_timer); } static void stop_wait_for_ldp_sync_timer(struct iface *iface) { - THREAD_OFF(iface->ldp_sync.wait_for_sync_timer); + EVENT_OFF(iface->ldp_sync.wait_for_sync_timer); } static int diff --git a/ldpd/lde.c b/ldpd/lde.c index 325b33d057..806bab6a21 100644 --- a/ldpd/lde.c +++ b/ldpd/lde.c @@ -30,8 +30,8 @@ #include "libfrr.h" static void lde_shutdown(void); -static void lde_dispatch_imsg(struct thread *thread); -static void lde_dispatch_parent(struct thread *thread); +static void lde_dispatch_imsg(struct event *thread); +static void lde_dispatch_parent(struct event *thread); static __inline int lde_nbr_compare(const struct lde_nbr *, const struct lde_nbr *); static struct lde_nbr *lde_nbr_new(uint32_t, struct lde_nbr *); @@ -134,8 +134,8 @@ lde(void) fatal(NULL); imsg_init(&iev_main->ibuf, LDPD_FD_ASYNC); iev_main->handler_read = lde_dispatch_parent; - thread_add_read(master, iev_main->handler_read, iev_main, iev_main->ibuf.fd, - &iev_main->ev_read); + event_add_read(master, iev_main->handler_read, iev_main, + iev_main->ibuf.fd, &iev_main->ev_read); iev_main->handler_write = ldp_write_handler; memset(&iev_main_sync_data, 0, sizeof(iev_main_sync_data)); @@ -145,9 +145,9 @@ lde(void) /* create base configuration */ ldeconf = config_new_empty(); - struct thread thread; - while (thread_fetch(master, &thread)) - thread_call(&thread); + struct event thread; + while (event_fetch(master, &thread)) + event_call(&thread); /* NOTREACHED */ return; @@ -232,9 +232,9 @@ lde_imsg_compose_ldpe(int type, uint32_t peerid, pid_t pid, void *data, } /* ARGSUSED */ -static void lde_dispatch_imsg(struct thread *thread) +static void lde_dispatch_imsg(struct event *thread) { - struct imsgev *iev = THREAD_ARG(thread); + struct imsgev *iev = EVENT_ARG(thread); struct imsgbuf *ibuf = &iev->ibuf; struct imsg imsg; struct lde_nbr *ln; @@ -395,14 +395,14 @@ static void lde_dispatch_imsg(struct thread *thread) imsg_event_add(iev); else { /* this pipe is dead, so remove the event handlers and exit */ - THREAD_OFF(iev->ev_read); - THREAD_OFF(iev->ev_write); + EVENT_OFF(iev->ev_read); + EVENT_OFF(iev->ev_write); lde_shutdown(); } } /* ARGSUSED */ -static void lde_dispatch_parent(struct thread *thread) +static void lde_dispatch_parent(struct event *thread) { static struct ldpd_conf *nconf; struct iface *iface, *niface; @@ -415,7 +415,7 @@ static void lde_dispatch_parent(struct thread *thread) struct kif *kif; struct kroute *kr; int fd; - struct imsgev *iev = THREAD_ARG(thread); + struct imsgev *iev = EVENT_ARG(thread); struct imsgbuf *ibuf = &iev->ibuf; ssize_t n; int shut = 0; @@ -523,8 +523,8 @@ static void lde_dispatch_parent(struct thread *thread) fatal(NULL); imsg_init(&iev_ldpe->ibuf, fd); iev_ldpe->handler_read = lde_dispatch_imsg; - thread_add_read(master, iev_ldpe->handler_read, iev_ldpe, iev_ldpe->ibuf.fd, - &iev_ldpe->ev_read); + event_add_read(master, iev_ldpe->handler_read, iev_ldpe, + iev_ldpe->ibuf.fd, &iev_ldpe->ev_read); iev_ldpe->handler_write = ldp_write_handler; iev_ldpe->ev_write = NULL; break; @@ -673,8 +673,8 @@ static void lde_dispatch_parent(struct thread *thread) imsg_event_add(iev); else { /* this pipe is dead, so remove the event handlers and exit */ - THREAD_OFF(iev->ev_read); - THREAD_OFF(iev->ev_write); + EVENT_OFF(iev->ev_read); + EVENT_OFF(iev->ev_write); lde_shutdown(); } } @@ -2123,7 +2123,7 @@ lde_address_list_free(struct lde_nbr *ln) /* * Event callback used to retry the label-manager sync zapi session. */ -static void zclient_sync_retry(struct thread *thread) +static void zclient_sync_retry(struct event *thread) { zclient_sync_init(); } @@ -2178,7 +2178,7 @@ retry: zclient_sync = NULL; /* Retry using a timer */ - thread_add_timer(master, zclient_sync_retry, NULL, 1, NULL); + event_add_timer(master, zclient_sync_retry, NULL, 1, NULL); } static void diff --git a/ldpd/lde.h b/ldpd/lde.h index 3a64f0d3b9..2688b6a86b 100644 --- a/ldpd/lde.h +++ b/ldpd/lde.h @@ -132,7 +132,7 @@ struct label_chunk { extern struct ldpd_conf *ldeconf; extern struct fec_tree ft; extern struct nbr_tree lde_nbrs; -extern struct thread *gc_timer; +extern struct event *gc_timer; /* lde.c */ void lde(void); @@ -216,7 +216,7 @@ void lde_check_withdraw(struct map *, struct lde_nbr *); void lde_check_withdraw_wcard(struct map *, struct lde_nbr *); int lde_wildcard_apply(struct map *, struct fec *, struct lde_map *); -void lde_gc_timer(struct thread *thread); +void lde_gc_timer(struct event *thread); void lde_gc_start_timer(void); void lde_gc_stop_timer(void); diff --git a/ldpd/lde_lib.c b/ldpd/lde_lib.c index d737e9f416..470580ff5e 100644 --- a/ldpd/lde_lib.c +++ b/ldpd/lde_lib.c @@ -28,7 +28,7 @@ static void fec_nh_del(struct fec_nh *); RB_GENERATE(fec_tree, fec, entry, fec_compare) struct fec_tree ft = RB_INITIALIZER(&ft); -struct thread *gc_timer; +struct event *gc_timer; /* FEC tree functions */ void @@ -1026,7 +1026,7 @@ lde_wildcard_apply(struct map *wcard, struct fec *fec, struct lde_map *me) /* gabage collector timer: timer to remove dead entries from the LIB */ /* ARGSUSED */ -void lde_gc_timer(struct thread *thread) +void lde_gc_timer(struct event *thread) { struct fec *fec, *safe; struct fec_node *fn; @@ -1057,13 +1057,12 @@ void lde_gc_timer(struct thread *thread) void lde_gc_start_timer(void) { - THREAD_OFF(gc_timer); - thread_add_timer(master, lde_gc_timer, NULL, LDE_GC_INTERVAL, - &gc_timer); + EVENT_OFF(gc_timer); + event_add_timer(master, lde_gc_timer, NULL, LDE_GC_INTERVAL, &gc_timer); } void lde_gc_stop_timer(void) { - THREAD_OFF(gc_timer); + EVENT_OFF(gc_timer); } diff --git a/ldpd/ldp_snmp.c b/ldpd/ldp_snmp.c index 9a26a8d17b..ed391ac600 100644 --- a/ldpd/ldp_snmp.c +++ b/ldpd/ldp_snmp.c @@ -1173,7 +1173,7 @@ static int ldp_snmp_nbr_state_change(struct nbr * nbr, int old_state) return 0; } -static int ldp_snmp_init(struct thread_master *tm) +static int ldp_snmp_init(struct event_loop *tm) { hook_register(agentx_enabled, ldp_snmp_agentx_enabled); @@ -1182,7 +1182,7 @@ static int ldp_snmp_init(struct thread_master *tm) return 0; } -static int ldp_snmp_register_mib(struct thread_master *tm) +static int ldp_snmp_register_mib(struct event_loop *tm) { static int registered = 0; diff --git a/ldpd/ldp_zebra.c b/ldpd/ldp_zebra.c index 6f0f990e49..02cd1678e9 100644 --- a/ldpd/ldp_zebra.c +++ b/ldpd/ldp_zebra.c @@ -690,8 +690,7 @@ static zclient_handler *const ldp_handlers[] = { [ZEBRA_OPAQUE_MESSAGE] = ldp_zebra_opaque_msg_handler, }; -void -ldp_zebra_init(struct thread_master *master) +void ldp_zebra_init(struct event_loop *master) { if_zapi_callbacks(ldp_ifp_create, ldp_ifp_up, ldp_ifp_down, ldp_ifp_destroy); diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c index 2026a7857c..3c616d4a8c 100644 --- a/ldpd/ldpd.c +++ b/ldpd/ldpd.c @@ -35,8 +35,8 @@ static void ldpd_shutdown(void); static pid_t start_child(enum ldpd_process, char *, int, int); -static void main_dispatch_ldpe(struct thread *thread); -static void main_dispatch_lde(struct thread *thread); +static void main_dispatch_ldpe(struct event *thread); +static void main_dispatch_lde(struct event *thread); static int main_imsg_send_ipc_sockets(struct imsgbuf *, struct imsgbuf *); static void main_imsg_send_net_sockets(int); @@ -77,7 +77,7 @@ static pid_t lde_pid; static struct frr_daemon_info ldpd_di; -DEFINE_HOOK(ldp_register_mib, (struct thread_master * tm), (tm)); +DEFINE_HOOK(ldp_register_mib, (struct event_loop * tm), (tm)); static void ldp_load_module(const char *name) { @@ -104,7 +104,7 @@ enum ldpd_process ldpd_process; #define LDP_VTY_PORT 2612 /* Master of threads. */ -struct thread_master *master; +struct event_loop *master; /* ldpd privileges */ static zebra_capabilities_t _caps_p [] = @@ -208,7 +208,7 @@ FRR_DAEMON_INFO(ldpd, LDP, .n_yang_modules = array_size(ldpd_yang_modules), ); -static void ldp_config_fork_apply(struct thread *t) +static void ldp_config_fork_apply(struct event *t) { /* * So the frr_config_fork() function schedules @@ -383,7 +383,7 @@ main(int argc, char *argv[]) frr_config_fork(); /* apply configuration */ - thread_add_event(master, ldp_config_fork_apply, NULL, 0, NULL); + event_add_event(master, ldp_config_fork_apply, NULL, 0, NULL); /* setup pipes to children */ if ((iev_ldpe = calloc(1, sizeof(struct imsgev))) == NULL || @@ -394,26 +394,26 @@ main(int argc, char *argv[]) imsg_init(&iev_ldpe->ibuf, pipe_parent2ldpe[0]); iev_ldpe->handler_read = main_dispatch_ldpe; - thread_add_read(master, iev_ldpe->handler_read, iev_ldpe, iev_ldpe->ibuf.fd, - &iev_ldpe->ev_read); + event_add_read(master, iev_ldpe->handler_read, iev_ldpe, + iev_ldpe->ibuf.fd, &iev_ldpe->ev_read); iev_ldpe->handler_write = ldp_write_handler; imsg_init(&iev_ldpe_sync->ibuf, pipe_parent2ldpe_sync[0]); iev_ldpe_sync->handler_read = main_dispatch_ldpe; - thread_add_read(master, iev_ldpe_sync->handler_read, iev_ldpe_sync, iev_ldpe_sync->ibuf.fd, - &iev_ldpe_sync->ev_read); + event_add_read(master, iev_ldpe_sync->handler_read, iev_ldpe_sync, + iev_ldpe_sync->ibuf.fd, &iev_ldpe_sync->ev_read); iev_ldpe_sync->handler_write = ldp_write_handler; imsg_init(&iev_lde->ibuf, pipe_parent2lde[0]); iev_lde->handler_read = main_dispatch_lde; - thread_add_read(master, iev_lde->handler_read, iev_lde, iev_lde->ibuf.fd, - &iev_lde->ev_read); + event_add_read(master, iev_lde->handler_read, iev_lde, iev_lde->ibuf.fd, + &iev_lde->ev_read); iev_lde->handler_write = ldp_write_handler; imsg_init(&iev_lde_sync->ibuf, pipe_parent2lde_sync[0]); iev_lde_sync->handler_read = main_dispatch_lde; - thread_add_read(master, iev_lde_sync->handler_read, iev_lde_sync, iev_lde_sync->ibuf.fd, - &iev_lde_sync->ev_read); + event_add_read(master, iev_lde_sync->handler_read, iev_lde_sync, + iev_lde_sync->ibuf.fd, &iev_lde_sync->ev_read); iev_lde_sync->handler_write = ldp_write_handler; if (main_imsg_send_ipc_sockets(&iev_ldpe->ibuf, &iev_lde->ibuf)) @@ -557,9 +557,9 @@ start_child(enum ldpd_process p, char *argv0, int fd_async, int fd_sync) /* imsg handling */ /* ARGSUSED */ -static void main_dispatch_ldpe(struct thread *thread) +static void main_dispatch_ldpe(struct event *thread) { - struct imsgev *iev = THREAD_ARG(thread); + struct imsgev *iev = EVENT_ARG(thread); struct imsgbuf *ibuf = &iev->ibuf; struct imsg imsg; int af; @@ -613,8 +613,8 @@ static void main_dispatch_ldpe(struct thread *thread) imsg_event_add(iev); else { /* this pipe is dead, so remove the event handlers and exit */ - THREAD_OFF(iev->ev_read); - THREAD_OFF(iev->ev_write); + EVENT_OFF(iev->ev_read); + EVENT_OFF(iev->ev_write); ldpe_pid = 0; if (lde_pid == 0) @@ -625,9 +625,9 @@ static void main_dispatch_ldpe(struct thread *thread) } /* ARGSUSED */ -static void main_dispatch_lde(struct thread *thread) +static void main_dispatch_lde(struct event *thread) { - struct imsgev *iev = THREAD_ARG(thread); + struct imsgev *iev = EVENT_ARG(thread); struct imsgbuf *ibuf = &iev->ibuf; struct imsg imsg; ssize_t n; @@ -722,8 +722,8 @@ static void main_dispatch_lde(struct thread *thread) imsg_event_add(iev); else { /* this pipe is dead, so remove the event handlers and exit */ - THREAD_OFF(iev->ev_read); - THREAD_OFF(iev->ev_write); + EVENT_OFF(iev->ev_read); + EVENT_OFF(iev->ev_write); lde_pid = 0; if (ldpe_pid == 0) ldpd_shutdown(); @@ -733,9 +733,9 @@ static void main_dispatch_lde(struct thread *thread) } /* ARGSUSED */ -void ldp_write_handler(struct thread *thread) +void ldp_write_handler(struct event *thread) { - struct imsgev *iev = THREAD_ARG(thread); + struct imsgev *iev = EVENT_ARG(thread); struct imsgbuf *ibuf = &iev->ibuf; ssize_t n; @@ -745,8 +745,8 @@ void ldp_write_handler(struct thread *thread) fatal("msgbuf_write"); if (n == 0) { /* this pipe is dead, so remove the event handlers */ - THREAD_OFF(iev->ev_read); - THREAD_OFF(iev->ev_write); + EVENT_OFF(iev->ev_read); + EVENT_OFF(iev->ev_write); return; } @@ -787,12 +787,12 @@ void imsg_event_add(struct imsgev *iev) { if (iev->handler_read) - thread_add_read(master, iev->handler_read, iev, iev->ibuf.fd, - &iev->ev_read); + event_add_read(master, iev->handler_read, iev, iev->ibuf.fd, + &iev->ev_read); if (iev->handler_write && iev->ibuf.w.queued) - thread_add_write(master, iev->handler_write, iev, - iev->ibuf.fd, &iev->ev_write); + event_add_write(master, iev->handler_write, iev, iev->ibuf.fd, + &iev->ev_write); } int @@ -819,11 +819,11 @@ void evbuf_event_add(struct evbuf *eb) { if (eb->wbuf.queued) - thread_add_write(master, eb->handler, eb->arg, eb->wbuf.fd, - &eb->ev); + event_add_write(master, eb->handler, eb->arg, eb->wbuf.fd, + &eb->ev); } -void evbuf_init(struct evbuf *eb, int fd, void (*handler)(struct thread *), +void evbuf_init(struct evbuf *eb, int fd, void (*handler)(struct event *), void *arg) { msgbuf_init(&eb->wbuf); @@ -835,7 +835,7 @@ void evbuf_init(struct evbuf *eb, int fd, void (*handler)(struct thread *), void evbuf_clear(struct evbuf *eb) { - THREAD_OFF(eb->ev); + EVENT_OFF(eb->ev); msgbuf_clear(&eb->wbuf); eb->wbuf.fd = -1; } diff --git a/ldpd/ldpd.h b/ldpd/ldpd.h index dc993e3d7c..1fec5beafc 100644 --- a/ldpd/ldpd.h +++ b/ldpd/ldpd.h @@ -14,7 +14,7 @@ #include "queue.h" #include "openbsd-tree.h" #include "imsg.h" -#include "thread.h" +#include "frrevent.h" #include "qobj.h" #include "prefix.h" #include "filter.h" @@ -51,17 +51,17 @@ struct evbuf { struct msgbuf wbuf; - struct thread *ev; - void (*handler)(struct thread *); + struct event *ev; + void (*handler)(struct event *); void *arg; }; struct imsgev { struct imsgbuf ibuf; - void (*handler_write)(struct thread *); - struct thread *ev_write; - void (*handler_read)(struct thread *); - struct thread *ev_read; + void (*handler_write)(struct event *); + struct event *ev_write; + void (*handler_read)(struct event *); + struct event *ev_read; }; enum imsg_type { @@ -329,14 +329,14 @@ struct iface_af { int state; struct ia_adj_head adj_tree; time_t uptime; - struct thread *hello_timer; + struct event *hello_timer; uint16_t hello_holdtime; uint16_t hello_interval; }; struct iface_ldp_sync { int state; - struct thread *wait_for_sync_timer; + struct event *wait_for_sync_timer; }; struct iface { @@ -359,7 +359,7 @@ DECLARE_QOBJ_TYPE(iface); /* source of targeted hellos */ struct tnbr { RB_ENTRY(tnbr) entry; - struct thread *hello_timer; + struct event *hello_timer; struct adj *adj; int af; union ldpd_addr addr; @@ -582,8 +582,8 @@ DECLARE_QOBJ_TYPE(ldpd_conf); #define F_LDPD_ALLOW_BROKEN_LSP 0x0010 struct ldpd_af_global { - struct thread *disc_ev; - struct thread *edisc_ev; + struct event *disc_ev; + struct event *edisc_ev; int ldp_disc_socket; int ldp_edisc_socket; int ldp_session_socket; @@ -781,7 +781,7 @@ void sa2addr(struct sockaddr *, int *, union ldpd_addr *, socklen_t sockaddr_len(struct sockaddr *); /* ldpd.c */ -void ldp_write_handler(struct thread *thread); +void ldp_write_handler(struct event *thread); void main_imsg_compose_ldpe(int, pid_t, void *, uint16_t); void main_imsg_compose_lde(int, pid_t, void *, uint16_t); int main_imsg_compose_both(enum imsg_type, void *, @@ -791,7 +791,7 @@ int imsg_compose_event(struct imsgev *, uint16_t, uint32_t, pid_t, int, void *, uint16_t); void evbuf_enqueue(struct evbuf *, struct ibuf *); void evbuf_event_add(struct evbuf *); -void evbuf_init(struct evbuf *, int, void (*)(struct thread *), void *); +void evbuf_init(struct evbuf *, int, void (*)(struct event *), void *); void evbuf_clear(struct evbuf *); int ldp_acl_request(struct imsgev *, char *, int, union ldpd_addr *, uint8_t); @@ -883,11 +883,11 @@ const char *pw_type_name(uint16_t); const char *pw_error_code(uint8_t); /* quagga */ -extern struct thread_master *master; +extern struct event_loop *master; extern char ctl_sock_path[MAXPATHLEN]; /* ldp_zebra.c */ -void ldp_zebra_init(struct thread_master *); +void ldp_zebra_init(struct event_loop *m); void ldp_zebra_destroy(void); int ldp_sync_zebra_send_state_update(struct ldp_igp_sync_if_state *); int ldp_zebra_send_rlfa_labels(struct zapi_rlfa_response * @@ -904,7 +904,7 @@ void ldp_zebra_regdereg_zebra_info(bool want_register); (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_INTFACELOCAL)) #endif -DECLARE_HOOK(ldp_register_mib, (struct thread_master * tm), (tm)); +DECLARE_HOOK(ldp_register_mib, (struct event_loop * tm), (tm)); extern void ldp_agentx_enabled(void); diff --git a/ldpd/ldpe.c b/ldpd/ldpe.c index f53dc72540..d3193b16d7 100644 --- a/ldpd/ldpe.c +++ b/ldpd/ldpe.c @@ -25,10 +25,10 @@ #include "libfrr.h" static void ldpe_shutdown(void); -static void ldpe_dispatch_main(struct thread *thread); -static void ldpe_dispatch_lde(struct thread *thread); +static void ldpe_dispatch_main(struct event *thread); +static void ldpe_dispatch_lde(struct event *thread); #ifdef __OpenBSD__ -static void ldpe_dispatch_pfkey(struct thread *thread); +static void ldpe_dispatch_pfkey(struct event *thread); #endif static void ldpe_setup_sockets(int, int, int, int); static void ldpe_close_sockets(int); @@ -44,7 +44,7 @@ static struct imsgev iev_main_data; static struct imsgev *iev_main, *iev_main_sync; static struct imsgev *iev_lde; #ifdef __OpenBSD__ -static struct thread *pfkey_ev; +static struct event *pfkey_ev; #endif /* ldpe privileges */ @@ -111,8 +111,8 @@ ldpe(void) fatal(NULL); imsg_init(&iev_main->ibuf, LDPD_FD_ASYNC); iev_main->handler_read = ldpe_dispatch_main; - thread_add_read(master, iev_main->handler_read, iev_main, iev_main->ibuf.fd, - &iev_main->ev_read); + event_add_read(master, iev_main->handler_read, iev_main, + iev_main->ibuf.fd, &iev_main->ev_read); iev_main->handler_write = ldp_write_handler; memset(&iev_main_data, 0, sizeof(iev_main_data)); @@ -122,9 +122,9 @@ ldpe(void) /* create base configuration */ leconf = config_new_empty(); - struct thread thread; - while (thread_fetch(master, &thread)) - thread_call(&thread); + struct event thread; + while (event_fetch(master, &thread)) + event_call(&thread); /* NOTREACHED */ return; @@ -137,8 +137,8 @@ ldpe_init(struct ldpd_init *init) /* This socket must be open before dropping privileges. */ global.pfkeysock = pfkey_init(); if (sysdep.no_pfkey == 0) { - thread_add_read(master, ldpe_dispatch_pfkey, NULL, global.pfkeysock, - &pfkey_ev); + event_add_read(master, ldpe_dispatch_pfkey, NULL, + global.pfkeysock, &pfkey_ev); } #endif @@ -200,7 +200,7 @@ ldpe_shutdown(void) #ifdef __OpenBSD__ if (sysdep.no_pfkey == 0) { - THREAD_OFF(pfkey_ev); + EVENT_OFF(pfkey_ev); close(global.pfkeysock); } #endif @@ -262,7 +262,7 @@ ldpe_imsg_compose_lde(int type, uint32_t peerid, pid_t pid, void *data, } /* ARGSUSED */ -static void ldpe_dispatch_main(struct thread *thread) +static void ldpe_dispatch_main(struct event *thread) { static struct ldpd_conf *nconf; struct iface *niface; @@ -273,7 +273,7 @@ static void ldpe_dispatch_main(struct thread *thread) struct l2vpn_pw *pw, *npw; struct imsg imsg; int fd; - struct imsgev *iev = THREAD_ARG(thread); + struct imsgev *iev = EVENT_ARG(thread); struct imsgbuf *ibuf = &iev->ibuf; struct iface *iface = NULL; struct kif *kif; @@ -363,8 +363,8 @@ static void ldpe_dispatch_main(struct thread *thread) fatal(NULL); imsg_init(&iev_lde->ibuf, fd); iev_lde->handler_read = ldpe_dispatch_lde; - thread_add_read(master, iev_lde->handler_read, iev_lde, iev_lde->ibuf.fd, - &iev_lde->ev_read); + event_add_read(master, iev_lde->handler_read, iev_lde, + iev_lde->ibuf.fd, &iev_lde->ev_read); iev_lde->handler_write = ldp_write_handler; iev_lde->ev_write = NULL; break; @@ -615,16 +615,16 @@ static void ldpe_dispatch_main(struct thread *thread) imsg_event_add(iev); else { /* this pipe is dead, so remove the event handlers and exit */ - THREAD_OFF(iev->ev_read); - THREAD_OFF(iev->ev_write); + EVENT_OFF(iev->ev_read); + EVENT_OFF(iev->ev_write); ldpe_shutdown(); } } /* ARGSUSED */ -static void ldpe_dispatch_lde(struct thread *thread) +static void ldpe_dispatch_lde(struct event *thread) { - struct imsgev *iev = THREAD_ARG(thread); + struct imsgev *iev = EVENT_ARG(thread); struct imsgbuf *ibuf = &iev->ibuf; struct imsg imsg; struct map *map; @@ -751,20 +751,20 @@ static void ldpe_dispatch_lde(struct thread *thread) imsg_event_add(iev); else { /* this pipe is dead, so remove the event handlers and exit */ - THREAD_OFF(iev->ev_read); - THREAD_OFF(iev->ev_write); + EVENT_OFF(iev->ev_read); + EVENT_OFF(iev->ev_write); ldpe_shutdown(); } } #ifdef __OpenBSD__ /* ARGSUSED */ -static void ldpe_dispatch_pfkey(struct thread *thread) +static void ldpe_dispatch_pfkey(struct event *thread) { - int fd = THREAD_FD(thread); + int fd = EVENT_FD(thread); - thread_add_read(master, ldpe_dispatch_pfkey, NULL, global.pfkeysock, - &pfkey_ev); + event_add_read(master, ldpe_dispatch_pfkey, NULL, global.pfkeysock, + &pfkey_ev); if (pfkey_read(fd, NULL) == -1) fatal("pfkey_read failed, exiting..."); @@ -781,13 +781,13 @@ ldpe_setup_sockets(int af, int disc_socket, int edisc_socket, /* discovery socket */ af_global->ldp_disc_socket = disc_socket; - thread_add_read(master, disc_recv_packet, &af_global->disc_ev, af_global->ldp_disc_socket, - &af_global->disc_ev); + event_add_read(master, disc_recv_packet, &af_global->disc_ev, + af_global->ldp_disc_socket, &af_global->disc_ev); /* extended discovery socket */ af_global->ldp_edisc_socket = edisc_socket; - thread_add_read(master, disc_recv_packet, &af_global->edisc_ev, af_global->ldp_edisc_socket, - &af_global->edisc_ev); + event_add_read(master, disc_recv_packet, &af_global->edisc_ev, + af_global->ldp_edisc_socket, &af_global->edisc_ev); /* session socket */ af_global->ldp_session_socket = session_socket; @@ -802,14 +802,14 @@ ldpe_close_sockets(int af) af_global = ldp_af_global_get(&global, af); /* discovery socket */ - THREAD_OFF(af_global->disc_ev); + EVENT_OFF(af_global->disc_ev); if (af_global->ldp_disc_socket != -1) { close(af_global->ldp_disc_socket); af_global->ldp_disc_socket = -1; } /* extended discovery socket */ - THREAD_OFF(af_global->edisc_ev); + EVENT_OFF(af_global->edisc_ev); if (af_global->ldp_edisc_socket != -1) { close(af_global->ldp_edisc_socket); af_global->ldp_edisc_socket = -1; diff --git a/ldpd/ldpe.h b/ldpd/ldpe.h index e799538b62..f310ba5dd2 100644 --- a/ldpd/ldpe.h +++ b/ldpd/ldpe.h @@ -37,7 +37,7 @@ struct adj { struct nbr *nbr; int ds_tlv; struct hello_source source; - struct thread *inactivity_timer; + struct event *inactivity_timer; uint16_t holdtime; union ldpd_addr trans_addr; }; @@ -50,7 +50,7 @@ struct tcp_conn { int fd; struct ibuf_read *rbuf; struct evbuf wbuf; - struct thread *rev; + struct event *rev; in_port_t lport; in_port_t rport; }; @@ -59,11 +59,11 @@ struct nbr { RB_ENTRY(nbr) id_tree, addr_tree, pid_tree; struct tcp_conn *tcp; struct nbr_adj_head adj_tree; /* adjacencies */ - struct thread *ev_connect; - struct thread *keepalive_timer; - struct thread *keepalive_timeout; - struct thread *init_timeout; - struct thread *initdelay_timer; + struct event *ev_connect; + struct event *keepalive_timer; + struct event *keepalive_timeout; + struct event *init_timeout; + struct event *initdelay_timer; struct mapping_head mapping_list; struct mapping_head withdraw_list; @@ -115,7 +115,7 @@ struct pending_conn { int fd; int af; union ldpd_addr addr; - struct thread *ev_timeout; + struct event *ev_timeout; }; #define PENDING_CONN_TIMEOUT 5 @@ -137,7 +137,7 @@ extern struct nbr_pid_head nbrs_by_pid; /* accept.c */ void accept_init(void); -int accept_add(int, void (*)(struct thread *), void *); +int accept_add(int, void (*)(struct event *), void *); void accept_del(int); void accept_pause(void); void accept_unpause(void); @@ -281,8 +281,8 @@ int gen_ldp_hdr(struct ibuf *, uint16_t); int gen_msg_hdr(struct ibuf *, uint16_t, uint16_t); int send_packet(int, int, union ldpd_addr *, struct iface_af *, void *, size_t); -void disc_recv_packet(struct thread *thread); -void session_accept(struct thread *thread); +void disc_recv_packet(struct event *thread); +void session_accept(struct event *thread); void session_accept_nbr(struct nbr *, int); void session_shutdown(struct nbr *, uint32_t, uint32_t, uint32_t); diff --git a/ldpd/neighbor.c b/ldpd/neighbor.c index 831f2a6aba..6f9177fe8b 100644 --- a/ldpd/neighbor.c +++ b/ldpd/neighbor.c @@ -24,13 +24,13 @@ static __inline int nbr_addr_compare(const struct nbr *, static __inline int nbr_pid_compare(const struct nbr *, const struct nbr *); static void nbr_update_peerid(struct nbr *); -static void nbr_ktimer(struct thread *thread); +static void nbr_ktimer(struct event *thread); static void nbr_start_ktimer(struct nbr *); -static void nbr_ktimeout(struct thread *thread); +static void nbr_ktimeout(struct event *thread); static void nbr_start_ktimeout(struct nbr *); -static void nbr_itimeout(struct thread *thread); +static void nbr_itimeout(struct event *thread); static void nbr_start_itimeout(struct nbr *); -static void nbr_idtimer(struct thread *thread); +static void nbr_idtimer(struct event *thread); static int nbr_act_session_operational(struct nbr *); static void nbr_send_labelmappings(struct nbr *); static __inline int nbr_params_compare(const struct nbr_params *, @@ -296,7 +296,7 @@ nbr_del(struct nbr *nbr) nbr->auth.method = AUTH_NONE; if (nbr_pending_connect(nbr)) - THREAD_OFF(nbr->ev_connect); + EVENT_OFF(nbr->ev_connect); nbr_stop_ktimer(nbr); nbr_stop_ktimeout(nbr); nbr_stop_itimeout(nbr); @@ -407,9 +407,9 @@ nbr_session_active_role(struct nbr *nbr) /* Keepalive timer: timer to send keepalive message to neighbors */ -static void nbr_ktimer(struct thread *thread) +static void nbr_ktimer(struct event *thread) { - struct nbr *nbr = THREAD_ARG(thread); + struct nbr *nbr = EVENT_ARG(thread); nbr->keepalive_timer = NULL; send_keepalive(nbr); @@ -423,22 +423,22 @@ nbr_start_ktimer(struct nbr *nbr) /* send three keepalives per period */ secs = nbr->keepalive / KEEPALIVE_PER_PERIOD; - THREAD_OFF(nbr->keepalive_timer); + EVENT_OFF(nbr->keepalive_timer); nbr->keepalive_timer = NULL; - thread_add_timer(master, nbr_ktimer, nbr, secs, &nbr->keepalive_timer); + event_add_timer(master, nbr_ktimer, nbr, secs, &nbr->keepalive_timer); } void nbr_stop_ktimer(struct nbr *nbr) { - THREAD_OFF(nbr->keepalive_timer); + EVENT_OFF(nbr->keepalive_timer); } /* Keepalive timeout: if the nbr hasn't sent keepalive */ -static void nbr_ktimeout(struct thread *thread) +static void nbr_ktimeout(struct event *thread) { - struct nbr *nbr = THREAD_ARG(thread); + struct nbr *nbr = EVENT_ARG(thread); nbr->keepalive_timeout = NULL; @@ -450,23 +450,23 @@ static void nbr_ktimeout(struct thread *thread) static void nbr_start_ktimeout(struct nbr *nbr) { - THREAD_OFF(nbr->keepalive_timeout); + EVENT_OFF(nbr->keepalive_timeout); nbr->keepalive_timeout = NULL; - thread_add_timer(master, nbr_ktimeout, nbr, nbr->keepalive, - &nbr->keepalive_timeout); + event_add_timer(master, nbr_ktimeout, nbr, nbr->keepalive, + &nbr->keepalive_timeout); } void nbr_stop_ktimeout(struct nbr *nbr) { - THREAD_OFF(nbr->keepalive_timeout); + EVENT_OFF(nbr->keepalive_timeout); } /* Session initialization timeout: if nbr got stuck in the initialization FSM */ -static void nbr_itimeout(struct thread *thread) +static void nbr_itimeout(struct event *thread) { - struct nbr *nbr = THREAD_ARG(thread); + struct nbr *nbr = EVENT_ARG(thread); log_debug("%s: lsr-id %pI4", __func__, &nbr->id); @@ -479,22 +479,22 @@ nbr_start_itimeout(struct nbr *nbr) int secs; secs = INIT_FSM_TIMEOUT; - THREAD_OFF(nbr->init_timeout); + EVENT_OFF(nbr->init_timeout); nbr->init_timeout = NULL; - thread_add_timer(master, nbr_itimeout, nbr, secs, &nbr->init_timeout); + event_add_timer(master, nbr_itimeout, nbr, secs, &nbr->init_timeout); } void nbr_stop_itimeout(struct nbr *nbr) { - THREAD_OFF(nbr->init_timeout); + EVENT_OFF(nbr->init_timeout); } /* Init delay timer: timer to retry to iniziatize session */ -static void nbr_idtimer(struct thread *thread) +static void nbr_idtimer(struct event *thread) { - struct nbr *nbr = THREAD_ARG(thread); + struct nbr *nbr = EVENT_ARG(thread); nbr->initdelay_timer = NULL; @@ -525,16 +525,15 @@ nbr_start_idtimer(struct nbr *nbr) break; } - THREAD_OFF(nbr->initdelay_timer); + EVENT_OFF(nbr->initdelay_timer); nbr->initdelay_timer = NULL; - thread_add_timer(master, nbr_idtimer, nbr, secs, - &nbr->initdelay_timer); + event_add_timer(master, nbr_idtimer, nbr, secs, &nbr->initdelay_timer); } void nbr_stop_idtimer(struct nbr *nbr) { - THREAD_OFF(nbr->initdelay_timer); + EVENT_OFF(nbr->initdelay_timer); } int @@ -549,9 +548,9 @@ nbr_pending_connect(struct nbr *nbr) return (nbr->ev_connect != NULL); } -static void nbr_connect_cb(struct thread *thread) +static void nbr_connect_cb(struct event *thread) { - struct nbr *nbr = THREAD_ARG(thread); + struct nbr *nbr = EVENT_ARG(thread); int error; socklen_t len; @@ -650,8 +649,8 @@ nbr_establish_connection(struct nbr *nbr) if (connect(nbr->fd, &remote_su.sa, sockaddr_len(&remote_su.sa)) == -1) { if (errno == EINPROGRESS) { - thread_add_write(master, nbr_connect_cb, nbr, nbr->fd, - &nbr->ev_connect); + event_add_write(master, nbr_connect_cb, nbr, nbr->fd, + &nbr->ev_connect); return (0); } log_warn("%s: error while connecting to %s", __func__, @@ -836,7 +835,7 @@ nbr_to_ctl(struct nbr *nbr) nctl.flags = nbr->flags; nctl.max_pdu_len = nbr->max_pdu_len; nctl.hold_time_remaining = - thread_timer_remain_second(nbr->keepalive_timer); + event_timer_remain_second(nbr->keepalive_timer); gettimeofday(&now, NULL); if (nbr->state == NBR_STA_OPER) { diff --git a/ldpd/packet.c b/ldpd/packet.c index a253ef4660..71eeb1adb6 100644 --- a/ldpd/packet.c +++ b/ldpd/packet.c @@ -17,12 +17,12 @@ static struct iface *disc_find_iface(unsigned int, int, union ldpd_addr *); -static void session_read(struct thread *thread); -static void session_write(struct thread *thread); +static void session_read(struct event *thread); +static void session_write(struct event *thread); static ssize_t session_get_pdu(struct ibuf_read *, char **); static void tcp_close(struct tcp_conn *); static struct pending_conn *pending_conn_new(int, int, union ldpd_addr *); -static void pending_conn_timeout(struct thread *thread); +static void pending_conn_timeout(struct event *thread); int gen_ldp_hdr(struct ibuf *buf, uint16_t size) @@ -95,10 +95,10 @@ send_packet(int fd, int af, union ldpd_addr *dst, struct iface_af *ia, } /* Discovery functions */ -void disc_recv_packet(struct thread *thread) +void disc_recv_packet(struct event *thread) { - int fd = THREAD_FD(thread); - struct thread **threadp = THREAD_ARG(thread); + int fd = EVENT_FD(thread); + struct event **threadp = EVENT_ARG(thread); union { struct cmsghdr hdr; @@ -129,7 +129,7 @@ void disc_recv_packet(struct thread *thread) struct in_addr lsr_id; /* reschedule read */ - thread_add_read(master, disc_recv_packet, threadp, fd, threadp); + event_add_read(master, disc_recv_packet, threadp, fd, threadp); /* setup buffer */ memset(&m, 0, sizeof(m)); @@ -290,9 +290,9 @@ disc_find_iface(unsigned int ifindex, int af, union ldpd_addr *src) return (iface); } -void session_accept(struct thread *thread) +void session_accept(struct event *thread) { - int fd = THREAD_FD(thread); + int fd = EVENT_FD(thread); struct sockaddr_storage src; socklen_t len = sizeof(src); int newfd; @@ -394,10 +394,10 @@ session_accept_nbr(struct nbr *nbr, int fd) nbr_fsm(nbr, NBR_EVT_MATCH_ADJ); } -static void session_read(struct thread *thread) +static void session_read(struct event *thread) { - int fd = THREAD_FD(thread); - struct nbr *nbr = THREAD_ARG(thread); + int fd = EVENT_FD(thread); + struct nbr *nbr = EVENT_ARG(thread); struct tcp_conn *tcp = nbr->tcp; struct ldp_hdr *ldp_hdr; struct ldp_msg *msg; @@ -406,7 +406,7 @@ static void session_read(struct thread *thread) uint16_t pdu_len, msg_len, msg_size, max_pdu_len; int ret; - thread_add_read(master, session_read, nbr, fd, &tcp->rev); + event_add_read(master, session_read, nbr, fd, &tcp->rev); if ((n = read(fd, tcp->rbuf->buf + tcp->rbuf->wpos, sizeof(tcp->rbuf->buf) - tcp->rbuf->wpos)) == -1) { @@ -610,9 +610,9 @@ static void session_read(struct thread *thread) free(buf); } -static void session_write(struct thread *thread) +static void session_write(struct event *thread) { - struct tcp_conn *tcp = THREAD_ARG(thread); + struct tcp_conn *tcp = EVENT_ARG(thread); struct nbr *nbr = tcp->nbr; tcp->wbuf.ev = NULL; @@ -640,7 +640,7 @@ session_shutdown(struct nbr *nbr, uint32_t status, uint32_t msg_id, switch (nbr->state) { case NBR_STA_PRESENT: if (nbr_pending_connect(nbr)) - THREAD_OFF(nbr->ev_connect); + EVENT_OFF(nbr->ev_connect); break; case NBR_STA_INITIAL: case NBR_STA_OPENREC: @@ -721,7 +721,7 @@ tcp_new(int fd, struct nbr *nbr) if ((tcp->rbuf = calloc(1, sizeof(struct ibuf_read))) == NULL) fatal(__func__); - thread_add_read(master, session_read, nbr, tcp->fd, &tcp->rev); + event_add_read(master, session_read, nbr, tcp->fd, &tcp->rev); tcp->nbr = nbr; } @@ -745,7 +745,7 @@ tcp_close(struct tcp_conn *tcp) evbuf_clear(&tcp->wbuf); if (tcp->nbr) { - THREAD_OFF(tcp->rev); + EVENT_OFF(tcp->rev); free(tcp->rbuf); tcp->nbr->tcp = NULL; } @@ -768,8 +768,8 @@ pending_conn_new(int fd, int af, union ldpd_addr *addr) pconn->addr = *addr; TAILQ_INSERT_TAIL(&global.pending_conns, pconn, entry); pconn->ev_timeout = NULL; - thread_add_timer(master, pending_conn_timeout, pconn, PENDING_CONN_TIMEOUT, - &pconn->ev_timeout); + event_add_timer(master, pending_conn_timeout, pconn, + PENDING_CONN_TIMEOUT, &pconn->ev_timeout); return (pconn); } @@ -777,7 +777,7 @@ pending_conn_new(int fd, int af, union ldpd_addr *addr) void pending_conn_del(struct pending_conn *pconn) { - THREAD_OFF(pconn->ev_timeout); + EVENT_OFF(pconn->ev_timeout); TAILQ_REMOVE(&global.pending_conns, pconn, entry); free(pconn); } @@ -795,9 +795,9 @@ pending_conn_find(int af, union ldpd_addr *addr) return (NULL); } -static void pending_conn_timeout(struct thread *thread) +static void pending_conn_timeout(struct event *thread) { - struct pending_conn *pconn = THREAD_ARG(thread); + struct pending_conn *pconn = EVENT_ARG(thread); struct tcp_conn *tcp; pconn->ev_timeout = NULL; diff --git a/lib/agentx.c b/lib/agentx.c index 2f45ae8332..45f14c2703 100644 --- a/lib/agentx.c +++ b/lib/agentx.c @@ -27,13 +27,13 @@ DEFINE_HOOK(agentx_enabled, (), ()); static bool agentx_enabled = false; -static struct thread_master *agentx_tm; -static struct thread *timeout_thr = NULL; +static struct event_loop *agentx_tm; +static struct event *timeout_thr = NULL; static struct list *events = NULL; static void agentx_events_update(void); -static void agentx_timeout(struct thread *t) +static void agentx_timeout(struct event *t) { snmp_timeout(); run_alarms(); @@ -41,18 +41,18 @@ static void agentx_timeout(struct thread *t) agentx_events_update(); } -static void agentx_read(struct thread *t) +static void agentx_read(struct event *t) { fd_set fds; int flags, new_flags = 0; int nonblock = false; - struct listnode *ln = THREAD_ARG(t); - struct thread **thr = listgetdata(ln); + struct listnode *ln = EVENT_ARG(t); + struct event **thr = listgetdata(ln); XFREE(MTYPE_TMP, thr); list_delete_node(events, ln); /* fix for non blocking socket */ - flags = fcntl(THREAD_FD(t), F_GETFL, 0); + flags = fcntl(EVENT_FD(t), F_GETFL, 0); if (-1 == flags) { flog_err(EC_LIB_SYSTEM_CALL, "Failed to get FD settings fcntl: %s(%d)", strerror(errno), errno); @@ -62,19 +62,19 @@ static void agentx_read(struct thread *t) if (flags & O_NONBLOCK) nonblock = true; else - new_flags = fcntl(THREAD_FD(t), F_SETFL, flags | O_NONBLOCK); + new_flags = fcntl(EVENT_FD(t), F_SETFL, flags | O_NONBLOCK); if (new_flags == -1) flog_err(EC_LIB_SYSTEM_CALL, "Failed to set snmp fd non blocking: %s(%d)", strerror(errno), errno); FD_ZERO(&fds); - FD_SET(THREAD_FD(t), &fds); + FD_SET(EVENT_FD(t), &fds); snmp_read(&fds); /* Reset the flag */ if (!nonblock) { - new_flags = fcntl(THREAD_FD(t), F_SETFL, flags); + new_flags = fcntl(EVENT_FD(t), F_SETFL, flags); if (new_flags == -1) flog_err( @@ -94,22 +94,22 @@ static void agentx_events_update(void) struct timeval timeout = {.tv_sec = 0, .tv_usec = 0}; fd_set fds; struct listnode *ln; - struct thread **thr; + struct event **thr; int fd, thr_fd; - thread_cancel(&timeout_thr); + event_cancel(&timeout_thr); FD_ZERO(&fds); snmp_select_info(&maxfd, &fds, &timeout, &block); if (!block) { - thread_add_timer_tv(agentx_tm, agentx_timeout, NULL, &timeout, - &timeout_thr); + event_add_timer_tv(agentx_tm, agentx_timeout, NULL, &timeout, + &timeout_thr); } ln = listhead(events); thr = ln ? listgetdata(ln) : NULL; - thr_fd = thr ? THREAD_FD(*thr) : -1; + thr_fd = thr ? EVENT_FD(*thr) : -1; /* "two-pointer" / two-list simultaneous iteration * ln/thr/thr_fd point to the next existing event listener to hit while @@ -119,21 +119,21 @@ static void agentx_events_update(void) if (thr_fd == fd) { struct listnode *nextln = listnextnode(ln); if (!FD_ISSET(fd, &fds)) { - thread_cancel(thr); + event_cancel(thr); XFREE(MTYPE_TMP, thr); list_delete_node(events, ln); } ln = nextln; thr = ln ? listgetdata(ln) : NULL; - thr_fd = thr ? THREAD_FD(*thr) : -1; + thr_fd = thr ? EVENT_FD(*thr) : -1; } /* need listener, but haven't hit one where it would be */ else if (FD_ISSET(fd, &fds)) { struct listnode *newln; - thr = XCALLOC(MTYPE_TMP, sizeof(struct thread *)); + thr = XCALLOC(MTYPE_TMP, sizeof(struct event *)); newln = listnode_add_before(events, ln, thr); - thread_add_read(agentx_tm, agentx_read, newln, fd, thr); + event_add_read(agentx_tm, agentx_read, newln, fd, thr); } } @@ -142,7 +142,7 @@ static void agentx_events_update(void) while (ln) { struct listnode *nextln = listnextnode(ln); thr = listgetdata(ln); - thread_cancel(thr); + event_cancel(thr); XFREE(MTYPE_TMP, thr); list_delete_node(events, ln); ln = nextln; @@ -244,7 +244,7 @@ bool smux_enabled(void) return agentx_enabled; } -void smux_init(struct thread_master *tm) +void smux_init(struct event_loop *tm) { agentx_tm = tm; diff --git a/lib/bfd.c b/lib/bfd.c index c1e0fff7f5..cc6d09a60f 100644 --- a/lib/bfd.c +++ b/lib/bfd.c @@ -10,7 +10,7 @@ #include "command.h" #include "memory.h" #include "prefix.h" -#include "thread.h" +#include "frrevent.h" #include "stream.h" #include "vrf.h" #include "zclient.h" @@ -75,7 +75,7 @@ struct bfd_session_params { * Next event. * * This variable controls what action to execute when the command batch - * finishes. Normally we'd use `thread_add_event` value, however since + * finishes. Normally we'd use `event_add_event` value, however since * that function is going to be called multiple times and the value * might be different we'll use this variable to keep track of it. */ @@ -87,7 +87,7 @@ struct bfd_session_params { * configuration load or northbound batch), so we'll use this to * install/uninstall the BFD session parameters only once. */ - struct thread *installev; + struct event *installev; /** BFD session installation state. */ bool installed; @@ -111,7 +111,7 @@ struct bfd_sessions_global { struct bfd_source_list source_list; /** Pointer to FRR's event manager. */ - struct thread_master *tm; + struct event_loop *tm; /** Pointer to zebra client data structure. */ struct zclient *zc; @@ -485,9 +485,9 @@ static bool _bfd_sess_valid(const struct bfd_session_params *bsp) return true; } -static void _bfd_sess_send(struct thread *t) +static void _bfd_sess_send(struct event *t) { - struct bfd_session_params *bsp = THREAD_ARG(t); + struct bfd_session_params *bsp = EVENT_ARG(t); int rv; /* Validate configuration before trying to send bogus data. */ @@ -533,7 +533,7 @@ static void _bfd_sess_send(struct thread *t) static void _bfd_sess_remove(struct bfd_session_params *bsp) { /* Cancel any pending installation request. */ - THREAD_OFF(bsp->installev); + EVENT_OFF(bsp->installev); /* Not installed, nothing to do. */ if (!bsp->installed) @@ -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) @@ -733,13 +733,13 @@ void bfd_sess_set_auto_source(struct bfd_session_params *bsp, bool enable) void bfd_sess_install(struct bfd_session_params *bsp) { bsp->lastev = BSE_INSTALL; - thread_add_event(bsglobal.tm, _bfd_sess_send, bsp, 0, &bsp->installev); + event_add_event(bsglobal.tm, _bfd_sess_send, bsp, 0, &bsp->installev); } void bfd_sess_uninstall(struct bfd_session_params *bsp) { bsp->lastev = BSE_UNINSTALL; - thread_add_event(bsglobal.tm, _bfd_sess_send, bsp, 0, &bsp->installev); + event_add_event(bsglobal.tm, _bfd_sess_send, bsp, 0, &bsp->installev); } enum bfd_session_state bfd_sess_status(const struct bfd_session_params *bsp) @@ -890,11 +890,11 @@ int zclient_bfd_session_replay(ZAPI_CALLBACK_ARGS) bsp->installed = false; /* Cancel any pending installation request. */ - THREAD_OFF(bsp->installev); + EVENT_OFF(bsp->installev); /* 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; @@ -1039,7 +1039,7 @@ static int bfd_protocol_integration_finish(void) return 0; } -void bfd_protocol_integration_init(struct zclient *zc, struct thread_master *tm) +void bfd_protocol_integration_init(struct zclient *zc, struct event_loop *tm) { /* Initialize data structure. */ TAILQ_INIT(&bsglobal.bsplist); diff --git a/lib/bfd.h b/lib/bfd.h index 66c08cde74..bfa5287340 100644 --- a/lib/bfd.h +++ b/lib/bfd.h @@ -348,7 +348,7 @@ void bfd_sess_show(struct vty *vty, struct json_object *json, * Initializes the BFD integration library. This function executes the * following actions: * - * - Copy the `struct thread_master` pointer to use as "thread" to execute + * - Copy the `struct event_loop` pointer to use as "thread" to execute * the BFD session parameters installation. * - Copy the `struct zclient` pointer to install its callbacks. * - Initializes internal data structures. @@ -356,8 +356,7 @@ void bfd_sess_show(struct vty *vty, struct json_object *json, * \param tm normally the daemon main thread event manager. * \param zc the zebra client of the daemon. */ -void bfd_protocol_integration_init(struct zclient *zc, - struct thread_master *tm); +void bfd_protocol_integration_init(struct zclient *zc, struct event_loop *tm); /** * BFD session registration arguments. diff --git a/lib/command.c b/lib/command.c index 196d73d46a..97ea200ff4 100644 --- a/lib/command.c +++ b/lib/command.c @@ -17,7 +17,7 @@ #include "memory.h" #include "log.h" #include "log_vty.h" -#include "thread.h" +#include "frrevent.h" #include "vector.h" #include "linklist.h" #include "vty.h" @@ -2542,7 +2542,7 @@ void cmd_init(int terminal) install_default(CONFIG_NODE); - thread_cmd_init(); + event_cmd_init(); workqueue_cmd_init(); hash_cmd_init(); } diff --git a/lib/thread.c b/lib/event.c similarity index 77% rename from lib/thread.c rename to lib/event.c index 87ad3d8823..a8eb89f48d 100644 --- a/lib/thread.c +++ b/lib/event.c @@ -8,7 +8,7 @@ #include #include -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "frrcu.h" #include "log.h" @@ -24,23 +24,23 @@ #include "libfrr.h" DEFINE_MTYPE_STATIC(LIB, THREAD, "Thread"); -DEFINE_MTYPE_STATIC(LIB, THREAD_MASTER, "Thread master"); -DEFINE_MTYPE_STATIC(LIB, THREAD_POLL, "Thread Poll Info"); -DEFINE_MTYPE_STATIC(LIB, THREAD_STATS, "Thread stats"); +DEFINE_MTYPE_STATIC(LIB, EVENT_MASTER, "Thread master"); +DEFINE_MTYPE_STATIC(LIB, EVENT_POLL, "Thread Poll Info"); +DEFINE_MTYPE_STATIC(LIB, EVENT_STATS, "Thread stats"); -DECLARE_LIST(thread_list, struct thread, threaditem); +DECLARE_LIST(event_list, struct event, eventitem); struct cancel_req { int flags; - struct thread *thread; + struct event *thread; void *eventobj; - struct thread **threadref; + struct event **threadref; }; /* Flags for task cancellation */ -#define THREAD_CANCEL_FLAG_READY 0x01 +#define EVENT_CANCEL_FLAG_READY 0x01 -static int thread_timer_cmp(const struct thread *a, const struct thread *b) +static int event_timer_cmp(const struct event *a, const struct event *b) { if (a->u.sands.tv_sec < b->u.sands.tv_sec) return -1; @@ -53,7 +53,7 @@ static int thread_timer_cmp(const struct thread *a, const struct thread *b) return 0; } -DECLARE_HEAP(thread_timer_list, struct thread, timeritem, thread_timer_cmp); +DECLARE_HEAP(event_timer_list, struct event, timeritem, event_timer_cmp); #if defined(__APPLE__) #include @@ -64,7 +64,7 @@ DECLARE_HEAP(thread_timer_list, struct thread, timeritem, thread_timer_cmp); do { \ const unsigned char wakebyte = 0x01; \ write(m->io_pipe[1], &wakebyte, 1); \ - } while (0); + } while (0) /* control variable for initializer */ static pthread_once_t init_once = PTHREAD_ONCE_INIT; @@ -73,7 +73,7 @@ pthread_key_t thread_current; static pthread_mutex_t masters_mtx = PTHREAD_MUTEX_INITIALIZER; static struct list *masters; -static void thread_free(struct thread_master *master, struct thread *thread); +static void thread_free(struct event_loop *master, struct event *thread); #ifndef EXCLUDE_CPU_TIME #define EXCLUDE_CPU_TIME 0 @@ -87,25 +87,26 @@ unsigned long cputime_threshold = CONSUMED_TIME_CHECK; unsigned long walltime_threshold = CONSUMED_TIME_CHECK; /* CLI start ---------------------------------------------------------------- */ -#include "lib/thread_clippy.c" +#include "lib/event_clippy.c" -static unsigned int cpu_record_hash_key(const struct cpu_thread_history *a) +static unsigned int cpu_record_hash_key(const struct cpu_event_history *a) { int size = sizeof(a->func); return jhash(&a->func, size, 0); } -static bool cpu_record_hash_cmp(const struct cpu_thread_history *a, - const struct cpu_thread_history *b) +static bool cpu_record_hash_cmp(const struct cpu_event_history *a, + const struct cpu_event_history *b) { return a->func == b->func; } -static void *cpu_record_hash_alloc(struct cpu_thread_history *a) +static void *cpu_record_hash_alloc(struct cpu_event_history *a) { - struct cpu_thread_history *new; - new = XCALLOC(MTYPE_THREAD_STATS, sizeof(struct cpu_thread_history)); + struct cpu_event_history *new; + + new = XCALLOC(MTYPE_EVENT_STATS, sizeof(struct cpu_event_history)); new->func = a->func; new->funcname = a->funcname; return new; @@ -113,13 +114,13 @@ static void *cpu_record_hash_alloc(struct cpu_thread_history *a) static void cpu_record_hash_free(void *a) { - struct cpu_thread_history *hist = a; + struct cpu_event_history *hist = a; - XFREE(MTYPE_THREAD_STATS, hist); + XFREE(MTYPE_EVENT_STATS, hist); } -static void vty_out_cpu_thread_history(struct vty *vty, - struct cpu_thread_history *a) +static void vty_out_cpu_event_history(struct vty *vty, + struct cpu_event_history *a) { vty_out(vty, "%5zu %10zu.%03zu %9zu %8zu %9zu %8zu %9zu %9zu %9zu %10zu", @@ -128,21 +129,21 @@ static void vty_out_cpu_thread_history(struct vty *vty, (a->real.total / a->total_calls), a->real.max, a->total_cpu_warn, a->total_wall_warn, a->total_starv_warn); vty_out(vty, " %c%c%c%c%c %s\n", - a->types & (1 << THREAD_READ) ? 'R' : ' ', - a->types & (1 << THREAD_WRITE) ? 'W' : ' ', - a->types & (1 << THREAD_TIMER) ? 'T' : ' ', - a->types & (1 << THREAD_EVENT) ? 'E' : ' ', - a->types & (1 << THREAD_EXECUTE) ? 'X' : ' ', a->funcname); + a->types & (1 << EVENT_READ) ? 'R' : ' ', + a->types & (1 << EVENT_WRITE) ? 'W' : ' ', + a->types & (1 << EVENT_TIMER) ? 'T' : ' ', + a->types & (1 << EVENT_EVENT) ? 'E' : ' ', + a->types & (1 << EVENT_EXECUTE) ? 'X' : ' ', a->funcname); } static void cpu_record_hash_print(struct hash_bucket *bucket, void *args[]) { - struct cpu_thread_history *totals = args[0]; - struct cpu_thread_history copy; + struct cpu_event_history *totals = args[0]; + struct cpu_event_history copy; struct vty *vty = args[1]; uint8_t *filter = args[2]; - struct cpu_thread_history *a = bucket->data; + struct cpu_event_history *a = bucket->data; copy.total_active = atomic_load_explicit(&a->total_active, memory_order_seq_cst); @@ -167,7 +168,7 @@ static void cpu_record_hash_print(struct hash_bucket *bucket, void *args[]) if (!(copy.types & *filter)) return; - vty_out_cpu_thread_history(vty, ©); + vty_out_cpu_event_history(vty, ©); totals->total_active += copy.total_active; totals->total_calls += copy.total_calls; totals->total_cpu_warn += copy.total_cpu_warn; @@ -183,9 +184,9 @@ static void cpu_record_hash_print(struct hash_bucket *bucket, void *args[]) static void cpu_record_print(struct vty *vty, uint8_t filter) { - struct cpu_thread_history tmp; + struct cpu_event_history tmp; void *args[3] = {&tmp, vty, &filter}; - struct thread_master *m; + struct event_loop *m; struct listnode *ln; if (!cputime_enabled) @@ -203,8 +204,8 @@ static void cpu_record_print(struct vty *vty, uint8_t filter) frr_with_mutex (&masters_mtx) { for (ALL_LIST_ELEMENTS_RO(masters, ln, m)) { const char *name = m->name ? m->name : "main"; - char underline[strlen(name) + 1]; + memset(underline, '-', sizeof(underline)); underline[sizeof(underline) - 1] = '\0'; @@ -244,7 +245,7 @@ static void cpu_record_print(struct vty *vty, uint8_t filter) vty_out(vty, " Type Thread\n"); if (tmp.total_calls > 0) - vty_out_cpu_thread_history(vty, &tmp); + vty_out_cpu_event_history(vty, &tmp); } static void cpu_record_hash_clear(struct hash_bucket *bucket, void *args[]) @@ -252,7 +253,7 @@ static void cpu_record_hash_clear(struct hash_bucket *bucket, void *args[]) uint8_t *filter = args[0]; struct hash *cpu_record = args[1]; - struct cpu_thread_history *a = bucket->data; + struct cpu_event_history *a = bucket->data; if (!(a->types & *filter)) return; @@ -263,13 +264,14 @@ static void cpu_record_hash_clear(struct hash_bucket *bucket, void *args[]) static void cpu_record_clear(uint8_t filter) { uint8_t *tmp = &filter; - struct thread_master *m; + struct event_loop *m; struct listnode *ln; frr_with_mutex (&masters_mtx) { for (ALL_LIST_ELEMENTS_RO(masters, ln, m)) { frr_with_mutex (&m->mtx) { void *args[2] = {tmp, m->cpu_record}; + hash_iterate( m->cpu_record, (void (*)(struct hash_bucket *, @@ -289,23 +291,23 @@ static uint8_t parse_filter(const char *filterstr) switch (filterstr[i]) { case 'r': case 'R': - filter |= (1 << THREAD_READ); + filter |= (1 << EVENT_READ); break; case 'w': case 'W': - filter |= (1 << THREAD_WRITE); + filter |= (1 << EVENT_WRITE); break; case 't': case 'T': - filter |= (1 << THREAD_TIMER); + filter |= (1 << EVENT_TIMER); break; case 'e': case 'E': - filter |= (1 << THREAD_EVENT); + filter |= (1 << EVENT_EVENT); break; case 'x': case 'X': - filter |= (1 << THREAD_EXECUTE); + filter |= (1 << EVENT_EXECUTE); break; default: break; @@ -395,11 +397,11 @@ ALIAS (service_walltime_warning, "Set up miscellaneous service\n" "Warn for tasks exceeding total wallclock threshold\n") -static void show_thread_poll_helper(struct vty *vty, struct thread_master *m) +static void show_thread_poll_helper(struct vty *vty, struct event_loop *m) { const char *name = m->name ? m->name : "main"; char underline[strlen(name) + 1]; - struct thread *thread; + struct event *thread; uint32_t i; memset(underline, '-', sizeof(underline)); @@ -444,12 +446,11 @@ DEFUN_NOSH (show_thread_poll, "Show poll FD's and information\n") { struct listnode *node; - struct thread_master *m; + struct event_loop *m; frr_with_mutex (&masters_mtx) { - for (ALL_LIST_ELEMENTS_RO(masters, node, m)) { + for (ALL_LIST_ELEMENTS_RO(masters, node, m)) show_thread_poll_helper(vty, m); - } } return CMD_SUCCESS; @@ -481,11 +482,11 @@ DEFUN (clear_thread_cpu, return CMD_SUCCESS; } -static void show_thread_timers_helper(struct vty *vty, struct thread_master *m) +static void show_thread_timers_helper(struct vty *vty, struct event_loop *m) { const char *name = m->name ? m->name : "main"; char underline[strlen(name) + 1]; - struct thread *thread; + struct event *thread; memset(underline, '-', sizeof(underline)); underline[sizeof(underline) - 1] = '\0'; @@ -493,7 +494,7 @@ static void show_thread_timers_helper(struct vty *vty, struct thread_master *m) vty_out(vty, "\nShowing timers for %s\n", name); vty_out(vty, "-------------------%s\n", underline); - frr_each (thread_timer_list, &m->timer, thread) { + frr_each (event_timer_list, &m->timer, thread) { vty_out(vty, " %-50s%pTH\n", thread->hist->funcname, thread); } } @@ -506,7 +507,7 @@ DEFPY_NOSH (show_thread_timers, "Show all timers and how long they have in the system\n") { struct listnode *node; - struct thread_master *m; + struct event_loop *m; frr_with_mutex (&masters_mtx) { for (ALL_LIST_ELEMENTS_RO(masters, node, m)) @@ -516,7 +517,7 @@ DEFPY_NOSH (show_thread_timers, return CMD_SUCCESS; } -void thread_cmd_init(void) +void event_cmd_init(void) { install_element(VIEW_NODE, &show_thread_cpu_cmd); install_element(VIEW_NODE, &show_thread_poll_cmd); @@ -544,14 +545,14 @@ static void initializer(void) pthread_key_create(&thread_current, NULL); } -struct thread_master *thread_master_create(const char *name) +struct event_loop *event_master_create(const char *name) { - struct thread_master *rv; + struct event_loop *rv; struct rlimit limit; pthread_once(&init_once, &initializer); - rv = XCALLOC(MTYPE_THREAD_MASTER, sizeof(struct thread_master)); + rv = XCALLOC(MTYPE_EVENT_MASTER, sizeof(struct event_loop)); /* Initialize master mutex */ pthread_mutex_init(&rv->mtx, NULL); @@ -559,7 +560,7 @@ struct thread_master *thread_master_create(const char *name) /* Set name */ name = name ? name : "default"; - rv->name = XSTRDUP(MTYPE_THREAD_MASTER, name); + rv->name = XSTRDUP(MTYPE_EVENT_MASTER, name); /* Initialize I/O task data structures */ @@ -570,13 +571,14 @@ struct thread_master *thread_master_create(const char *name) rv->fd_limit = (int)limit.rlim_cur; } - rv->read = XCALLOC(MTYPE_THREAD_POLL, - sizeof(struct thread *) * rv->fd_limit); + rv->read = XCALLOC(MTYPE_EVENT_POLL, + sizeof(struct event *) * rv->fd_limit); - rv->write = XCALLOC(MTYPE_THREAD_POLL, - sizeof(struct thread *) * rv->fd_limit); + rv->write = XCALLOC(MTYPE_EVENT_POLL, + sizeof(struct event *) * rv->fd_limit); char tmhashname[strlen(name) + 32]; + snprintf(tmhashname, sizeof(tmhashname), "%s - threadmaster event hash", name); rv->cpu_record = hash_create_size( @@ -584,12 +586,12 @@ struct thread_master *thread_master_create(const char *name) (bool (*)(const void *, const void *))cpu_record_hash_cmp, tmhashname); - thread_list_init(&rv->event); - thread_list_init(&rv->ready); - thread_list_init(&rv->unuse); - thread_timer_list_init(&rv->timer); + event_list_init(&rv->event); + event_list_init(&rv->ready); + event_list_init(&rv->unuse); + event_timer_list_init(&rv->timer); - /* Initialize thread_fetch() settings */ + /* Initialize event_fetch() settings */ rv->spin = true; rv->handle_signals = true; @@ -607,9 +609,9 @@ struct thread_master *thread_master_create(const char *name) /* Initialize data structures for poll() */ rv->handler.pfdsize = rv->fd_limit; rv->handler.pfdcount = 0; - rv->handler.pfds = XCALLOC(MTYPE_THREAD_MASTER, + rv->handler.pfds = XCALLOC(MTYPE_EVENT_MASTER, sizeof(struct pollfd) * rv->handler.pfdsize); - rv->handler.copy = XCALLOC(MTYPE_THREAD_MASTER, + rv->handler.copy = XCALLOC(MTYPE_EVENT_MASTER, sizeof(struct pollfd) * rv->handler.pfdsize); /* add to list of threadmasters */ @@ -623,32 +625,32 @@ struct thread_master *thread_master_create(const char *name) return rv; } -void thread_master_set_name(struct thread_master *master, const char *name) +void event_master_set_name(struct event_loop *master, const char *name) { frr_with_mutex (&master->mtx) { - XFREE(MTYPE_THREAD_MASTER, master->name); - master->name = XSTRDUP(MTYPE_THREAD_MASTER, name); + XFREE(MTYPE_EVENT_MASTER, master->name); + master->name = XSTRDUP(MTYPE_EVENT_MASTER, name); } } -#define THREAD_UNUSED_DEPTH 10 +#define EVENT_UNUSED_DEPTH 10 /* Move thread to unuse list. */ -static void thread_add_unuse(struct thread_master *m, struct thread *thread) +static void thread_add_unuse(struct event_loop *m, struct event *thread) { pthread_mutex_t mtxc = thread->mtx; assert(m != NULL && thread != NULL); thread->hist->total_active--; - memset(thread, 0, sizeof(struct thread)); - thread->type = THREAD_UNUSED; + memset(thread, 0, sizeof(struct event)); + thread->type = EVENT_UNUSED; /* Restore the thread mutex context. */ thread->mtx = mtxc; - if (thread_list_count(&m->unuse) < THREAD_UNUSED_DEPTH) { - thread_list_add_tail(&m->unuse, thread); + if (event_list_count(&m->unuse) < EVENT_UNUSED_DEPTH) { + event_list_add_tail(&m->unuse, thread); return; } @@ -656,19 +658,17 @@ static void thread_add_unuse(struct thread_master *m, struct thread *thread) } /* Free all unused thread. */ -static void thread_list_free(struct thread_master *m, - struct thread_list_head *list) +static void thread_list_free(struct event_loop *m, struct event_list_head *list) { - struct thread *t; + struct event *t; - while ((t = thread_list_pop(list))) + while ((t = event_list_pop(list))) thread_free(m, t); } -static void thread_array_free(struct thread_master *m, - struct thread **thread_array) +static void thread_array_free(struct event_loop *m, struct event **thread_array) { - struct thread *t; + struct event *t; int index; for (index = 0; index < m->fd_limit; ++index) { @@ -678,41 +678,41 @@ static void thread_array_free(struct thread_master *m, thread_free(m, t); } } - XFREE(MTYPE_THREAD_POLL, thread_array); + XFREE(MTYPE_EVENT_POLL, thread_array); } /* - * thread_master_free_unused + * event_master_free_unused * * As threads are finished with they are put on the * unuse list for later reuse. * If we are shutting down, Free up unused threads * So we can see if we forget to shut anything off */ -void thread_master_free_unused(struct thread_master *m) +void event_master_free_unused(struct event_loop *m) { frr_with_mutex (&m->mtx) { - struct thread *t; - while ((t = thread_list_pop(&m->unuse))) + struct event *t; + + while ((t = event_list_pop(&m->unuse))) thread_free(m, t); } } /* Stop thread scheduler. */ -void thread_master_free(struct thread_master *m) +void event_master_free(struct event_loop *m) { - struct thread *t; + struct event *t; frr_with_mutex (&masters_mtx) { listnode_delete(masters, m); - if (masters->count == 0) { + if (masters->count == 0) list_delete(&masters); - } } thread_array_free(m, m->read); thread_array_free(m, m->write); - while ((t = thread_timer_list_pop(&m->timer))) + while ((t = event_timer_list_pop(&m->timer))) thread_free(m, t); thread_list_free(m, &m->event); thread_list_free(m, &m->ready); @@ -726,18 +726,18 @@ void thread_master_free(struct thread_master *m) hash_clean_and_free(&m->cpu_record, cpu_record_hash_free); - XFREE(MTYPE_THREAD_MASTER, m->name); - XFREE(MTYPE_THREAD_MASTER, m->handler.pfds); - XFREE(MTYPE_THREAD_MASTER, m->handler.copy); - XFREE(MTYPE_THREAD_MASTER, m); + XFREE(MTYPE_EVENT_MASTER, m->name); + XFREE(MTYPE_EVENT_MASTER, m->handler.pfds); + XFREE(MTYPE_EVENT_MASTER, m->handler.copy); + XFREE(MTYPE_EVENT_MASTER, m); } /* Return remain time in milliseconds. */ -unsigned long thread_timer_remain_msec(struct thread *thread) +unsigned long event_timer_remain_msec(struct event *thread) { int64_t remain; - if (!thread_is_scheduled(thread)) + if (!event_is_scheduled(thread)) return 0; frr_with_mutex (&thread->mtx) { @@ -748,14 +748,15 @@ unsigned long thread_timer_remain_msec(struct thread *thread) } /* Return remain time in seconds. */ -unsigned long thread_timer_remain_second(struct thread *thread) +unsigned long event_timer_remain_second(struct event *thread) { - return thread_timer_remain_msec(thread) / 1000LL; + return event_timer_remain_msec(thread) / 1000LL; } -struct timeval thread_timer_remain(struct thread *thread) +struct timeval event_timer_remain(struct event *thread) { struct timeval remain; + frr_with_mutex (&thread->mtx) { monotime_until(&thread->u.sands, &remain); } @@ -780,28 +781,26 @@ static int time_hhmmss(char *buf, int buf_size, long sec) return wr != 8; } -char *thread_timer_to_hhmmss(char *buf, int buf_size, - struct thread *t_timer) +char *event_timer_to_hhmmss(char *buf, int buf_size, struct event *t_timer) { - if (t_timer) { - time_hhmmss(buf, buf_size, - thread_timer_remain_second(t_timer)); - } else { + if (t_timer) + time_hhmmss(buf, buf_size, event_timer_remain_second(t_timer)); + else snprintf(buf, buf_size, "--:--:--"); - } + return buf; } /* Get new thread. */ -static struct thread *thread_get(struct thread_master *m, uint8_t type, - void (*func)(struct thread *), void *arg, - const struct xref_threadsched *xref) +static struct event *thread_get(struct event_loop *m, uint8_t type, + void (*func)(struct event *), void *arg, + const struct xref_eventsched *xref) { - struct thread *thread = thread_list_pop(&m->unuse); - struct cpu_thread_history tmp; + struct event *thread = event_list_pop(&m->unuse); + struct cpu_event_history tmp; if (!thread) { - thread = XCALLOC(MTYPE_THREAD, sizeof(struct thread)); + thread = XCALLOC(MTYPE_THREAD, sizeof(struct event)); /* mutex only needs to be initialized at struct creation. */ pthread_mutex_init(&thread->mtx, NULL); m->alloc++; @@ -811,7 +810,7 @@ static struct thread *thread_get(struct thread_master *m, uint8_t type, thread->add_type = type; thread->master = m; thread->arg = arg; - thread->yield = THREAD_YIELD_TIME_SLOT; /* default */ + thread->yield = EVENT_YIELD_TIME_SLOT; /* default */ thread->ref = NULL; thread->ignore_timer_late = false; @@ -840,7 +839,7 @@ static struct thread *thread_get(struct thread_master *m, uint8_t type, return thread; } -static void thread_free(struct thread_master *master, struct thread *thread) +static void thread_free(struct event_loop *master, struct event *thread) { /* Update statistics. */ assert(master->alloc > 0); @@ -851,7 +850,7 @@ static void thread_free(struct thread_master *master, struct thread *thread) XFREE(MTYPE_THREAD, thread); } -static int fd_poll(struct thread_master *m, const struct timeval *timer_wait, +static int fd_poll(struct event_loop *m, const struct timeval *timer_wait, bool *eintr_p) { sigset_t origsigs; @@ -860,7 +859,7 @@ static int fd_poll(struct thread_master *m, const struct timeval *timer_wait, /* * If timer_wait is null here, that means poll() should block - * indefinitely, unless the thread_master has overridden it by setting + * indefinitely, unless the event_master has overridden it by setting * ->selectpoll_timeout. * * If the value is positive, it specifies the maximum number of @@ -873,15 +872,17 @@ static int fd_poll(struct thread_master *m, const struct timeval *timer_wait, /* number of file descriptors with events */ int num; - if (timer_wait != NULL - && m->selectpoll_timeout == 0) // use the default value + if (timer_wait != NULL && m->selectpoll_timeout == 0) { + /* use the default value */ timeout = (timer_wait->tv_sec * 1000) + (timer_wait->tv_usec / 1000); - else if (m->selectpoll_timeout > 0) // use the user's timeout + } else if (m->selectpoll_timeout > 0) { + /* use the user's timeout */ timeout = m->selectpoll_timeout; - else if (m->selectpoll_timeout - < 0) // effect a poll (return immediately) + } else if (m->selectpoll_timeout < 0) { + /* effect a poll (return immediately) */ timeout = 0; + } zlog_tls_buffer_flush(); rcu_read_unlock(); @@ -949,16 +950,15 @@ done: } /* Add new read thread. */ -void _thread_add_read_write(const struct xref_threadsched *xref, - struct thread_master *m, - void (*func)(struct thread *), void *arg, int fd, - struct thread **t_ptr) +void _event_add_read_write(const struct xref_eventsched *xref, + struct event_loop *m, void (*func)(struct event *), + void *arg, int fd, struct event **t_ptr) { - int dir = xref->thread_type; - struct thread *thread = NULL; - struct thread **thread_array; + int dir = xref->event_type; + struct event *thread = NULL; + struct event **thread_array; - if (dir == THREAD_READ) + if (dir == EVENT_READ) frrtrace(9, frr_libfrr, schedule_read, m, xref->funcname, xref->xref.file, xref->xref.line, t_ptr, fd, 0, arg, 0); @@ -972,20 +972,22 @@ void _thread_add_read_write(const struct xref_threadsched *xref, assert(!"Number of FD's open is greater than FRR currently configured to handle, aborting"); frr_with_mutex (&m->mtx) { + /* Thread is already scheduled; don't reschedule */ if (t_ptr && *t_ptr) - // thread is already scheduled; don't reschedule break; /* default to a new pollfd */ nfds_t queuepos = m->handler.pfdcount; - if (dir == THREAD_READ) + if (dir == EVENT_READ) thread_array = m->read; else thread_array = m->write; - /* if we already have a pollfd for our file descriptor, find and - * use it */ + /* + * if we already have a pollfd for our file descriptor, find and + * use it + */ for (nfds_t i = 0; i < m->handler.pfdcount; i++) if (m->handler.pfds[i].fd == fd) { queuepos = i; @@ -1008,7 +1010,7 @@ void _thread_add_read_write(const struct xref_threadsched *xref, m->handler.pfds[queuepos].fd = fd; m->handler.pfds[queuepos].events |= - (dir == THREAD_READ ? POLLIN : POLLOUT); + (dir == EVENT_READ ? POLLIN : POLLOUT); if (queuepos == m->handler.pfdcount) m->handler.pfdcount++; @@ -1029,13 +1031,13 @@ void _thread_add_read_write(const struct xref_threadsched *xref, } } -static void _thread_add_timer_timeval(const struct xref_threadsched *xref, - struct thread_master *m, - void (*func)(struct thread *), void *arg, - struct timeval *time_relative, - struct thread **t_ptr) +static void _event_add_timer_timeval(const struct xref_eventsched *xref, + struct event_loop *m, + void (*func)(struct event *), void *arg, + struct timeval *time_relative, + struct event **t_ptr) { - struct thread *thread; + struct event *thread; struct timeval t; assert(m != NULL); @@ -1055,11 +1057,11 @@ static void _thread_add_timer_timeval(const struct xref_threadsched *xref, /* thread is already scheduled; don't reschedule */ return; - thread = thread_get(m, THREAD_TIMER, func, arg, xref); + thread = thread_get(m, EVENT_TIMER, func, arg, xref); frr_with_mutex (&thread->mtx) { thread->u.sands = t; - thread_timer_list_add(&m->timer, thread); + event_timer_list_add(&m->timer, thread); if (t_ptr) { *t_ptr = thread; thread->ref = t_ptr; @@ -1070,7 +1072,7 @@ static void _thread_add_timer_timeval(const struct xref_threadsched *xref, * might change the time we'll wait for, give the pthread * a chance to re-compute. */ - if (thread_timer_list_first(&m->timer) == thread) + if (event_timer_list_first(&m->timer) == thread) AWAKEN(m); } #define ONEYEAR2SEC (60 * 60 * 24 * 365) @@ -1083,9 +1085,9 @@ static void _thread_add_timer_timeval(const struct xref_threadsched *xref, /* Add timer event thread. */ -void _thread_add_timer(const struct xref_threadsched *xref, - struct thread_master *m, void (*func)(struct thread *), - void *arg, long timer, struct thread **t_ptr) +void _event_add_timer(const struct xref_eventsched *xref, struct event_loop *m, + void (*func)(struct event *), void *arg, long timer, + struct event **t_ptr) { struct timeval trel; @@ -1094,14 +1096,13 @@ void _thread_add_timer(const struct xref_threadsched *xref, trel.tv_sec = timer; trel.tv_usec = 0; - _thread_add_timer_timeval(xref, m, func, arg, &trel, t_ptr); + _event_add_timer_timeval(xref, m, func, arg, &trel, t_ptr); } /* Add timer event thread with "millisecond" resolution */ -void _thread_add_timer_msec(const struct xref_threadsched *xref, - struct thread_master *m, - void (*func)(struct thread *), void *arg, - long timer, struct thread **t_ptr) +void _event_add_timer_msec(const struct xref_eventsched *xref, + struct event_loop *m, void (*func)(struct event *), + void *arg, long timer, struct event **t_ptr) { struct timeval trel; @@ -1110,24 +1111,23 @@ void _thread_add_timer_msec(const struct xref_threadsched *xref, trel.tv_sec = timer / 1000; trel.tv_usec = 1000 * (timer % 1000); - _thread_add_timer_timeval(xref, m, func, arg, &trel, t_ptr); + _event_add_timer_timeval(xref, m, func, arg, &trel, t_ptr); } /* Add timer event thread with "timeval" resolution */ -void _thread_add_timer_tv(const struct xref_threadsched *xref, - struct thread_master *m, - void (*func)(struct thread *), void *arg, - struct timeval *tv, struct thread **t_ptr) +void _event_add_timer_tv(const struct xref_eventsched *xref, + struct event_loop *m, void (*func)(struct event *), + void *arg, struct timeval *tv, struct event **t_ptr) { - _thread_add_timer_timeval(xref, m, func, arg, tv, t_ptr); + _event_add_timer_timeval(xref, m, func, arg, tv, t_ptr); } /* Add simple event thread. */ -void _thread_add_event(const struct xref_threadsched *xref, - struct thread_master *m, void (*func)(struct thread *), - void *arg, int val, struct thread **t_ptr) +void _event_add_event(const struct xref_eventsched *xref, struct event_loop *m, + void (*func)(struct event *), void *arg, int val, + struct event **t_ptr) { - struct thread *thread = NULL; + struct event *thread = NULL; frrtrace(9, frr_libfrr, schedule_event, m, xref->funcname, xref->xref.file, xref->xref.line, @@ -1140,10 +1140,10 @@ void _thread_add_event(const struct xref_threadsched *xref, /* thread is already scheduled; don't reschedule */ break; - thread = thread_get(m, THREAD_EVENT, func, arg, xref); + thread = thread_get(m, EVENT_EVENT, func, arg, xref); frr_with_mutex (&thread->mtx) { thread->u.val = val; - thread_list_add_tail(&m->event, thread); + event_list_add_tail(&m->event, thread); } if (t_ptr) { @@ -1161,7 +1161,7 @@ void _thread_add_event(const struct xref_threadsched *xref, * NOT's out the .events field of pollfd corresponding to the given file * descriptor. The event to be NOT'd is passed in the 'state' parameter. * - * This needs to happen for both copies of pollfd's. See 'thread_fetch' + * This needs to happen for both copies of pollfd's. See 'event_fetch' * implementation for details. * * @param master @@ -1171,8 +1171,8 @@ void _thread_add_event(const struct xref_threadsched *xref, * - POLLIN * - POLLOUT */ -static void thread_cancel_rw(struct thread_master *master, int fd, short state, - int idx_hint) +static void event_cancel_rw(struct event_loop *master, int fd, short state, + int idx_hint) { bool found = false; @@ -1216,8 +1216,10 @@ static void thread_cancel_rw(struct thread_master *master, int fd, short state, master->handler.pfds[master->handler.pfdcount].events = 0; } - /* If we have the same pollfd in the copy, perform the same operations, - * otherwise return. */ + /* + * If we have the same pollfd in the copy, perform the same operations, + * otherwise return. + */ if (i >= master->handler.copycount) return; @@ -1229,7 +1231,7 @@ static void thread_cancel_rw(struct thread_master *master, int fd, short state, * sizeof(struct pollfd)); master->handler.copycount--; master->handler.copy[master->handler.copycount].fd = 0; - master->handler.copy[master->handler.copycount].events = 0; + master->handler.copy[master->handler.copycount].events = 0; } } @@ -1237,10 +1239,10 @@ static void thread_cancel_rw(struct thread_master *master, int fd, short state, * Process task cancellation given a task argument: iterate through the * various lists of tasks, looking for any that match the argument. */ -static void cancel_arg_helper(struct thread_master *master, +static void cancel_arg_helper(struct event_loop *master, const struct cancel_req *cr) { - struct thread *t; + struct event *t; nfds_t i; int fd; struct pollfd *pfd; @@ -1250,26 +1252,26 @@ static void cancel_arg_helper(struct thread_master *master, return; /* First process the ready lists. */ - frr_each_safe(thread_list, &master->event, t) { + frr_each_safe (event_list, &master->event, t) { if (t->arg != cr->eventobj) continue; - thread_list_del(&master->event, t); + event_list_del(&master->event, t); if (t->ref) *t->ref = NULL; thread_add_unuse(master, t); } - frr_each_safe(thread_list, &master->ready, t) { + frr_each_safe (event_list, &master->ready, t) { if (t->arg != cr->eventobj) continue; - thread_list_del(&master->ready, t); + event_list_del(&master->ready, t); if (t->ref) *t->ref = NULL; thread_add_unuse(master, t); } /* If requested, stop here and ignore io and timers */ - if (CHECK_FLAG(cr->flags, THREAD_CANCEL_FLAG_READY)) + if (CHECK_FLAG(cr->flags, EVENT_CANCEL_FLAG_READY)) return; /* Check the io tasks */ @@ -1285,7 +1287,7 @@ static void cancel_arg_helper(struct thread_master *master, fd = pfd->fd; /* Found a match to cancel: clean up fd arrays */ - thread_cancel_rw(master, pfd->fd, pfd->events, i); + event_cancel_rw(master, pfd->fd, pfd->events, i); /* Clean up thread arrays */ master->read[fd] = NULL; @@ -1305,14 +1307,14 @@ static void cancel_arg_helper(struct thread_master *master, } /* Check the timer tasks */ - t = thread_timer_list_first(&master->timer); + t = event_timer_list_first(&master->timer); while (t) { - struct thread *t_next; + struct event *t_next; - t_next = thread_timer_list_next(&master->timer, t); + t_next = event_timer_list_next(&master->timer, t); if (t->arg == cr->eventobj) { - thread_timer_list_del(&master->timer, t); + event_timer_list_del(&master->timer, t); if (t->ref) *t->ref = NULL; thread_add_unuse(master, t); @@ -1325,16 +1327,16 @@ static void cancel_arg_helper(struct thread_master *master, /** * Process cancellation requests. * - * This may only be run from the pthread which owns the thread_master. + * This may only be run from the pthread which owns the event_master. * * @param master the thread master to process * @REQUIRE master->mtx */ -static void do_thread_cancel(struct thread_master *master) +static void do_event_cancel(struct event_loop *master) { - struct thread_list_head *list = NULL; - struct thread **thread_array = NULL; - struct thread *thread; + struct event_list_head *list = NULL; + struct event **thread_array = NULL; + struct event *thread; struct cancel_req *cr; struct listnode *ln; @@ -1365,33 +1367,33 @@ static void do_thread_cancel(struct thread_master *master) /* Determine the appropriate queue to cancel the thread from */ switch (thread->type) { - case THREAD_READ: - thread_cancel_rw(master, thread->u.fd, POLLIN, -1); + case EVENT_READ: + event_cancel_rw(master, thread->u.fd, POLLIN, -1); thread_array = master->read; break; - case THREAD_WRITE: - thread_cancel_rw(master, thread->u.fd, POLLOUT, -1); + case EVENT_WRITE: + event_cancel_rw(master, thread->u.fd, POLLOUT, -1); thread_array = master->write; break; - case THREAD_TIMER: - thread_timer_list_del(&master->timer, thread); + case EVENT_TIMER: + event_timer_list_del(&master->timer, thread); break; - case THREAD_EVENT: + case EVENT_EVENT: list = &master->event; break; - case THREAD_READY: + case EVENT_READY: list = &master->ready; break; - default: + case EVENT_UNUSED: + case EVENT_EXECUTE: continue; break; } - if (list) { - thread_list_del(list, thread); - } else if (thread_array) { + if (list) + event_list_del(list, thread); + else if (thread_array) thread_array[thread->u.fd] = NULL; - } if (thread->ref) *thread->ref = NULL; @@ -1403,7 +1405,7 @@ static void do_thread_cancel(struct thread_master *master) if (master->cancel_req) list_delete_all_node(master->cancel_req); - /* Wake up any threads which may be blocked in thread_cancel_async() */ + /* Wake up any threads which may be blocked in event_cancel_async() */ master->canceled = true; pthread_cond_broadcast(&master->cancel_cond); } @@ -1411,7 +1413,7 @@ static void do_thread_cancel(struct thread_master *master) /* * Helper function used for multiple flavors of arg-based cancellation. */ -static void cancel_event_helper(struct thread_master *m, void *arg, int flags) +static void cancel_event_helper(struct event_loop *m, void *arg, int flags) { struct cancel_req *cr; @@ -1428,7 +1430,7 @@ static void cancel_event_helper(struct thread_master *m, void *arg, int flags) frr_with_mutex (&m->mtx) { cr->eventobj = arg; listnode_add(m->cancel_req, cr); - do_thread_cancel(m); + do_event_cancel(m); } } @@ -1437,10 +1439,10 @@ static void cancel_event_helper(struct thread_master *m, void *arg, int flags) * * MT-Unsafe * - * @param m the thread_master to cancel from + * @param m the event_master to cancel from * @param arg the argument passed when creating the event */ -void thread_cancel_event(struct thread_master *master, void *arg) +void event_cancel_event(struct event_loop *master, void *arg) { cancel_event_helper(master, arg, 0); } @@ -1450,14 +1452,14 @@ void thread_cancel_event(struct thread_master *master, void *arg) * * MT-Unsafe * - * @param m the thread_master to cancel from + * @param m the event_master to cancel from * @param arg the argument passed when creating the event */ -void thread_cancel_event_ready(struct thread_master *m, void *arg) +void event_cancel_event_ready(struct event_loop *m, void *arg) { /* Only cancel ready/event tasks */ - cancel_event_helper(m, arg, THREAD_CANCEL_FLAG_READY); + cancel_event_helper(m, arg, EVENT_CANCEL_FLAG_READY); } /** @@ -1467,19 +1469,19 @@ void thread_cancel_event_ready(struct thread_master *m, void *arg) * * @param thread task to cancel */ -void thread_cancel(struct thread **thread) +void event_cancel(struct event **thread) { - struct thread_master *master; + struct event_loop *master; if (thread == NULL || *thread == NULL) return; master = (*thread)->master; - frrtrace(9, frr_libfrr, thread_cancel, master, - (*thread)->xref->funcname, (*thread)->xref->xref.file, - (*thread)->xref->xref.line, NULL, (*thread)->u.fd, - (*thread)->u.val, (*thread)->arg, (*thread)->u.sands.tv_sec); + frrtrace(9, frr_libfrr, event_cancel, master, (*thread)->xref->funcname, + (*thread)->xref->xref.file, (*thread)->xref->xref.line, NULL, + (*thread)->u.fd, (*thread)->u.val, (*thread)->arg, + (*thread)->u.sands.tv_sec); assert(master->owner == pthread_self()); @@ -1488,7 +1490,7 @@ void thread_cancel(struct thread **thread) XCALLOC(MTYPE_TMP, sizeof(struct cancel_req)); cr->thread = *thread; listnode_add(master->cancel_req, cr); - do_thread_cancel(master); + do_event_cancel(master); } *thread = NULL; @@ -1497,7 +1499,7 @@ void thread_cancel(struct thread **thread) /** * Asynchronous cancellation. * - * Called with either a struct thread ** or void * to an event argument, + * Called with either a struct event ** or void * to an event argument, * this function posts the correct cancellation request and blocks until it is * serviced. * @@ -1506,7 +1508,7 @@ void thread_cancel(struct thread **thread) * The last two parameters are mutually exclusive, i.e. if you pass one the * other must be NULL. * - * When the cancellation procedure executes on the target thread_master, the + * When the cancellation procedure executes on the target event_master, the * thread * provided is checked for nullity. If it is null, the thread is * assumed to no longer exist and the cancellation request is a no-op. Thus * users of this API must pass a back-reference when scheduling the original @@ -1518,19 +1520,19 @@ void thread_cancel(struct thread **thread) * @param thread pointer to thread to cancel * @param eventobj the event */ -void thread_cancel_async(struct thread_master *master, struct thread **thread, - void *eventobj) +void event_cancel_async(struct event_loop *master, struct event **thread, + void *eventobj) { assert(!(thread && eventobj) && (thread || eventobj)); if (thread && *thread) - frrtrace(9, frr_libfrr, thread_cancel_async, master, + frrtrace(9, frr_libfrr, event_cancel_async, master, (*thread)->xref->funcname, (*thread)->xref->xref.file, (*thread)->xref->xref.line, NULL, (*thread)->u.fd, (*thread)->u.val, (*thread)->arg, (*thread)->u.sands.tv_sec); else - frrtrace(9, frr_libfrr, thread_cancel_async, master, NULL, NULL, + frrtrace(9, frr_libfrr, event_cancel_async, master, NULL, NULL, 0, NULL, 0, 0, eventobj, 0); assert(master->owner != pthread_self()); @@ -1560,30 +1562,30 @@ void thread_cancel_async(struct thread_master *master, struct thread **thread, } /* ------------------------------------------------------------------------- */ -static struct timeval *thread_timer_wait(struct thread_timer_list_head *timers, +static struct timeval *thread_timer_wait(struct event_timer_list_head *timers, struct timeval *timer_val) { - if (!thread_timer_list_count(timers)) + if (!event_timer_list_count(timers)) return NULL; - struct thread *next_timer = thread_timer_list_first(timers); + struct event *next_timer = event_timer_list_first(timers); + monotime_until(&next_timer->u.sands, timer_val); return timer_val; } -static struct thread *thread_run(struct thread_master *m, struct thread *thread, - struct thread *fetch) +static struct event *thread_run(struct event_loop *m, struct event *thread, + struct event *fetch) { *fetch = *thread; thread_add_unuse(m, thread); return fetch; } -static int thread_process_io_helper(struct thread_master *m, - struct thread *thread, short state, - short actual_state, int pos) +static int thread_process_io_helper(struct event_loop *m, struct event *thread, + short state, short actual_state, int pos) { - struct thread **thread_array; + struct event **thread_array; /* * poll() clears the .events field, but the pollfd array we @@ -1606,14 +1608,14 @@ static int thread_process_io_helper(struct thread_master *m, return 0; } - if (thread->type == THREAD_READ) + if (thread->type == EVENT_READ) thread_array = m->read; else thread_array = m->write; thread_array[thread->u.fd] = NULL; - thread_list_add_tail(&m->ready, thread); - thread->type = THREAD_READY; + event_list_add_tail(&m->ready, thread); + thread->type = EVENT_READY; return 1; } @@ -1627,7 +1629,7 @@ static int thread_process_io_helper(struct thread_master *m, * @param m the thread master * @param num the number of active file descriptors (return value of poll()) */ -static void thread_process_io(struct thread_master *m, unsigned int num) +static void thread_process_io(struct event_loop *m, unsigned int num) { unsigned int ready = 0; struct pollfd *pfds = m->handler.copy; @@ -1640,10 +1642,10 @@ static void thread_process_io(struct thread_master *m, unsigned int num) ready++; /* - * Unless someone has called thread_cancel from another + * Unless someone has called event_cancel from another * pthread, the only thing that could have changed in * m->handler.pfds while we were asleep is the .events - * field in a given pollfd. Barring thread_cancel() that + * field in a given pollfd. Barring event_cancel() that * value should be a superset of the values we have in our * copy, so there's no need to update it. Similarily, * barring deletion, the fd should still be a valid index @@ -1661,9 +1663,10 @@ static void thread_process_io(struct thread_master *m, unsigned int num) thread_process_io_helper(m, m->write[pfds[i].fd], POLLOUT, pfds[i].revents, i); - /* if one of our file descriptors is garbage, remove the same - * from - * both pfds + update sizes and index */ + /* + * if one of our file descriptors is garbage, remove the same + * from both pfds + update sizes and index + */ if (pfds[i].revents & POLLNVAL) { memmove(m->handler.pfds + i, m->handler.pfds + i + 1, (m->handler.pfdcount - i - 1) @@ -1685,15 +1688,15 @@ static void thread_process_io(struct thread_master *m, unsigned int num) } /* Add all timers that have popped to the ready list. */ -static unsigned int thread_process_timers(struct thread_master *m, +static unsigned int thread_process_timers(struct event_loop *m, struct timeval *timenow) { struct timeval prev = *timenow; bool displayed = false; - struct thread *thread; + struct event *thread; unsigned int ready = 0; - while ((thread = thread_timer_list_first(&m->timer))) { + while ((thread = event_timer_list_first(&m->timer))) { if (timercmp(timenow, &thread->u.sands, <)) break; prev = thread->u.sands; @@ -1717,9 +1720,9 @@ static unsigned int thread_process_timers(struct thread_master *m, } } - thread_timer_list_pop(&m->timer); - thread->type = THREAD_READY; - thread_list_add_tail(&m->ready, thread); + event_timer_list_pop(&m->timer); + thread->type = EVENT_READY; + event_list_add_tail(&m->ready, thread); ready++; } @@ -1727,14 +1730,14 @@ static unsigned int thread_process_timers(struct thread_master *m, } /* process a list en masse, e.g. for event thread lists */ -static unsigned int thread_process(struct thread_list_head *list) +static unsigned int thread_process(struct event_list_head *list) { - struct thread *thread; + struct event *thread; unsigned int ready = 0; - while ((thread = thread_list_pop(list))) { - thread->type = THREAD_READY; - thread_list_add_tail(&thread->master->ready, thread); + while ((thread = event_list_pop(list))) { + thread->type = EVENT_READY; + event_list_add_tail(&thread->master->ready, thread); ready++; } return ready; @@ -1742,9 +1745,9 @@ static unsigned int thread_process(struct thread_list_head *list) /* Fetch next ready thread. */ -struct thread *thread_fetch(struct thread_master *m, struct thread *fetch) +struct event *event_fetch(struct event_loop *m, struct event *fetch) { - struct thread *thread = NULL; + struct event *thread = NULL; struct timeval now; struct timeval zerotime = {0, 0}; struct timeval tv; @@ -1760,13 +1763,13 @@ struct thread *thread_fetch(struct thread_master *m, struct thread *fetch) pthread_mutex_lock(&m->mtx); /* Process any pending cancellation requests */ - do_thread_cancel(m); + do_event_cancel(m); /* * Attempt to flush ready queue before going into poll(). * This is performance-critical. Think twice before modifying. */ - if ((thread = thread_list_pop(&m->ready))) { + if ((thread = event_list_pop(&m->ready))) { fetch = thread_run(m, thread, fetch); if (fetch->ref) *fetch->ref = NULL; @@ -1802,11 +1805,11 @@ struct thread *thread_fetch(struct thread_master *m, struct thread *fetch) * In every case except the last, we need to hit poll() at least * once per loop to avoid starvation by events */ - if (!thread_list_count(&m->ready)) + if (!event_list_count(&m->ready)) tw = thread_timer_wait(&m->timer, &tv); - if (thread_list_count(&m->ready) || - (tw && !timercmp(tw, &zerotime, >))) + if (event_list_count(&m->ready) || + (tw && !timercmp(tw, &zerotime, >))) tw = &zerotime; if (!tw && m->handler.pfdcount == 0) { /* die */ @@ -1867,8 +1870,8 @@ static unsigned long timeval_elapsed(struct timeval a, struct timeval b) + (a.tv_usec - b.tv_usec)); } -unsigned long thread_consumed_time(RUSAGE_T *now, RUSAGE_T *start, - unsigned long *cputime) +unsigned long event_consumed_time(RUSAGE_T *now, RUSAGE_T *start, + unsigned long *cputime) { #ifdef HAVE_CLOCK_THREAD_CPUTIME_ID @@ -1902,19 +1905,22 @@ unsigned long thread_consumed_time(RUSAGE_T *now, RUSAGE_T *start, return timeval_elapsed(now->real, start->real); } -/* We should aim to yield after yield milliseconds, which defaults - to THREAD_YIELD_TIME_SLOT . - Note: we are using real (wall clock) time for this calculation. - It could be argued that CPU time may make more sense in certain - contexts. The things to consider are whether the thread may have - blocked (in which case wall time increases, but CPU time does not), - or whether the system is heavily loaded with other processes competing - for CPU time. On balance, wall clock time seems to make sense. - Plus it has the added benefit that gettimeofday should be faster - than calling getrusage. */ -int thread_should_yield(struct thread *thread) +/* + * We should aim to yield after yield milliseconds, which defaults + * to EVENT_YIELD_TIME_SLOT . + * Note: we are using real (wall clock) time for this calculation. + * It could be argued that CPU time may make more sense in certain + * contexts. The things to consider are whether the thread may have + * blocked (in which case wall time increases, but CPU time does not), + * or whether the system is heavily loaded with other processes competing + * for CPU time. On balance, wall clock time seems to make sense. + * Plus it has the added benefit that gettimeofday should be faster + * than calling getrusage. + */ +int event_should_yield(struct event *thread) { int result; + frr_with_mutex (&thread->mtx) { result = monotime_since(&thread->real, NULL) > (int64_t)thread->yield; @@ -1922,14 +1928,14 @@ int thread_should_yield(struct thread *thread) return result; } -void thread_set_yield_time(struct thread *thread, unsigned long yield_time) +void event_set_yield_time(struct event *thread, unsigned long yield_time) { frr_with_mutex (&thread->mtx) { thread->yield = yield_time; } } -void thread_getrusage(RUSAGE_T *r) +void event_getrusage(RUSAGE_T *r) { monotime(&r->real); if (!cputime_enabled) { @@ -1963,7 +1969,7 @@ void thread_getrusage(RUSAGE_T *r) * particular, the maximum real and cpu times must be monotonically increasing * or this code is not correct. */ -void thread_call(struct thread *thread) +void event_call(struct event *thread) { RUSAGE_T before, after; @@ -1980,10 +1986,10 @@ void thread_call(struct thread *thread) thread->real = before.real; - frrtrace(9, frr_libfrr, thread_call, thread->master, + frrtrace(9, frr_libfrr, event_call, thread->master, thread->xref->funcname, thread->xref->xref.file, - thread->xref->xref.line, NULL, thread->u.fd, - thread->u.val, thread->arg, thread->u.sands.tv_sec); + thread->xref->xref.line, NULL, thread->u.fd, thread->u.val, + thread->arg, thread->u.sands.tv_sec); pthread_setspecific(thread_current, thread); (*thread->func)(thread); @@ -1995,7 +2001,7 @@ void thread_call(struct thread *thread) unsigned long walltime, cputime; unsigned long exp; - walltime = thread_consumed_time(&after, &before, &cputime); + walltime = event_consumed_time(&after, &before, &cputime); /* update walltime */ atomic_fetch_add_explicit(&thread->hist->real.total, walltime, @@ -2059,26 +2065,25 @@ void thread_call(struct thread *thread) } /* Execute thread */ -void _thread_execute(const struct xref_threadsched *xref, - struct thread_master *m, void (*func)(struct thread *), - void *arg, int val) +void _event_execute(const struct xref_eventsched *xref, struct event_loop *m, + void (*func)(struct event *), void *arg, int val) { - struct thread *thread; + struct event *thread; /* Get or allocate new thread to execute. */ frr_with_mutex (&m->mtx) { - thread = thread_get(m, THREAD_EVENT, func, arg, xref); + thread = thread_get(m, EVENT_EVENT, func, arg, xref); /* Set its event value. */ frr_with_mutex (&thread->mtx) { - thread->add_type = THREAD_EXECUTE; + thread->add_type = EVENT_EXECUTE; thread->u.val = val; thread->ref = &thread; } } /* Execute thread doing all accounting. */ - thread_call(thread); + event_call(thread); /* Give back or free thread. */ thread_add_unuse(m, thread); @@ -2131,16 +2136,13 @@ void debug_signals(const sigset_t *sigs) } static ssize_t printfrr_thread_dbg(struct fbuf *buf, struct printfrr_eargs *ea, - const struct thread *thread) + const struct event *thread) { - static const char * const types[] = { - [THREAD_READ] = "read", - [THREAD_WRITE] = "write", - [THREAD_TIMER] = "timer", - [THREAD_EVENT] = "event", - [THREAD_READY] = "ready", - [THREAD_UNUSED] = "unused", - [THREAD_EXECUTE] = "exec", + static const char *const types[] = { + [EVENT_READ] = "read", [EVENT_WRITE] = "write", + [EVENT_TIMER] = "timer", [EVENT_EVENT] = "event", + [EVENT_READY] = "ready", [EVENT_UNUSED] = "unused", + [EVENT_EXECUTE] = "exec", }; ssize_t rv = 0; char info[16] = ""; @@ -2156,14 +2158,19 @@ static ssize_t printfrr_thread_dbg(struct fbuf *buf, struct printfrr_eargs *ea, rv += bprintfrr(buf, " INVALID(%u)", thread->type); switch (thread->type) { - case THREAD_READ: - case THREAD_WRITE: + case EVENT_READ: + case EVENT_WRITE: snprintfrr(info, sizeof(info), "fd=%d", thread->u.fd); break; - case THREAD_TIMER: + case EVENT_TIMER: snprintfrr(info, sizeof(info), "r=%pTVMud", &thread->u.sands); break; + case EVENT_READY: + case EVENT_EVENT: + case EVENT_UNUSED: + case EVENT_EXECUTE: + break; } rv += bprintfrr(buf, " %-12s %s() %s from %s:%d}", info, @@ -2176,7 +2183,7 @@ printfrr_ext_autoreg_p("TH", printfrr_thread); static ssize_t printfrr_thread(struct fbuf *buf, struct printfrr_eargs *ea, const void *ptr) { - const struct thread *thread = ptr; + const struct event *thread = ptr; struct timespec remain = {}; if (ea->fmt[0] == 'D') { diff --git a/lib/frr_pthread.c b/lib/frr_pthread.c index 0c617238fa..c4ead01bf6 100644 --- a/lib/frr_pthread.c +++ b/lib/frr_pthread.c @@ -75,7 +75,7 @@ struct frr_pthread *frr_pthread_new(const struct frr_pthread_attr *attr, /* initialize mutex */ pthread_mutex_init(&fpt->mtx, NULL); /* create new thread master */ - fpt->master = thread_master_create(name); + fpt->master = event_master_create(name); /* set attributes */ fpt->attr = *attr; name = (name ? name : "Anonymous thread"); @@ -101,7 +101,7 @@ struct frr_pthread *frr_pthread_new(const struct frr_pthread_attr *attr, static void frr_pthread_destroy_nolock(struct frr_pthread *fpt) { - thread_master_free(fpt->master); + event_master_free(fpt->master); pthread_mutex_destroy(&fpt->mtx); pthread_mutex_destroy(fpt->running_cond_mtx); pthread_cond_destroy(fpt->running_cond); @@ -224,14 +224,14 @@ void frr_pthread_stop_all(void) */ /* dummy task for sleeper pipe */ -static void fpt_dummy(struct thread *thread) +static void fpt_dummy(struct event *thread) { } /* poison pill task to end event loop */ -static void fpt_finish(struct thread *thread) +static void fpt_finish(struct event *thread) { - struct frr_pthread *fpt = THREAD_ARG(thread); + struct frr_pthread *fpt = EVENT_ARG(thread); atomic_store_explicit(&fpt->running, false, memory_order_relaxed); } @@ -239,7 +239,7 @@ static void fpt_finish(struct thread *thread) /* stop function, called from other threads to halt this one */ static int fpt_halt(struct frr_pthread *fpt, void **res) { - thread_add_event(fpt->master, &fpt_finish, fpt, 0, NULL); + event_add_event(fpt->master, &fpt_finish, fpt, 0, NULL); pthread_join(fpt->thread, res); return 0; @@ -281,7 +281,7 @@ static void *fpt_run(void *arg) int sleeper[2]; pipe(sleeper); - thread_add_read(fpt->master, &fpt_dummy, NULL, sleeper[0], NULL); + event_add_read(fpt->master, &fpt_dummy, NULL, sleeper[0], NULL); fpt->master->handle_signals = false; @@ -289,11 +289,11 @@ static void *fpt_run(void *arg) frr_pthread_notify_running(fpt); - struct thread task; + struct event task; while (atomic_load_explicit(&fpt->running, memory_order_relaxed)) { pthread_testcancel(); - if (thread_fetch(fpt->master, &task)) { - thread_call(&task); + if (event_fetch(fpt->master, &task)) { + event_call(&task); } } diff --git a/lib/frr_pthread.h b/lib/frr_pthread.h index b1d08717fb..f91044dfae 100644 --- a/lib/frr_pthread.h +++ b/lib/frr_pthread.h @@ -11,7 +11,7 @@ #include "frratomic.h" #include "memory.h" #include "frrcu.h" -#include "thread.h" +#include "frrevent.h" #ifdef __cplusplus extern "C" { @@ -41,7 +41,7 @@ struct frr_pthread { struct rcu_thread *rcu_thread; /* thread master for this pthread's thread.c event loop */ - struct thread_master *master; + struct event_loop *master; /* caller-specified data; start & stop funcs, name, id */ struct frr_pthread_attr attr; diff --git a/lib/frr_zmq.c b/lib/frr_zmq.c index 2673d57605..b28dd7f1bb 100644 --- a/lib/frr_zmq.c +++ b/lib/frr_zmq.c @@ -15,7 +15,7 @@ #include #include -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "frr_zmq.h" #include "log.h" @@ -43,9 +43,9 @@ void frrzmq_finish(void) } } -static void frrzmq_read_msg(struct thread *t) +static void frrzmq_read_msg(struct event *t) { - struct frrzmq_cb **cbp = THREAD_ARG(t); + struct frrzmq_cb **cbp = EVENT_ARG(t); struct frrzmq_cb *cb; zmq_msg_t msg; unsigned partno; @@ -138,8 +138,8 @@ static void frrzmq_read_msg(struct thread *t) if (read) frrzmq_check_events(cbp, &cb->write, ZMQ_POLLOUT); - thread_add_read(t->master, frrzmq_read_msg, cbp, - cb->fd, &cb->read.thread); + event_add_read(t->master, frrzmq_read_msg, cbp, cb->fd, + &cb->read.thread); return; out_err: @@ -149,14 +149,13 @@ out_err: cb->read.cb_error(cb->read.arg, cb->zmqsock); } -int _frrzmq_thread_add_read(const struct xref_threadsched *xref, - struct thread_master *master, - void (*msgfunc)(void *arg, void *zmqsock), - void (*partfunc)(void *arg, void *zmqsock, - zmq_msg_t *msg, unsigned partnum), - void (*errfunc)(void *arg, void *zmqsock), - void *arg, void *zmqsock, - struct frrzmq_cb **cbp) +int _frrzmq_event_add_read(const struct xref_eventsched *xref, + struct event_loop *master, + void (*msgfunc)(void *arg, void *zmqsock), + void (*partfunc)(void *arg, void *zmqsock, + zmq_msg_t *msg, unsigned partnum), + void (*errfunc)(void *arg, void *zmqsock), void *arg, + void *zmqsock, struct frrzmq_cb **cbp) { int fd, events; size_t len; @@ -191,19 +190,19 @@ int _frrzmq_thread_add_read(const struct xref_threadsched *xref, cb->in_cb = false; if (events & ZMQ_POLLIN) { - thread_cancel(&cb->read.thread); + event_cancel(&cb->read.thread); - thread_add_event(master, frrzmq_read_msg, cbp, fd, - &cb->read.thread); - } else - thread_add_read(master, frrzmq_read_msg, cbp, fd, + event_add_event(master, frrzmq_read_msg, cbp, fd, &cb->read.thread); + } else + event_add_read(master, frrzmq_read_msg, cbp, fd, + &cb->read.thread); return 0; } -static void frrzmq_write_msg(struct thread *t) +static void frrzmq_write_msg(struct event *t) { - struct frrzmq_cb **cbp = THREAD_ARG(t); + struct frrzmq_cb **cbp = EVENT_ARG(t); struct frrzmq_cb *cb; unsigned char written = 0; int ret; @@ -247,8 +246,8 @@ static void frrzmq_write_msg(struct thread *t) if (written) frrzmq_check_events(cbp, &cb->read, ZMQ_POLLIN); - thread_add_write(t->master, frrzmq_write_msg, cbp, - cb->fd, &cb->write.thread); + event_add_write(t->master, frrzmq_write_msg, cbp, cb->fd, + &cb->write.thread); return; out_err: @@ -258,11 +257,11 @@ out_err: cb->write.cb_error(cb->write.arg, cb->zmqsock); } -int _frrzmq_thread_add_write(const struct xref_threadsched *xref, - struct thread_master *master, - void (*msgfunc)(void *arg, void *zmqsock), - void (*errfunc)(void *arg, void *zmqsock), - void *arg, void *zmqsock, struct frrzmq_cb **cbp) +int _frrzmq_event_add_write(const struct xref_eventsched *xref, + struct event_loop *master, + void (*msgfunc)(void *arg, void *zmqsock), + void (*errfunc)(void *arg, void *zmqsock), + void *arg, void *zmqsock, struct frrzmq_cb **cbp) { int fd, events; size_t len; @@ -297,13 +296,13 @@ int _frrzmq_thread_add_write(const struct xref_threadsched *xref, cb->in_cb = false; if (events & ZMQ_POLLOUT) { - thread_cancel(&cb->write.thread); + event_cancel(&cb->write.thread); - _thread_add_event(xref, master, frrzmq_write_msg, cbp, fd, - &cb->write.thread); - } else - thread_add_write(master, frrzmq_write_msg, cbp, fd, + _event_add_event(xref, master, frrzmq_write_msg, cbp, fd, &cb->write.thread); + } else + event_add_write(master, frrzmq_write_msg, cbp, fd, + &cb->write.thread); return 0; } @@ -312,7 +311,7 @@ void frrzmq_thread_cancel(struct frrzmq_cb **cb, struct cb_core *core) if (!cb || !*cb) return; core->cancelled = true; - thread_cancel(&core->thread); + event_cancel(&core->thread); /* If cancelled from within a callback, don't try to free memory * in this path. @@ -343,15 +342,15 @@ void frrzmq_check_events(struct frrzmq_cb **cbp, struct cb_core *core, if (zmq_getsockopt(cb->zmqsock, ZMQ_EVENTS, &events, &len)) return; if ((events & event) && core->thread && !core->cancelled) { - struct thread_master *tm = core->thread->master; + struct event_loop *tm = core->thread->master; - thread_cancel(&core->thread); + event_cancel(&core->thread); if (event == ZMQ_POLLIN) - thread_add_event(tm, frrzmq_read_msg, - cbp, cb->fd, &core->thread); + event_add_event(tm, frrzmq_read_msg, cbp, cb->fd, + &core->thread); else - thread_add_event(tm, frrzmq_write_msg, - cbp, cb->fd, &core->thread); + event_add_event(tm, frrzmq_write_msg, cbp, cb->fd, + &core->thread); } } diff --git a/lib/frr_zmq.h b/lib/frr_zmq.h index f12291d602..73da3770f4 100644 --- a/lib/frr_zmq.h +++ b/lib/frr_zmq.h @@ -7,7 +7,7 @@ #ifndef _FRRZMQ_H #define _FRRZMQ_H -#include "thread.h" +#include "frrevent.h" #include #ifdef __cplusplus @@ -26,7 +26,7 @@ extern "C" { /* callback integration */ struct cb_core { - struct thread *thread; + struct event *thread; void *arg; bool cancelled; @@ -59,30 +59,29 @@ extern void frrzmq_finish(void); #define _xref_zmq_a(type, f, d, call) \ ({ \ - static const struct xref_threadsched _xref \ - __attribute__((used)) = { \ - .xref = XREF_INIT(XREFT_THREADSCHED, NULL, __func__), \ + static const struct xref_eventsched _xref __attribute__( \ + (used)) = { \ + .xref = XREF_INIT(XREFT_EVENTSCHED, NULL, __func__), \ .funcname = #f, \ .dest = #d, \ - .thread_type = THREAD_ ## type, \ + .event_type = EVENT_##type, \ }; \ XREF_LINK(_xref.xref); \ call; \ - }) \ - /* end */ + }) /* end */ /* core event registration, one of these 2 macros should be used */ -#define frrzmq_thread_add_read_msg(m, f, e, a, z, d) \ +#define frrzmq_event_add_read_msg(m, f, e, a, z, d) \ _xref_zmq_a(READ, f, d, \ - _frrzmq_thread_add_read(&_xref, m, f, NULL, e, a, z, d)) + _frrzmq_event_add_read(&_xref, m, f, NULL, e, a, z, d)) -#define frrzmq_thread_add_read_part(m, f, e, a, z, d) \ +#define frrzmq_event_add_read_part(m, f, e, a, z, d) \ _xref_zmq_a(READ, f, d, \ - _frrzmq_thread_add_read(&_xref, m, NULL, f, e, a, z, d)) + _frrzmq_event_add_read(&_xref, m, NULL, f, e, a, z, d)) -#define frrzmq_thread_add_write_msg(m, f, e, a, z, d) \ +#define frrzmq_event_add_write_msg(m, f, e, a, z, d) \ _xref_zmq_a(WRITE, f, d, \ - _frrzmq_thread_add_write(&_xref, m, f, e, a, z, d)) + _frrzmq_event_add_write(&_xref, m, f, e, a, z, d)) struct cb_core; struct frrzmq_cb; @@ -108,18 +107,20 @@ struct frrzmq_cb; * may schedule the event to run as soon as libfrr is back in its main * loop. */ -extern int _frrzmq_thread_add_read( - const struct xref_threadsched *xref, struct thread_master *master, - void (*msgfunc)(void *arg, void *zmqsock), - void (*partfunc)(void *arg, void *zmqsock, zmq_msg_t *msg, - unsigned partnum), - void (*errfunc)(void *arg, void *zmqsock), void *arg, void *zmqsock, - struct frrzmq_cb **cb); -extern int _frrzmq_thread_add_write( - const struct xref_threadsched *xref, struct thread_master *master, - void (*msgfunc)(void *arg, void *zmqsock), - void (*errfunc)(void *arg, void *zmqsock), void *arg, void *zmqsock, - struct frrzmq_cb **cb); +extern int +_frrzmq_event_add_read(const struct xref_eventsched *xref, + struct event_loop *master, + void (*msgfunc)(void *arg, void *zmqsock), + void (*partfunc)(void *arg, void *zmqsock, + zmq_msg_t *msg, unsigned partnum), + void (*errfunc)(void *arg, void *zmqsock), void *arg, + void *zmqsock, struct frrzmq_cb **cb); +extern int _frrzmq_event_add_write(const struct xref_eventsched *xref, + struct event_loop *master, + void (*msgfunc)(void *arg, void *zmqsock), + void (*errfunc)(void *arg, void *zmqsock), + void *arg, void *zmqsock, + struct frrzmq_cb **cb); extern void frrzmq_thread_cancel(struct frrzmq_cb **cb, struct cb_core *core); diff --git a/lib/frrevent.h b/lib/frrevent.h new file mode 100644 index 0000000000..2b0c52bb51 --- /dev/null +++ b/lib/frrevent.h @@ -0,0 +1,295 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* Event management routine header. + * Copyright (C) 1998 Kunihiro Ishiguro + */ + +#ifndef _ZEBRA_THREAD_H +#define _ZEBRA_THREAD_H + +#include +#include +#include +#include "monotime.h" +#include "frratomic.h" +#include "typesafe.h" +#include "xref.h" + +#ifdef __cplusplus +extern "C" { +#endif + +extern bool cputime_enabled; +extern unsigned long cputime_threshold; +/* capturing wallclock time is always enabled since it is fast (reading + * hardware TSC w/o syscalls) + */ +extern unsigned long walltime_threshold; + +struct rusage_t { +#ifdef HAVE_CLOCK_THREAD_CPUTIME_ID + struct timespec cpu; +#else + struct rusage cpu; +#endif + struct timeval real; +}; +#define RUSAGE_T struct rusage_t + +#define GETRUSAGE(X) event_getrusage(X) + +PREDECL_LIST(event_list); +PREDECL_HEAP(event_timer_list); + +struct fd_handler { + /* number of pfd that fit in the allocated space of pfds. This is a + * constant and is the same for both pfds and copy. + */ + nfds_t pfdsize; + + /* file descriptors to monitor for i/o */ + struct pollfd *pfds; + /* number of pollfds stored in pfds */ + nfds_t pfdcount; + + /* chunk used for temp copy of pollfds */ + struct pollfd *copy; + /* number of pollfds stored in copy */ + nfds_t copycount; +}; + +struct xref_eventsched { + struct xref xref; + + const char *funcname; + const char *dest; + uint32_t event_type; +}; + +/* Master of the theads. */ +struct event_loop { + char *name; + + struct event **read; + struct event **write; + struct event_timer_list_head timer; + struct event_list_head event, ready, unuse; + struct list *cancel_req; + bool canceled; + pthread_cond_t cancel_cond; + struct hash *cpu_record; + int io_pipe[2]; + int fd_limit; + struct fd_handler handler; + unsigned long alloc; + long selectpoll_timeout; + bool spin; + bool handle_signals; + pthread_mutex_t mtx; + pthread_t owner; + + bool ready_run_loop; + RUSAGE_T last_getrusage; +}; + +/* Event types. */ +enum event_types { + EVENT_READ, + EVENT_WRITE, + EVENT_TIMER, + EVENT_EVENT, + EVENT_READY, + EVENT_UNUSED, + EVENT_EXECUTE, +}; + +/* Event itself. */ +struct event { + enum event_types type; /* event type */ + enum event_types add_type; /* event type */ + struct event_list_item eventitem; + struct event_timer_list_item timeritem; + struct event **ref; /* external reference (if given) */ + struct event_loop *master; /* pointer to the struct event_loop */ + void (*func)(struct event *e); /* event function */ + void *arg; /* event argument */ + union { + int val; /* second argument of the event. */ + int fd; /* file descriptor in case of r/w */ + struct timeval sands; /* rest of time sands value. */ + } u; + struct timeval real; + struct cpu_event_history *hist; /* cache pointer to cpu_history */ + unsigned long yield; /* yield time in microseconds */ + const struct xref_eventsched *xref; /* origin location */ + pthread_mutex_t mtx; /* mutex for thread.c functions */ + bool ignore_timer_late; +}; + +#ifdef _FRR_ATTRIBUTE_PRINTFRR +#pragma FRR printfrr_ext "%pTH"(struct event *) +#endif + +struct cpu_event_history { + void (*func)(struct event *e); + atomic_size_t total_cpu_warn; + atomic_size_t total_wall_warn; + atomic_size_t total_starv_warn; + atomic_size_t total_calls; + atomic_size_t total_active; + struct time_stats { + atomic_size_t total, max; + } real; + struct time_stats cpu; + atomic_uint_fast32_t types; + const char *funcname; +}; + +/* Struct timeval's tv_usec one second value. */ +#define TIMER_SECOND_MICRO 1000000L + +/* Event yield time. */ +#define EVENT_YIELD_TIME_SLOT 10 * 1000L /* 10ms */ + +#define EVENT_TIMER_STRLEN 12 + +/* Macros. */ +#define EVENT_ARG(X) ((X)->arg) +#define EVENT_FD(X) ((X)->u.fd) +#define EVENT_VAL(X) ((X)->u.val) + +/* + * Please consider this macro deprecated, and do not use it in new code. + */ +#define EVENT_OFF(thread) \ + do { \ + if ((thread)) \ + event_cancel(&(thread)); \ + } while (0) + +/* + * Macro wrappers to generate xrefs for all thread add calls. Includes + * file/line/function info for debugging/tracing. + */ +#include "lib/xref.h" + +#define _xref_t_a(addfn, type, m, f, a, v, t) \ + ({ \ + static const struct xref_eventsched _xref __attribute__( \ + (used)) = { \ + .xref = XREF_INIT(XREFT_EVENTSCHED, NULL, __func__), \ + .funcname = #f, \ + .dest = #t, \ + .event_type = EVENT_##type, \ + }; \ + XREF_LINK(_xref.xref); \ + _event_add_##addfn(&_xref, m, f, a, v, t); \ + }) /* end */ + +#define event_add_read(m, f, a, v, t) _xref_t_a(read_write, READ, m, f, a, v, t) +#define event_add_write(m, f, a, v, t) \ + _xref_t_a(read_write, WRITE, m, f, a, v, t) +#define event_add_timer(m, f, a, v, t) _xref_t_a(timer, TIMER, m, f, a, v, t) +#define event_add_timer_msec(m, f, a, v, t) \ + _xref_t_a(timer_msec, TIMER, m, f, a, v, t) +#define event_add_timer_tv(m, f, a, v, t) \ + _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 event_execute(m, f, a, v) \ + ({ \ + static const struct xref_eventsched _xref __attribute__( \ + (used)) = { \ + .xref = XREF_INIT(XREFT_EVENTSCHED, NULL, __func__), \ + .funcname = #f, \ + .dest = NULL, \ + .event_type = EVENT_EXECUTE, \ + }; \ + XREF_LINK(_xref.xref); \ + _event_execute(&_xref, m, f, a, v); \ + }) /* end */ + +/* Prototypes. */ +extern struct event_loop *event_master_create(const char *name); +void event_master_set_name(struct event_loop *master, const char *name); +extern void event_master_free(struct event_loop *m); +extern void event_master_free_unused(struct event_loop *m); + +extern void _event_add_read_write(const struct xref_eventsched *xref, + struct event_loop *master, + void (*fn)(struct event *), void *arg, int fd, + struct event **tref); + +extern void _event_add_timer(const struct xref_eventsched *xref, + struct event_loop *master, + void (*fn)(struct event *), void *arg, long t, + struct event **tref); + +extern void _event_add_timer_msec(const struct xref_eventsched *xref, + struct event_loop *master, + void (*fn)(struct event *), void *arg, long t, + struct event **tref); + +extern void _event_add_timer_tv(const struct xref_eventsched *xref, + struct event_loop *master, + void (*fn)(struct event *), void *arg, + struct timeval *tv, struct event **tref); + +extern void _event_add_event(const struct xref_eventsched *xref, + struct event_loop *master, + void (*fn)(struct event *), void *arg, int val, + struct event **tref); + +extern void _event_execute(const struct xref_eventsched *xref, + struct event_loop *master, + void (*fn)(struct event *), void *arg, int val); + +extern void event_cancel(struct event **event); +extern void event_cancel_async(struct event_loop *m, struct event **eptr, + void *data); +/* Cancel ready tasks with an arg matching 'arg' */ +extern void event_cancel_event_ready(struct event_loop *m, void *arg); +/* Cancel all tasks with an arg matching 'arg', including timers and io */ +extern void event_cancel_event(struct event_loop *m, void *arg); +extern struct event *event_fetch(struct event_loop *m, struct event *event); +extern void event_call(struct event *event); +extern unsigned long event_timer_remain_second(struct event *event); +extern struct timeval event_timer_remain(struct event *event); +extern unsigned long event_timer_remain_msec(struct event *event); +extern int event_should_yield(struct event *event); +/* set yield time for thread */ +extern void event_set_yield_time(struct event *event, unsigned long ytime); + +/* Internal libfrr exports */ +extern void event_getrusage(RUSAGE_T *r); +extern void event_cmd_init(void); + +/* Returns elapsed real (wall clock) time. */ +extern unsigned long event_consumed_time(RUSAGE_T *after, RUSAGE_T *before, + unsigned long *cpu_time_elapsed); + +/* only for use in logging functions! */ +extern pthread_key_t thread_current; +extern char *event_timer_to_hhmmss(char *buf, int buf_size, + struct event *t_timer); + +static inline bool event_is_scheduled(struct event *thread) +{ + if (thread) + return true; + + return false; +} + +/* Debug signal mask */ +void debug_signals(const sigset_t *sigs); + +static inline void event_ignore_late_timer(struct event *event) +{ + event->ignore_timer_late = true; +} + +#ifdef __cplusplus +} +#endif + +#endif /* _ZEBRA_THREAD_H */ diff --git a/lib/grammar_sandbox_main.c b/lib/grammar_sandbox_main.c index cdb1c3adb4..abd42f359f 100644 --- a/lib/grammar_sandbox_main.c +++ b/lib/grammar_sandbox_main.c @@ -23,13 +23,13 @@ static void vty_do_exit(int isexit) exit(0); } -struct thread_master *master; +struct event_loop *master; int main(int argc, char **argv) { - struct thread thread; + struct event event; - master = thread_master_create(NULL); + master = event_master_create(NULL); zlog_aux_init("NONE: ", LOG_DEBUG); @@ -45,8 +45,8 @@ int main(int argc, char **argv) vty_stdio(vty_do_exit); /* Fetch next active thread. */ - while (thread_fetch(master, &thread)) - thread_call(&thread); + while (event_fetch(master, &event)) + event_call(&event); /* Not reached. */ exit(0); diff --git a/lib/ldp_sync.c b/lib/ldp_sync.c index b01cf87287..d55819dfaf 100644 --- a/lib/ldp_sync.c +++ b/lib/ldp_sync.c @@ -10,7 +10,7 @@ #include "memory.h" #include "prefix.h" #include "log.h" -#include "thread.h" +#include "frrevent.h" #include "stream.h" #include "zclient.h" #include "table.h" @@ -66,7 +66,7 @@ bool ldp_sync_if_down(struct ldp_sync_info *ldp_sync_info) * update state */ if (ldp_sync_info && ldp_sync_info->enabled == LDP_IGP_SYNC_ENABLED) { - THREAD_OFF(ldp_sync_info->t_holddown); + EVENT_OFF(ldp_sync_info->t_holddown); if (ldp_sync_info->state == LDP_IGP_SYNC_STATE_REQUIRED_UP) ldp_sync_info->state = diff --git a/lib/ldp_sync.h b/lib/ldp_sync.h index 5b6ebbf887..f7601ebf9d 100644 --- a/lib/ldp_sync.h +++ b/lib/ldp_sync.h @@ -37,7 +37,7 @@ struct ldp_sync_info { uint8_t enabled; /* enabled */ uint8_t state; /* running state */ uint16_t holddown; /* timer value */ - struct thread *t_holddown; /* holddown timer*/ + struct event *t_holddown; /* holddown timer*/ uint32_t metric[2]; /* isis interface metric */ }; diff --git a/lib/libfrr.c b/lib/libfrr.c index d1b7dd133e..07e2eafec5 100644 --- a/lib/libfrr.c +++ b/lib/libfrr.c @@ -33,10 +33,10 @@ #include "frrscript.h" #include "systemd.h" -DEFINE_HOOK(frr_early_init, (struct thread_master * tm), (tm)); -DEFINE_HOOK(frr_late_init, (struct thread_master * tm), (tm)); -DEFINE_HOOK(frr_config_pre, (struct thread_master * tm), (tm)); -DEFINE_HOOK(frr_config_post, (struct thread_master * tm), (tm)); +DEFINE_HOOK(frr_early_init, (struct event_loop * tm), (tm)); +DEFINE_HOOK(frr_late_init, (struct event_loop * tm), (tm)); +DEFINE_HOOK(frr_config_pre, (struct event_loop * tm), (tm)); +DEFINE_HOOK(frr_config_post, (struct event_loop * tm), (tm)); DEFINE_KOOH(frr_early_fini, (), ()); DEFINE_KOOH(frr_fini, (), ()); @@ -696,8 +696,8 @@ static void _err_print(const void *cookie, const char *errstr) fprintf(stderr, "%s: %s\n", prefix, errstr); } -static struct thread_master *master; -struct thread_master *frr_init(void) +static struct event_loop *master; +struct event_loop *frr_init(void) { struct option_chain *oc; struct log_arg *log_arg; @@ -769,7 +769,7 @@ struct thread_master *frr_init(void) zprivs_init(di->privs); - master = thread_master_create(NULL); + master = event_master_create(NULL); signal_init(master, di->n_signals, di->signals); hook_call(frr_early_init, master); @@ -964,7 +964,7 @@ static void frr_daemonize(void) * to read the config in after thread execution starts, so that * we can match this behavior. */ -static void frr_config_read_in(struct thread *t) +static void frr_config_read_in(struct event *t) { hook_call(frr_config_pre, master); @@ -1015,8 +1015,8 @@ void frr_config_fork(void) exit(0); } - thread_add_event(master, frr_config_read_in, NULL, 0, - &di->read_in); + event_add_event(master, frr_config_read_in, NULL, 0, + &di->read_in); } if (di->daemon_mode || di->terminal) @@ -1095,9 +1095,9 @@ static void frr_terminal_close(int isexit) } } -static struct thread *daemon_ctl_thread = NULL; +static struct event *daemon_ctl_thread = NULL; -static void frr_daemon_ctl(struct thread *t) +static void frr_daemon_ctl(struct event *t) { char buf[1]; ssize_t nr; @@ -1129,8 +1129,8 @@ static void frr_daemon_ctl(struct thread *t) } out: - thread_add_read(master, frr_daemon_ctl, NULL, daemon_ctl_sock, - &daemon_ctl_thread); + event_add_read(master, frr_daemon_ctl, NULL, daemon_ctl_sock, + &daemon_ctl_thread); } void frr_detach(void) @@ -1139,7 +1139,7 @@ void frr_detach(void) frr_check_detach(); } -void frr_run(struct thread_master *master) +void frr_run(struct event_loop *master) { char instanceinfo[64] = ""; @@ -1158,8 +1158,8 @@ void frr_run(struct thread_master *master) vty_stdio(frr_terminal_close); if (daemon_ctl_sock != -1) { set_nonblocking(daemon_ctl_sock); - thread_add_read(master, frr_daemon_ctl, NULL, - daemon_ctl_sock, &daemon_ctl_thread); + event_add_read(master, frr_daemon_ctl, NULL, + daemon_ctl_sock, &daemon_ctl_thread); } } else if (di->daemon_mode) { int nullfd = open("/dev/null", O_RDONLY | O_NOCTTY); @@ -1180,9 +1180,9 @@ void frr_run(struct thread_master *master) /* end fixed stderr startup logging */ zlog_startup_end(); - struct thread thread; - while (thread_fetch(master, &thread)) - thread_call(&thread); + struct event thread; + while (event_fetch(master, &thread)) + event_call(&thread); } void frr_early_fini(void) @@ -1213,7 +1213,7 @@ void frr_fini(void) frr_pthread_finish(); zprivs_terminate(di->privs); /* signal_init -> nothing needed */ - thread_master_free(master); + event_master_free(master); master = NULL; zlog_tls_buffer_fini(); zlog_fini(); diff --git a/lib/libfrr.h b/lib/libfrr.h index 97e9b93c10..c05bc01e4f 100644 --- a/lib/libfrr.h +++ b/lib/libfrr.h @@ -11,7 +11,7 @@ #include "typesafe.h" #include "sigevent.h" #include "privs.h" -#include "thread.h" +#include "frrevent.h" #include "log.h" #include "getopt.h" #include "module.h" @@ -70,7 +70,7 @@ struct frr_daemon_info { bool terminal; enum frr_cli_mode cli_mode; - struct thread *read_in; + struct event *read_in; const char *config_file; const char *backup_config_file; const char *pid_file; @@ -133,22 +133,22 @@ extern int frr_getopt(int argc, char *const argv[], int *longindex); extern __attribute__((__noreturn__)) void frr_help_exit(int status); -extern struct thread_master *frr_init(void); +extern struct event_loop *frr_init(void); extern const char *frr_get_progname(void); extern enum frr_cli_mode frr_get_cli_mode(void); extern uint32_t frr_get_fd_limit(void); extern bool frr_is_startup_fd(int fd); /* call order of these hooks is as ordered here */ -DECLARE_HOOK(frr_early_init, (struct thread_master * tm), (tm)); -DECLARE_HOOK(frr_late_init, (struct thread_master * tm), (tm)); +DECLARE_HOOK(frr_early_init, (struct event_loop * tm), (tm)); +DECLARE_HOOK(frr_late_init, (struct event_loop * tm), (tm)); /* fork() happens between late_init and config_pre */ -DECLARE_HOOK(frr_config_pre, (struct thread_master * tm), (tm)); -DECLARE_HOOK(frr_config_post, (struct thread_master * tm), (tm)); +DECLARE_HOOK(frr_config_pre, (struct event_loop * tm), (tm)); +DECLARE_HOOK(frr_config_post, (struct event_loop * tm), (tm)); extern void frr_config_fork(void); -extern void frr_run(struct thread_master *master); +extern void frr_run(struct event_loop *master); extern void frr_detach(void); extern bool frr_zclient_addr(struct sockaddr_storage *sa, socklen_t *sa_len, diff --git a/lib/libfrr_trace.h b/lib/libfrr_trace.h index 92c469706a..05c958fa42 100644 --- a/lib/libfrr_trace.h +++ b/lib/libfrr_trace.h @@ -21,7 +21,7 @@ #include #include "hash.h" -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "table.h" @@ -73,8 +73,8 @@ TRACEPOINT_EVENT( TRACEPOINT_LOGLEVEL(frr_libfrr, hash_release, TRACE_INFO) #define THREAD_SCHEDULE_ARGS \ - TP_ARGS(struct thread_master *, master, const char *, funcname, \ - const char *, schedfrom, int, fromln, struct thread **, \ + TP_ARGS(struct event_loop *, master, const char *, funcname, \ + const char *, schedfrom, int, fromln, struct event **, \ thread_ptr, int, fd, int, val, void *, arg, long, time) TRACEPOINT_EVENT_CLASS( @@ -103,9 +103,9 @@ THREAD_OPERATION_TRACEPOINT_INSTANCE(schedule_timer) THREAD_OPERATION_TRACEPOINT_INSTANCE(schedule_event) THREAD_OPERATION_TRACEPOINT_INSTANCE(schedule_read) THREAD_OPERATION_TRACEPOINT_INSTANCE(schedule_write) -THREAD_OPERATION_TRACEPOINT_INSTANCE(thread_cancel) -THREAD_OPERATION_TRACEPOINT_INSTANCE(thread_cancel_async) -THREAD_OPERATION_TRACEPOINT_INSTANCE(thread_call) +THREAD_OPERATION_TRACEPOINT_INSTANCE(event_cancel) +THREAD_OPERATION_TRACEPOINT_INSTANCE(event_cancel_async) +THREAD_OPERATION_TRACEPOINT_INSTANCE(event_call) TRACEPOINT_EVENT( frr_libfrr, diff --git a/lib/log.c b/lib/log.c index f7ab86fd9d..00b897dca1 100644 --- a/lib/log.c +++ b/lib/log.c @@ -140,7 +140,7 @@ void zlog_signal(int signo, const char *action, void *siginfo_v, fb.pos = buf; - struct thread *tc; + struct event *tc; tc = pthread_getspecific(thread_current); if (!tc) @@ -284,7 +284,7 @@ void zlog_backtrace(int priority) void zlog_thread_info(int log_level) { - struct thread *tc; + struct event *tc; tc = pthread_getspecific(thread_current); if (tc) diff --git a/lib/mgmt_be_client.c b/lib/mgmt_be_client.c index bb45024d0e..c35399cb5a 100644 --- a/lib/mgmt_be_client.c +++ b/lib/mgmt_be_client.c @@ -105,12 +105,12 @@ DECLARE_LIST(mgmt_be_txns, struct mgmt_be_txn_ctx, list_linkage); struct mgmt_be_client_ctx { int conn_fd; - struct thread_master *tm; - struct thread *conn_retry_tmr; - struct thread *conn_read_ev; - struct thread *conn_write_ev; - struct thread *conn_writes_on; - struct thread *msg_proc_ev; + struct event_loop *tm; + struct event *conn_retry_tmr; + struct event *conn_read_ev; + struct event *conn_write_ev; + struct event *conn_writes_on; + struct event *msg_proc_ev; uint32_t flags; struct mgmt_msg_state mstate; @@ -897,18 +897,18 @@ static void mgmt_be_client_process_msg(void *user_ctx, uint8_t *data, mgmtd__be_message__free_unpacked(be_msg, NULL); } -static void mgmt_be_client_proc_msgbufs(struct thread *thread) +static void mgmt_be_client_proc_msgbufs(struct event *thread) { - struct mgmt_be_client_ctx *client_ctx = THREAD_ARG(thread); + struct mgmt_be_client_ctx *client_ctx = EVENT_ARG(thread); if (mgmt_msg_procbufs(&client_ctx->mstate, mgmt_be_client_process_msg, client_ctx, mgmt_debug_be_client)) mgmt_be_client_register_event(client_ctx, MGMTD_BE_PROC_MSG); } -static void mgmt_be_client_read(struct thread *thread) +static void mgmt_be_client_read(struct event *thread) { - struct mgmt_be_client_ctx *client_ctx = THREAD_ARG(thread); + struct mgmt_be_client_ctx *client_ctx = EVENT_ARG(thread); enum mgmt_msg_rsched rv; rv = mgmt_msg_read(&client_ctx->mstate, client_ctx->conn_fd, @@ -962,9 +962,9 @@ static int mgmt_be_client_send_msg(struct mgmt_be_client_ctx *client_ctx, return rv; } -static void mgmt_be_client_write(struct thread *thread) +static void mgmt_be_client_write(struct event *thread) { - struct mgmt_be_client_ctx *client_ctx = THREAD_ARG(thread); + struct mgmt_be_client_ctx *client_ctx = EVENT_ARG(thread); enum mgmt_msg_wsched rv; rv = mgmt_msg_write(&client_ctx->mstate, client_ctx->conn_fd, @@ -981,11 +981,11 @@ static void mgmt_be_client_write(struct thread *thread) assert(rv == MSW_SCHED_NONE); } -static void mgmt_be_client_resume_writes(struct thread *thread) +static void mgmt_be_client_resume_writes(struct event *thread) { struct mgmt_be_client_ctx *client_ctx; - client_ctx = (struct mgmt_be_client_ctx *)THREAD_ARG(thread); + client_ctx = (struct mgmt_be_client_ctx *)EVENT_ARG(thread); assert(client_ctx && client_ctx->conn_fd != -1); mgmt_be_client_writes_on(client_ctx); @@ -1040,9 +1040,9 @@ static void mgmt_be_server_connect(struct mgmt_be_client_ctx *client_ctx) client_ctx->client_params.user_data, true); } -static void mgmt_be_client_conn_timeout(struct thread *thread) +static void mgmt_be_client_conn_timeout(struct event *thread) { - mgmt_be_server_connect(THREAD_ARG(thread)); + mgmt_be_server_connect(EVENT_ARG(thread)); } static void @@ -1053,25 +1053,25 @@ mgmt_be_client_register_event(struct mgmt_be_client_ctx *client_ctx, switch (event) { case MGMTD_BE_CONN_READ: - thread_add_read(client_ctx->tm, mgmt_be_client_read, + event_add_read(client_ctx->tm, mgmt_be_client_read, client_ctx, client_ctx->conn_fd, &client_ctx->conn_read_ev); assert(client_ctx->conn_read_ev); break; case MGMTD_BE_CONN_WRITE: - thread_add_write(client_ctx->tm, mgmt_be_client_write, + event_add_write(client_ctx->tm, mgmt_be_client_write, client_ctx, client_ctx->conn_fd, &client_ctx->conn_write_ev); assert(client_ctx->conn_write_ev); break; case MGMTD_BE_PROC_MSG: tv.tv_usec = MGMTD_BE_MSG_PROC_DELAY_USEC; - thread_add_timer_tv(client_ctx->tm, mgmt_be_client_proc_msgbufs, + event_add_timer_tv(client_ctx->tm, mgmt_be_client_proc_msgbufs, client_ctx, &tv, &client_ctx->msg_proc_ev); assert(client_ctx->msg_proc_ev); break; case MGMTD_BE_CONN_WRITES_ON: - thread_add_timer_msec(client_ctx->tm, + event_add_timer_msec(client_ctx->tm, mgmt_be_client_resume_writes, client_ctx, MGMTD_BE_MSG_WRITE_DELAY_MSEC, &client_ctx->conn_writes_on); @@ -1095,7 +1095,7 @@ mgmt_be_client_schedule_conn_retry(struct mgmt_be_client_ctx *client_ctx, MGMTD_BE_CLIENT_DBG( "Scheduling MGMTD Backend server connection retry after %lu seconds", intvl_secs); - thread_add_timer(client_ctx->tm, mgmt_be_client_conn_timeout, + event_add_timer(client_ctx->tm, mgmt_be_client_conn_timeout, (void *)client_ctx, intvl_secs, &client_ctx->conn_retry_tmr); } @@ -1106,7 +1106,7 @@ extern struct nb_config *running_config; * Initialize library and try connecting with MGMTD. */ uintptr_t mgmt_be_client_lib_init(struct mgmt_be_client_params *params, - struct thread_master *master_thread) + struct event_loop *master_thread) { assert(master_thread && params && strlen(params->name) && !mgmt_be_client_ctx.tm); @@ -1213,11 +1213,11 @@ void mgmt_be_client_lib_destroy(uintptr_t lib_hndl) mgmt_msg_destroy(&client_ctx->mstate); - THREAD_OFF(client_ctx->conn_retry_tmr); - THREAD_OFF(client_ctx->conn_read_ev); - THREAD_OFF(client_ctx->conn_write_ev); - THREAD_OFF(client_ctx->conn_writes_on); - THREAD_OFF(client_ctx->msg_proc_ev); + EVENT_OFF(client_ctx->conn_retry_tmr); + EVENT_OFF(client_ctx->conn_read_ev); + EVENT_OFF(client_ctx->conn_write_ev); + EVENT_OFF(client_ctx->conn_writes_on); + EVENT_OFF(client_ctx->msg_proc_ev); mgmt_be_cleanup_all_txns(client_ctx); mgmt_be_txns_fini(&client_ctx->txn_head); } diff --git a/lib/mgmt_be_client.h b/lib/mgmt_be_client.h index 66bc62fb08..db427457a4 100644 --- a/lib/mgmt_be_client.h +++ b/lib/mgmt_be_client.h @@ -188,9 +188,8 @@ mgmt_be_client_name2id(const char *name) * Returns: * Backend client lib handler (nothing but address of mgmt_be_client_ctx) */ -extern uintptr_t -mgmt_be_client_lib_init(struct mgmt_be_client_params *params, - struct thread_master *master_thread); +extern uintptr_t mgmt_be_client_lib_init(struct mgmt_be_client_params *params, + struct event_loop *master_thread); /* * Subscribe with MGMTD for one or more YANG subtree(s). diff --git a/lib/mgmt_fe_client.c b/lib/mgmt_fe_client.c index 3624922124..57c1961ff0 100644 --- a/lib/mgmt_fe_client.c +++ b/lib/mgmt_fe_client.c @@ -49,12 +49,12 @@ DEFINE_MTYPE_STATIC(LIB, MGMTD_FE_SESSION, "MGMTD Frontend session"); struct mgmt_fe_client_ctx { int conn_fd; - struct thread_master *tm; - struct thread *conn_retry_tmr; - struct thread *conn_read_ev; - struct thread *conn_write_ev; - struct thread *conn_writes_on; - struct thread *msg_proc_ev; + struct event_loop *tm; + struct event *conn_retry_tmr; + struct event *conn_read_ev; + struct event *conn_write_ev; + struct event *conn_writes_on; + struct event *msg_proc_ev; uint32_t flags; struct mgmt_msg_state mstate; @@ -174,12 +174,12 @@ static int mgmt_fe_client_send_msg(struct mgmt_fe_client_ctx *client_ctx, return rv; } -static void mgmt_fe_client_write(struct thread *thread) +static void mgmt_fe_client_write(struct event *thread) { struct mgmt_fe_client_ctx *client_ctx; enum mgmt_msg_wsched rv; - client_ctx = (struct mgmt_fe_client_ctx *)THREAD_ARG(thread); + client_ctx = (struct mgmt_fe_client_ctx *)EVENT_ARG(thread); rv = mgmt_msg_write(&client_ctx->mstate, client_ctx->conn_fd, mgmt_debug_fe_client); if (rv == MSW_SCHED_STREAM) @@ -194,11 +194,11 @@ static void mgmt_fe_client_write(struct thread *thread) assert(rv == MSW_SCHED_NONE); } -static void mgmt_fe_client_resume_writes(struct thread *thread) +static void mgmt_fe_client_resume_writes(struct event *thread) { struct mgmt_fe_client_ctx *client_ctx; - client_ctx = (struct mgmt_fe_client_ctx *)THREAD_ARG(thread); + client_ctx = (struct mgmt_fe_client_ctx *)EVENT_ARG(thread); assert(client_ctx && client_ctx->conn_fd != -1); mgmt_fe_client_writes_on(client_ctx); @@ -670,22 +670,22 @@ static void mgmt_fe_client_process_msg(void *user_ctx, uint8_t *data, mgmtd__fe_message__free_unpacked(fe_msg, NULL); } -static void mgmt_fe_client_proc_msgbufs(struct thread *thread) +static void mgmt_fe_client_proc_msgbufs(struct event *thread) { struct mgmt_fe_client_ctx *client_ctx; - client_ctx = (struct mgmt_fe_client_ctx *)THREAD_ARG(thread); + client_ctx = (struct mgmt_fe_client_ctx *)EVENT_ARG(thread); if (mgmt_msg_procbufs(&client_ctx->mstate, mgmt_fe_client_process_msg, client_ctx, mgmt_debug_fe_client)) mgmt_fe_client_register_event(client_ctx, MGMTD_FE_PROC_MSG); } -static void mgmt_fe_client_read(struct thread *thread) +static void mgmt_fe_client_read(struct event *thread) { struct mgmt_fe_client_ctx *client_ctx; enum mgmt_msg_rsched rv; - client_ctx = (struct mgmt_fe_client_ctx *)THREAD_ARG(thread); + client_ctx = (struct mgmt_fe_client_ctx *)EVENT_ARG(thread); rv = mgmt_msg_read(&client_ctx->mstate, client_ctx->conn_fd, mgmt_debug_fe_client); @@ -725,9 +725,9 @@ static void mgmt_fe_server_connect(struct mgmt_fe_client_ctx *client_ctx) } -static void mgmt_fe_client_conn_timeout(struct thread *thread) +static void mgmt_fe_client_conn_timeout(struct event *thread) { - mgmt_fe_server_connect(THREAD_ARG(thread)); + mgmt_fe_server_connect(EVENT_ARG(thread)); } static void @@ -738,26 +738,26 @@ mgmt_fe_client_register_event(struct mgmt_fe_client_ctx *client_ctx, switch (event) { case MGMTD_FE_CONN_READ: - thread_add_read(client_ctx->tm, mgmt_fe_client_read, + event_add_read(client_ctx->tm, mgmt_fe_client_read, client_ctx, client_ctx->conn_fd, &client_ctx->conn_read_ev); assert(client_ctx->conn_read_ev); break; case MGMTD_FE_CONN_WRITE: - thread_add_write(client_ctx->tm, mgmt_fe_client_write, + event_add_write(client_ctx->tm, mgmt_fe_client_write, client_ctx, client_ctx->conn_fd, &client_ctx->conn_write_ev); assert(client_ctx->conn_write_ev); break; case MGMTD_FE_PROC_MSG: tv.tv_usec = MGMTD_FE_MSG_PROC_DELAY_USEC; - thread_add_timer_tv(client_ctx->tm, + event_add_timer_tv(client_ctx->tm, mgmt_fe_client_proc_msgbufs, client_ctx, &tv, &client_ctx->msg_proc_ev); assert(client_ctx->msg_proc_ev); break; case MGMTD_FE_CONN_WRITES_ON: - thread_add_timer_msec( + event_add_timer_msec( client_ctx->tm, mgmt_fe_client_resume_writes, client_ctx, MGMTD_FE_MSG_WRITE_DELAY_MSEC, &client_ctx->conn_writes_on); @@ -775,7 +775,7 @@ static void mgmt_fe_client_schedule_conn_retry( MGMTD_FE_CLIENT_DBG( "Scheduling MGMTD Frontend server connection retry after %lu seconds", intvl_secs); - thread_add_timer(client_ctx->tm, mgmt_fe_client_conn_timeout, + event_add_timer(client_ctx->tm, mgmt_fe_client_conn_timeout, (void *)client_ctx, intvl_secs, &client_ctx->conn_retry_tmr); } @@ -784,7 +784,7 @@ static void mgmt_fe_client_schedule_conn_retry( * Initialize library and try connecting with MGMTD. */ uintptr_t mgmt_fe_client_lib_init(struct mgmt_fe_client_params *params, - struct thread_master *master_thread) + struct event_loop *master_thread) { assert(master_thread && params && strlen(params->name) && !mgmt_fe_client_ctx.tm); @@ -1067,10 +1067,10 @@ void mgmt_fe_client_lib_destroy(uintptr_t lib_hndl) mgmt_fe_destroy_client_sessions(lib_hndl); - THREAD_OFF(client_ctx->conn_retry_tmr); - THREAD_OFF(client_ctx->conn_read_ev); - THREAD_OFF(client_ctx->conn_write_ev); - THREAD_OFF(client_ctx->conn_writes_on); - THREAD_OFF(client_ctx->msg_proc_ev); + EVENT_OFF(client_ctx->conn_retry_tmr); + EVENT_OFF(client_ctx->conn_read_ev); + EVENT_OFF(client_ctx->conn_write_ev); + EVENT_OFF(client_ctx->conn_writes_on); + EVENT_OFF(client_ctx->msg_proc_ev); mgmt_msg_destroy(&client_ctx->mstate); } diff --git a/lib/mgmt_fe_client.h b/lib/mgmt_fe_client.h index ac29b8f27c..aa3371f03c 100644 --- a/lib/mgmt_fe_client.h +++ b/lib/mgmt_fe_client.h @@ -13,7 +13,7 @@ extern "C" { #endif #include "mgmt_pb.h" -#include "thread.h" +#include "frrevent.h" #include "mgmtd/mgmt_defines.h" /*************************************************************** @@ -130,9 +130,8 @@ struct mgmt_fe_client_params { * Returns: * Frontend client lib handler (nothing but address of mgmt_fe_client_ctx) */ -extern uintptr_t -mgmt_fe_client_lib_init(struct mgmt_fe_client_params *params, - struct thread_master *master_thread); +extern uintptr_t mgmt_fe_client_lib_init(struct mgmt_fe_client_params *params, + struct event_loop *master_thread); /* * Create a new Session for a Frontend Client connection. diff --git a/lib/mgmt_msg.c b/lib/mgmt_msg.c index 2fab03bc54..3f55f82024 100644 --- a/lib/mgmt_msg.c +++ b/lib/mgmt_msg.c @@ -10,7 +10,7 @@ #include "network.h" #include "sockopt.h" #include "stream.h" -#include "thread.h" +#include "frrevent.h" #include "mgmt_msg.h" diff --git a/lib/mgmt_msg.h b/lib/mgmt_msg.h index 854875170b..e2dd2d476a 100644 --- a/lib/mgmt_msg.h +++ b/lib/mgmt_msg.h @@ -8,7 +8,7 @@ #define _MGMT_MSG_H #include "stream.h" -#include "thread.h" +#include "frrevent.h" #define MGMT_MSG_MARKER (0x4D724B21u) /* ASCII - "MrK!"*/ diff --git a/lib/northbound.c b/lib/northbound.c index 1259294a22..307cf0fb49 100644 --- a/lib/northbound.c +++ b/lib/northbound.c @@ -2685,7 +2685,7 @@ void nb_validate_callbacks(void) } -void nb_init(struct thread_master *tm, +void nb_init(struct event_loop *tm, const struct frr_yang_module_info *const modules[], size_t nmodules, bool db_enabled) { diff --git a/lib/northbound.h b/lib/northbound.h index 4b5028c87e..1723a87e4e 100644 --- a/lib/northbound.h +++ b/lib/northbound.h @@ -7,7 +7,7 @@ #ifndef _FRR_NORTHBOUND_H_ #define _FRR_NORTHBOUND_H_ -#include "thread.h" +#include "frrevent.h" #include "hook.h" #include "linklist.h" #include "openbsd-tree.h" @@ -1478,7 +1478,7 @@ void nb_validate_callbacks(void); * db_enabled * Set this to record the transactions in the transaction log. */ -extern void nb_init(struct thread_master *tm, +extern void nb_init(struct event_loop *tm, const struct frr_yang_module_info *const modules[], size_t nmodules, bool db_enabled); diff --git a/lib/northbound_cli.c b/lib/northbound_cli.c index 281d9a4704..5cf5f93b43 100644 --- a/lib/northbound_cli.c +++ b/lib/northbound_cli.c @@ -29,7 +29,7 @@ struct debug nb_dbg_events = {0, "Northbound events"}; struct debug nb_dbg_libyang = {0, "libyang debugging"}; struct nb_config *vty_shared_candidate_config; -static struct thread_master *master; +static struct event_loop *master; static void vty_show_nb_errors(struct vty *vty, int error, const char *errmsg) { @@ -265,7 +265,7 @@ int nb_cli_rpc(struct vty *vty, const char *xpath, struct list *input, void nb_cli_confirmed_commit_clean(struct vty *vty) { - thread_cancel(&vty->t_confirmed_commit_timeout); + event_cancel(&vty->t_confirmed_commit_timeout); nb_config_free(vty->confirmed_commit_rollback); vty->confirmed_commit_rollback = NULL; } @@ -300,9 +300,9 @@ int nb_cli_confirmed_commit_rollback(struct vty *vty) return ret; } -static void nb_cli_confirmed_commit_timeout(struct thread *thread) +static void nb_cli_confirmed_commit_timeout(struct event *thread) { - struct vty *vty = THREAD_ARG(thread); + struct vty *vty = EVENT_ARG(thread); /* XXX: broadcast this message to all logged-in users? */ vty_out(vty, @@ -328,11 +328,10 @@ static int nb_cli_commit(struct vty *vty, bool force, "%% Resetting confirmed-commit timeout to %u minute(s)\n\n", confirmed_timeout); - thread_cancel(&vty->t_confirmed_commit_timeout); - thread_add_timer(master, - nb_cli_confirmed_commit_timeout, vty, - confirmed_timeout * 60, - &vty->t_confirmed_commit_timeout); + event_cancel(&vty->t_confirmed_commit_timeout); + event_add_timer(master, nb_cli_confirmed_commit_timeout, + vty, confirmed_timeout * 60, + &vty->t_confirmed_commit_timeout); } else { /* Accept commit confirmation. */ vty_out(vty, "%% Commit complete.\n\n"); @@ -355,9 +354,9 @@ static int nb_cli_commit(struct vty *vty, bool force, vty->confirmed_commit_rollback = nb_config_dup(running_config); vty->t_confirmed_commit_timeout = NULL; - thread_add_timer(master, nb_cli_confirmed_commit_timeout, vty, - confirmed_timeout * 60, - &vty->t_confirmed_commit_timeout); + event_add_timer(master, nb_cli_confirmed_commit_timeout, vty, + confirmed_timeout * 60, + &vty->t_confirmed_commit_timeout); } context.client = NB_CLIENT_CLI; @@ -1877,7 +1876,7 @@ static const struct cmd_variable_handler yang_var_handlers[] = { .completions = yang_translator_autocomplete}, {.completions = NULL}}; -void nb_cli_init(struct thread_master *tm) +void nb_cli_init(struct event_loop *tm) { master = tm; diff --git a/lib/northbound_cli.h b/lib/northbound_cli.h index ef2ef44eb0..c8f8a8481a 100644 --- a/lib/northbound_cli.h +++ b/lib/northbound_cli.h @@ -137,7 +137,7 @@ extern void nb_cli_show_config_prepare(struct nb_config *config, extern void nb_cli_confirmed_commit_clean(struct vty *vty); extern int nb_cli_confirmed_commit_rollback(struct vty *vty); extern void nb_cli_install_default(int node); -extern void nb_cli_init(struct thread_master *tm); +extern void nb_cli_init(struct event_loop *tm); extern void nb_cli_terminate(void); #ifdef __cplusplus diff --git a/lib/northbound_confd.c b/lib/northbound_confd.c index ee19568516..34406a110b 100644 --- a/lib/northbound_confd.c +++ b/lib/northbound_confd.c @@ -23,10 +23,10 @@ DEFINE_MTYPE_STATIC(LIB, CONFD, "ConfD module"); static struct debug nb_dbg_client_confd = {0, "Northbound client: ConfD"}; -static struct thread_master *master; +static struct event_loop *master; static struct sockaddr confd_addr; static int cdb_sub_sock, dp_ctl_sock, dp_worker_sock; -static struct thread *t_cdb_sub, *t_dp_ctl, *t_dp_worker; +static struct event *t_cdb_sub, *t_dp_ctl, *t_dp_worker; static struct confd_daemon_ctx *dctx; static struct confd_notification_ctx *live_ctx; static bool confd_connected; @@ -401,15 +401,15 @@ static int frr_confd_cdb_read_cb_abort(int fd, int *subp, int reslen) return 0; } -static void frr_confd_cdb_read_cb(struct thread *thread) +static void frr_confd_cdb_read_cb(struct event *thread) { - int fd = THREAD_FD(thread); + int fd = EVENT_FD(thread); enum cdb_sub_notification cdb_ev; int flags; int *subp = NULL; int reslen = 0; - thread_add_read(master, frr_confd_cdb_read_cb, NULL, fd, &t_cdb_sub); + event_add_read(master, frr_confd_cdb_read_cb, NULL, fd, &t_cdb_sub); if (cdb_read_subscription_socket2(fd, &cdb_ev, &flags, &subp, &reslen) != CONFD_OK) { @@ -574,8 +574,8 @@ static int frr_confd_init_cdb(void) } pthread_detach(cdb_trigger_thread); - thread_add_read(master, frr_confd_cdb_read_cb, NULL, cdb_sub_sock, - &t_cdb_sub); + event_add_read(master, frr_confd_cdb_read_cb, NULL, cdb_sub_sock, + &t_cdb_sub); return 0; @@ -588,7 +588,7 @@ error: static void frr_confd_finish_cdb(void) { if (cdb_sub_sock > 0) { - THREAD_OFF(t_cdb_sub); + EVENT_OFF(t_cdb_sub); cdb_close(cdb_sub_sock); } } @@ -1173,22 +1173,23 @@ static int frr_confd_dp_read(struct confd_daemon_ctx *dctx, int fd) return 0; } -static void frr_confd_dp_ctl_read(struct thread *thread) +static void frr_confd_dp_ctl_read(struct event *thread) { - struct confd_daemon_ctx *dctx = THREAD_ARG(thread); - int fd = THREAD_FD(thread); + struct confd_daemon_ctx *dctx = EVENT_ARG(thread); + int fd = EVENT_FD(thread); - thread_add_read(master, frr_confd_dp_ctl_read, dctx, fd, &t_dp_ctl); + event_add_read(master, frr_confd_dp_ctl_read, dctx, fd, &t_dp_ctl); frr_confd_dp_read(dctx, fd); } -static void frr_confd_dp_worker_read(struct thread *thread) +static void frr_confd_dp_worker_read(struct event *thread) { - struct confd_daemon_ctx *dctx = THREAD_ARG(thread); - int fd = THREAD_FD(thread); + struct confd_daemon_ctx *dctx = EVENT_ARG(thread); + int fd = EVENT_FD(thread); - thread_add_read(master, frr_confd_dp_worker_read, dctx, fd, &t_dp_worker); + event_add_read(master, frr_confd_dp_worker_read, dctx, fd, + &t_dp_worker); frr_confd_dp_read(dctx, fd); } @@ -1320,10 +1321,10 @@ static int frr_confd_init_dp(const char *program_name) goto error; } - thread_add_read(master, frr_confd_dp_ctl_read, dctx, dp_ctl_sock, - &t_dp_ctl); - thread_add_read(master, frr_confd_dp_worker_read, dctx, dp_worker_sock, - &t_dp_worker); + event_add_read(master, frr_confd_dp_ctl_read, dctx, dp_ctl_sock, + &t_dp_ctl); + event_add_read(master, frr_confd_dp_worker_read, dctx, dp_worker_sock, + &t_dp_worker); return 0; @@ -1336,11 +1337,11 @@ error: static void frr_confd_finish_dp(void) { if (dp_worker_sock > 0) { - THREAD_OFF(t_dp_worker); + EVENT_OFF(t_dp_worker); close(dp_worker_sock); } if (dp_ctl_sock > 0) { - THREAD_OFF(t_dp_ctl); + EVENT_OFF(t_dp_ctl); close(dp_ctl_sock); } if (dctx != NULL) @@ -1464,7 +1465,7 @@ static int frr_confd_finish(void) return 0; } -static int frr_confd_module_late_init(struct thread_master *tm) +static int frr_confd_module_late_init(struct event_loop *tm) { master = tm; diff --git a/lib/northbound_grpc.cpp b/lib/northbound_grpc.cpp index 274a0ca45a..6c33351cef 100644 --- a/lib/northbound_grpc.cpp +++ b/lib/northbound_grpc.cpp @@ -12,7 +12,7 @@ #include "log.h" #include "libfrr.h" #include "lib/version.h" -#include "lib/thread.h" +#include "frrevent.h" #include "command.h" #include "lib_errors.h" #include "northbound.h" @@ -38,7 +38,7 @@ */ static bool nb_dbg_client_grpc = 0; -static struct thread_master *main_master; +static struct event_loop *main_master; static struct frr_pthread *fpt; @@ -157,8 +157,7 @@ class RpcStateBase * state will either be MORE or FINISH. It will always be FINISH * for Unary RPCs. */ - thread_add_event(main_master, c_callback, (void *)this, 0, - NULL); + event_add_event(main_master, c_callback, (void *)this, 0, NULL); pthread_mutex_lock(&this->cmux); while (this->state == PROCESS) @@ -181,11 +180,11 @@ class RpcStateBase } protected: - virtual CallState run_mainthread(struct thread *thread) = 0; + virtual CallState run_mainthread(struct event *thread) = 0; - static void c_callback(struct thread *thread) + static void c_callback(struct event *thread) { - auto _tag = static_cast(THREAD_ARG(thread)); + auto _tag = static_cast(EVENT_ARG(thread)); /* * We hold the lock until the callback finishes and has updated * _tag->state, then we signal done and release. @@ -250,7 +249,7 @@ template class UnaryRpcState : public RpcStateBase ©->responder, cq, cq, copy); } - CallState run_mainthread(struct thread *thread) override + CallState run_mainthread(struct event *thread) override { // Unary RPC are always finished, see "Unary" :) grpc::Status status = this->callback(this); @@ -302,7 +301,7 @@ class StreamRpcState : public RpcStateBase ©->async_responder, cq, cq, copy); } - CallState run_mainthread(struct thread *thread) override + CallState run_mainthread(struct event *thread) override { if (this->callback(this)) return MORE; @@ -1275,7 +1274,7 @@ static int frr_grpc_finish(void) * fork. This is done by scheduling this init function as an event task, since * the event loop doesn't run until after fork. */ -static void frr_grpc_module_very_late_init(struct thread *thread) +static void frr_grpc_module_very_late_init(struct event *thread) { const char *args = THIS_MODULE->load_args; uint port = GRPC_DEFAULT_PORT; @@ -1299,11 +1298,11 @@ error: flog_err(EC_LIB_GRPC_INIT, "failed to initialize the gRPC module"); } -static int frr_grpc_module_late_init(struct thread_master *tm) +static int frr_grpc_module_late_init(struct event_loop *tm) { main_master = tm; hook_register(frr_fini, frr_grpc_finish); - thread_add_event(tm, frr_grpc_module_very_late_init, NULL, 0, NULL); + event_add_event(tm, frr_grpc_module_very_late_init, NULL, 0, NULL); return 0; } diff --git a/lib/northbound_sysrepo.c b/lib/northbound_sysrepo.c index 337fb690d1..86105d2e77 100644 --- a/lib/northbound_sysrepo.c +++ b/lib/northbound_sysrepo.c @@ -23,12 +23,12 @@ DEFINE_MTYPE_STATIC(LIB, SYSREPO, "Sysrepo module"); static struct debug nb_dbg_client_sysrepo = {0, "Northbound client: Sysrepo"}; -static struct thread_master *master; +static struct event_loop *master; static sr_session_ctx_t *session; static sr_conn_ctx_t *connection; static struct nb_transaction *transaction; -static void frr_sr_read_cb(struct thread *thread); +static void frr_sr_read_cb(struct event *thread); static int frr_sr_finish(void); /* Convert FRR YANG data value to sysrepo YANG data value. */ @@ -514,10 +514,10 @@ static int frr_sr_notification_send(const char *xpath, struct list *arguments) return NB_OK; } -static void frr_sr_read_cb(struct thread *thread) +static void frr_sr_read_cb(struct event *thread) { - struct yang_module *module = THREAD_ARG(thread); - int fd = THREAD_FD(thread); + struct yang_module *module = EVENT_ARG(thread); + int fd = EVENT_FD(thread); int ret; ret = sr_subscription_process_events(module->sr_subscription, session, @@ -528,7 +528,7 @@ static void frr_sr_read_cb(struct thread *thread) return; } - thread_add_read(master, frr_sr_read_cb, module, fd, &module->sr_thread); + event_add_read(master, frr_sr_read_cb, module, fd, &module->sr_thread); } static void frr_sr_subscribe_config(struct yang_module *module) @@ -688,8 +688,8 @@ static int frr_sr_init(void) sr_strerror(ret)); goto cleanup; } - thread_add_read(master, frr_sr_read_cb, module, - event_pipe, &module->sr_thread); + event_add_read(master, frr_sr_read_cb, module, event_pipe, + &module->sr_thread); } hook_register(nb_notification_send, frr_sr_notification_send); @@ -710,7 +710,7 @@ static int frr_sr_finish(void) if (!module->sr_subscription) continue; sr_unsubscribe(module->sr_subscription); - THREAD_OFF(module->sr_thread); + EVENT_OFF(module->sr_thread); } if (session) @@ -721,7 +721,7 @@ static int frr_sr_finish(void) return 0; } -static int frr_sr_module_config_loaded(struct thread_master *tm) +static int frr_sr_module_config_loaded(struct event_loop *tm) { master = tm; @@ -736,7 +736,7 @@ static int frr_sr_module_config_loaded(struct thread_master *tm) return 0; } -static int frr_sr_module_late_init(struct thread_master *tm) +static int frr_sr_module_late_init(struct event_loop *tm) { frr_sr_cli_init(); diff --git a/lib/pullwr.c b/lib/pullwr.c index 5bc566c285..3967eb5875 100644 --- a/lib/pullwr.c +++ b/lib/pullwr.c @@ -16,9 +16,9 @@ struct pullwr { int fd; - struct thread_master *tm; + struct event_loop *tm; /* writer == NULL <=> we're idle */ - struct thread *writer; + struct event *writer; void *arg; void (*fill)(void *, struct pullwr *); @@ -38,12 +38,11 @@ struct pullwr { DEFINE_MTYPE_STATIC(LIB, PULLWR_HEAD, "pull-driven write controller"); DEFINE_MTYPE_STATIC(LIB, PULLWR_BUF, "pull-driven write buffer"); -static void pullwr_run(struct thread *t); +static void pullwr_run(struct event *t); -struct pullwr *_pullwr_new(struct thread_master *tm, int fd, - void *arg, - void (*fill)(void *, struct pullwr *), - void (*err)(void *, struct pullwr *, bool)) +struct pullwr *_pullwr_new(struct event_loop *tm, int fd, void *arg, + void (*fill)(void *, struct pullwr *), + void (*err)(void *, struct pullwr *, bool)) { struct pullwr *pullwr; @@ -62,7 +61,7 @@ struct pullwr *_pullwr_new(struct thread_master *tm, int fd, void pullwr_del(struct pullwr *pullwr) { - THREAD_OFF(pullwr->writer); + EVENT_OFF(pullwr->writer); XFREE(MTYPE_PULLWR_BUF, pullwr->buffer); XFREE(MTYPE_PULLWR_HEAD, pullwr); @@ -80,7 +79,7 @@ void pullwr_bump(struct pullwr *pullwr) if (pullwr->writer) return; - thread_add_timer(pullwr->tm, pullwr_run, pullwr, 0, &pullwr->writer); + event_add_timer(pullwr->tm, pullwr_run, pullwr, 0, &pullwr->writer); } static size_t pullwr_iov(struct pullwr *pullwr, struct iovec *iov) @@ -176,9 +175,9 @@ void pullwr_write(struct pullwr *pullwr, const void *data, size_t len) pullwr_bump(pullwr); } -static void pullwr_run(struct thread *t) +static void pullwr_run(struct event *t) { - struct pullwr *pullwr = THREAD_ARG(t); + struct pullwr *pullwr = EVENT_ARG(t); struct iovec iov[2]; size_t niov, lastvalid; ssize_t nwr; @@ -206,7 +205,7 @@ static void pullwr_run(struct thread *t) if (pullwr->valid == 0) { /* we made a fill() call above that didn't feed any * data in, and we have nothing more queued, so we go - * into idle, i.e. no calling thread_add_write() + * into idle, i.e. no calling event_add_write() */ pullwr_resize(pullwr, 0); return; @@ -237,7 +236,7 @@ static void pullwr_run(struct thread *t) * is full and we go wait until it's available for writing again. */ - thread_add_write(pullwr->tm, pullwr_run, pullwr, pullwr->fd, + event_add_write(pullwr->tm, pullwr_run, pullwr, pullwr->fd, &pullwr->writer); /* if we hit the time limit, just keep the buffer, we'll probably need diff --git a/lib/pullwr.h b/lib/pullwr.h index 77ecf855b4..ef2e01c04e 100644 --- a/lib/pullwr.h +++ b/lib/pullwr.h @@ -10,7 +10,7 @@ #include #include -#include "thread.h" +#include "frrevent.h" #include "stream.h" #ifdef __cplusplus @@ -45,10 +45,10 @@ struct pullwr; * and released with pullwr_del(). This can be done from inside the callback, * the pullwr code holds no more references on it when calling err(). */ -extern struct pullwr *_pullwr_new(struct thread_master *tm, int fd, - void *arg, - void (*fill)(void *, struct pullwr *), - void (*err)(void *, struct pullwr *, bool eof)); +extern struct pullwr *_pullwr_new(struct event_loop *tm, int fd, void *arg, + void (*fill)(void *, struct pullwr *), + void (*err)(void *, struct pullwr *, + bool eof)); extern void pullwr_del(struct pullwr *pullwr); /* type-checking wrapper. makes sure fill() and err() take a first argument diff --git a/lib/qobj.c b/lib/qobj.c index 09b156ba39..b9630e7547 100644 --- a/lib/qobj.c +++ b/lib/qobj.c @@ -7,7 +7,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "hash.h" #include "log.h" diff --git a/lib/resolver.c b/lib/resolver.c index 2918576c03..99bf356eb3 100644 --- a/lib/resolver.c +++ b/lib/resolver.c @@ -12,7 +12,7 @@ #include "typesafe.h" #include "jhash.h" -#include "thread.h" +#include "frrevent.h" #include "lib_errors.h" #include "resolver.h" #include "command.h" @@ -23,8 +23,8 @@ XREF_SETUP(); struct resolver_state { ares_channel channel; - struct thread_master *master; - struct thread *timeout; + struct event_loop *master; + struct event *timeout; }; static struct resolver_state state; @@ -47,7 +47,7 @@ struct resolver_fd { int fd; struct resolver_state *state; - struct thread *t_read, *t_write; + struct event *t_read, *t_write; }; static int resolver_fd_cmp(const struct resolver_fd *a, @@ -100,38 +100,38 @@ static void resolver_fd_drop_maybe(struct resolver_fd *resfd) static void resolver_update_timeouts(struct resolver_state *r); -static void resolver_cb_timeout(struct thread *t) +static void resolver_cb_timeout(struct event *t) { - struct resolver_state *r = THREAD_ARG(t); + struct resolver_state *r = EVENT_ARG(t); ares_process(r->channel, NULL, NULL); resolver_update_timeouts(r); } -static void resolver_cb_socket_readable(struct thread *t) +static void resolver_cb_socket_readable(struct event *t) { - struct resolver_fd *resfd = THREAD_ARG(t); + struct resolver_fd *resfd = EVENT_ARG(t); struct resolver_state *r = resfd->state; - thread_add_read(r->master, resolver_cb_socket_readable, resfd, - resfd->fd, &resfd->t_read); + event_add_read(r->master, resolver_cb_socket_readable, resfd, resfd->fd, + &resfd->t_read); /* ^ ordering important: - * ares_process_fd may transitively call THREAD_OFF(resfd->t_read) + * ares_process_fd may transitively call EVENT_OFF(resfd->t_read) * combined with resolver_fd_drop_maybe, so resfd may be free'd after! */ ares_process_fd(r->channel, resfd->fd, ARES_SOCKET_BAD); resolver_update_timeouts(r); } -static void resolver_cb_socket_writable(struct thread *t) +static void resolver_cb_socket_writable(struct event *t) { - struct resolver_fd *resfd = THREAD_ARG(t); + struct resolver_fd *resfd = EVENT_ARG(t); struct resolver_state *r = resfd->state; - thread_add_write(r->master, resolver_cb_socket_writable, resfd, - resfd->fd, &resfd->t_write); + event_add_write(r->master, resolver_cb_socket_writable, resfd, + resfd->fd, &resfd->t_write); /* ^ ordering important: - * ares_process_fd may transitively call THREAD_OFF(resfd->t_write) + * ares_process_fd may transitively call EVENT_OFF(resfd->t_write) * combined with resolver_fd_drop_maybe, so resfd may be free'd after! */ ares_process_fd(r->channel, ARES_SOCKET_BAD, resfd->fd); @@ -142,13 +142,13 @@ static void resolver_update_timeouts(struct resolver_state *r) { struct timeval *tv, tvbuf; - THREAD_OFF(r->timeout); + EVENT_OFF(r->timeout); tv = ares_timeout(r->channel, NULL, &tvbuf); if (tv) { unsigned int timeoutms = tv->tv_sec * 1000 + tv->tv_usec / 1000; - thread_add_timer_msec(r->master, resolver_cb_timeout, r, - timeoutms, &r->timeout); + event_add_timer_msec(r->master, resolver_cb_timeout, r, + timeoutms, &r->timeout); } } @@ -165,16 +165,16 @@ static void ares_socket_cb(void *data, ares_socket_t fd, int readable, assert(resfd->state == r); if (!readable) - THREAD_OFF(resfd->t_read); + EVENT_OFF(resfd->t_read); else if (!resfd->t_read) - thread_add_read(r->master, resolver_cb_socket_readable, resfd, - fd, &resfd->t_read); + event_add_read(r->master, resolver_cb_socket_readable, resfd, + fd, &resfd->t_read); if (!writable) - THREAD_OFF(resfd->t_write); + EVENT_OFF(resfd->t_write); else if (!resfd->t_write) - thread_add_write(r->master, resolver_cb_socket_writable, resfd, - fd, &resfd->t_write); + event_add_write(r->master, resolver_cb_socket_writable, resfd, + fd, &resfd->t_write); resolver_fd_drop_maybe(resfd); } @@ -222,9 +222,9 @@ static void ares_address_cb(void *arg, int status, int timeouts, callback(query, NULL, i, &addr[0]); } -static void resolver_cb_literal(struct thread *t) +static void resolver_cb_literal(struct event *t) { - struct resolver_query *query = THREAD_ARG(t); + struct resolver_query *query = EVENT_ARG(t); void (*callback)(struct resolver_query *, const char *, int, union sockunion *); @@ -264,8 +264,8 @@ void resolver_resolve(struct resolver_query *query, int af, vrf_id_t vrf_id, /* for consistency with proper name lookup, don't call the * callback immediately; defer to thread loop */ - thread_add_timer_msec(state.master, resolver_cb_literal, - query, 0, &query->literal_cb); + event_add_timer_msec(state.master, resolver_cb_literal, query, + 0, &query->literal_cb); return; } @@ -314,7 +314,7 @@ static int resolver_config_write_debug(struct vty *vty) } -void resolver_init(struct thread_master *tm) +void resolver_init(struct event_loop *tm) { struct ares_options ares_opts; diff --git a/lib/resolver.h b/lib/resolver.h index d3f38f742d..87e8ecdc4a 100644 --- a/lib/resolver.h +++ b/lib/resolver.h @@ -6,7 +6,7 @@ #ifndef _FRR_RESOLVER_H #define _FRR_RESOLVER_H -#include "thread.h" +#include "frrevent.h" #include "sockunion.h" #ifdef __cplusplus @@ -19,10 +19,10 @@ struct resolver_query { /* used to immediate provide the result if IP literal is passed in */ union sockunion literal_addr; - struct thread *literal_cb; + struct event *literal_cb; }; -void resolver_init(struct thread_master *tm); +void resolver_init(struct event_loop *tm); void resolver_resolve(struct resolver_query *query, int af, vrf_id_t vrf_id, const char *hostname, void (*cb)(struct resolver_query *, const char *, int, diff --git a/lib/sigevent.c b/lib/sigevent.c index 3ed34894e5..3cd65eb800 100644 --- a/lib/sigevent.c +++ b/lib/sigevent.c @@ -22,7 +22,7 @@ /* master signals descriptor struct */ static struct frr_sigevent_master_t { - struct thread *t; + struct event *t; struct frr_signal_t *signals; int sigc; @@ -127,14 +127,14 @@ int frr_sigevent_process(void) #ifdef SIGEVENT_SCHEDULE_THREAD /* timer thread to check signals. shouldn't be needed */ -void frr_signal_timer(struct thread *t) +void frr_signal_timer(struct event *t) { struct frr_sigevent_master_t *sigm; - sigm = THREAD_ARG(t); + sigm = EVENT_ARG(t); sigm->t = NULL; - thread_add_timer(sigm->t->master, frr_signal_timer, &sigmaster, - FRR_SIGNAL_TIMER_INTERVAL, &sigm->t); + event_add_timer(sigm->t->master, frr_signal_timer, &sigmaster, + FRR_SIGNAL_TIMER_INTERVAL, &sigm->t); frr_sigevent_process(); } #endif /* SIGEVENT_SCHEDULE_THREAD */ @@ -331,8 +331,7 @@ static void trap_default_signals(void) } } -void signal_init(struct thread_master *m, int sigc, - struct frr_signal_t signals[]) +void signal_init(struct event_loop *m, int sigc, struct frr_signal_t signals[]) { int i = 0; @@ -354,7 +353,7 @@ void signal_init(struct thread_master *m, int sigc, #ifdef SIGEVENT_SCHEDULE_THREAD sigmaster.t = NULL; - thread_add_timer(m, frr_signal_timer, &sigmaster, - FRR_SIGNAL_TIMER_INTERVAL, &sigmaster.t); + event_add_timer(m, frr_signal_timer, &sigmaster, + FRR_SIGNAL_TIMER_INTERVAL, &sigmaster.t); #endif /* SIGEVENT_SCHEDULE_THREAD */ } diff --git a/lib/sigevent.h b/lib/sigevent.h index e58b9a70c0..0b07f594c1 100644 --- a/lib/sigevent.h +++ b/lib/sigevent.h @@ -8,7 +8,7 @@ #ifndef _FRR_SIGNAL_H #define _FRR_SIGNAL_H -#include +#include #ifdef __cplusplus extern "C" { @@ -25,12 +25,12 @@ struct frr_signal_t { /* initialise sigevent system * takes: - * - pointer to valid struct thread_master + * - pointer to valid struct event_loop * - number of elements in passed in signals array * - array of frr_signal_t's describing signals to handle * and handlers to use for each signal */ -extern void signal_init(struct thread_master *m, int sigc, +extern void signal_init(struct event_loop *m, int sigc, struct frr_signal_t *signals); diff --git a/lib/smux.h b/lib/smux.h index 28a303cf72..cec4d2a1bf 100644 --- a/lib/smux.h +++ b/lib/smux.h @@ -9,7 +9,7 @@ #include #include -#include "thread.h" +#include "frrevent.h" #include "hook.h" #ifdef __cplusplus @@ -99,7 +99,7 @@ struct index_oid { */ extern bool smux_enabled(void); -extern void smux_init(struct thread_master *tm); +extern void smux_init(struct event_loop *tm); extern void smux_agentx_enable(void); extern void smux_register_mib(const char *, struct variable *, size_t, int, oid[], size_t); diff --git a/lib/spf_backoff.c b/lib/spf_backoff.c index 1e80b5ec2d..b05c44ddf7 100644 --- a/lib/spf_backoff.c +++ b/lib/spf_backoff.c @@ -17,7 +17,7 @@ #include "command.h" #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "vty.h" DEFINE_MTYPE_STATIC(LIB, SPF_BACKOFF, "SPF backoff"); @@ -37,7 +37,7 @@ enum spf_backoff_state { }; struct spf_backoff { - struct thread_master *m; + struct event_loop *m; /* Timers as per draft */ long init_delay; @@ -48,8 +48,8 @@ struct spf_backoff { /* State machine */ enum spf_backoff_state state; - struct thread *t_holddown; - struct thread *t_timetolearn; + struct event *t_holddown; + struct event *t_timetolearn; /* For debugging */ char *name; @@ -70,7 +70,7 @@ static const char *spf_backoff_state2str(enum spf_backoff_state state) return "???"; } -struct spf_backoff *spf_backoff_new(struct thread_master *m, const char *name, +struct spf_backoff *spf_backoff_new(struct event_loop *m, const char *name, long init_delay, long short_delay, long long_delay, long holddown, long timetolearn) @@ -97,27 +97,27 @@ void spf_backoff_free(struct spf_backoff *backoff) if (!backoff) return; - thread_cancel(&backoff->t_holddown); - thread_cancel(&backoff->t_timetolearn); + event_cancel(&backoff->t_holddown); + event_cancel(&backoff->t_timetolearn); XFREE(MTYPE_SPF_BACKOFF_NAME, backoff->name); XFREE(MTYPE_SPF_BACKOFF, backoff); } -static void spf_backoff_timetolearn_elapsed(struct thread *thread) +static void spf_backoff_timetolearn_elapsed(struct event *thread) { - struct spf_backoff *backoff = THREAD_ARG(thread); + struct spf_backoff *backoff = EVENT_ARG(thread); backoff->state = SPF_BACKOFF_LONG_WAIT; backoff_debug("SPF Back-off(%s) TIMETOLEARN elapsed, move to state %s", backoff->name, spf_backoff_state2str(backoff->state)); } -static void spf_backoff_holddown_elapsed(struct thread *thread) +static void spf_backoff_holddown_elapsed(struct event *thread) { - struct spf_backoff *backoff = THREAD_ARG(thread); + struct spf_backoff *backoff = EVENT_ARG(thread); - THREAD_OFF(backoff->t_timetolearn); + EVENT_OFF(backoff->t_timetolearn); timerclear(&backoff->first_event_time); backoff->state = SPF_BACKOFF_QUIET; backoff_debug("SPF Back-off(%s) HOLDDOWN elapsed, move to state %s", @@ -139,21 +139,21 @@ long spf_backoff_schedule(struct spf_backoff *backoff) switch (backoff->state) { case SPF_BACKOFF_QUIET: backoff->state = SPF_BACKOFF_SHORT_WAIT; - thread_add_timer_msec( + event_add_timer_msec( backoff->m, spf_backoff_timetolearn_elapsed, backoff, backoff->timetolearn, &backoff->t_timetolearn); - thread_add_timer_msec(backoff->m, spf_backoff_holddown_elapsed, - backoff, backoff->holddown, - &backoff->t_holddown); + event_add_timer_msec(backoff->m, spf_backoff_holddown_elapsed, + backoff, backoff->holddown, + &backoff->t_holddown); backoff->first_event_time = now; rv = backoff->init_delay; break; case SPF_BACKOFF_SHORT_WAIT: case SPF_BACKOFF_LONG_WAIT: - thread_cancel(&backoff->t_holddown); - thread_add_timer_msec(backoff->m, spf_backoff_holddown_elapsed, - backoff, backoff->holddown, - &backoff->t_holddown); + event_cancel(&backoff->t_holddown); + event_add_timer_msec(backoff->m, spf_backoff_holddown_elapsed, + backoff, backoff->holddown, + &backoff->t_holddown); if (backoff->state == SPF_BACKOFF_SHORT_WAIT) rv = backoff->short_delay; else @@ -204,8 +204,8 @@ void spf_backoff_show(struct spf_backoff *backoff, struct vty *vty, vty_out(vty, "%sHolddown timer: %ld msec\n", prefix, backoff->holddown); if (backoff->t_holddown) { - struct timeval remain = - thread_timer_remain(backoff->t_holddown); + struct timeval remain = event_timer_remain(backoff->t_holddown); + vty_out(vty, "%s Still runs for %lld msec\n", prefix, (long long)remain.tv_sec * 1000 @@ -218,7 +218,7 @@ void spf_backoff_show(struct spf_backoff *backoff, struct vty *vty, backoff->timetolearn); if (backoff->t_timetolearn) { struct timeval remain = - thread_timer_remain(backoff->t_timetolearn); + event_timer_remain(backoff->t_timetolearn); vty_out(vty, "%s Still runs for %lld msec\n", prefix, (long long)remain.tv_sec * 1000 diff --git a/lib/spf_backoff.h b/lib/spf_backoff.h index 87aa4a0825..83f1b76adc 100644 --- a/lib/spf_backoff.h +++ b/lib/spf_backoff.h @@ -18,10 +18,10 @@ extern "C" { #endif struct spf_backoff; -struct thread_master; +struct event_loop; struct vty; -struct spf_backoff *spf_backoff_new(struct thread_master *m, const char *name, +struct spf_backoff *spf_backoff_new(struct event_loop *m, const char *name, long init_delay, long short_delay, long long_delay, long holddown, long timetolearn); diff --git a/lib/subdir.am b/lib/subdir.am index d456629bbd..469fac2446 100644 --- a/lib/subdir.am +++ b/lib/subdir.am @@ -108,7 +108,7 @@ lib_libfrr_la_SOURCES = \ lib/systemd.c \ lib/table.c \ lib/termtable.c \ - lib/thread.c \ + lib/event.c \ lib/typerb.c \ lib/typesafe.c \ lib/vector.c \ @@ -181,7 +181,7 @@ clippy_scan += \ lib/plist.c \ lib/routemap.c \ lib/routemap_cli.c \ - lib/thread.c \ + lib/event.c \ lib/vty.c \ lib/zlog_5424_cli.c \ # end @@ -288,7 +288,7 @@ pkginclude_HEADERS += \ lib/systemd.h \ lib/table.h \ lib/termtable.h \ - lib/thread.h \ + lib/frrevent.h \ lib/trace.h \ lib/typerb.h \ lib/typesafe.h \ diff --git a/lib/systemd.c b/lib/systemd.c index 0106e88b93..56a53a6e78 100644 --- a/lib/systemd.c +++ b/lib/systemd.c @@ -7,7 +7,7 @@ #include #include -#include "thread.h" +#include "frrevent.h" #include "systemd.h" #include "lib_errors.h" @@ -63,18 +63,18 @@ void systemd_send_stopping(void) systemd_send_information("STOPPING=1"); } -static struct thread_master *systemd_master = NULL; +static struct event_loop *systemd_master = NULL; -static void systemd_send_watchdog(struct thread *t) +static void systemd_send_watchdog(struct event *t) { systemd_send_information("WATCHDOG=1"); assert(watchdog_msec > 0); - thread_add_timer_msec(systemd_master, systemd_send_watchdog, NULL, - watchdog_msec, NULL); + event_add_timer_msec(systemd_master, systemd_send_watchdog, NULL, + watchdog_msec, NULL); } -void systemd_send_started(struct thread_master *m) +void systemd_send_started(struct event_loop *m) { assert(m != NULL); diff --git a/lib/systemd.h b/lib/systemd.h index 09f27a70ba..ba2461b8a1 100644 --- a/lib/systemd.h +++ b/lib/systemd.h @@ -21,11 +21,11 @@ extern bool sd_stderr_is_journal; void systemd_send_stopping(void); /* - * master - The struct thread_master * to use to schedule ourself + * master - The struct event_loop * to use to schedule ourself * the_process - Should we send watchdog if we are not the requested * process? */ -void systemd_send_started(struct thread_master *master); +void systemd_send_started(struct event_loop *master); /* * status - A status string to send to systemd diff --git a/lib/thread.h b/lib/thread.h deleted file mode 100644 index 128d11b6eb..0000000000 --- a/lib/thread.h +++ /dev/null @@ -1,291 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* Thread management routine header. - * Copyright (C) 1998 Kunihiro Ishiguro - */ - -#ifndef _ZEBRA_THREAD_H -#define _ZEBRA_THREAD_H - -#include -#include -#include -#include "monotime.h" -#include "frratomic.h" -#include "typesafe.h" -#include "xref.h" - -#ifdef __cplusplus -extern "C" { -#endif - -extern bool cputime_enabled; -extern unsigned long cputime_threshold; -/* capturing wallclock time is always enabled since it is fast (reading - * hardware TSC w/o syscalls) - */ -extern unsigned long walltime_threshold; - -struct rusage_t { -#ifdef HAVE_CLOCK_THREAD_CPUTIME_ID - struct timespec cpu; -#else - struct rusage cpu; -#endif - struct timeval real; -}; -#define RUSAGE_T struct rusage_t - -#define GETRUSAGE(X) thread_getrusage(X) - -PREDECL_LIST(thread_list); -PREDECL_HEAP(thread_timer_list); - -struct fd_handler { - /* number of pfd that fit in the allocated space of pfds. This is a - * constant and is the same for both pfds and copy. - */ - nfds_t pfdsize; - - /* file descriptors to monitor for i/o */ - struct pollfd *pfds; - /* number of pollfds stored in pfds */ - nfds_t pfdcount; - - /* chunk used for temp copy of pollfds */ - struct pollfd *copy; - /* number of pollfds stored in copy */ - nfds_t copycount; -}; - -struct xref_threadsched { - struct xref xref; - - const char *funcname; - const char *dest; - uint32_t thread_type; -}; - -/* Master of the theads. */ -struct thread_master { - char *name; - - struct thread **read; - struct thread **write; - struct thread_timer_list_head timer; - struct thread_list_head event, ready, unuse; - struct list *cancel_req; - bool canceled; - pthread_cond_t cancel_cond; - struct hash *cpu_record; - int io_pipe[2]; - int fd_limit; - struct fd_handler handler; - unsigned long alloc; - long selectpoll_timeout; - bool spin; - bool handle_signals; - pthread_mutex_t mtx; - pthread_t owner; - - bool ready_run_loop; - RUSAGE_T last_getrusage; -}; - -/* Thread itself. */ -struct thread { - uint8_t type; /* thread type */ - uint8_t add_type; /* thread type */ - struct thread_list_item threaditem; - struct thread_timer_list_item timeritem; - struct thread **ref; /* external reference (if given) */ - struct thread_master *master; /* pointer to the struct thread_master */ - void (*func)(struct thread *); /* event function */ - void *arg; /* event argument */ - union { - int val; /* second argument of the event. */ - int fd; /* file descriptor in case of r/w */ - struct timeval sands; /* rest of time sands value. */ - } u; - struct timeval real; - struct cpu_thread_history *hist; /* cache pointer to cpu_history */ - unsigned long yield; /* yield time in microseconds */ - const struct xref_threadsched *xref; /* origin location */ - pthread_mutex_t mtx; /* mutex for thread.c functions */ - bool ignore_timer_late; -}; - -#ifdef _FRR_ATTRIBUTE_PRINTFRR -#pragma FRR printfrr_ext "%pTH" (struct thread *) -#endif - -struct cpu_thread_history { - void (*func)(struct thread *); - atomic_size_t total_cpu_warn; - atomic_size_t total_wall_warn; - atomic_size_t total_starv_warn; - atomic_size_t total_calls; - atomic_size_t total_active; - struct time_stats { - atomic_size_t total, max; - } real; - struct time_stats cpu; - atomic_uint_fast32_t types; - const char *funcname; -}; - -/* Struct timeval's tv_usec one second value. */ -#define TIMER_SECOND_MICRO 1000000L - -/* Thread types. */ -#define THREAD_READ 0 -#define THREAD_WRITE 1 -#define THREAD_TIMER 2 -#define THREAD_EVENT 3 -#define THREAD_READY 4 -#define THREAD_UNUSED 5 -#define THREAD_EXECUTE 6 - -/* Thread yield time. */ -#define THREAD_YIELD_TIME_SLOT 10 * 1000L /* 10ms */ - -#define THREAD_TIMER_STRLEN 12 - -/* Macros. */ -#define THREAD_ARG(X) ((X)->arg) -#define THREAD_FD(X) ((X)->u.fd) -#define THREAD_VAL(X) ((X)->u.val) - -/* - * Please consider this macro deprecated, and do not use it in new code. - */ -#define THREAD_OFF(thread) \ - do { \ - if ((thread)) \ - thread_cancel(&(thread)); \ - } while (0) - -/* - * Macro wrappers to generate xrefs for all thread add calls. Includes - * file/line/function info for debugging/tracing. - */ -#include "lib/xref.h" - -#define _xref_t_a(addfn, type, m, f, a, v, t) \ - ({ \ - static const struct xref_threadsched _xref \ - __attribute__((used)) = { \ - .xref = XREF_INIT(XREFT_THREADSCHED, NULL, __func__), \ - .funcname = #f, \ - .dest = #t, \ - .thread_type = THREAD_ ## type, \ - }; \ - XREF_LINK(_xref.xref); \ - _thread_add_ ## addfn(&_xref, m, f, a, v, t); \ - }) \ - /* end */ - -#define thread_add_read(m,f,a,v,t) _xref_t_a(read_write, READ, m,f,a,v,t) -#define thread_add_write(m,f,a,v,t) _xref_t_a(read_write, WRITE, m,f,a,v,t) -#define thread_add_timer(m,f,a,v,t) _xref_t_a(timer, TIMER, m,f,a,v,t) -#define thread_add_timer_msec(m,f,a,v,t) _xref_t_a(timer_msec, TIMER, m,f,a,v,t) -#define thread_add_timer_tv(m,f,a,v,t) _xref_t_a(timer_tv, TIMER, m,f,a,v,t) -#define thread_add_event(m,f,a,v,t) _xref_t_a(event, EVENT, m,f,a,v,t) - -#define thread_execute(m,f,a,v) \ - ({ \ - static const struct xref_threadsched _xref \ - __attribute__((used)) = { \ - .xref = XREF_INIT(XREFT_THREADSCHED, NULL, __func__), \ - .funcname = #f, \ - .dest = NULL, \ - .thread_type = THREAD_EXECUTE, \ - }; \ - XREF_LINK(_xref.xref); \ - _thread_execute(&_xref, m, f, a, v); \ - }) /* end */ - -/* Prototypes. */ -extern struct thread_master *thread_master_create(const char *); -void thread_master_set_name(struct thread_master *master, const char *name); -extern void thread_master_free(struct thread_master *); -extern void thread_master_free_unused(struct thread_master *); - -extern void _thread_add_read_write(const struct xref_threadsched *xref, - struct thread_master *master, - void (*fn)(struct thread *), void *arg, - int fd, struct thread **tref); - -extern void _thread_add_timer(const struct xref_threadsched *xref, - struct thread_master *master, - void (*fn)(struct thread *), void *arg, long t, - struct thread **tref); - -extern void _thread_add_timer_msec(const struct xref_threadsched *xref, - struct thread_master *master, - void (*fn)(struct thread *), void *arg, - long t, struct thread **tref); - -extern void _thread_add_timer_tv(const struct xref_threadsched *xref, - struct thread_master *master, - void (*fn)(struct thread *), void *arg, - struct timeval *tv, struct thread **tref); - -extern void _thread_add_event(const struct xref_threadsched *xref, - struct thread_master *master, - void (*fn)(struct thread *), void *arg, int val, - struct thread **tref); - -extern void _thread_execute(const struct xref_threadsched *xref, - struct thread_master *master, - void (*fn)(struct thread *), void *arg, int val); - -extern void thread_cancel(struct thread **event); -extern void thread_cancel_async(struct thread_master *, struct thread **, - void *); -/* Cancel ready tasks with an arg matching 'arg' */ -extern void thread_cancel_event_ready(struct thread_master *m, void *arg); -/* Cancel all tasks with an arg matching 'arg', including timers and io */ -extern void thread_cancel_event(struct thread_master *m, void *arg); -extern struct thread *thread_fetch(struct thread_master *, struct thread *); -extern void thread_call(struct thread *); -extern unsigned long thread_timer_remain_second(struct thread *); -extern struct timeval thread_timer_remain(struct thread *); -extern unsigned long thread_timer_remain_msec(struct thread *); -extern int thread_should_yield(struct thread *); -/* set yield time for thread */ -extern void thread_set_yield_time(struct thread *, unsigned long); - -/* Internal libfrr exports */ -extern void thread_getrusage(RUSAGE_T *); -extern void thread_cmd_init(void); - -/* Returns elapsed real (wall clock) time. */ -extern unsigned long thread_consumed_time(RUSAGE_T *after, RUSAGE_T *before, - unsigned long *cpu_time_elapsed); - -/* only for use in logging functions! */ -extern pthread_key_t thread_current; -extern char *thread_timer_to_hhmmss(char *buf, int buf_size, - struct thread *t_timer); - -static inline bool thread_is_scheduled(struct thread *thread) -{ - if (thread) - return true; - - return false; -} - -/* Debug signal mask */ -void debug_signals(const sigset_t *sigs); - -static inline void thread_ignore_late_timer(struct thread *thread) -{ - thread->ignore_timer_late = true; -} - -#ifdef __cplusplus -} -#endif - -#endif /* _ZEBRA_THREAD_H */ diff --git a/lib/vty.c b/lib/vty.c index 3dcae0282f..d0a6677788 100644 --- a/lib/vty.c +++ b/lib/vty.c @@ -22,7 +22,7 @@ #include #include "linklist.h" -#include "thread.h" +#include "frrevent.h" #include "buffer.h" #include "command.h" #include "sockunion.h" @@ -81,7 +81,7 @@ struct vty_serv { int sock; bool vtysh; - struct thread *t_accept; + struct event *t_accept; }; DECLARE_DLIST(vtyservs, struct vty_serv, itm); @@ -545,7 +545,7 @@ static int vty_command(struct vty *vty, char *buf) GETRUSAGE(&after); - walltime = thread_consumed_time(&after, &before, &cputime); + walltime = event_consumed_time(&after, &before, &cputime); if (cputime_enabled_here && cputime_enabled && cputime_threshold && cputime > cputime_threshold) @@ -1360,13 +1360,13 @@ static void vty_buffer_reset(struct vty *vty) } /* Read data via vty socket. */ -static void vty_read(struct thread *thread) +static void vty_read(struct event *thread) { int i; int nbytes; unsigned char buf[VTY_READ_BUFSIZ]; - struct vty *vty = THREAD_ARG(thread); + struct vty *vty = EVENT_ARG(thread); /* Read raw data from socket */ if ((nbytes = read(vty->fd, buf, VTY_READ_BUFSIZ)) <= 0) { @@ -1563,15 +1563,15 @@ static void vty_read(struct thread *thread) } /* Flush buffer to the vty. */ -static void vty_flush(struct thread *thread) +static void vty_flush(struct event *thread) { int erase; buffer_status_t flushrc; - struct vty *vty = THREAD_ARG(thread); + struct vty *vty = EVENT_ARG(thread); /* Tempolary disable read thread. */ if (vty->lines == 0) - THREAD_OFF(vty->t_read); + EVENT_OFF(vty->t_read); /* Function execution continue. */ erase = ((vty->status == VTY_MORE || vty->status == VTY_MORELINE)); @@ -1757,9 +1757,9 @@ void vty_stdio_suspend(void) if (!stdio_vty) return; - THREAD_OFF(stdio_vty->t_write); - THREAD_OFF(stdio_vty->t_read); - THREAD_OFF(stdio_vty->t_timeout); + EVENT_OFF(stdio_vty->t_write); + EVENT_OFF(stdio_vty->t_read); + EVENT_OFF(stdio_vty->t_timeout); if (stdio_termios) tcsetattr(0, TCSANOW, &stdio_orig_termios); @@ -1823,9 +1823,9 @@ struct vty *vty_stdio(void (*atclose)(int isexit)) } /* Accept connection from the network. */ -static void vty_accept(struct thread *thread) +static void vty_accept(struct event *thread) { - struct vty_serv *vtyserv = THREAD_ARG(thread); + struct vty_serv *vtyserv = EVENT_ARG(thread); int vty_sock; union sockunion su; int ret; @@ -2036,9 +2036,9 @@ static void vty_serv_un(const char *path) /* #define VTYSH_DEBUG 1 */ -static void vtysh_accept(struct thread *thread) +static void vtysh_accept(struct event *thread) { - struct vty_serv *vtyserv = THREAD_ARG(thread); + struct vty_serv *vtyserv = EVENT_ARG(thread); int accept_sock = vtyserv->sock; int sock; int client_len; @@ -2166,7 +2166,7 @@ void vty_pass_fd(struct vty *vty, int fd) vty->pass_fd = fd; } -static void vtysh_read(struct thread *thread) +static void vtysh_read(struct event *thread) { int ret; int sock; @@ -2176,8 +2176,8 @@ static void vtysh_read(struct thread *thread) unsigned char *p; uint8_t header[4] = {0, 0, 0, 0}; - sock = THREAD_FD(thread); - vty = THREAD_ARG(thread); + sock = EVENT_FD(thread); + vty = EVENT_ARG(thread); if ((nbytes = read(sock, buf, VTY_READ_BUFSIZ)) <= 0) { if (nbytes < 0) { @@ -2275,9 +2275,9 @@ static void vtysh_read(struct thread *thread) vty_event(VTYSH_READ, vty); } -static void vtysh_write(struct thread *thread) +static void vtysh_write(struct event *thread) { - struct vty *vty = THREAD_ARG(thread); + struct vty *vty = EVENT_ARG(thread); vtysh_flush(vty); } @@ -2322,9 +2322,9 @@ void vty_close(struct vty *vty) vty_config_exit(vty); /* Cancel threads.*/ - THREAD_OFF(vty->t_read); - THREAD_OFF(vty->t_write); - THREAD_OFF(vty->t_timeout); + EVENT_OFF(vty->t_read); + EVENT_OFF(vty->t_write); + EVENT_OFF(vty->t_timeout); if (vty->pass_fd != -1) { close(vty->pass_fd); @@ -2382,11 +2382,11 @@ void vty_close(struct vty *vty) } /* When time out occur output message then close connection. */ -static void vty_timeout(struct thread *thread) +static void vty_timeout(struct event *thread) { struct vty *vty; - vty = THREAD_ARG(thread); + vty = EVENT_ARG(thread); vty->v_timeout = 0; /* Clear buffer*/ @@ -2801,19 +2801,19 @@ int vty_config_node_exit(struct vty *vty) } /* Master of the threads. */ -static struct thread_master *vty_master; +static struct event_loop *vty_master; static void vty_event_serv(enum vty_event event, struct vty_serv *vty_serv) { switch (event) { case VTY_SERV: - thread_add_read(vty_master, vty_accept, vty_serv, - vty_serv->sock, &vty_serv->t_accept); + event_add_read(vty_master, vty_accept, vty_serv, vty_serv->sock, + &vty_serv->t_accept); break; #ifdef VTYSH case VTYSH_SERV: - thread_add_read(vty_master, vtysh_accept, vty_serv, - vty_serv->sock, &vty_serv->t_accept); + event_add_read(vty_master, vtysh_accept, vty_serv, + vty_serv->sock, &vty_serv->t_accept); break; #endif /* VTYSH */ case VTY_READ: @@ -2830,34 +2830,34 @@ static void vty_event(enum vty_event event, struct vty *vty) switch (event) { #ifdef VTYSH case VTYSH_READ: - thread_add_read(vty_master, vtysh_read, vty, vty->fd, - &vty->t_read); + event_add_read(vty_master, vtysh_read, vty, vty->fd, + &vty->t_read); break; case VTYSH_WRITE: - thread_add_write(vty_master, vtysh_write, vty, vty->wfd, - &vty->t_write); + event_add_write(vty_master, vtysh_write, vty, vty->wfd, + &vty->t_write); break; #endif /* VTYSH */ case VTY_READ: - thread_add_read(vty_master, vty_read, vty, vty->fd, - &vty->t_read); + event_add_read(vty_master, vty_read, vty, vty->fd, + &vty->t_read); /* Time out treatment. */ if (vty->v_timeout) { - THREAD_OFF(vty->t_timeout); - thread_add_timer(vty_master, vty_timeout, vty, - vty->v_timeout, &vty->t_timeout); + EVENT_OFF(vty->t_timeout); + event_add_timer(vty_master, vty_timeout, vty, + vty->v_timeout, &vty->t_timeout); } break; case VTY_WRITE: - thread_add_write(vty_master, vty_flush, vty, vty->wfd, - &vty->t_write); + event_add_write(vty_master, vty_flush, vty, vty->wfd, + &vty->t_write); break; case VTY_TIMEOUT_RESET: - THREAD_OFF(vty->t_timeout); + EVENT_OFF(vty->t_timeout); if (vty->v_timeout) - thread_add_timer(vty_master, vty_timeout, vty, - vty->v_timeout, &vty->t_timeout); + event_add_timer(vty_master, vty_timeout, vty, + vty->v_timeout, &vty->t_timeout); break; case VTY_SERV: case VTYSH_SERV: @@ -3655,7 +3655,7 @@ int vty_mgmt_send_get_data(struct vty *vty, Mgmtd__DatastoreId datastore, } /* Install vty's own commands like `who' command. */ -void vty_init(struct thread_master *master_thread, bool do_command_logging) +void vty_init(struct event_loop *master_thread, bool do_command_logging) { /* For further configuration read, preserve current directory. */ vty_save_cwd(); @@ -3726,7 +3726,7 @@ void vty_terminate(void) vtys_init(vtysh_sessions); while ((vtyserv = vtyservs_pop(vty_servs))) { - THREAD_OFF(vtyserv->t_accept); + EVENT_OFF(vtyserv->t_accept); close(vtyserv->sock); XFREE(MTYPE_VTY_SERV, vtyserv); } diff --git a/lib/vty.h b/lib/vty.h index b302c14913..66d3355329 100644 --- a/lib/vty.h +++ b/lib/vty.h @@ -18,7 +18,7 @@ #include #endif /* HAVE_LIBPCRE2_POSIX */ -#include "thread.h" +#include "frrevent.h" #include "log.h" #include "sockunion.h" #include "qobj.h" @@ -148,7 +148,7 @@ struct vty { size_t pending_cmds_bufpos; /* Confirmed-commit timeout and rollback configuration. */ - struct thread *t_confirmed_commit_timeout; + struct event *t_confirmed_commit_timeout; struct nb_config *confirmed_commit_rollback; /* qobj object ID (replacement for "index") */ @@ -202,12 +202,12 @@ struct vty { int lines; /* Read and write thread. */ - struct thread *t_read; - struct thread *t_write; + struct event *t_read; + struct event *t_write; /* Timeout seconds and thread. */ unsigned long v_timeout; - struct thread *t_timeout; + struct event *t_timeout; /* What address is this vty comming from. */ char address[SU_ADDRSTRLEN]; @@ -337,7 +337,7 @@ struct vty_arg { extern struct nb_config *vty_mgmt_candidate_config; /* Prototypes. */ -extern void vty_init(struct thread_master *, bool do_command_logging); +extern void vty_init(struct event_loop *m, bool do_command_logging); extern void vty_init_vtysh(void); extern void vty_terminate(void); extern void vty_reset(void); diff --git a/lib/wheel.c b/lib/wheel.c index 4aca23481b..e17995c64a 100644 --- a/lib/wheel.c +++ b/lib/wheel.c @@ -6,7 +6,7 @@ */ #include "zebra.h" #include "linklist.h" -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "wheel.h" #include "log.h" @@ -16,9 +16,9 @@ DEFINE_MTYPE_STATIC(LIB, TIMER_WHEEL_LIST, "Timer Wheel Slot List"); static int debug_timer_wheel = 0; -static void wheel_timer_thread(struct thread *t); +static void wheel_timer_thread(struct event *t); -static void wheel_timer_thread_helper(struct thread *t) +static void wheel_timer_thread_helper(struct event *t) { struct listnode *node, *nextnode; unsigned long long curr_slot; @@ -26,7 +26,7 @@ static void wheel_timer_thread_helper(struct thread *t) struct timer_wheel *wheel; void *data; - wheel = THREAD_ARG(t); + wheel = EVENT_ARG(t); wheel->curr_slot += wheel->slots_to_skip; @@ -47,23 +47,23 @@ static void wheel_timer_thread_helper(struct thread *t) slots_to_skip++; wheel->slots_to_skip = slots_to_skip; - thread_add_timer_msec(wheel->master, wheel_timer_thread, wheel, - wheel->nexttime * slots_to_skip, &wheel->timer); + event_add_timer_msec(wheel->master, wheel_timer_thread, wheel, + wheel->nexttime * slots_to_skip, &wheel->timer); } -static void wheel_timer_thread(struct thread *t) +static void wheel_timer_thread(struct event *t) { struct timer_wheel *wheel; - wheel = THREAD_ARG(t); + wheel = EVENT_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, - size_t slots, unsigned int (*slot_key)(const void *), - void (*slot_run)(void *), - const char *run_name) +struct timer_wheel *wheel_init(struct event_loop *master, int period, + size_t slots, + unsigned int (*slot_key)(const void *), + void (*slot_run)(void *), const char *run_name) { struct timer_wheel *wheel; size_t i; @@ -85,8 +85,8 @@ struct timer_wheel *wheel_init(struct thread_master *master, int period, for (i = 0; i < slots; i++) wheel->wheel_slot_lists[i] = list_new(); - thread_add_timer_msec(wheel->master, wheel_timer_thread, wheel, - wheel->nexttime, &wheel->timer); + event_add_timer_msec(wheel->master, wheel_timer_thread, wheel, + wheel->nexttime, &wheel->timer); return wheel; } @@ -99,7 +99,7 @@ void wheel_delete(struct timer_wheel *wheel) list_delete(&wheel->wheel_slot_lists[i]); } - THREAD_OFF(wheel->timer); + EVENT_OFF(wheel->timer); XFREE(MTYPE_TIMER_WHEEL_LIST, wheel->wheel_slot_lists); XFREE(MTYPE_TIMER_WHEEL, wheel->name); XFREE(MTYPE_TIMER_WHEEL, wheel); diff --git a/lib/wheel.h b/lib/wheel.h index 9aa808cdfd..0d9ac10020 100644 --- a/lib/wheel.h +++ b/lib/wheel.h @@ -13,7 +13,7 @@ extern "C" { struct timer_wheel { char *name; - struct thread_master *master; + struct event_loop *master; int slots; long long curr_slot; unsigned int period; @@ -21,7 +21,7 @@ struct timer_wheel { unsigned int slots_to_skip; struct list **wheel_slot_lists; - struct thread *timer; + struct event *timer; /* * Key to determine what slot the item belongs in */ @@ -66,7 +66,7 @@ struct timer_wheel { * and cause significant amount of time handling thread events instead * of running your code. */ -struct timer_wheel *wheel_init(struct thread_master *master, int period, +struct timer_wheel *wheel_init(struct event_loop *master, int period, size_t slots, unsigned int (*slot_key)(const void *), void (*slot_run)(void *), const char *run_name); diff --git a/lib/workqueue.c b/lib/workqueue.c index 5477aadd65..fa5d585360 100644 --- a/lib/workqueue.c +++ b/lib/workqueue.c @@ -6,7 +6,7 @@ */ #include -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "workqueue.h" #include "linklist.h" @@ -59,8 +59,7 @@ static void work_queue_item_remove(struct work_queue *wq, } /* create new work queue */ -struct work_queue *work_queue_new(struct thread_master *m, - const char *queue_name) +struct work_queue *work_queue_new(struct event_loop *m, const char *queue_name) { struct work_queue *new; @@ -78,7 +77,7 @@ struct work_queue *work_queue_new(struct thread_master *m, /* Default values, can be overridden by caller */ new->spec.hold = WORK_QUEUE_DEFAULT_HOLD; - new->spec.yield = THREAD_YIELD_TIME_SLOT; + new->spec.yield = EVENT_YIELD_TIME_SLOT; new->spec.retry = WORK_QUEUE_DEFAULT_RETRY; return new; @@ -88,7 +87,7 @@ void work_queue_free_and_null(struct work_queue **wqp) { struct work_queue *wq = *wqp; - THREAD_OFF(wq->thread); + EVENT_OFF(wq->thread); while (!work_queue_empty(wq)) { struct work_queue_item *item = work_queue_last_item(wq); @@ -106,29 +105,29 @@ void work_queue_free_and_null(struct work_queue **wqp) bool work_queue_is_scheduled(struct work_queue *wq) { - return thread_is_scheduled(wq->thread); + return event_is_scheduled(wq->thread); } static int work_queue_schedule(struct work_queue *wq, unsigned int delay) { /* if appropriate, schedule work queue thread */ if (CHECK_FLAG(wq->flags, WQ_UNPLUGGED) && - !thread_is_scheduled(wq->thread) && !work_queue_empty(wq)) { + !event_is_scheduled(wq->thread) && !work_queue_empty(wq)) { /* Schedule timer if there's a delay, otherwise just schedule * as an 'event' */ if (delay > 0) { - thread_add_timer_msec(wq->master, work_queue_run, wq, - delay, &wq->thread); - thread_ignore_late_timer(wq->thread); + event_add_timer_msec(wq->master, work_queue_run, wq, + delay, &wq->thread); + event_ignore_late_timer(wq->thread); } else - thread_add_event(wq->master, work_queue_run, wq, 0, - &wq->thread); + event_add_event(wq->master, work_queue_run, wq, 0, + &wq->thread); /* set thread yield time, if needed */ - if (thread_is_scheduled(wq->thread) && - wq->spec.yield != THREAD_YIELD_TIME_SLOT) - thread_set_yield_time(wq->thread, wq->spec.yield); + if (event_is_scheduled(wq->thread) && + wq->spec.yield != EVENT_YIELD_TIME_SLOT) + event_set_yield_time(wq->thread, wq->spec.yield); return 1; } else return 0; @@ -198,7 +197,7 @@ void workqueue_cmd_init(void) */ void work_queue_plug(struct work_queue *wq) { - THREAD_OFF(wq->thread); + EVENT_OFF(wq->thread); UNSET_FLAG(wq->flags, WQ_UNPLUGGED); } @@ -218,7 +217,7 @@ void work_queue_unplug(struct work_queue *wq) * will reschedule itself if required, * otherwise work_queue_item_add */ -void work_queue_run(struct thread *thread) +void work_queue_run(struct event *thread) { struct work_queue *wq; struct work_queue_item *item, *titem; @@ -226,7 +225,7 @@ void work_queue_run(struct thread *thread) unsigned int cycles = 0; char yielded = 0; - wq = THREAD_ARG(thread); + wq = EVENT_ARG(thread); assert(wq); @@ -311,8 +310,8 @@ void work_queue_run(struct thread *thread) cycles++; /* test if we should yield */ - if (!(cycles % wq->cycles.granularity) - && thread_should_yield(thread)) { + if (!(cycles % wq->cycles.granularity) && + event_should_yield(thread)) { yielded = 1; goto stats; } diff --git a/lib/workqueue.h b/lib/workqueue.h index c7ed14b056..5d84739d5c 100644 --- a/lib/workqueue.h +++ b/lib/workqueue.h @@ -47,8 +47,8 @@ struct work_queue { /* Everything but the specification struct is private * the following may be read */ - struct thread_master *master; /* thread master */ - struct thread *thread; /* thread, if one is active */ + struct event_loop *master; /* thread master */ + struct event *thread; /* thread, if one is active */ char *name; /* work queue name */ /* Specification for this work queue. @@ -137,7 +137,7 @@ static inline void work_queue_item_dequeue(struct work_queue *wq, * user must fill in the spec of the returned work queue before adding * anything to it */ -extern struct work_queue *work_queue_new(struct thread_master *m, +extern struct work_queue *work_queue_new(struct event_loop *m, const char *queue_name); /* destroy work queue */ @@ -158,7 +158,7 @@ extern void work_queue_unplug(struct work_queue *wq); bool work_queue_is_scheduled(struct work_queue *wq); /* Helpers, exported for thread.c and command.c */ -extern void work_queue_run(struct thread *thread); +extern void work_queue_run(struct event *thread); extern void workqueue_cmd_init(void); diff --git a/lib/xref.h b/lib/xref.h index b49c9eb2f2..f06d65b422 100644 --- a/lib/xref.h +++ b/lib/xref.h @@ -20,7 +20,7 @@ extern "C" { enum xref_type { XREFT_NONE = 0, - XREFT_THREADSCHED = 0x100, + XREFT_EVENTSCHED = 0x100, XREFT_LOGMSG = 0x200, XREFT_ASSERT = 0x280, diff --git a/lib/yang.h b/lib/yang.h index 91cd641ce8..654c246f0d 100644 --- a/lib/yang.h +++ b/lib/yang.h @@ -50,7 +50,7 @@ struct yang_module { #endif #ifdef HAVE_SYSREPO sr_subscription_ctx_t *sr_subscription; - struct thread *sr_thread; + struct event *sr_thread; #endif }; RB_HEAD(yang_modules, yang_module); diff --git a/lib/zclient.c b/lib/zclient.c index 0e49d65528..95093a56f5 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -14,7 +14,7 @@ #include "vrf_int.h" #include "if.h" #include "log.h" -#include "thread.h" +#include "frrevent.h" #include "zclient.h" #include "memory.h" #include "table.h" @@ -51,7 +51,7 @@ socklen_t zclient_addr_len; static int zclient_debug; /* Allocate zclient structure. */ -struct zclient *zclient_new(struct thread_master *master, +struct zclient *zclient_new(struct event_loop *master, struct zclient_options *opt, zclient_handler *const *handlers, size_t n_handlers) { @@ -160,9 +160,9 @@ void zclient_stop(struct zclient *zclient) zlog_debug("zclient %p stopped", zclient); /* Stop threads. */ - THREAD_OFF(zclient->t_read); - THREAD_OFF(zclient->t_connect); - THREAD_OFF(zclient->t_write); + EVENT_OFF(zclient->t_read); + EVENT_OFF(zclient->t_connect); + EVENT_OFF(zclient->t_write); /* Reset streams. */ stream_reset(zclient->ibuf); @@ -249,9 +249,9 @@ static enum zclient_send_status zclient_failed(struct zclient *zclient) return ZCLIENT_SEND_FAILURE; } -static void zclient_flush_data(struct thread *thread) +static void zclient_flush_data(struct event *thread) { - struct zclient *zclient = THREAD_ARG(thread); + struct zclient *zclient = EVENT_ARG(thread); zclient->t_write = NULL; if (zclient->sock < 0) @@ -266,8 +266,8 @@ static void zclient_flush_data(struct thread *thread) return; case BUFFER_PENDING: zclient->t_write = NULL; - thread_add_write(zclient->master, zclient_flush_data, zclient, - zclient->sock, &zclient->t_write); + event_add_write(zclient->master, zclient_flush_data, zclient, + zclient->sock, &zclient->t_write); break; case BUFFER_EMPTY: if (zclient->zebra_buffer_write_ready) @@ -295,11 +295,11 @@ enum zclient_send_status zclient_send_message(struct zclient *zclient) __func__, zclient->sock); return zclient_failed(zclient); case BUFFER_EMPTY: - THREAD_OFF(zclient->t_write); + EVENT_OFF(zclient->t_write); return ZCLIENT_SEND_SUCCESS; case BUFFER_PENDING: - thread_add_write(zclient->master, zclient_flush_data, zclient, - zclient->sock, &zclient->t_write); + event_add_write(zclient->master, zclient_flush_data, zclient, + zclient->sock, &zclient->t_write); return ZCLIENT_SEND_BUFFERED; } @@ -744,11 +744,11 @@ void zclient_init(struct zclient *zclient, int redist_default, /* This function is a wrapper function for calling zclient_start from timer or event thread. */ -static void zclient_connect(struct thread *t) +static void zclient_connect(struct event *t) { struct zclient *zclient; - zclient = THREAD_ARG(t); + zclient = EVENT_ARG(t); zclient->t_connect = NULL; if (zclient_debug) @@ -4026,7 +4026,7 @@ static zclient_handler *const lib_handlers[] = { }; /* Zebra client message read function. */ -static void zclient_read(struct thread *thread) +static void zclient_read(struct event *thread) { size_t already; uint16_t length, command; @@ -4035,7 +4035,7 @@ static void zclient_read(struct thread *thread) struct zclient *zclient; /* Get socket to zebra. */ - zclient = THREAD_ARG(thread); + zclient = EVENT_ARG(thread); zclient->t_read = NULL; /* Read zebra header (if we don't have it already). */ @@ -4204,22 +4204,22 @@ static void zclient_event(enum zclient_event event, struct zclient *zclient) { switch (event) { case ZCLIENT_SCHEDULE: - thread_add_event(zclient->master, zclient_connect, zclient, 0, - &zclient->t_connect); + event_add_event(zclient->master, zclient_connect, zclient, 0, + &zclient->t_connect); break; case ZCLIENT_CONNECT: if (zclient_debug) zlog_debug( "zclient connect failures: %d schedule interval is now %d", zclient->fail, zclient->fail < 3 ? 10 : 60); - thread_add_timer(zclient->master, zclient_connect, zclient, - zclient->fail < 3 ? 10 : 60, - &zclient->t_connect); + event_add_timer(zclient->master, zclient_connect, zclient, + zclient->fail < 3 ? 10 : 60, + &zclient->t_connect); break; case ZCLIENT_READ: zclient->t_read = NULL; - thread_add_read(zclient->master, zclient_read, zclient, - zclient->sock, &zclient->t_read); + event_add_read(zclient->master, zclient_read, zclient, + zclient->sock, &zclient->t_read); break; } } diff --git a/lib/zclient.h b/lib/zclient.h index 53c7038c88..367e5b1474 100644 --- a/lib/zclient.h +++ b/lib/zclient.h @@ -290,7 +290,7 @@ typedef int (zclient_handler)(ZAPI_CALLBACK_ARGS); /* Structure for the zebra client. */ struct zclient { /* The thread master we schedule ourselves on */ - struct thread_master *master; + struct event_loop *master; /* Privileges to change socket values */ struct zebra_privs_t *privs; @@ -323,11 +323,11 @@ struct zclient { struct buffer *wb; /* Read and connect thread. */ - struct thread *t_read; - struct thread *t_connect; + struct event *t_read; + struct event *t_connect; /* Thread to write buffered data to zebra. */ - struct thread *t_write; + struct event *t_write; /* Redistribute information. */ uint8_t redist_default; /* clients protocol */ @@ -862,7 +862,7 @@ int zclient_neigh_ip_encode(struct stream *s, uint16_t cmd, union sockunion *in, extern uint32_t zclient_get_nhg_start(uint32_t proto); -extern struct zclient *zclient_new(struct thread_master *m, +extern struct zclient *zclient_new(struct event_loop *m, struct zclient_options *opt, zclient_handler *const *handlers, size_t n_handlers); diff --git a/lib/zlog.c b/lib/zlog.c index e05720fd9e..309a955fa9 100644 --- a/lib/zlog.c +++ b/lib/zlog.c @@ -48,7 +48,7 @@ #include "frrcu.h" #include "zlog.h" #include "libfrr_trace.h" -#include "thread.h" +#include "frrevent.h" DEFINE_MTYPE_STATIC(LIB, LOG_MESSAGE, "log message"); DEFINE_MTYPE_STATIC(LIB, LOG_TLSBUF, "log thread-local buffer"); @@ -506,7 +506,7 @@ static void vzlog_tls(struct zlog_tls *zlog_tls, const struct xref_logmsg *xref, static void zlog_backtrace_msg(const struct xref_logmsg *xref, int prio) { - struct thread *tc = pthread_getspecific(thread_current); + struct event *tc = pthread_getspecific(thread_current); const char *uid = xref->xref.xrefdata->uid; bool found_thread = false; diff --git a/lib/zlog_5424.c b/lib/zlog_5424.c index 5264dda0f8..c15bdece29 100644 --- a/lib/zlog_5424.c +++ b/lib/zlog_5424.c @@ -26,7 +26,7 @@ #include "frr_pthread.h" #include "command.h" #include "monotime.h" -#include "thread.h" +#include "frrevent.h" #include "lib/version.h" #include "lib/lib_errors.h" @@ -789,10 +789,10 @@ static void zlog_5424_cycle(struct zlog_cfg_5424 *zcf, int fd) rcu_free(MTYPE_LOG_5424, oldt, zt.rcu_head); } -static void zlog_5424_reconnect(struct thread *t) +static void zlog_5424_reconnect(struct event *t) { - struct zlog_cfg_5424 *zcf = THREAD_ARG(t); - int fd = THREAD_FD(t); + struct zlog_cfg_5424 *zcf = EVENT_ARG(t); + int fd = EVENT_FD(t); char dummy[256]; ssize_t ret; @@ -800,8 +800,8 @@ static void zlog_5424_reconnect(struct thread *t) ret = read(fd, dummy, sizeof(dummy)); if (ret > 0) { /* logger is sending us something?!?! */ - thread_add_read(t->master, zlog_5424_reconnect, zcf, fd, - &zcf->t_reconnect); + event_add_read(t->master, zlog_5424_reconnect, zcf, fd, + &zcf->t_reconnect); return; } @@ -1030,14 +1030,14 @@ static int zlog_5424_open(struct zlog_cfg_5424 *zcf, int sock_type) assert(zcf->master); if (fd != -1) { - thread_add_read(zcf->master, zlog_5424_reconnect, zcf, - fd, &zcf->t_reconnect); + event_add_read(zcf->master, zlog_5424_reconnect, zcf, + fd, &zcf->t_reconnect); zcf->reconn_backoff_cur = zcf->reconn_backoff; } else { - thread_add_timer_msec(zcf->master, zlog_5424_reconnect, - zcf, zcf->reconn_backoff_cur, - &zcf->t_reconnect); + event_add_timer_msec(zcf->master, zlog_5424_reconnect, + zcf, zcf->reconn_backoff_cur, + &zcf->t_reconnect); zcf->reconn_backoff_cur += zcf->reconn_backoff_cur / 2; if (zcf->reconn_backoff_cur > zcf->reconn_backoff_max) @@ -1053,7 +1053,7 @@ bool zlog_5424_apply_dst(struct zlog_cfg_5424 *zcf) { int fd = -1; - thread_cancel(&zcf->t_reconnect); + event_cancel(&zcf->t_reconnect); if (zcf->prio_min != ZLOG_DISABLED) fd = zlog_5424_open(zcf, -1); @@ -1106,7 +1106,7 @@ bool zlog_5424_rotate(struct zlog_cfg_5424 *zcf) if (!zcf->active) return true; - thread_cancel(&zcf->t_reconnect); + event_cancel(&zcf->t_reconnect); /* need to retain the socket type because it also influences * other fields (packets) and we can't atomically swap these diff --git a/lib/zlog_5424.h b/lib/zlog_5424.h index 377e7be220..06525c0044 100644 --- a/lib/zlog_5424.h +++ b/lib/zlog_5424.h @@ -13,8 +13,8 @@ #include "zlog_targets.h" #include "qobj.h" -struct thread; -struct thread_master; +struct event; +struct event_loop; enum zlog_5424_dst { /* can be used to disable a target temporarily */ @@ -78,8 +78,8 @@ struct zlog_cfg_5424 { */ /* sockets only - read handler to reconnect on errors */ - struct thread_master *master; - struct thread *t_reconnect; + struct event_loop *master; + struct event *t_reconnect; unsigned int reconn_backoff, reconn_backoff_cur, reconn_backoff_max; int sock_type; struct sockaddr_storage sa; diff --git a/lib/zlog_5424_cli.c b/lib/zlog_5424_cli.c index 7f070afbc5..3003df542f 100644 --- a/lib/zlog_5424_cli.c +++ b/lib/zlog_5424_cli.c @@ -28,7 +28,7 @@ DECLARE_RBTREE_UNIQ(targets, struct zlog_cfg_5424_user, targets_item, DEFINE_QOBJ_TYPE(zlog_cfg_5424_user); static struct targets_head targets = INIT_RBTREE_UNIQ(targets); -static struct thread_master *log_5424_master; +static struct event_loop *log_5424_master; static void clear_dst(struct zlog_cfg_5424_user *cfg); @@ -948,7 +948,7 @@ void log_5424_cmd_init(void) /* hooks */ -static int log_5424_early_init(struct thread_master *master); +static int log_5424_early_init(struct event_loop *master); static int log_5424_rotate(void); static int log_5424_fini(void); @@ -959,7 +959,7 @@ __attribute__((_CONSTRUCTOR(475))) static void zlog_5424_startup_init(void) hook_register(frr_fini, log_5424_fini); } -static int log_5424_early_init(struct thread_master *master) +static int log_5424_early_init(struct event_loop *master) { log_5424_master = master; diff --git a/mgmtd/mgmt.c b/mgmtd/mgmt.c index e1acfde390..a5c0eb34a3 100644 --- a/mgmtd/mgmt.c +++ b/mgmtd/mgmt.c @@ -27,7 +27,7 @@ static struct mgmt_master mgmt_master; /* MGMTD process wide configuration pointer to export. */ struct mgmt_master *mm; -void mgmt_master_init(struct thread_master *master, const int buffer_size) +void mgmt_master_init(struct event_loop *master, const int buffer_size) { memset(&mgmt_master, 0, sizeof(struct mgmt_master)); diff --git a/mgmtd/mgmt.h b/mgmtd/mgmt.h index 2a9d947517..4d186c176b 100644 --- a/mgmtd/mgmt.h +++ b/mgmtd/mgmt.h @@ -34,7 +34,7 @@ struct mgmt_txn_ctx; * MGMTD master for system wide configurations and variables. */ struct mgmt_master { - struct thread_master *master; + struct event_loop *master; /* How big should we set the socket buffer size */ uint32_t socket_buffer; @@ -95,8 +95,7 @@ extern time_t mgmt_clock(void); extern int mgmt_config_write(struct vty *vty); -extern void mgmt_master_init(struct thread_master *master, - const int buffer_size); +extern void mgmt_master_init(struct event_loop *master, const int buffer_size); extern void mgmt_init(void); extern void mgmt_vty_init(void); diff --git a/mgmtd/mgmt_be_adapter.c b/mgmtd/mgmt_be_adapter.c index 2957b2908f..e0ab2cab80 100644 --- a/mgmtd/mgmt_be_adapter.c +++ b/mgmtd/mgmt_be_adapter.c @@ -7,7 +7,7 @@ */ #include -#include "thread.h" +#include "frrevent.h" #include "sockopt.h" #include "network.h" #include "libfrr.h" @@ -106,7 +106,7 @@ static struct mgmt_be_xpath_regexp_map mgmt_xpath_map[MGMTD_BE_MAX_NUM_XPATH_MAP]; static int mgmt_num_xpath_maps; -static struct thread_master *mgmt_be_adapter_tm; +static struct event_loop *mgmt_be_adapter_tm; static struct mgmt_be_adapters_head mgmt_be_adapters; @@ -614,21 +614,21 @@ static void mgmt_be_adapter_process_msg(void *user_ctx, uint8_t *data, mgmtd__be_message__free_unpacked(be_msg, NULL); } -static void mgmt_be_adapter_proc_msgbufs(struct thread *thread) +static void mgmt_be_adapter_proc_msgbufs(struct event *thread) { - struct mgmt_be_client_adapter *adapter = THREAD_ARG(thread); + struct mgmt_be_client_adapter *adapter = EVENT_ARG(thread); if (mgmt_msg_procbufs(&adapter->mstate, mgmt_be_adapter_process_msg, adapter, mgmt_debug_be)) mgmt_be_adapter_register_event(adapter, MGMTD_BE_PROC_MSG); } -static void mgmt_be_adapter_read(struct thread *thread) +static void mgmt_be_adapter_read(struct event *thread) { struct mgmt_be_client_adapter *adapter; enum mgmt_msg_rsched rv; - adapter = (struct mgmt_be_client_adapter *)THREAD_ARG(thread); + adapter = (struct mgmt_be_client_adapter *)EVENT_ARG(thread); rv = mgmt_msg_read(&adapter->mstate, adapter->conn_fd, mgmt_debug_be); if (rv == MSR_DISCONNECT) { @@ -640,9 +640,9 @@ static void mgmt_be_adapter_read(struct thread *thread) mgmt_be_adapter_register_event(adapter, MGMTD_BE_CONN_READ); } -static void mgmt_be_adapter_write(struct thread *thread) +static void mgmt_be_adapter_write(struct event *thread) { - struct mgmt_be_client_adapter *adapter = THREAD_ARG(thread); + struct mgmt_be_client_adapter *adapter = EVENT_ARG(thread); enum mgmt_msg_wsched rv; rv = mgmt_msg_write(&adapter->mstate, adapter->conn_fd, mgmt_debug_be); @@ -658,11 +658,11 @@ static void mgmt_be_adapter_write(struct thread *thread) assert(rv == MSW_SCHED_NONE); } -static void mgmt_be_adapter_resume_writes(struct thread *thread) +static void mgmt_be_adapter_resume_writes(struct event *thread) { struct mgmt_be_client_adapter *adapter; - adapter = (struct mgmt_be_client_adapter *)THREAD_ARG(thread); + adapter = (struct mgmt_be_client_adapter *)EVENT_ARG(thread); assert(adapter && adapter->conn_fd >= 0); mgmt_be_adapter_writes_on(adapter); @@ -695,11 +695,11 @@ static void mgmt_be_iter_and_get_cfg(struct mgmt_ds_ctx *ds_ctx, nb_config_diff_created(node, seq, root); } -static void mgmt_be_adapter_conn_init(struct thread *thread) +static void mgmt_be_adapter_conn_init(struct event *thread) { struct mgmt_be_client_adapter *adapter; - adapter = (struct mgmt_be_client_adapter *)THREAD_ARG(thread); + adapter = (struct mgmt_be_client_adapter *)EVENT_ARG(thread); assert(adapter && adapter->conn_fd >= 0); /* @@ -733,14 +733,14 @@ mgmt_be_adapter_register_event(struct mgmt_be_client_adapter *adapter, switch (event) { case MGMTD_BE_CONN_INIT: - thread_add_timer_msec(mgmt_be_adapter_tm, + event_add_timer_msec(mgmt_be_adapter_tm, mgmt_be_adapter_conn_init, adapter, MGMTD_BE_CONN_INIT_DELAY_MSEC, &adapter->conn_init_ev); assert(adapter->conn_init_ev); break; case MGMTD_BE_CONN_READ: - thread_add_read(mgmt_be_adapter_tm, mgmt_be_adapter_read, + event_add_read(mgmt_be_adapter_tm, mgmt_be_adapter_read, adapter, adapter->conn_fd, &adapter->conn_read_ev); assert(adapter->conn_read_ev); break; @@ -753,19 +753,19 @@ mgmt_be_adapter_register_event(struct mgmt_be_client_adapter *adapter, MGMTD_BE_ADAPTER_DBG( "scheduling write ready notify for client %s", adapter->name); - thread_add_write(mgmt_be_adapter_tm, mgmt_be_adapter_write, + event_add_write(mgmt_be_adapter_tm, mgmt_be_adapter_write, adapter, adapter->conn_fd, &adapter->conn_write_ev); assert(adapter->conn_write_ev); break; case MGMTD_BE_PROC_MSG: tv.tv_usec = MGMTD_BE_MSG_PROC_DELAY_USEC; - thread_add_timer_tv(mgmt_be_adapter_tm, + event_add_timer_tv(mgmt_be_adapter_tm, mgmt_be_adapter_proc_msgbufs, adapter, &tv, &adapter->proc_msg_ev); assert(adapter->proc_msg_ev); break; case MGMTD_BE_CONN_WRITES_ON: - thread_add_timer_msec(mgmt_be_adapter_tm, + event_add_timer_msec(mgmt_be_adapter_tm, mgmt_be_adapter_resume_writes, adapter, MGMTD_BE_MSG_WRITE_DELAY_MSEC, &adapter->conn_writes_on); @@ -793,11 +793,11 @@ extern void mgmt_be_adapter_unlock(struct mgmt_be_client_adapter **adapter) (*adapter)->refcount--; if (!(*adapter)->refcount) { mgmt_be_adapters_del(&mgmt_be_adapters, *adapter); - THREAD_OFF((*adapter)->conn_init_ev); - THREAD_OFF((*adapter)->conn_read_ev); - THREAD_OFF((*adapter)->conn_write_ev); - THREAD_OFF((*adapter)->conn_writes_on); - THREAD_OFF((*adapter)->proc_msg_ev); + EVENT_OFF((*adapter)->conn_init_ev); + EVENT_OFF((*adapter)->conn_read_ev); + EVENT_OFF((*adapter)->conn_write_ev); + EVENT_OFF((*adapter)->conn_writes_on); + EVENT_OFF((*adapter)->proc_msg_ev); mgmt_msg_destroy(&(*adapter)->mstate); XFREE(MTYPE_MGMTD_BE_ADPATER, *adapter); } @@ -805,7 +805,7 @@ extern void mgmt_be_adapter_unlock(struct mgmt_be_client_adapter **adapter) *adapter = NULL; } -int mgmt_be_adapter_init(struct thread_master *tm) +int mgmt_be_adapter_init(struct event_loop *tm) { if (!mgmt_be_adapter_tm) { mgmt_be_adapter_tm = tm; diff --git a/mgmtd/mgmt_be_adapter.h b/mgmtd/mgmt_be_adapter.h index 7f57233d35..88d54a7842 100644 --- a/mgmtd/mgmt_be_adapter.h +++ b/mgmtd/mgmt_be_adapter.h @@ -44,11 +44,11 @@ struct mgmt_be_client_adapter { enum mgmt_be_client_id id; int conn_fd; union sockunion conn_su; - struct thread *conn_init_ev; - struct thread *conn_read_ev; - struct thread *conn_write_ev; - struct thread *conn_writes_on; - struct thread *proc_msg_ev; + struct event *conn_init_ev; + struct event *conn_read_ev; + struct event *conn_write_ev; + struct event *conn_writes_on; + struct event *proc_msg_ev; uint32_t flags; char name[MGMTD_CLIENT_NAME_MAX_LEN]; uint8_t num_xpath_reg; @@ -92,7 +92,7 @@ struct mgmt_be_client_subscr_info { }; /* Initialise backend adapter module. */ -extern int mgmt_be_adapter_init(struct thread_master *tm); +extern int mgmt_be_adapter_init(struct event_loop *tm); /* Destroy the backend adapter module. */ extern void mgmt_be_adapter_destroy(void); diff --git a/mgmtd/mgmt_be_server.c b/mgmtd/mgmt_be_server.c index 6997fdcf81..0fa7ddd6d6 100644 --- a/mgmtd/mgmt_be_server.c +++ b/mgmtd/mgmt_be_server.c @@ -29,11 +29,11 @@ #endif /* REDIRECT_DEBUG_TO_STDERR */ static int mgmt_be_listen_fd = -1; -static struct thread_master *mgmt_be_listen_tm; -static struct thread *mgmt_be_listen_ev; +static struct event_loop *mgmt_be_listen_tm; +static struct event *mgmt_be_listen_ev; static void mgmt_be_server_register_event(enum mgmt_be_event event); -static void mgmt_be_conn_accept(struct thread *thread) +static void mgmt_be_conn_accept(struct event *thread) { int client_conn_fd; union sockunion su; @@ -65,7 +65,7 @@ static void mgmt_be_conn_accept(struct thread *thread) static void mgmt_be_server_register_event(enum mgmt_be_event event) { if (event == MGMTD_BE_SERVER) { - thread_add_read(mgmt_be_listen_tm, mgmt_be_conn_accept, + event_add_read(mgmt_be_listen_tm, mgmt_be_conn_accept, NULL, mgmt_be_listen_fd, &mgmt_be_listen_ev); assert(mgmt_be_listen_ev); @@ -126,7 +126,7 @@ mgmt_be_server_start_failed: exit(-1); } -int mgmt_be_server_init(struct thread_master *master) +int mgmt_be_server_init(struct event_loop *master) { if (mgmt_be_listen_tm) { MGMTD_BE_SRVR_DBG("MGMTD Backend Server already running!"); @@ -146,7 +146,7 @@ void mgmt_be_server_destroy(void) MGMTD_BE_SRVR_DBG("Closing MGMTD Backend Server!"); if (mgmt_be_listen_ev) { - THREAD_OFF(mgmt_be_listen_ev); + EVENT_OFF(mgmt_be_listen_ev); mgmt_be_listen_ev = NULL; } diff --git a/mgmtd/mgmt_be_server.h b/mgmtd/mgmt_be_server.h index 5ee57fdf1d..63731a0ef5 100644 --- a/mgmtd/mgmt_be_server.h +++ b/mgmtd/mgmt_be_server.h @@ -12,7 +12,7 @@ #define MGMTD_BE_MAX_CONN 32 /* Initialise backend server */ -extern int mgmt_be_server_init(struct thread_master *master); +extern int mgmt_be_server_init(struct event_loop *master); /* Destroy backend server */ extern void mgmt_be_server_destroy(void); diff --git a/mgmtd/mgmt_fe_adapter.c b/mgmtd/mgmt_fe_adapter.c index 6b4f09d9b2..ba4ac9f08d 100644 --- a/mgmtd/mgmt_fe_adapter.c +++ b/mgmtd/mgmt_fe_adapter.c @@ -51,8 +51,8 @@ struct mgmt_fe_session_ctx { uint8_t ds_write_locked[MGMTD_DS_MAX_ID]; uint8_t ds_read_locked[MGMTD_DS_MAX_ID]; uint8_t ds_locked_implict[MGMTD_DS_MAX_ID]; - struct thread *proc_cfg_txn_clnp; - struct thread *proc_show_txn_clnp; + struct event *proc_cfg_txn_clnp; + struct event *proc_show_txn_clnp; struct mgmt_fe_sessions_item list_linkage; }; @@ -62,7 +62,7 @@ DECLARE_LIST(mgmt_fe_sessions, struct mgmt_fe_session_ctx, list_linkage); #define FOREACH_SESSION_IN_LIST(adapter, session) \ frr_each_safe (mgmt_fe_sessions, &(adapter)->fe_sessions, (session)) -static struct thread_master *mgmt_fe_adapter_tm; +static struct event_loop *mgmt_fe_adapter_tm; static struct mgmt_master *mgmt_fe_adapter_mm; static struct mgmt_fe_adapters_head mgmt_fe_adapters; @@ -629,20 +629,20 @@ static int mgmt_fe_send_getdata_reply(struct mgmt_fe_session_ctx *session, return mgmt_fe_adapter_send_msg(session->adapter, &fe_msg); } -static void mgmt_fe_session_cfg_txn_clnup(struct thread *thread) +static void mgmt_fe_session_cfg_txn_clnup(struct event *thread) { struct mgmt_fe_session_ctx *session; - session = (struct mgmt_fe_session_ctx *)THREAD_ARG(thread); + session = (struct mgmt_fe_session_ctx *)EVENT_ARG(thread); mgmt_fe_session_cfg_txn_cleanup(session); } -static void mgmt_fe_session_show_txn_clnup(struct thread *thread) +static void mgmt_fe_session_show_txn_clnup(struct event *thread) { struct mgmt_fe_session_ctx *session; - session = (struct mgmt_fe_session_ctx *)THREAD_ARG(thread); + session = (struct mgmt_fe_session_ctx *)EVENT_ARG(thread); mgmt_fe_session_show_txn_cleanup(session); } @@ -656,13 +656,13 @@ mgmt_fe_session_register_event(struct mgmt_fe_session_ctx *session, switch (event) { case MGMTD_FE_SESSION_CFG_TXN_CLNUP: - thread_add_timer_tv(mgmt_fe_adapter_tm, + event_add_timer_tv(mgmt_fe_adapter_tm, mgmt_fe_session_cfg_txn_clnup, session, &tv, &session->proc_cfg_txn_clnp); assert(session->proc_cfg_txn_clnp); break; case MGMTD_FE_SESSION_SHOW_TXN_CLNUP: - thread_add_timer_tv(mgmt_fe_adapter_tm, + event_add_timer_tv(mgmt_fe_adapter_tm, mgmt_fe_session_show_txn_clnup, session, &tv, &session->proc_show_txn_clnp); assert(session->proc_show_txn_clnp); @@ -1435,18 +1435,18 @@ static void mgmt_fe_adapter_process_msg(void *user_ctx, uint8_t *data, mgmtd__fe_message__free_unpacked(fe_msg, NULL); } -static void mgmt_fe_adapter_proc_msgbufs(struct thread *thread) +static void mgmt_fe_adapter_proc_msgbufs(struct event *thread) { - struct mgmt_fe_client_adapter *adapter = THREAD_ARG(thread); + struct mgmt_fe_client_adapter *adapter = EVENT_ARG(thread); if (mgmt_msg_procbufs(&adapter->mstate, mgmt_fe_adapter_process_msg, adapter, mgmt_debug_fe)) mgmt_fe_adapter_register_event(adapter, MGMTD_FE_PROC_MSG); } -static void mgmt_fe_adapter_read(struct thread *thread) +static void mgmt_fe_adapter_read(struct event *thread) { - struct mgmt_fe_client_adapter *adapter = THREAD_ARG(thread); + struct mgmt_fe_client_adapter *adapter = EVENT_ARG(thread); enum mgmt_msg_rsched rv; rv = mgmt_msg_read(&adapter->mstate, adapter->conn_fd, mgmt_debug_fe); @@ -1459,9 +1459,9 @@ static void mgmt_fe_adapter_read(struct thread *thread) mgmt_fe_adapter_register_event(adapter, MGMTD_FE_CONN_READ); } -static void mgmt_fe_adapter_write(struct thread *thread) +static void mgmt_fe_adapter_write(struct event *thread) { - struct mgmt_fe_client_adapter *adapter = THREAD_ARG(thread); + struct mgmt_fe_client_adapter *adapter = EVENT_ARG(thread); enum mgmt_msg_wsched rv; rv = mgmt_msg_write(&adapter->mstate, adapter->conn_fd, mgmt_debug_fe); @@ -1477,11 +1477,11 @@ static void mgmt_fe_adapter_write(struct thread *thread) assert(rv == MSW_SCHED_NONE); } -static void mgmt_fe_adapter_resume_writes(struct thread *thread) +static void mgmt_fe_adapter_resume_writes(struct event *thread) { struct mgmt_fe_client_adapter *adapter; - adapter = (struct mgmt_fe_client_adapter *)THREAD_ARG(thread); + adapter = (struct mgmt_fe_client_adapter *)EVENT_ARG(thread); assert(adapter && adapter->conn_fd != -1); mgmt_fe_adapter_writes_on(adapter); @@ -1495,25 +1495,25 @@ mgmt_fe_adapter_register_event(struct mgmt_fe_client_adapter *adapter, switch (event) { case MGMTD_FE_CONN_READ: - thread_add_read(mgmt_fe_adapter_tm, mgmt_fe_adapter_read, + event_add_read(mgmt_fe_adapter_tm, mgmt_fe_adapter_read, adapter, adapter->conn_fd, &adapter->conn_read_ev); assert(adapter->conn_read_ev); break; case MGMTD_FE_CONN_WRITE: - thread_add_write(mgmt_fe_adapter_tm, + event_add_write(mgmt_fe_adapter_tm, mgmt_fe_adapter_write, adapter, adapter->conn_fd, &adapter->conn_write_ev); assert(adapter->conn_write_ev); break; case MGMTD_FE_PROC_MSG: tv.tv_usec = MGMTD_FE_MSG_PROC_DELAY_USEC; - thread_add_timer_tv(mgmt_fe_adapter_tm, + event_add_timer_tv(mgmt_fe_adapter_tm, mgmt_fe_adapter_proc_msgbufs, adapter, &tv, &adapter->proc_msg_ev); assert(adapter->proc_msg_ev); break; case MGMTD_FE_CONN_WRITES_ON: - thread_add_timer_msec(mgmt_fe_adapter_tm, + event_add_timer_msec(mgmt_fe_adapter_tm, mgmt_fe_adapter_resume_writes, adapter, MGMTD_FE_MSG_WRITE_DELAY_MSEC, &adapter->conn_writes_on); @@ -1538,10 +1538,10 @@ mgmt_fe_adapter_unlock(struct mgmt_fe_client_adapter **adapter) (*adapter)->refcount--; if (!(*adapter)->refcount) { mgmt_fe_adapters_del(&mgmt_fe_adapters, *adapter); - THREAD_OFF((*adapter)->conn_read_ev); - THREAD_OFF((*adapter)->conn_write_ev); - THREAD_OFF((*adapter)->proc_msg_ev); - THREAD_OFF((*adapter)->conn_writes_on); + EVENT_OFF((*adapter)->conn_read_ev); + EVENT_OFF((*adapter)->conn_write_ev); + EVENT_OFF((*adapter)->proc_msg_ev); + EVENT_OFF((*adapter)->conn_writes_on); mgmt_msg_destroy(&(*adapter)->mstate); XFREE(MTYPE_MGMTD_FE_ADPATER, *adapter); } @@ -1549,7 +1549,7 @@ mgmt_fe_adapter_unlock(struct mgmt_fe_client_adapter **adapter) *adapter = NULL; } -int mgmt_fe_adapter_init(struct thread_master *tm, struct mgmt_master *mm) +int mgmt_fe_adapter_init(struct event_loop *tm, struct mgmt_master *mm) { if (!mgmt_fe_adapter_tm) { mgmt_fe_adapter_tm = tm; diff --git a/mgmtd/mgmt_fe_adapter.h b/mgmtd/mgmt_fe_adapter.h index 3389234a3f..6f72837031 100644 --- a/mgmtd/mgmt_fe_adapter.h +++ b/mgmtd/mgmt_fe_adapter.h @@ -56,10 +56,10 @@ PREDECL_LIST(mgmt_fe_adapters); struct mgmt_fe_client_adapter { int conn_fd; union sockunion conn_su; - struct thread *conn_read_ev; - struct thread *conn_write_ev; - struct thread *conn_writes_on; - struct thread *proc_msg_ev; + struct event *conn_read_ev; + struct event *conn_write_ev; + struct event *conn_writes_on; + struct event *proc_msg_ev; uint32_t flags; char name[MGMTD_CLIENT_NAME_MAX_LEN]; @@ -82,8 +82,7 @@ struct mgmt_fe_client_adapter { DECLARE_LIST(mgmt_fe_adapters, struct mgmt_fe_client_adapter, list_linkage); /* Initialise frontend adapter module */ -extern int mgmt_fe_adapter_init(struct thread_master *tm, - struct mgmt_master *cm); +extern int mgmt_fe_adapter_init(struct event_loop *tm, struct mgmt_master *cm); /* Destroy frontend adapter module */ extern void mgmt_fe_adapter_destroy(void); diff --git a/mgmtd/mgmt_fe_server.c b/mgmtd/mgmt_fe_server.c index 0b0a56ea65..6097c23aac 100644 --- a/mgmtd/mgmt_fe_server.c +++ b/mgmtd/mgmt_fe_server.c @@ -29,11 +29,11 @@ #endif /* REDIRECT_DEBUG_TO_STDERR */ static int mgmt_fe_listen_fd = -1; -static struct thread_master *mgmt_fe_listen_tm; -static struct thread *mgmt_fe_listen_ev; +static struct event_loop *mgmt_fe_listen_tm; +static struct event *mgmt_fe_listen_ev; static void mgmt_fe_server_register_event(enum mgmt_fe_event event); -static void mgmt_fe_conn_accept(struct thread *thread) +static void mgmt_fe_conn_accept(struct event *thread) { int client_conn_fd; union sockunion su; @@ -65,7 +65,7 @@ static void mgmt_fe_conn_accept(struct thread *thread) static void mgmt_fe_server_register_event(enum mgmt_fe_event event) { if (event == MGMTD_FE_SERVER) { - thread_add_read(mgmt_fe_listen_tm, mgmt_fe_conn_accept, + event_add_read(mgmt_fe_listen_tm, mgmt_fe_conn_accept, NULL, mgmt_fe_listen_fd, &mgmt_fe_listen_ev); assert(mgmt_fe_listen_ev); @@ -126,7 +126,7 @@ mgmt_fe_server_start_failed: exit(-1); } -int mgmt_fe_server_init(struct thread_master *master) +int mgmt_fe_server_init(struct event_loop *master) { if (mgmt_fe_listen_tm) { MGMTD_FE_SRVR_DBG("MGMTD Frontend Server already running!"); @@ -146,7 +146,7 @@ void mgmt_fe_server_destroy(void) MGMTD_FE_SRVR_DBG("Closing MGMTD Frontend Server!"); if (mgmt_fe_listen_ev) { - THREAD_OFF(mgmt_fe_listen_ev); + EVENT_OFF(mgmt_fe_listen_ev); mgmt_fe_listen_ev = NULL; } diff --git a/mgmtd/mgmt_fe_server.h b/mgmtd/mgmt_fe_server.h index 672ab05c3e..6f676ba4da 100644 --- a/mgmtd/mgmt_fe_server.h +++ b/mgmtd/mgmt_fe_server.h @@ -12,7 +12,7 @@ #define MGMTD_FE_MAX_CONN 32 /* Initialise frontend server */ -extern int mgmt_fe_server_init(struct thread_master *master); +extern int mgmt_fe_server_init(struct event_loop *master); /* Destroy frontend server */ extern void mgmt_fe_server_destroy(void); diff --git a/mgmtd/mgmt_history.c b/mgmtd/mgmt_history.c index 0e664bc0f1..6f9f2dd63f 100644 --- a/mgmtd/mgmt_history.c +++ b/mgmtd/mgmt_history.c @@ -7,7 +7,7 @@ #include #include "md5.h" -#include "thread.h" +#include "frrevent.h" #include "xref.h" #include "mgmt_fe_client.h" diff --git a/mgmtd/mgmt_txn.c b/mgmtd/mgmt_txn.c index 7ae720bc5f..b5f61d3bc1 100644 --- a/mgmtd/mgmt_txn.c +++ b/mgmtd/mgmt_txn.c @@ -215,12 +215,12 @@ struct mgmt_txn_ctx { /* struct mgmt_master *mm; */ - struct thread *proc_set_cfg; - struct thread *proc_comm_cfg; - struct thread *proc_get_cfg; - struct thread *proc_get_data; - struct thread *comm_cfg_timeout; - struct thread *clnup; + struct event *proc_set_cfg; + struct event *proc_comm_cfg; + struct event *proc_get_cfg; + struct event *proc_get_data; + struct event *comm_cfg_timeout; + struct event *clnup; /* List of backend adapters involved in this transaction */ struct mgmt_txn_badapters_head be_adapters; @@ -286,7 +286,7 @@ static int mgmt_txn_send_be_txn_delete(struct mgmt_txn_ctx *txn, struct mgmt_be_client_adapter *adapter); -static struct thread_master *mgmt_txn_tm; +static struct event_loop *mgmt_txn_tm; static struct mgmt_master *mgmt_txn_mm; static void mgmt_txn_register_event(struct mgmt_txn_ctx *txn, @@ -615,7 +615,7 @@ static void mgmt_txn_req_free(struct mgmt_txn_req **txn_req) *txn_req = NULL; } -static void mgmt_txn_process_set_cfg(struct thread *thread) +static void mgmt_txn_process_set_cfg(struct event *thread) { struct mgmt_txn_ctx *txn; struct mgmt_txn_req *txn_req; @@ -628,7 +628,7 @@ static void mgmt_txn_process_set_cfg(struct thread *thread) struct mgmt_commit_stats *cmt_stats; int ret = 0; - txn = (struct mgmt_txn_ctx *)THREAD_ARG(thread); + txn = (struct mgmt_txn_ctx *)EVENT_ARG(thread); assert(txn); cmt_stats = mgmt_fe_get_session_commit_stats(txn->session_id); @@ -780,7 +780,7 @@ static int mgmt_txn_send_commit_cfg_reply(struct mgmt_txn_ctx *txn, if (success) { /* Stop the commit-timeout timer */ - THREAD_OFF(txn->comm_cfg_timeout); + EVENT_OFF(txn->comm_cfg_timeout); create_cmt_info_rec = (result != MGMTD_NO_CFG_CHANGES && @@ -1454,11 +1454,11 @@ mgmt_txn_send_be_txn_delete(struct mgmt_txn_ctx *txn, return 0; } -static void mgmt_txn_cfg_commit_timedout(struct thread *thread) +static void mgmt_txn_cfg_commit_timedout(struct event *thread) { struct mgmt_txn_ctx *txn; - txn = (struct mgmt_txn_ctx *)THREAD_ARG(thread); + txn = (struct mgmt_txn_ctx *)EVENT_ARG(thread); assert(txn); assert(txn->type == MGMTD_TXN_TYPE_CONFIG); @@ -1544,12 +1544,12 @@ static int mgmt_txn_send_be_cfg_apply(struct mgmt_txn_ctx *txn) return 0; } -static void mgmt_txn_process_commit_cfg(struct thread *thread) +static void mgmt_txn_process_commit_cfg(struct event *thread) { struct mgmt_txn_ctx *txn; struct mgmt_commit_cfg_req *cmtcfg_req; - txn = (struct mgmt_txn_ctx *)THREAD_ARG(thread); + txn = (struct mgmt_txn_ctx *)EVENT_ARG(thread); assert(txn); MGMTD_TXN_DBG( @@ -1615,7 +1615,7 @@ static void mgmt_txn_process_commit_cfg(struct thread *thread) * cleanup. Please see mgmt_fe_send_commit_cfg_reply() for * more details. */ - THREAD_OFF(txn->comm_cfg_timeout); + EVENT_OFF(txn->comm_cfg_timeout); mgmt_txn_send_commit_cfg_reply(txn, MGMTD_SUCCESS, NULL); break; case MGMTD_COMMIT_PHASE_MAX: @@ -1874,7 +1874,7 @@ mgmt_txn_get_config_failed: return 0; } -static void mgmt_txn_process_get_cfg(struct thread *thread) +static void mgmt_txn_process_get_cfg(struct event *thread) { struct mgmt_txn_ctx *txn; struct mgmt_txn_req *txn_req; @@ -1882,7 +1882,7 @@ static void mgmt_txn_process_get_cfg(struct thread *thread) int num_processed = 0; bool error; - txn = (struct mgmt_txn_ctx *)THREAD_ARG(thread); + txn = (struct mgmt_txn_ctx *)EVENT_ARG(thread); assert(txn); MGMTD_TXN_DBG( @@ -1941,7 +1941,7 @@ static void mgmt_txn_process_get_cfg(struct thread *thread) } } -static void mgmt_txn_process_get_data(struct thread *thread) +static void mgmt_txn_process_get_data(struct event *thread) { struct mgmt_txn_ctx *txn; struct mgmt_txn_req *txn_req; @@ -1949,7 +1949,7 @@ static void mgmt_txn_process_get_data(struct thread *thread) int num_processed = 0; bool error; - txn = (struct mgmt_txn_ctx *)THREAD_ARG(thread); + txn = (struct mgmt_txn_ctx *)EVENT_ARG(thread); assert(txn); MGMTD_TXN_DBG( @@ -2170,10 +2170,10 @@ static void mgmt_txn_unlock(struct mgmt_txn_ctx **txn, const char *file, if ((*txn)->type == MGMTD_TXN_TYPE_CONFIG) if (mgmt_txn_mm->cfg_txn == *txn) mgmt_txn_mm->cfg_txn = NULL; - THREAD_OFF((*txn)->proc_get_cfg); - THREAD_OFF((*txn)->proc_get_data); - THREAD_OFF((*txn)->proc_comm_cfg); - THREAD_OFF((*txn)->comm_cfg_timeout); + EVENT_OFF((*txn)->proc_get_cfg); + EVENT_OFF((*txn)->proc_get_data); + EVENT_OFF((*txn)->proc_comm_cfg); + EVENT_OFF((*txn)->comm_cfg_timeout); hash_release(mgmt_txn_mm->txn_hash, *txn); mgmt_txns_del(&mgmt_txn_mm->txn_list, *txn); @@ -2206,11 +2206,11 @@ mgmt_txn_cleanup_all_txns(void) mgmt_txn_cleanup_txn(&txn); } -static void mgmt_txn_cleanup(struct thread *thread) +static void mgmt_txn_cleanup(struct event *thread) { struct mgmt_txn_ctx *txn; - txn = (struct mgmt_txn_ctx *)THREAD_ARG(thread); + txn = (struct mgmt_txn_ctx *)EVENT_ARG(thread); assert(txn); mgmt_txn_cleanup_txn(&txn); @@ -2226,27 +2226,27 @@ static void mgmt_txn_register_event(struct mgmt_txn_ctx *txn, switch (event) { case MGMTD_TXN_PROC_SETCFG: - thread_add_timer_tv(mgmt_txn_tm, mgmt_txn_process_set_cfg, + event_add_timer_tv(mgmt_txn_tm, mgmt_txn_process_set_cfg, txn, &tv, &txn->proc_set_cfg); assert(txn->proc_set_cfg); break; case MGMTD_TXN_PROC_COMMITCFG: - thread_add_timer_tv(mgmt_txn_tm, mgmt_txn_process_commit_cfg, + event_add_timer_tv(mgmt_txn_tm, mgmt_txn_process_commit_cfg, txn, &tv, &txn->proc_comm_cfg); assert(txn->proc_comm_cfg); break; case MGMTD_TXN_PROC_GETCFG: - thread_add_timer_tv(mgmt_txn_tm, mgmt_txn_process_get_cfg, + event_add_timer_tv(mgmt_txn_tm, mgmt_txn_process_get_cfg, txn, &tv, &txn->proc_get_cfg); assert(txn->proc_get_cfg); break; case MGMTD_TXN_PROC_GETDATA: - thread_add_timer_tv(mgmt_txn_tm, mgmt_txn_process_get_data, + event_add_timer_tv(mgmt_txn_tm, mgmt_txn_process_get_data, txn, &tv, &txn->proc_get_data); assert(txn->proc_get_data); break; case MGMTD_TXN_COMMITCFG_TIMEOUT: - thread_add_timer_msec(mgmt_txn_tm, + event_add_timer_msec(mgmt_txn_tm, mgmt_txn_cfg_commit_timedout, txn, MGMTD_TXN_CFG_COMMIT_MAX_DELAY_MSEC, &txn->comm_cfg_timeout); @@ -2254,13 +2254,13 @@ static void mgmt_txn_register_event(struct mgmt_txn_ctx *txn, break; case MGMTD_TXN_CLEANUP: tv.tv_usec = MGMTD_TXN_CLEANUP_DELAY_USEC; - thread_add_timer_tv(mgmt_txn_tm, mgmt_txn_cleanup, txn, &tv, + event_add_timer_tv(mgmt_txn_tm, mgmt_txn_cleanup, txn, &tv, &txn->clnup); assert(txn->clnup); } } -int mgmt_txn_init(struct mgmt_master *mm, struct thread_master *tm) +int mgmt_txn_init(struct mgmt_master *mm, struct event_loop *tm) { if (mgmt_txn_mm || mgmt_txn_tm) assert(!"MGMTD TXN: Call txn_init() only once"); diff --git a/mgmtd/mgmt_txn.h b/mgmtd/mgmt_txn.h index f026a39937..be781ab954 100644 --- a/mgmtd/mgmt_txn.h +++ b/mgmtd/mgmt_txn.h @@ -65,7 +65,7 @@ static inline const char *mgmt_txn_type2str(enum mgmt_txn_type type) } /* Initialise transaction module. */ -extern int mgmt_txn_init(struct mgmt_master *cm, struct thread_master *tm); +extern int mgmt_txn_init(struct mgmt_master *cm, struct event_loop *tm); /* Destroy the transaction module. */ extern void mgmt_txn_destroy(void); diff --git a/nhrpd/netlink_arp.c b/nhrpd/netlink_arp.c index 877659b4c0..2e22f8e247 100644 --- a/nhrpd/netlink_arp.c +++ b/nhrpd/netlink_arp.c @@ -14,7 +14,7 @@ #include #include -#include "thread.h" +#include "frrevent.h" #include "stream.h" #include "prefix.h" #include "nhrpd.h" @@ -23,7 +23,7 @@ int netlink_nflog_group; static int netlink_log_fd = -1; -static struct thread *netlink_log_thread; +static struct event *netlink_log_thread; void netlink_update_binding(struct interface *ifp, union sockunion *proto, union sockunion *nbma) @@ -96,10 +96,10 @@ static void netlink_log_indication(struct nlmsghdr *msg, struct zbuf *zb) nhrp_peer_send_indication(ifp, htons(pkthdr->hw_protocol), &pktpl); } -static void netlink_log_recv(struct thread *t) +static void netlink_log_recv(struct event *t) { uint8_t buf[ZNL_BUFFER_SIZE]; - int fd = THREAD_FD(t); + int fd = EVENT_FD(t); struct zbuf payload, zb; struct nlmsghdr *n; @@ -118,14 +118,14 @@ static void netlink_log_recv(struct thread *t) } } - thread_add_read(master, netlink_log_recv, 0, netlink_log_fd, - &netlink_log_thread); + event_add_read(master, netlink_log_recv, 0, netlink_log_fd, + &netlink_log_thread); } void netlink_set_nflog_group(int nlgroup) { if (netlink_log_fd >= 0) { - thread_cancel(&netlink_log_thread); + event_cancel(&netlink_log_thread); close(netlink_log_fd); netlink_log_fd = -1; } @@ -136,8 +136,8 @@ void netlink_set_nflog_group(int nlgroup) return; netlink_log_register(netlink_log_fd, nlgroup); - thread_add_read(master, netlink_log_recv, 0, netlink_log_fd, - &netlink_log_thread); + event_add_read(master, netlink_log_recv, 0, netlink_log_fd, + &netlink_log_thread); } } diff --git a/nhrpd/nhrp_cache.c b/nhrpd/nhrp_cache.c index 42c6c2fbba..1a11e0d98b 100644 --- a/nhrpd/nhrp_cache.c +++ b/nhrpd/nhrp_cache.c @@ -5,7 +5,7 @@ #include "zebra.h" #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "hash.h" #include "nhrpd.h" @@ -72,8 +72,8 @@ static void nhrp_cache_free(struct nhrp_cache *c) hash_release(nifp->cache_hash, c); nhrp_peer_unref(c->cur.peer); nhrp_peer_unref(c->new.peer); - THREAD_OFF(c->t_timeout); - THREAD_OFF(c->t_auth); + EVENT_OFF(c->t_timeout); + EVENT_OFF(c->t_auth); XFREE(MTYPE_NHRP_CACHE, c); } @@ -195,17 +195,17 @@ struct nhrp_cache *nhrp_cache_get(struct interface *ifp, create ? nhrp_cache_alloc : NULL); } -static void nhrp_cache_do_free(struct thread *t) +static void nhrp_cache_do_free(struct event *t) { - struct nhrp_cache *c = THREAD_ARG(t); + struct nhrp_cache *c = EVENT_ARG(t); c->t_timeout = NULL; nhrp_cache_free(c); } -static void nhrp_cache_do_timeout(struct thread *t) +static void nhrp_cache_do_timeout(struct event *t) { - struct nhrp_cache *c = THREAD_ARG(t); + struct nhrp_cache *c = EVENT_ARG(t); c->t_timeout = NULL; if (c->cur.type != NHRP_CACHE_INVALID) @@ -310,7 +310,7 @@ static void nhrp_cache_peer_notifier(struct notifier_block *n, static void nhrp_cache_reset_new(struct nhrp_cache *c) { - THREAD_OFF(c->t_auth); + EVENT_OFF(c->t_auth); if (notifier_list_anywhere(&c->newpeer_notifier)) nhrp_peer_notify_del(c->new.peer, &c->newpeer_notifier); nhrp_peer_unref(c->new.peer); @@ -320,13 +320,13 @@ static void nhrp_cache_reset_new(struct nhrp_cache *c) static void nhrp_cache_update_timers(struct nhrp_cache *c) { - THREAD_OFF(c->t_timeout); + EVENT_OFF(c->t_timeout); switch (c->cur.type) { case NHRP_CACHE_INVALID: if (!c->t_auth) - thread_add_timer_msec(master, nhrp_cache_do_free, c, 10, - &c->t_timeout); + event_add_timer_msec(master, nhrp_cache_do_free, c, 10, + &c->t_timeout); break; case NHRP_CACHE_INCOMPLETE: case NHRP_CACHE_NEGATIVE: @@ -337,9 +337,9 @@ static void nhrp_cache_update_timers(struct nhrp_cache *c) case NHRP_CACHE_LOCAL: case NHRP_CACHE_NUM_TYPES: if (c->cur.expires) - thread_add_timer(master, nhrp_cache_do_timeout, c, - c->cur.expires - monotime(NULL), - &c->t_timeout); + event_add_timer(master, nhrp_cache_do_timeout, c, + c->cur.expires - monotime(NULL), + &c->t_timeout); break; } } @@ -395,9 +395,9 @@ static void nhrp_cache_authorize_binding(struct nhrp_reqid *r, void *arg) nhrp_cache_update_timers(c); } -static void nhrp_cache_do_auth_timeout(struct thread *t) +static void nhrp_cache_do_auth_timeout(struct event *t) { - struct nhrp_cache *c = THREAD_ARG(t); + struct nhrp_cache *c = EVENT_ARG(t); c->t_auth = NULL; nhrp_cache_authorize_binding(&c->eventid, (void *)"timeout"); } @@ -413,8 +413,8 @@ static void nhrp_cache_newpeer_notifier(struct notifier_block *n, if (nhrp_peer_check(c->new.peer, 1)) { evmgr_notify("authorize-binding", c, nhrp_cache_authorize_binding); - thread_add_timer(master, nhrp_cache_do_auth_timeout, c, - 10, &c->t_auth); + event_add_timer(master, nhrp_cache_do_auth_timeout, c, + 10, &c->t_auth); } break; case NOTIFY_PEER_DOWN: @@ -506,8 +506,8 @@ int nhrp_cache_update_binding(struct nhrp_cache *c, enum nhrp_cache_type type, nhrp_cache_newpeer_notifier); nhrp_cache_newpeer_notifier(&c->newpeer_notifier, NOTIFY_PEER_UP); - thread_add_timer(master, nhrp_cache_do_auth_timeout, c, - 60, &c->t_auth); + event_add_timer(master, nhrp_cache_do_auth_timeout, c, + 60, &c->t_auth); } } nhrp_cache_update_timers(c); diff --git a/nhrpd/nhrp_event.c b/nhrpd/nhrp_event.c index 9c11890831..ba318581d5 100644 --- a/nhrpd/nhrp_event.c +++ b/nhrpd/nhrp_event.c @@ -11,7 +11,7 @@ #include #include -#include "thread.h" +#include "frrevent.h" #include "zbuf.h" #include "log.h" #include "nhrpd.h" @@ -20,19 +20,19 @@ const char *nhrp_event_socket_path; struct nhrp_reqid_pool nhrp_event_reqid; struct event_manager { - struct thread *t_reconnect, *t_read, *t_write; + struct event *t_reconnect, *t_read, *t_write; struct zbuf ibuf; struct zbuf_queue obuf; int fd; uint8_t ibuf_data[4 * 1024]; }; -static void evmgr_reconnect(struct thread *t); +static void evmgr_reconnect(struct event *t); static void evmgr_connection_error(struct event_manager *evmgr) { - THREAD_OFF(evmgr->t_read); - THREAD_OFF(evmgr->t_write); + EVENT_OFF(evmgr->t_read); + EVENT_OFF(evmgr->t_write); zbuf_reset(&evmgr->ibuf); zbufq_reset(&evmgr->obuf); @@ -40,8 +40,8 @@ static void evmgr_connection_error(struct event_manager *evmgr) close(evmgr->fd); evmgr->fd = -1; if (nhrp_event_socket_path) - thread_add_timer_msec(master, evmgr_reconnect, evmgr, 10, - &evmgr->t_reconnect); + event_add_timer_msec(master, evmgr_reconnect, evmgr, 10, + &evmgr->t_reconnect); } static void evmgr_recv_message(struct event_manager *evmgr, struct zbuf *zb) @@ -74,9 +74,9 @@ static void evmgr_recv_message(struct event_manager *evmgr, struct zbuf *zb) } } -static void evmgr_read(struct thread *t) +static void evmgr_read(struct event *t) { - struct event_manager *evmgr = THREAD_ARG(t); + struct event_manager *evmgr = EVENT_ARG(t); struct zbuf *ibuf = &evmgr->ibuf; struct zbuf msg; @@ -89,18 +89,18 @@ static void evmgr_read(struct thread *t) while (zbuf_may_pull_until(ibuf, "\n\n", &msg)) evmgr_recv_message(evmgr, &msg); - thread_add_read(master, evmgr_read, evmgr, evmgr->fd, &evmgr->t_read); + event_add_read(master, evmgr_read, evmgr, evmgr->fd, &evmgr->t_read); } -static void evmgr_write(struct thread *t) +static void evmgr_write(struct event *t) { - struct event_manager *evmgr = THREAD_ARG(t); + struct event_manager *evmgr = EVENT_ARG(t); int r; r = zbufq_write(&evmgr->obuf, evmgr->fd); if (r > 0) { - thread_add_write(master, evmgr_write, evmgr, evmgr->fd, - &evmgr->t_write); + event_add_write(master, evmgr_write, evmgr, evmgr->fd, + &evmgr->t_write); } else if (r < 0) { evmgr_connection_error(evmgr); } @@ -175,13 +175,13 @@ static void evmgr_submit(struct event_manager *evmgr, struct zbuf *obuf) zbuf_put(obuf, "\n", 1); zbufq_queue(&evmgr->obuf, obuf); if (evmgr->fd >= 0) - thread_add_write(master, evmgr_write, evmgr, evmgr->fd, - &evmgr->t_write); + event_add_write(master, evmgr_write, evmgr, evmgr->fd, + &evmgr->t_write); } -static void evmgr_reconnect(struct thread *t) +static void evmgr_reconnect(struct event *t) { - struct event_manager *evmgr = THREAD_ARG(t); + struct event_manager *evmgr = EVENT_ARG(t); int fd; if (evmgr->fd >= 0 || !nhrp_event_socket_path) @@ -192,14 +192,14 @@ static void evmgr_reconnect(struct thread *t) zlog_warn("%s: failure connecting nhrp-event socket: %s", __func__, strerror(errno)); zbufq_reset(&evmgr->obuf); - thread_add_timer(master, evmgr_reconnect, evmgr, 10, - &evmgr->t_reconnect); + event_add_timer(master, evmgr_reconnect, evmgr, 10, + &evmgr->t_reconnect); return; } zlog_info("Connected to Event Manager"); evmgr->fd = fd; - thread_add_read(master, evmgr_read, evmgr, evmgr->fd, &evmgr->t_read); + event_add_read(master, evmgr_read, evmgr, evmgr->fd, &evmgr->t_read); } static struct event_manager evmgr_connection; @@ -211,8 +211,8 @@ void evmgr_init(void) evmgr->fd = -1; zbuf_init(&evmgr->ibuf, evmgr->ibuf_data, sizeof(evmgr->ibuf_data), 0); zbufq_init(&evmgr->obuf); - thread_add_timer_msec(master, evmgr_reconnect, evmgr, 10, - &evmgr->t_reconnect); + event_add_timer_msec(master, evmgr_reconnect, evmgr, 10, + &evmgr->t_reconnect); } void evmgr_set_socket(const char *socket) diff --git a/nhrpd/nhrp_interface.c b/nhrpd/nhrp_interface.c index d396f510ed..7c84fde367 100644 --- a/nhrpd/nhrp_interface.c +++ b/nhrpd/nhrp_interface.c @@ -11,7 +11,7 @@ #include "zebra.h" #include "linklist.h" #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "nhrpd.h" #include "os.h" diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c index 10d3c8f82f..593498ca13 100644 --- a/nhrpd/nhrp_main.c +++ b/nhrpd/nhrp_main.c @@ -12,7 +12,7 @@ #include "zebra.h" #include "privs.h" #include "getopt.h" -#include "thread.h" +#include "frrevent.h" #include "sigevent.h" #include "lib/version.h" #include "log.h" @@ -28,7 +28,7 @@ DEFINE_MGROUP(NHRPD, "NHRP"); unsigned int debug_flags = 0; -struct thread_master *master; +struct event_loop *master; struct timeval current_time; /* nhrpd options. */ diff --git a/nhrpd/nhrp_multicast.c b/nhrpd/nhrp_multicast.c index cdd79e25f4..fdc1a31f25 100644 --- a/nhrpd/nhrp_multicast.c +++ b/nhrpd/nhrp_multicast.c @@ -18,7 +18,7 @@ #include #include -#include "thread.h" +#include "frrevent.h" #include "nhrpd.h" #include "netlink.h" #include "znl.h" @@ -28,7 +28,7 @@ DEFINE_MTYPE_STATIC(NHRPD, NHRP_MULTICAST, "NHRP Multicast"); int netlink_mcast_nflog_group; static int netlink_mcast_log_fd = -1; -static struct thread *netlink_mcast_log_thread; +static struct event *netlink_mcast_log_thread; struct mcast_ctx { struct interface *ifp; @@ -138,10 +138,10 @@ static void netlink_mcast_log_handler(struct nlmsghdr *msg, struct zbuf *zb) } } -static void netlink_mcast_log_recv(struct thread *t) +static void netlink_mcast_log_recv(struct event *t) { uint8_t buf[65535]; /* Max OSPF Packet size */ - int fd = THREAD_FD(t); + int fd = EVENT_FD(t); struct zbuf payload, zb; struct nlmsghdr *n; @@ -160,8 +160,8 @@ static void netlink_mcast_log_recv(struct thread *t) } } - thread_add_read(master, netlink_mcast_log_recv, 0, netlink_mcast_log_fd, - &netlink_mcast_log_thread); + event_add_read(master, netlink_mcast_log_recv, 0, netlink_mcast_log_fd, + &netlink_mcast_log_thread); } static void netlink_mcast_log_register(int fd, int group) @@ -190,7 +190,7 @@ static void netlink_mcast_log_register(int fd, int group) void netlink_mcast_set_nflog_group(int nlgroup) { if (netlink_mcast_log_fd >= 0) { - THREAD_OFF(netlink_mcast_log_thread); + EVENT_OFF(netlink_mcast_log_thread); close(netlink_mcast_log_fd); netlink_mcast_log_fd = -1; debugf(NHRP_DEBUG_COMMON, "De-register nflog group"); @@ -202,9 +202,8 @@ void netlink_mcast_set_nflog_group(int nlgroup) return; netlink_mcast_log_register(netlink_mcast_log_fd, nlgroup); - thread_add_read(master, netlink_mcast_log_recv, 0, - netlink_mcast_log_fd, - &netlink_mcast_log_thread); + event_add_read(master, netlink_mcast_log_recv, 0, + netlink_mcast_log_fd, &netlink_mcast_log_thread); debugf(NHRP_DEBUG_COMMON, "Register nflog group: %d", netlink_mcast_nflog_group); } diff --git a/nhrpd/nhrp_nhs.c b/nhrpd/nhrp_nhs.c index 49f881df1f..b2af0da429 100644 --- a/nhrpd/nhrp_nhs.c +++ b/nhrpd/nhrp_nhs.c @@ -6,15 +6,15 @@ #include "zebra.h" #include "zbuf.h" #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "nhrpd.h" #include "nhrp_protocol.h" DEFINE_MTYPE_STATIC(NHRPD, NHRP_NHS, "NHRP next hop server"); DEFINE_MTYPE_STATIC(NHRPD, NHRP_REGISTRATION, "NHRP registration entries"); -static void nhrp_nhs_resolve(struct thread *t); -static void nhrp_reg_send_req(struct thread *t); +static void nhrp_nhs_resolve(struct event *t); +static void nhrp_reg_send_req(struct event *t); static void nhrp_reg_reply(struct nhrp_reqid *reqid, void *arg) { @@ -88,12 +88,12 @@ static void nhrp_reg_reply(struct nhrp_reqid *reqid, void *arg) /* Success - schedule next registration, and route NHS */ r->timeout = 2; holdtime = nifp->afi[nhs->afi].holdtime; - THREAD_OFF(r->t_register); + EVENT_OFF(r->t_register); /* RFC 2332 5.2.3 - Registration is recommend to be renewed * every one third of holdtime */ - thread_add_timer(master, nhrp_reg_send_req, r, holdtime / 3, - &r->t_register); + event_add_timer(master, nhrp_reg_send_req, r, holdtime / 3, + &r->t_register); r->proto_addr = p->dst_proto; c = nhrp_cache_get(ifp, &p->dst_proto, 1); @@ -103,9 +103,9 @@ static void nhrp_reg_reply(struct nhrp_reqid *reqid, void *arg) &cie_nbma_nhs); } -static void nhrp_reg_timeout(struct thread *t) +static void nhrp_reg_timeout(struct event *t) { - struct nhrp_registration *r = THREAD_ARG(t); + struct nhrp_registration *r = EVENT_ARG(t); struct nhrp_cache *c; @@ -133,7 +133,7 @@ static void nhrp_reg_timeout(struct thread *t) } r->timeout = 2; } - thread_add_timer_msec(master, nhrp_reg_send_req, r, 10, &r->t_register); + event_add_timer_msec(master, nhrp_reg_send_req, r, 10, &r->t_register); } static void nhrp_reg_peer_notify(struct notifier_block *n, unsigned long cmd) @@ -148,16 +148,16 @@ static void nhrp_reg_peer_notify(struct notifier_block *n, unsigned long cmd) case NOTIFY_PEER_MTU_CHANGED: debugf(NHRP_DEBUG_COMMON, "NHS: Flush timer for %pSU", &r->peer->vc->remote.nbma); - THREAD_OFF(r->t_register); - thread_add_timer_msec(master, nhrp_reg_send_req, r, 10, - &r->t_register); + EVENT_OFF(r->t_register); + event_add_timer_msec(master, nhrp_reg_send_req, r, 10, + &r->t_register); break; } } -static void nhrp_reg_send_req(struct thread *t) +static void nhrp_reg_send_req(struct event *t) { - struct nhrp_registration *r = THREAD_ARG(t); + struct nhrp_registration *r = EVENT_ARG(t); struct nhrp_nhs *nhs = r->nhs; struct interface *ifp = nhs->ifp; struct nhrp_interface *nifp = ifp->info; @@ -171,13 +171,13 @@ static void nhrp_reg_send_req(struct thread *t) if (!nhrp_peer_check(r->peer, 2)) { debugf(NHRP_DEBUG_COMMON, "NHS: Waiting link for %pSU", &r->peer->vc->remote.nbma); - thread_add_timer(master, nhrp_reg_send_req, r, 120, - &r->t_register); + event_add_timer(master, nhrp_reg_send_req, r, 120, + &r->t_register); return; } - thread_add_timer(master, nhrp_reg_timeout, r, r->timeout, - &r->t_register); + event_add_timer(master, nhrp_reg_timeout, r, r->timeout, + &r->t_register); /* RFC2332 5.2.3 NHC uses it's own address as dst if NHS is unknown */ dst_proto = &nhs->proto_addr; @@ -244,7 +244,7 @@ static void nhrp_reg_delete(struct nhrp_registration *r) nhrp_peer_notify_del(r->peer, &r->peer_notifier); nhrp_peer_unref(r->peer); nhrp_reglist_del(&r->nhs->reglist_head, r); - THREAD_OFF(r->t_register); + EVENT_OFF(r->t_register); XFREE(MTYPE_NHRP_REGISTRATION, r); } @@ -269,13 +269,13 @@ static void nhrp_nhs_resolve_cb(struct resolver_query *q, const char *errstr, if (n < 0) { /* Failed, retry in a moment */ - thread_add_timer(master, nhrp_nhs_resolve, nhs, 5, - &nhs->t_resolve); + event_add_timer(master, nhrp_nhs_resolve, nhs, 5, + &nhs->t_resolve); return; } - thread_add_timer(master, nhrp_nhs_resolve, nhs, 2 * 60 * 60, - &nhs->t_resolve); + event_add_timer(master, nhrp_nhs_resolve, nhs, 2 * 60 * 60, + &nhs->t_resolve); frr_each (nhrp_reglist, &nhs->reglist_head, reg) reg->mark = 1; @@ -300,8 +300,8 @@ static void nhrp_nhs_resolve_cb(struct resolver_query *q, const char *errstr, nhrp_reglist_add_tail(&nhs->reglist_head, reg); nhrp_peer_notify_add(reg->peer, ®->peer_notifier, nhrp_reg_peer_notify); - thread_add_timer_msec(master, nhrp_reg_send_req, reg, 50, - ®->t_register); + event_add_timer_msec(master, nhrp_reg_send_req, reg, 50, + ®->t_register); } frr_each_safe (nhrp_reglist, &nhs->reglist_head, reg) @@ -309,9 +309,9 @@ static void nhrp_nhs_resolve_cb(struct resolver_query *q, const char *errstr, nhrp_reg_delete(reg); } -static void nhrp_nhs_resolve(struct thread *t) +static void nhrp_nhs_resolve(struct event *t) { - struct nhrp_nhs *nhs = THREAD_ARG(t); + struct nhrp_nhs *nhs = EVENT_ARG(t); resolver_resolve(&nhs->dns_resolve, AF_INET, VRF_DEFAULT, nhs->nbma_fqdn, nhrp_nhs_resolve_cb); @@ -347,8 +347,8 @@ int nhrp_nhs_add(struct interface *ifp, afi_t afi, union sockunion *proto_addr, .reglist_head = INIT_DLIST(nhs->reglist_head), }; nhrp_nhslist_add_tail(&nifp->afi[afi].nhslist_head, nhs); - thread_add_timer_msec(master, nhrp_nhs_resolve, nhs, 1000, - &nhs->t_resolve); + event_add_timer_msec(master, nhrp_nhs_resolve, nhs, 1000, + &nhs->t_resolve); return NHRP_OK; } @@ -383,7 +383,7 @@ int nhrp_nhs_free(struct nhrp_interface *nifp, afi_t afi, struct nhrp_nhs *nhs) frr_each_safe (nhrp_reglist, &nhs->reglist_head, r) nhrp_reg_delete(r); - THREAD_OFF(nhs->t_resolve); + EVENT_OFF(nhs->t_resolve); nhrp_nhslist_del(&nifp->afi[afi].nhslist_head, nhs); free((void *)nhs->nbma_fqdn); XFREE(MTYPE_NHRP_NHS, nhs); diff --git a/nhrpd/nhrp_packet.c b/nhrpd/nhrp_packet.c index ecf8aa0b13..9d0b30cfee 100644 --- a/nhrpd/nhrp_packet.c +++ b/nhrpd/nhrp_packet.c @@ -10,7 +10,7 @@ #include #include "nhrpd.h" #include "zbuf.h" -#include "thread.h" +#include "frrevent.h" #include "hash.h" #include "nhrp_protocol.h" @@ -286,9 +286,9 @@ err: return -1; } -static void nhrp_packet_recvraw(struct thread *t) +static void nhrp_packet_recvraw(struct event *t) { - int fd = THREAD_FD(t), ifindex; + int fd = EVENT_FD(t), ifindex; struct zbuf *zb; struct interface *ifp; struct nhrp_peer *p; @@ -296,7 +296,7 @@ static void nhrp_packet_recvraw(struct thread *t) uint8_t addr[64]; size_t len, addrlen; - thread_add_read(master, nhrp_packet_recvraw, 0, fd, NULL); + event_add_read(master, nhrp_packet_recvraw, 0, fd, NULL); zb = zbuf_alloc(1500); if (!zb) @@ -336,6 +336,6 @@ err: int nhrp_packet_init(void) { - thread_add_read(master, nhrp_packet_recvraw, 0, os_socket(), NULL); + event_add_read(master, nhrp_packet_recvraw, 0, os_socket(), NULL); return 0; } diff --git a/nhrpd/nhrp_peer.c b/nhrpd/nhrp_peer.c index 9b92cdffc3..ffb6cf7506 100644 --- a/nhrpd/nhrp_peer.c +++ b/nhrpd/nhrp_peer.c @@ -11,7 +11,7 @@ #include "zebra.h" #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "hash.h" #include "network.h" @@ -43,17 +43,17 @@ static void nhrp_peer_check_delete(struct nhrp_peer *p) debugf(NHRP_DEBUG_COMMON, "Deleting peer ref:%d remote:%pSU local:%pSU", p->ref, &p->vc->remote.nbma, &p->vc->local.nbma); - THREAD_OFF(p->t_fallback); - THREAD_OFF(p->t_timer); + EVENT_OFF(p->t_fallback); + EVENT_OFF(p->t_timer); hash_release(nifp->peer_hash, p); nhrp_interface_notify_del(p->ifp, &p->ifp_notifier); nhrp_vc_notify_del(p->vc, &p->vc_notifier); XFREE(MTYPE_NHRP_PEER, p); } -static void nhrp_peer_notify_up(struct thread *t) +static void nhrp_peer_notify_up(struct event *t) { - struct nhrp_peer *p = THREAD_ARG(t); + struct nhrp_peer *p = EVENT_ARG(t); struct nhrp_vc *vc = p->vc; struct interface *ifp = p->ifp; struct nhrp_interface *nifp = ifp->info; @@ -76,14 +76,14 @@ static void __nhrp_peer_check(struct nhrp_peer *p) online = nifp->enabled && (!nifp->ipsec_profile || vc->ipsec); if (p->online != online) { - THREAD_OFF(p->t_fallback); + EVENT_OFF(p->t_fallback); if (online && notifier_active(&p->notifier_list)) { /* If we requested the IPsec connection, delay * the up notification a bit to allow things * settle down. This allows IKE to install * SPDs and SAs. */ - thread_add_timer_msec(master, nhrp_peer_notify_up, p, - 50, &p->t_fallback); + event_add_timer_msec(master, nhrp_peer_notify_up, p, 50, + &p->t_fallback); } else { nhrp_peer_ref(p); p->online = online; @@ -248,9 +248,9 @@ void nhrp_peer_unref(struct nhrp_peer *p) } } -static void nhrp_peer_request_timeout(struct thread *t) +static void nhrp_peer_request_timeout(struct event *t) { - struct nhrp_peer *p = THREAD_ARG(t); + struct nhrp_peer *p = EVENT_ARG(t); struct nhrp_vc *vc = p->vc; struct interface *ifp = p->ifp; struct nhrp_interface *nifp = ifp->info; @@ -264,21 +264,21 @@ static void nhrp_peer_request_timeout(struct thread *t) p->fallback_requested = 1; vici_request_vc(nifp->ipsec_fallback_profile, &vc->local.nbma, &vc->remote.nbma, p->prio); - thread_add_timer(master, nhrp_peer_request_timeout, p, 30, - &p->t_fallback); + event_add_timer(master, nhrp_peer_request_timeout, p, 30, + &p->t_fallback); } else { p->requested = p->fallback_requested = 0; } } -static void nhrp_peer_defer_vici_request(struct thread *t) +static void nhrp_peer_defer_vici_request(struct event *t) { - struct nhrp_peer *p = THREAD_ARG(t); + struct nhrp_peer *p = EVENT_ARG(t); struct nhrp_vc *vc = p->vc; struct interface *ifp = p->ifp; struct nhrp_interface *nifp = ifp->info; - THREAD_OFF(p->t_timer); + EVENT_OFF(p->t_timer); if (p->online) { debugf(NHRP_DEBUG_COMMON, @@ -287,10 +287,10 @@ static void nhrp_peer_defer_vici_request(struct thread *t) } else { vici_request_vc(nifp->ipsec_profile, &vc->local.nbma, &vc->remote.nbma, p->prio); - thread_add_timer( - master, nhrp_peer_request_timeout, p, - (nifp->ipsec_fallback_profile && !p->prio) ? 15 : 30, - &p->t_fallback); + event_add_timer(master, nhrp_peer_request_timeout, p, + (nifp->ipsec_fallback_profile && !p->prio) ? 15 + : 30, + &p->t_fallback); } } @@ -320,10 +320,10 @@ int nhrp_peer_check(struct nhrp_peer *p, int establish) if (p->prio) { vici_request_vc(nifp->ipsec_profile, &vc->local.nbma, &vc->remote.nbma, p->prio); - thread_add_timer( - master, nhrp_peer_request_timeout, p, - (nifp->ipsec_fallback_profile && !p->prio) ? 15 : 30, - &p->t_fallback); + event_add_timer(master, nhrp_peer_request_timeout, p, + (nifp->ipsec_fallback_profile && !p->prio) ? 15 + : 30, + &p->t_fallback); } else { /* Maximum timeout is 1 second */ int r_time_ms = frr_weak_random() % 1000; @@ -331,8 +331,8 @@ int nhrp_peer_check(struct nhrp_peer *p, int establish) debugf(NHRP_DEBUG_COMMON, "Initiating IPsec connection request to %pSU after %d ms:", &vc->remote.nbma, r_time_ms); - thread_add_timer_msec(master, nhrp_peer_defer_vici_request, - p, r_time_ms, &p->t_timer); + event_add_timer_msec(master, nhrp_peer_defer_vici_request, p, + r_time_ms, &p->t_timer); } return 0; diff --git a/nhrpd/nhrp_shortcut.c b/nhrpd/nhrp_shortcut.c index 90fb1d67c2..04dad2aea6 100644 --- a/nhrpd/nhrp_shortcut.c +++ b/nhrpd/nhrp_shortcut.c @@ -10,7 +10,7 @@ #include "nhrpd.h" #include "table.h" #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "log.h" #include "nhrp_protocol.h" @@ -18,7 +18,7 @@ DEFINE_MTYPE_STATIC(NHRPD, NHRP_SHORTCUT, "NHRP shortcut"); static struct route_table *shortcut_rib[AFI_MAX]; -static void nhrp_shortcut_do_purge(struct thread *t); +static void nhrp_shortcut_do_purge(struct event *t); static void nhrp_shortcut_delete(struct nhrp_shortcut *s); static void nhrp_shortcut_send_resolution_req(struct nhrp_shortcut *s); @@ -31,12 +31,12 @@ static void nhrp_shortcut_check_use(struct nhrp_shortcut *s) } } -static void nhrp_shortcut_do_expire(struct thread *t) +static void nhrp_shortcut_do_expire(struct event *t) { - struct nhrp_shortcut *s = THREAD_ARG(t); + struct nhrp_shortcut *s = EVENT_ARG(t); - thread_add_timer(master, nhrp_shortcut_do_purge, s, s->holding_time / 3, - &s->t_timer); + event_add_timer(master, nhrp_shortcut_do_purge, s, s->holding_time / 3, + &s->t_timer); s->expiring = 1; nhrp_shortcut_check_use(s); } @@ -123,12 +123,12 @@ static void nhrp_shortcut_update_binding(struct nhrp_shortcut *s, s->route_installed = 0; } - THREAD_OFF(s->t_timer); + EVENT_OFF(s->t_timer); if (holding_time) { s->expiring = 0; s->holding_time = holding_time; - thread_add_timer(master, nhrp_shortcut_do_expire, s, - 2 * holding_time / 3, &s->t_timer); + event_add_timer(master, nhrp_shortcut_do_expire, s, + 2 * holding_time / 3, &s->t_timer); } } @@ -137,7 +137,7 @@ static void nhrp_shortcut_delete(struct nhrp_shortcut *s) struct route_node *rn; afi_t afi = family2afi(PREFIX_FAMILY(s->p)); - THREAD_OFF(s->t_timer); + EVENT_OFF(s->t_timer); nhrp_reqid_free(&nhrp_packet_reqid, &s->reqid); debugf(NHRP_DEBUG_ROUTE, "Shortcut %pFX purged", s->p); @@ -154,9 +154,9 @@ static void nhrp_shortcut_delete(struct nhrp_shortcut *s) } } -static void nhrp_shortcut_do_purge(struct thread *t) +static void nhrp_shortcut_do_purge(struct event *t) { - struct nhrp_shortcut *s = THREAD_ARG(t); + struct nhrp_shortcut *s = EVENT_ARG(t); s->t_timer = NULL; nhrp_shortcut_delete(s); } @@ -204,8 +204,8 @@ static void nhrp_shortcut_recv_resolution_rep(struct nhrp_reqid *reqid, int holding_time = pp->if_ad->holdtime; nhrp_reqid_free(&nhrp_packet_reqid, &s->reqid); - THREAD_OFF(s->t_timer); - thread_add_timer(master, nhrp_shortcut_do_purge, s, 1, &s->t_timer); + EVENT_OFF(s->t_timer); + event_add_timer(master, nhrp_shortcut_do_purge, s, 1, &s->t_timer); if (pp->hdr->type != NHRP_PACKET_RESOLUTION_REPLY) { if (pp->hdr->type == NHRP_PACKET_ERROR_INDICATION @@ -454,9 +454,9 @@ void nhrp_shortcut_initiate(union sockunion *addr) s = nhrp_shortcut_get(&p); if (s && s->type != NHRP_CACHE_INCOMPLETE) { s->addr = *addr; - THREAD_OFF(s->t_timer); - thread_add_timer(master, nhrp_shortcut_do_purge, s, 30, - &s->t_timer); + EVENT_OFF(s->t_timer); + event_add_timer(master, nhrp_shortcut_do_purge, s, 30, + &s->t_timer); nhrp_shortcut_send_resolution_req(s); } } @@ -499,13 +499,13 @@ struct purge_ctx { void nhrp_shortcut_purge(struct nhrp_shortcut *s, int force) { - THREAD_OFF(s->t_timer); + EVENT_OFF(s->t_timer); nhrp_reqid_free(&nhrp_packet_reqid, &s->reqid); if (force) { /* Immediate purge on route with draw or pending shortcut */ - thread_add_timer_msec(master, nhrp_shortcut_do_purge, s, 5, - &s->t_timer); + event_add_timer_msec(master, nhrp_shortcut_do_purge, s, 5, + &s->t_timer); } else { /* Soft expire - force immediate renewal, but purge * in few seconds to make sure stale route is not @@ -514,8 +514,8 @@ void nhrp_shortcut_purge(struct nhrp_shortcut *s, int force) * This allows to keep nhrp route up, and to not * cause temporary rerouting via hubs causing latency * jitter. */ - thread_add_timer_msec(master, nhrp_shortcut_do_purge, s, 3000, - &s->t_timer); + event_add_timer_msec(master, nhrp_shortcut_do_purge, s, 3000, + &s->t_timer); s->expiring = 1; nhrp_shortcut_check_use(s); } diff --git a/nhrpd/nhrp_vc.c b/nhrpd/nhrp_vc.c index bffb2f6e94..2c3201438b 100644 --- a/nhrpd/nhrp_vc.c +++ b/nhrpd/nhrp_vc.c @@ -7,7 +7,7 @@ #include "memory.h" #include "stream.h" #include "hash.h" -#include "thread.h" +#include "frrevent.h" #include "jhash.h" #include "nhrpd.h" diff --git a/nhrpd/nhrpd.h b/nhrpd/nhrpd.h index c01296bee5..1421f0fc38 100644 --- a/nhrpd/nhrpd.h +++ b/nhrpd/nhrpd.h @@ -19,7 +19,7 @@ DECLARE_MGROUP(NHRPD); #define NHRP_VTY_PORT 2610 #define NHRP_DEFAULT_CONFIG "nhrpd.conf" -extern struct thread_master *master; +extern struct event_loop *master; enum { NHRP_OK = 0, NHRP_ERR_FAIL, @@ -166,9 +166,9 @@ struct nhrp_peer { struct notifier_list notifier_list; struct interface *ifp; struct nhrp_vc *vc; - struct thread *t_fallback; + struct event *t_fallback; struct notifier_block vc_notifier, ifp_notifier; - struct thread *t_timer; + struct event *t_timer; }; struct nhrp_packet_parser { @@ -232,8 +232,8 @@ struct nhrp_cache { struct notifier_block newpeer_notifier; struct notifier_list notifier_list; struct nhrp_reqid eventid; - struct thread *t_timeout; - struct thread *t_auth; + struct event *t_timeout; + struct event *t_auth; struct { enum nhrp_cache_type type; @@ -251,7 +251,7 @@ struct nhrp_shortcut { union sockunion addr; struct nhrp_reqid reqid; - struct thread *t_timer; + struct event *t_timer; enum nhrp_cache_type type; unsigned int holding_time; @@ -275,7 +275,7 @@ struct nhrp_nhs { union sockunion proto_addr; const char *nbma_fqdn; /* IP-address or FQDN */ - struct thread *t_resolve; + struct event *t_resolve; struct resolver_query dns_resolve; struct nhrp_reglist_head reglist_head; }; @@ -293,7 +293,7 @@ DECLARE_DLIST(nhrp_mcastlist, struct nhrp_multicast, mcastlist_entry); struct nhrp_registration { struct nhrp_reglist_item reglist_entry; - struct thread *t_register; + struct event *t_register; struct nhrp_nhs *nhs; struct nhrp_reqid reqid; unsigned int timeout; diff --git a/nhrpd/vici.c b/nhrpd/vici.c index 1dbb4e4f5e..2f76362603 100644 --- a/nhrpd/vici.c +++ b/nhrpd/vici.c @@ -11,7 +11,7 @@ #include #include -#include "thread.h" +#include "frrevent.h" #include "zbuf.h" #include "log.h" #include "lib_errors.h" @@ -44,7 +44,7 @@ static int blob2buf(const struct blob *b, char *buf, size_t n) } struct vici_conn { - struct thread *t_reconnect, *t_read, *t_write; + struct event *t_reconnect, *t_read, *t_write; struct zbuf ibuf; struct zbuf_queue obuf; int fd; @@ -56,7 +56,7 @@ struct vici_message_ctx { int nsections; }; -static void vici_reconnect(struct thread *t); +static void vici_reconnect(struct event *t); static void vici_submit_request(struct vici_conn *vici, const char *name, ...); static void vici_zbuf_puts(struct zbuf *obuf, const char *str) @@ -70,14 +70,14 @@ static void vici_connection_error(struct vici_conn *vici) { nhrp_vc_reset(); - THREAD_OFF(vici->t_read); - THREAD_OFF(vici->t_write); + EVENT_OFF(vici->t_read); + EVENT_OFF(vici->t_write); zbuf_reset(&vici->ibuf); zbufq_reset(&vici->obuf); close(vici->fd); vici->fd = -1; - thread_add_timer(master, vici_reconnect, vici, 2, &vici->t_reconnect); + event_add_timer(master, vici_reconnect, vici, 2, &vici->t_reconnect); } static void vici_parse_message(struct vici_conn *vici, struct zbuf *msg, @@ -357,9 +357,9 @@ static void vici_recv_message(struct vici_conn *vici, struct zbuf *msg) } } -static void vici_read(struct thread *t) +static void vici_read(struct event *t) { - struct vici_conn *vici = THREAD_ARG(t); + struct vici_conn *vici = EVENT_ARG(t); struct zbuf *ibuf = &vici->ibuf; struct zbuf pktbuf; @@ -384,18 +384,18 @@ static void vici_read(struct thread *t) vici_recv_message(vici, &pktbuf); } while (1); - thread_add_read(master, vici_read, vici, vici->fd, &vici->t_read); + event_add_read(master, vici_read, vici, vici->fd, &vici->t_read); } -static void vici_write(struct thread *t) +static void vici_write(struct event *t) { - struct vici_conn *vici = THREAD_ARG(t); + struct vici_conn *vici = EVENT_ARG(t); int r; r = zbufq_write(&vici->obuf, vici->fd); if (r > 0) { - thread_add_write(master, vici_write, vici, vici->fd, - &vici->t_write); + event_add_write(master, vici_write, vici, vici->fd, + &vici->t_write); } else if (r < 0) { vici_connection_error(vici); } @@ -409,7 +409,7 @@ static void vici_submit(struct vici_conn *vici, struct zbuf *obuf) } zbufq_queue(&vici->obuf, obuf); - thread_add_write(master, vici_write, vici, vici->fd, &vici->t_write); + event_add_write(master, vici_write, vici, vici->fd, &vici->t_write); } static void vici_submit_request(struct vici_conn *vici, const char *name, ...) @@ -500,9 +500,9 @@ static char *vici_get_charon_filepath(void) return buff; } -static void vici_reconnect(struct thread *t) +static void vici_reconnect(struct event *t) { - struct vici_conn *vici = THREAD_ARG(t); + struct vici_conn *vici = EVENT_ARG(t); int fd; char *file_path; @@ -519,14 +519,14 @@ static void vici_reconnect(struct thread *t) debugf(NHRP_DEBUG_VICI, "%s: failure connecting VICI socket: %s", __func__, strerror(errno)); - thread_add_timer(master, vici_reconnect, vici, 2, - &vici->t_reconnect); + event_add_timer(master, vici_reconnect, vici, 2, + &vici->t_reconnect); return; } debugf(NHRP_DEBUG_COMMON, "VICI: Connected"); vici->fd = fd; - thread_add_read(master, vici_read, vici, vici->fd, &vici->t_read); + event_add_read(master, vici_read, vici, vici->fd, &vici->t_read); /* Send event subscribtions */ // vici_register_event(vici, "child-updown"); @@ -547,8 +547,8 @@ void vici_init(void) vici->fd = -1; zbuf_init(&vici->ibuf, vici->ibuf_data, sizeof(vici->ibuf_data), 0); zbufq_init(&vici->obuf); - thread_add_timer_msec(master, vici_reconnect, vici, 10, - &vici->t_reconnect); + event_add_timer_msec(master, vici_reconnect, vici, 10, + &vici->t_reconnect); } void vici_terminate(void) diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c index 5b2b204dd8..f4202a4a29 100644 --- a/ospf6d/ospf6_abr.c +++ b/ospf6d/ospf6_abr.c @@ -12,7 +12,7 @@ #include "vty.h" #include "linklist.h" #include "command.h" -#include "thread.h" +#include "frrevent.h" #include "plist.h" #include "filter.h" diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c index 5795690a78..69c711bf06 100644 --- a/ospf6d/ospf6_area.c +++ b/ospf6d/ospf6_area.c @@ -8,7 +8,7 @@ #include "log.h" #include "memory.h" #include "linklist.h" -#include "thread.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "if.h" @@ -421,8 +421,8 @@ void ospf6_area_disable(struct ospf6_area *oa) ospf6_spf_table_finish(oa->spf_table); ospf6_route_remove_all(oa->route_table); - THREAD_OFF(oa->thread_router_lsa); - THREAD_OFF(oa->thread_intra_prefix_lsa); + EVENT_OFF(oa->thread_router_lsa); + EVENT_OFF(oa->thread_intra_prefix_lsa); } diff --git a/ospf6d/ospf6_area.h b/ospf6d/ospf6_area.h index 62b32d3762..d9afd65d81 100644 --- a/ospf6d/ospf6_area.h +++ b/ospf6d/ospf6_area.h @@ -60,8 +60,8 @@ struct ospf6_area { uint32_t spf_calculation; /* SPF calculation count */ - struct thread *thread_router_lsa; - struct thread *thread_intra_prefix_lsa; + struct event *thread_router_lsa; + struct event *thread_intra_prefix_lsa; uint32_t router_lsa_size_limit; /* Area announce list */ diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c index 57c873b53b..713dd82075 100644 --- a/ospf6d/ospf6_asbr.c +++ b/ospf6d/ospf6_asbr.c @@ -13,7 +13,7 @@ #include "routemap.h" #include "table.h" #include "plist.h" -#include "thread.h" +#include "frrevent.h" #include "linklist.h" #include "lib/northbound_cli.h" @@ -180,13 +180,13 @@ struct ospf6_lsa *ospf6_as_external_lsa_originate(struct ospf6_route *route, return lsa; } -void ospf6_orig_as_external_lsa(struct thread *thread) +void ospf6_orig_as_external_lsa(struct event *thread) { struct ospf6_interface *oi; struct ospf6_lsa *lsa; uint32_t type, adv_router; - oi = (struct ospf6_interface *)THREAD_ARG(thread); + oi = (struct ospf6_interface *)EVENT_ARG(thread); if (oi->state == OSPF6_INTERFACE_DOWN) return; @@ -1065,9 +1065,9 @@ static void ospf6_asbr_routemap_unset(struct ospf6_redist *red) ROUTEMAP(red) = NULL; } -static void ospf6_asbr_routemap_update_timer(struct thread *thread) +static void ospf6_asbr_routemap_update_timer(struct event *thread) { - struct ospf6 *ospf6 = THREAD_ARG(thread); + struct ospf6 *ospf6 = EVENT_ARG(thread); struct ospf6_redist *red; int type; @@ -1104,15 +1104,14 @@ void ospf6_asbr_distribute_list_update(struct ospf6 *ospf6, { SET_FLAG(red->flag, OSPF6_IS_RMAP_CHANGED); - if (thread_is_scheduled(ospf6->t_distribute_update)) + if (event_is_scheduled(ospf6->t_distribute_update)) return; if (IS_OSPF6_DEBUG_ASBR) zlog_debug("%s: trigger redistribute reset thread", __func__); - thread_add_timer_msec(master, ospf6_asbr_routemap_update_timer, ospf6, - OSPF_MIN_LS_INTERVAL, - &ospf6->t_distribute_update); + event_add_timer_msec(master, ospf6_asbr_routemap_update_timer, ospf6, + OSPF_MIN_LS_INTERVAL, &ospf6->t_distribute_update); } void ospf6_asbr_routemap_update(const char *mapname) @@ -3023,9 +3022,9 @@ static void ospf6_aggr_handle_external_info(void *data) if (IS_OSPF6_DEBUG_AGGR) zlog_debug("%s: LSA found, refresh it", __func__); - THREAD_OFF(lsa->refresh); - thread_add_event(master, ospf6_lsa_refresh, lsa, 0, - &lsa->refresh); + EVENT_OFF(lsa->refresh); + event_add_event(master, ospf6_lsa_refresh, lsa, 0, + &lsa->refresh); return; } } @@ -3226,9 +3225,9 @@ static void ospf6_handle_exnl_rt_after_aggr_del(struct ospf6 *ospf6, lsa = ospf6_find_external_lsa(ospf6, &rt->prefix); if (lsa) { - THREAD_OFF(lsa->refresh); - thread_add_event(master, ospf6_lsa_refresh, lsa, 0, - &lsa->refresh); + EVENT_OFF(lsa->refresh); + event_add_event(master, ospf6_lsa_refresh, lsa, 0, + &lsa->refresh); } else { if (IS_OSPF6_DEBUG_AGGR) zlog_debug("%s: Originate external route(%pFX)", @@ -3332,9 +3331,9 @@ ospf6_handle_external_aggr_add(struct ospf6 *ospf6) } } -static void ospf6_asbr_summary_process(struct thread *thread) +static void ospf6_asbr_summary_process(struct event *thread) { - struct ospf6 *ospf6 = THREAD_ARG(thread); + struct ospf6 *ospf6 = EVENT_ARG(thread); int operation = 0; operation = ospf6->aggr_action; @@ -3364,7 +3363,7 @@ ospf6_start_asbr_summary_delay_timer(struct ospf6 *ospf6, { aggr->action = operation; - if (thread_is_scheduled(ospf6->t_external_aggr)) { + if (event_is_scheduled(ospf6->t_external_aggr)) { if (ospf6->aggr_action == OSPF6_ROUTE_AGGR_ADD) { if (IS_OSPF6_DEBUG_AGGR) @@ -3377,7 +3376,7 @@ ospf6_start_asbr_summary_delay_timer(struct ospf6 *ospf6, if (IS_OSPF6_DEBUG_AGGR) zlog_debug("%s, Restarting Aggregator delay timer.", __func__); - THREAD_OFF(ospf6->t_external_aggr); + EVENT_OFF(ospf6->t_external_aggr); } } @@ -3386,10 +3385,8 @@ ospf6_start_asbr_summary_delay_timer(struct ospf6 *ospf6, __func__, ospf6->aggr_delay_interval); ospf6->aggr_action = operation; - thread_add_timer(master, - ospf6_asbr_summary_process, - ospf6, ospf6->aggr_delay_interval, - &ospf6->t_external_aggr); + event_add_timer(master, ospf6_asbr_summary_process, ospf6, + ospf6->aggr_delay_interval, &ospf6->t_external_aggr); } int ospf6_asbr_external_rt_advertise(struct ospf6 *ospf6, diff --git a/ospf6d/ospf6_bfd.c b/ospf6d/ospf6_bfd.c index 6cc9c3013b..6379f9d992 100644 --- a/ospf6d/ospf6_bfd.c +++ b/ospf6d/ospf6_bfd.c @@ -11,7 +11,7 @@ #include "linklist.h" #include "memory.h" #include "prefix.h" -#include "thread.h" +#include "frrevent.h" #include "buffer.h" #include "stream.h" #include "zclient.h" @@ -105,8 +105,8 @@ static void ospf6_bfd_callback(struct bfd_session_params *bsp, if (bss->state == BFD_STATUS_DOWN && bss->previous_state == BFD_STATUS_UP) { - THREAD_OFF(on->inactivity_timer); - thread_add_event(master, inactivity_timer, on, 0, NULL); + EVENT_OFF(on->inactivity_timer); + event_add_event(master, inactivity_timer, on, 0, NULL); } } diff --git a/ospf6d/ospf6_flood.c b/ospf6d/ospf6_flood.c index d519b0e119..a81d5222d6 100644 --- a/ospf6d/ospf6_flood.c +++ b/ospf6d/ospf6_flood.c @@ -6,7 +6,7 @@ #include #include "log.h" -#include "thread.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "command.h" @@ -103,9 +103,9 @@ void ospf6_lsa_originate(struct ospf6 *ospf6, struct ospf6_lsa *lsa) lsdb_self = ospf6_get_scoped_lsdb_self(lsa); ospf6_lsdb_add(ospf6_lsa_copy(lsa), lsdb_self); - THREAD_OFF(lsa->refresh); - thread_add_timer(master, ospf6_lsa_refresh, lsa, OSPF_LS_REFRESH_TIME, - &lsa->refresh); + EVENT_OFF(lsa->refresh); + event_add_timer(master, ospf6_lsa_refresh, lsa, OSPF_LS_REFRESH_TIME, + &lsa->refresh); if (IS_OSPF6_DEBUG_LSA_TYPE(lsa->header->type) || IS_OSPF6_DEBUG_ORIGINATE_TYPE(lsa->header->type)) { @@ -168,8 +168,8 @@ void ospf6_lsa_purge(struct ospf6_lsa *lsa) self = ospf6_lsdb_lookup(lsa->header->type, lsa->header->id, lsa->header->adv_router, lsdb_self); if (self) { - THREAD_OFF(self->expire); - THREAD_OFF(self->refresh); + EVENT_OFF(self->expire); + EVENT_OFF(self->refresh); ospf6_lsdb_remove(self, lsdb_self); } @@ -250,17 +250,17 @@ void ospf6_install_lsa(struct ospf6_lsa *lsa) lsa->name); lsa->external_lsa_id = old->external_lsa_id; } - THREAD_OFF(old->expire); - THREAD_OFF(old->refresh); + EVENT_OFF(old->expire); + EVENT_OFF(old->refresh); ospf6_flood_clear(old); } monotime(&now); if (!OSPF6_LSA_IS_MAXAGE(lsa)) { - thread_add_timer(master, ospf6_lsa_expire, lsa, - OSPF_LSA_MAXAGE + lsa->birth.tv_sec - - now.tv_sec, - &lsa->expire); + event_add_timer(master, ospf6_lsa_expire, lsa, + OSPF_LSA_MAXAGE + lsa->birth.tv_sec - + now.tv_sec, + &lsa->expire); } else lsa->expire = NULL; @@ -473,10 +473,10 @@ void ospf6_flood_interface(struct ospf6_neighbor *from, struct ospf6_lsa *lsa, ospf6_lsdb_add(ospf6_lsa_copy(lsa), on->retrans_list); - thread_add_timer( - master, ospf6_lsupdate_send_neighbor, - on, on->ospf6_if->rxmt_interval, - &on->thread_send_lsupdate); + event_add_timer(master, + ospf6_lsupdate_send_neighbor, + on, on->ospf6_if->rxmt_interval, + &on->thread_send_lsupdate); retrans_added++; } } @@ -520,14 +520,14 @@ void ospf6_flood_interface(struct ospf6_neighbor *from, struct ospf6_lsa *lsa, if ((oi->type == OSPF_IFTYPE_BROADCAST) || (oi->type == OSPF_IFTYPE_POINTOPOINT)) { ospf6_lsdb_add(ospf6_lsa_copy(lsa), oi->lsupdate_list); - thread_add_event(master, ospf6_lsupdate_send_interface, oi, 0, - &oi->thread_send_lsupdate); + event_add_event(master, ospf6_lsupdate_send_interface, oi, 0, + &oi->thread_send_lsupdate); } else { /* reschedule retransmissions to all neighbors */ for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on)) { - THREAD_OFF(on->thread_send_lsupdate); - thread_add_event(master, ospf6_lsupdate_send_neighbor, - on, 0, &on->thread_send_lsupdate); + EVENT_OFF(on->thread_send_lsupdate); + event_add_event(master, ospf6_lsupdate_send_neighbor, + on, 0, &on->thread_send_lsupdate); } } } @@ -697,8 +697,8 @@ static void ospf6_acknowledge_lsa_bdrouter(struct ospf6_lsa *lsa, "Delayed acknowledgement (BDR & MoreRecent & from DR)"); /* Delayed acknowledgement */ ospf6_lsdb_add(ospf6_lsa_copy(lsa), oi->lsack_list); - thread_add_timer(master, ospf6_lsack_send_interface, oi, - 3, &oi->thread_send_lsack); + event_add_timer(master, ospf6_lsack_send_interface, oi, + 3, &oi->thread_send_lsack); } else { if (is_debug) zlog_debug( @@ -718,8 +718,8 @@ static void ospf6_acknowledge_lsa_bdrouter(struct ospf6_lsa *lsa, "Delayed acknowledgement (BDR & Duplicate & ImpliedAck & from DR)"); /* Delayed acknowledgement */ ospf6_lsdb_add(ospf6_lsa_copy(lsa), oi->lsack_list); - thread_add_timer(master, ospf6_lsack_send_interface, oi, - 3, &oi->thread_send_lsack); + event_add_timer(master, ospf6_lsack_send_interface, oi, + 3, &oi->thread_send_lsack); } else { if (is_debug) zlog_debug( @@ -736,8 +736,8 @@ static void ospf6_acknowledge_lsa_bdrouter(struct ospf6_lsa *lsa, if (is_debug) zlog_debug("Direct acknowledgement (BDR & Duplicate)"); ospf6_lsdb_add(ospf6_lsa_copy(lsa), from->lsack_list); - thread_add_event(master, ospf6_lsack_send_neighbor, from, 0, - &from->thread_send_lsack); + event_add_event(master, ospf6_lsack_send_neighbor, from, 0, + &from->thread_send_lsack); return; } @@ -778,8 +778,8 @@ static void ospf6_acknowledge_lsa_allother(struct ospf6_lsa *lsa, "Delayed acknowledgement (AllOther & MoreRecent)"); /* Delayed acknowledgement */ ospf6_lsdb_add(ospf6_lsa_copy(lsa), oi->lsack_list); - thread_add_timer(master, ospf6_lsack_send_interface, oi, 3, - &oi->thread_send_lsack); + event_add_timer(master, ospf6_lsack_send_interface, oi, 3, + &oi->thread_send_lsack); return; } @@ -802,8 +802,8 @@ static void ospf6_acknowledge_lsa_allother(struct ospf6_lsa *lsa, zlog_debug( "Direct acknowledgement (AllOther & Duplicate)"); ospf6_lsdb_add(ospf6_lsa_copy(lsa), from->lsack_list); - thread_add_event(master, ospf6_lsack_send_neighbor, from, 0, - &from->thread_send_lsack); + event_add_event(master, ospf6_lsack_send_neighbor, from, 0, + &from->thread_send_lsack); return; } @@ -973,8 +973,8 @@ void ospf6_receive_lsa(struct ospf6_neighbor *from, /* a) Acknowledge back to neighbor (Direct acknowledgement, * 13.5) */ ospf6_lsdb_add(ospf6_lsa_copy(new), from->lsack_list); - thread_add_event(master, ospf6_lsack_send_neighbor, from, 0, - &from->thread_send_lsack); + event_add_event(master, ospf6_lsack_send_neighbor, from, 0, + &from->thread_send_lsack); /* b) Discard */ ospf6_lsa_delete(new); @@ -1105,8 +1105,8 @@ void ospf6_receive_lsa(struct ospf6_neighbor *from, "Newer instance of the self-originated LSA"); zlog_debug("Schedule reorigination"); } - thread_add_event(master, ospf6_lsa_refresh, new, 0, - &new->refresh); + event_add_event(master, ospf6_lsa_refresh, new, 0, + &new->refresh); } /* GR: check for network topology change. */ @@ -1134,7 +1134,7 @@ void ospf6_receive_lsa(struct ospf6_neighbor *from, new->name); /* BadLSReq */ - thread_add_event(master, bad_lsreq, from, 0, NULL); + event_add_event(master, bad_lsreq, from, 0, NULL); ospf6_lsa_delete(new); return; @@ -1231,8 +1231,8 @@ void ospf6_receive_lsa(struct ospf6_neighbor *from, ospf6_lsdb_add(ospf6_lsa_copy(old), from->lsupdate_list); - thread_add_event(master, ospf6_lsupdate_send_neighbor, - from, 0, &from->thread_send_lsupdate); + event_add_event(master, ospf6_lsupdate_send_neighbor, + from, 0, &from->thread_send_lsupdate); ospf6_lsa_delete(new); return; diff --git a/ospf6d/ospf6_gr.c b/ospf6d/ospf6_gr.c index 847531361e..976eb529d7 100644 --- a/ospf6d/ospf6_gr.c +++ b/ospf6d/ospf6_gr.c @@ -134,7 +134,7 @@ static void ospf6_gr_restart_exit(struct ospf6 *ospf6, const char *reason) ospf6->gr_info.restart_in_progress = false; ospf6->gr_info.finishing_restart = true; - THREAD_OFF(ospf6->gr_info.t_grace_period); + EVENT_OFF(ospf6->gr_info.t_grace_period); /* Record in non-volatile memory that the restart is complete. */ ospf6_gr_nvm_delete(ospf6); @@ -459,9 +459,9 @@ static bool ospf6_gr_check_adjs(struct ospf6 *ospf6) } /* Handling of grace period expiry. */ -static void ospf6_gr_grace_period_expired(struct thread *thread) +static void ospf6_gr_grace_period_expired(struct event *thread) { - struct ospf6 *ospf6 = THREAD_ARG(thread); + struct ospf6 *ospf6 = EVENT_ARG(thread); ospf6_gr_restart_exit(ospf6, "grace period has expired"); } @@ -592,9 +592,9 @@ void ospf6_gr_nvm_read(struct ospf6 *ospf6) zlog_debug( "GR: remaining time until grace period expires: %lu(s)", remaining_time); - thread_add_timer(master, ospf6_gr_grace_period_expired, - ospf6, remaining_time, - &ospf6->gr_info.t_grace_period); + event_add_timer(master, ospf6_gr_grace_period_expired, + ospf6, remaining_time, + &ospf6->gr_info.t_grace_period); } } diff --git a/ospf6d/ospf6_gr_helper.c b/ospf6d/ospf6_gr_helper.c index 3df0580fcd..d313510cfa 100644 --- a/ospf6d/ospf6_gr_helper.c +++ b/ospf6d/ospf6_gr_helper.c @@ -195,9 +195,9 @@ static int ospf6_extract_grace_lsa_fields(struct ospf6_lsa *lsa, * Returns: * Nothing */ -static void ospf6_handle_grace_timer_expiry(struct thread *thread) +static void ospf6_handle_grace_timer_expiry(struct event *thread) { - struct ospf6_neighbor *nbr = THREAD_ARG(thread); + struct ospf6_neighbor *nbr = EVENT_ARG(thread); ospf6_gr_helper_exit(nbr, OSPF6_GR_HELPER_GRACE_TIMEOUT); } @@ -382,7 +382,7 @@ int ospf6_process_grace_lsa(struct ospf6 *ospf6, struct ospf6_lsa *lsa, } if (OSPF6_GR_IS_ACTIVE_HELPER(restarter)) { - THREAD_OFF(restarter->gr_helper_info.t_grace_timer); + EVENT_OFF(restarter->gr_helper_info.t_grace_timer); if (ospf6->ospf6_helper_cfg.active_restarter_cnt > 0) ospf6->ospf6_helper_cfg.active_restarter_cnt--; @@ -415,9 +415,9 @@ int ospf6_process_grace_lsa(struct ospf6 *ospf6, struct ospf6_lsa *lsa, actual_grace_interval); /* Start the grace timer */ - thread_add_timer(master, ospf6_handle_grace_timer_expiry, restarter, - actual_grace_interval, - &restarter->gr_helper_info.t_grace_timer); + event_add_timer(master, ospf6_handle_grace_timer_expiry, restarter, + actual_grace_interval, + &restarter->gr_helper_info.t_grace_timer); return OSPF6_GR_ACTIVE_HELPER; } @@ -470,7 +470,7 @@ void ospf6_gr_helper_exit(struct ospf6_neighbor *nbr, * expiry, stop the grace timer. */ if (reason != OSPF6_GR_HELPER_GRACE_TIMEOUT) - THREAD_OFF(nbr->gr_helper_info.t_grace_timer); + EVENT_OFF(nbr->gr_helper_info.t_grace_timer); if (ospf6->ospf6_helper_cfg.active_restarter_cnt <= 0) { zlog_err( @@ -833,7 +833,7 @@ static void show_ospfv6_gr_helper_per_nbr(struct vty *vty, json_object *json, vty_out(vty, " Actual Grace period : %d(in seconds)\n", nbr->gr_helper_info.actual_grace_period); vty_out(vty, " Remaining GraceTime:%ld(in seconds).\n", - thread_timer_remain_second( + event_timer_remain_second( nbr->gr_helper_info.t_grace_timer)); vty_out(vty, " Graceful Restart reason: %s.\n\n", ospf6_restart_reason_desc[nbr->gr_helper_info @@ -850,8 +850,8 @@ static void show_ospfv6_gr_helper_per_nbr(struct vty *vty, json_object *json, json_object_int_add(json_neigh, "actualGraceInterval", nbr->gr_helper_info.actual_grace_period); json_object_int_add(json_neigh, "remainGracetime", - thread_timer_remain_second( - nbr->gr_helper_info.t_grace_timer)); + event_timer_remain_second( + nbr->gr_helper_info.t_grace_timer)); json_object_string_add(json_neigh, "restartReason", ospf6_restart_reason_desc[ nbr->gr_helper_info.gr_restart_reason]); diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index 7afb47c752..e7148d66ba 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -9,7 +9,7 @@ #include "if.h" #include "log.h" #include "command.h" -#include "thread.h" +#include "frrevent.h" #include "prefix.h" #include "plist.h" #include "zclient.h" @@ -260,11 +260,11 @@ void ospf6_interface_delete(struct ospf6_interface *oi) list_delete(&oi->neighbor_list); - THREAD_OFF(oi->thread_send_hello); - THREAD_OFF(oi->thread_send_lsupdate); - THREAD_OFF(oi->thread_send_lsack); - THREAD_OFF(oi->thread_sso); - THREAD_OFF(oi->thread_wait_timer); + EVENT_OFF(oi->thread_send_hello); + EVENT_OFF(oi->thread_send_lsupdate); + EVENT_OFF(oi->thread_send_lsack); + EVENT_OFF(oi->thread_sso); + EVENT_OFF(oi->thread_wait_timer); ospf6_lsdb_remove_all(oi->lsdb); ospf6_lsdb_remove_all(oi->lsupdate_list); @@ -307,23 +307,23 @@ void ospf6_interface_disable(struct ospf6_interface *oi) { SET_FLAG(oi->flag, OSPF6_INTERFACE_DISABLE); - thread_execute(master, interface_down, oi, 0); + event_execute(master, interface_down, oi, 0); ospf6_lsdb_remove_all(oi->lsdb); ospf6_lsdb_remove_all(oi->lsdb_self); ospf6_lsdb_remove_all(oi->lsupdate_list); ospf6_lsdb_remove_all(oi->lsack_list); - THREAD_OFF(oi->thread_send_hello); - THREAD_OFF(oi->thread_send_lsupdate); - THREAD_OFF(oi->thread_send_lsack); - THREAD_OFF(oi->thread_sso); + EVENT_OFF(oi->thread_send_hello); + EVENT_OFF(oi->thread_send_lsupdate); + EVENT_OFF(oi->thread_send_lsack); + EVENT_OFF(oi->thread_sso); - THREAD_OFF(oi->thread_network_lsa); - THREAD_OFF(oi->thread_link_lsa); - THREAD_OFF(oi->thread_intra_prefix_lsa); - THREAD_OFF(oi->thread_as_extern_lsa); - THREAD_OFF(oi->thread_wait_timer); + EVENT_OFF(oi->thread_network_lsa); + EVENT_OFF(oi->thread_link_lsa); + EVENT_OFF(oi->thread_intra_prefix_lsa); + EVENT_OFF(oi->thread_as_extern_lsa); + EVENT_OFF(oi->thread_wait_timer); } static struct in6_addr * @@ -382,9 +382,9 @@ void ospf6_interface_state_update(struct interface *ifp) if (if_is_operative(ifp) && (ospf6_interface_get_linklocal_address(oi->interface) || if_is_loopback(oi->interface))) - thread_execute(master, interface_up, oi, 0); + event_execute(master, interface_up, oi, 0); else - thread_execute(master, interface_down, oi, 0); + event_execute(master, interface_down, oi, 0); return; } @@ -671,8 +671,8 @@ uint8_t dr_election(struct ospf6_interface *oi) if (on->state < OSPF6_NEIGHBOR_TWOWAY) continue; /* Schedule AdjOK. */ - thread_add_event(master, adj_ok, on, 0, - &on->thread_adj_ok); + event_add_event(master, adj_ok, on, 0, + &on->thread_adj_ok); } } @@ -720,18 +720,18 @@ static bool ifmaddr_check(ifindex_t ifindex, struct in6_addr *addr) #endif /* __FreeBSD__ */ /* Interface State Machine */ -void interface_up(struct thread *thread) +void interface_up(struct event *thread) { struct ospf6_interface *oi; struct ospf6 *ospf6; - oi = (struct ospf6_interface *)THREAD_ARG(thread); + oi = (struct ospf6_interface *)EVENT_ARG(thread); assert(oi && oi->interface); if (!oi->type_cfg) oi->type = ospf6_default_iftype(oi->interface); - thread_cancel(&oi->thread_sso); + event_cancel(&oi->thread_sso); if (IS_OSPF6_DEBUG_INTERFACE) zlog_debug("Interface Event %s: [InterfaceUp]", @@ -785,9 +785,8 @@ void interface_up(struct thread *thread) zlog_info( "Interface %s is still in all routers group, rescheduling for SSO", oi->interface->name); - thread_add_timer(master, interface_up, oi, - OSPF6_INTERFACE_SSO_RETRY_INT, - &oi->thread_sso); + event_add_timer(master, interface_up, oi, + OSPF6_INTERFACE_SSO_RETRY_INT, &oi->thread_sso); return; } #endif /* __FreeBSD__ */ @@ -802,9 +801,9 @@ void interface_up(struct thread *thread) zlog_info( "Scheduling %s for sso retry, trial count: %d", oi->interface->name, oi->sso_try_cnt); - thread_add_timer(master, interface_up, oi, - OSPF6_INTERFACE_SSO_RETRY_INT, - &oi->thread_sso); + event_add_timer(master, interface_up, oi, + OSPF6_INTERFACE_SSO_RETRY_INT, + &oi->thread_sso); } return; } @@ -816,8 +815,8 @@ void interface_up(struct thread *thread) /* Schedule Hello */ if (!CHECK_FLAG(oi->flag, OSPF6_INTERFACE_PASSIVE) && !if_is_loopback(oi->interface)) { - thread_add_timer(master, ospf6_hello_send, oi, 0, - &oi->thread_send_hello); + event_add_timer(master, ospf6_hello_send, oi, 0, + &oi->thread_send_hello); } /* decide next interface state */ @@ -829,16 +828,16 @@ void interface_up(struct thread *thread) ospf6_interface_state_change(OSPF6_INTERFACE_DROTHER, oi); else { ospf6_interface_state_change(OSPF6_INTERFACE_WAITING, oi); - thread_add_timer(master, wait_timer, oi, oi->dead_interval, - &oi->thread_wait_timer); + event_add_timer(master, wait_timer, oi, oi->dead_interval, + &oi->thread_wait_timer); } } -void wait_timer(struct thread *thread) +void wait_timer(struct event *thread) { struct ospf6_interface *oi; - oi = (struct ospf6_interface *)THREAD_ARG(thread); + oi = (struct ospf6_interface *)EVENT_ARG(thread); assert(oi && oi->interface); if (IS_OSPF6_DEBUG_INTERFACE) @@ -849,11 +848,11 @@ void wait_timer(struct thread *thread) ospf6_interface_state_change(dr_election(oi), oi); } -void backup_seen(struct thread *thread) +void backup_seen(struct event *thread) { struct ospf6_interface *oi; - oi = (struct ospf6_interface *)THREAD_ARG(thread); + oi = (struct ospf6_interface *)EVENT_ARG(thread); assert(oi && oi->interface); if (IS_OSPF6_DEBUG_INTERFACE) @@ -864,11 +863,11 @@ void backup_seen(struct thread *thread) ospf6_interface_state_change(dr_election(oi), oi); } -void neighbor_change(struct thread *thread) +void neighbor_change(struct event *thread) { struct ospf6_interface *oi; - oi = (struct ospf6_interface *)THREAD_ARG(thread); + oi = (struct ospf6_interface *)EVENT_ARG(thread); assert(oi && oi->interface); if (IS_OSPF6_DEBUG_INTERFACE) @@ -881,14 +880,14 @@ void neighbor_change(struct thread *thread) ospf6_interface_state_change(dr_election(oi), oi); } -void interface_down(struct thread *thread) +void interface_down(struct event *thread) { struct ospf6_interface *oi; struct listnode *node, *nnode; struct ospf6_neighbor *on; struct ospf6 *ospf6; - oi = (struct ospf6_interface *)THREAD_ARG(thread); + oi = (struct ospf6_interface *)EVENT_ARG(thread); assert(oi && oi->interface); if (IS_OSPF6_DEBUG_INTERFACE) @@ -896,10 +895,10 @@ void interface_down(struct thread *thread) oi->interface->name); /* Stop Hellos */ - THREAD_OFF(oi->thread_send_hello); + EVENT_OFF(oi->thread_send_hello); /* Stop trying to set socket options. */ - THREAD_OFF(oi->thread_sso); + EVENT_OFF(oi->thread_sso); /* Cease the HELPER role for all the neighbours * of this interface. @@ -936,7 +935,7 @@ void interface_down(struct thread *thread) if (oi->on_write_q) { listnode_delete(ospf6->oi_write_q, oi); if (list_isempty(ospf6->oi_write_q)) - thread_cancel(&ospf6->t_write); + event_cancel(&ospf6->t_write); oi->on_write_q = 0; } @@ -1141,7 +1140,7 @@ static int ospf6_interface_show(struct vty *vty, struct interface *ifp, if (use_json) { timerclear(&res); - if (thread_is_scheduled(oi->thread_send_lsupdate)) + if (event_is_scheduled(oi->thread_send_lsupdate)) timersub(&oi->thread_send_lsupdate->u.sands, &now, &res); timerstring(&res, duration, sizeof(duration)); @@ -1151,9 +1150,8 @@ static int ospf6_interface_show(struct vty *vty, struct interface *ifp, duration); json_object_string_add( json_obj, "lsUpdateSendThread", - (thread_is_scheduled(oi->thread_send_lsupdate) - ? "on" - : "off")); + (event_is_scheduled(oi->thread_send_lsupdate) ? "on" + : "off")); json_arr = json_object_new_array(); for (ALL_LSDB(oi->lsupdate_list, lsa, lsanext)) @@ -1163,7 +1161,7 @@ static int ospf6_interface_show(struct vty *vty, struct interface *ifp, json_arr); timerclear(&res); - if (thread_is_scheduled(oi->thread_send_lsack)) + if (event_is_scheduled(oi->thread_send_lsack)) timersub(&oi->thread_send_lsack->u.sands, &now, &res); timerstring(&res, duration, sizeof(duration)); @@ -1173,8 +1171,8 @@ static int ospf6_interface_show(struct vty *vty, struct interface *ifp, duration); json_object_string_add( json_obj, "lsAckSendThread", - (thread_is_scheduled(oi->thread_send_lsack) ? "on" - : "off")); + (event_is_scheduled(oi->thread_send_lsack) ? "on" + : "off")); json_arr = json_object_new_array(); for (ALL_LSDB(oi->lsack_list, lsa, lsanext)) @@ -1184,28 +1182,27 @@ static int ospf6_interface_show(struct vty *vty, struct interface *ifp, } else { timerclear(&res); - if (thread_is_scheduled(oi->thread_send_lsupdate)) + if (event_is_scheduled(oi->thread_send_lsupdate)) timersub(&oi->thread_send_lsupdate->u.sands, &now, &res); timerstring(&res, duration, sizeof(duration)); vty_out(vty, " %d Pending LSAs for LSUpdate in Time %s [thread %s]\n", oi->lsupdate_list->count, duration, - (thread_is_scheduled(oi->thread_send_lsupdate) - ? "on" - : "off")); + (event_is_scheduled(oi->thread_send_lsupdate) ? "on" + : "off")); for (ALL_LSDB(oi->lsupdate_list, lsa, lsanext)) vty_out(vty, " %s\n", lsa->name); timerclear(&res); - if (thread_is_scheduled(oi->thread_send_lsack)) + if (event_is_scheduled(oi->thread_send_lsack)) timersub(&oi->thread_send_lsack->u.sands, &now, &res); timerstring(&res, duration, sizeof(duration)); vty_out(vty, " %d Pending LSAs for LSAck in Time %s [thread %s]\n", oi->lsack_list->count, duration, - (thread_is_scheduled(oi->thread_send_lsack) ? "on" - : "off")); + (event_is_scheduled(oi->thread_send_lsack) ? "on" + : "off")); for (ALL_LSDB(oi->lsack_list, lsa, lsanext)) vty_out(vty, " %s\n", lsa->name); } @@ -1879,8 +1876,8 @@ DEFUN (ipv6_ospf6_ifmtu, /* re-establish adjacencies */ for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on)) { - THREAD_OFF(on->inactivity_timer); - thread_add_event(master, inactivity_timer, on, 0, NULL); + EVENT_OFF(on->inactivity_timer); + event_add_event(master, inactivity_timer, on, 0, NULL); } return CMD_SUCCESS; @@ -1925,8 +1922,8 @@ DEFUN (no_ipv6_ospf6_ifmtu, /* re-establish adjacencies */ for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on)) { - THREAD_OFF(on->inactivity_timer); - thread_add_event(master, inactivity_timer, on, 0, NULL); + EVENT_OFF(on->inactivity_timer); + event_add_event(master, inactivity_timer, on, 0, NULL); } return CMD_SUCCESS; @@ -2108,11 +2105,11 @@ DEFUN (ipv6_ospf6_hellointerval, /* * If the thread is scheduled, send the new hello now. */ - if (thread_is_scheduled(oi->thread_send_hello)) { - THREAD_OFF(oi->thread_send_hello); + if (event_is_scheduled(oi->thread_send_hello)) { + EVENT_OFF(oi->thread_send_hello); - thread_add_timer(master, ospf6_hello_send, oi, 0, - &oi->thread_send_hello); + event_add_timer(master, ospf6_hello_send, oi, 0, + &oi->thread_send_hello); } return CMD_SUCCESS; } @@ -2325,12 +2322,12 @@ DEFUN (ipv6_ospf6_passive, assert(oi); SET_FLAG(oi->flag, OSPF6_INTERFACE_PASSIVE); - THREAD_OFF(oi->thread_send_hello); - THREAD_OFF(oi->thread_sso); + EVENT_OFF(oi->thread_send_hello); + EVENT_OFF(oi->thread_sso); for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on)) { - THREAD_OFF(on->inactivity_timer); - thread_add_event(master, inactivity_timer, on, 0, NULL); + EVENT_OFF(on->inactivity_timer); + event_add_event(master, inactivity_timer, on, 0, NULL); } return CMD_SUCCESS; @@ -2355,13 +2352,13 @@ DEFUN (no_ipv6_ospf6_passive, assert(oi); UNSET_FLAG(oi->flag, OSPF6_INTERFACE_PASSIVE); - THREAD_OFF(oi->thread_send_hello); - THREAD_OFF(oi->thread_sso); + EVENT_OFF(oi->thread_send_hello); + EVENT_OFF(oi->thread_sso); /* don't send hellos over loopback interface */ if (!if_is_loopback(oi->interface)) - thread_add_timer(master, ospf6_hello_send, oi, 0, - &oi->thread_send_hello); + event_add_timer(master, ospf6_hello_send, oi, 0, + &oi->thread_send_hello); return CMD_SUCCESS; } @@ -2521,8 +2518,8 @@ DEFUN (ipv6_ospf6_network, } /* Reset the interface */ - thread_execute(master, interface_down, oi, 0); - thread_execute(master, interface_up, oi, 0); + event_execute(master, interface_down, oi, 0); + event_execute(master, interface_up, oi, 0); return CMD_SUCCESS; } @@ -2557,8 +2554,8 @@ DEFUN (no_ipv6_ospf6_network, oi->type = type; /* Reset the interface */ - thread_execute(master, interface_down, oi, 0); - thread_execute(master, interface_up, oi, 0); + event_execute(master, interface_down, oi, 0); + event_execute(master, interface_up, oi, 0); return CMD_SUCCESS; } @@ -2774,8 +2771,8 @@ void ospf6_interface_clear(struct interface *ifp) zlog_debug("Interface %s: clear by reset", ifp->name); /* Reset the interface */ - thread_execute(master, interface_down, oi, 0); - thread_execute(master, interface_up, oi, 0); + event_execute(master, interface_down, oi, 0); + event_execute(master, interface_up, oi, 0); } /* Clear interface */ diff --git a/ospf6d/ospf6_interface.h b/ospf6d/ospf6_interface.h index e04842a7c8..ae0744b25d 100644 --- a/ospf6d/ospf6_interface.h +++ b/ospf6d/ospf6_interface.h @@ -90,7 +90,7 @@ struct ospf6_interface { /* Interface socket setting trial counter, resets on success */ uint8_t sso_try_cnt; - struct thread *thread_sso; + struct event *thread_sso; /* OSPF6 Interface flag */ char flag; @@ -115,15 +115,15 @@ struct ospf6_interface { struct ospf6_lsdb *lsack_list; /* Ongoing Tasks */ - struct thread *thread_send_hello; - struct thread *thread_send_lsupdate; - struct thread *thread_send_lsack; + struct event *thread_send_hello; + struct event *thread_send_lsupdate; + struct event *thread_send_lsack; - struct thread *thread_network_lsa; - struct thread *thread_link_lsa; - struct thread *thread_intra_prefix_lsa; - struct thread *thread_as_extern_lsa; - struct thread *thread_wait_timer; + struct event *thread_network_lsa; + struct event *thread_link_lsa; + struct event *thread_intra_prefix_lsa; + struct event *thread_as_extern_lsa; + struct event *thread_wait_timer; struct ospf6_route_table *route_connected; @@ -211,11 +211,11 @@ extern struct in6_addr * ospf6_interface_get_global_address(struct interface *ifp); /* interface event */ -extern void interface_up(struct thread *thread); -extern void interface_down(struct thread *thread); -extern void wait_timer(struct thread *thread); -extern void backup_seen(struct thread *thread); -extern void neighbor_change(struct thread *thread); +extern void interface_up(struct event *thread); +extern void interface_down(struct event *thread); +extern void wait_timer(struct event *thread); +extern void backup_seen(struct event *thread); +extern void neighbor_change(struct event *thread); extern void ospf6_interface_init(void); extern void ospf6_interface_clear(struct interface *ifp); diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c index e7ce2f5f72..301fccecd7 100644 --- a/ospf6d/ospf6_intra.c +++ b/ospf6d/ospf6_intra.c @@ -7,7 +7,7 @@ #include "log.h" #include "linklist.h" -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "if.h" #include "prefix.h" @@ -209,7 +209,7 @@ int ospf6_router_is_stub_router(struct ospf6_lsa *lsa) return OSPF6_NOT_STUB_ROUTER; } -void ospf6_router_lsa_originate(struct thread *thread) +void ospf6_router_lsa_originate(struct event *thread) { struct ospf6_area *oa; @@ -228,7 +228,7 @@ void ospf6_router_lsa_originate(struct thread *thread) uint32_t router; int count; - oa = (struct ospf6_area *)THREAD_ARG(thread); + oa = (struct ospf6_area *)EVENT_ARG(thread); if (oa->ospf6->gr_info.restart_in_progress) { if (IS_DEBUG_OSPF6_GR) @@ -494,7 +494,7 @@ static int ospf6_network_lsa_show(struct vty *vty, struct ospf6_lsa *lsa, return 0; } -void ospf6_network_lsa_originate(struct thread *thread) +void ospf6_network_lsa_originate(struct event *thread) { struct ospf6_interface *oi; @@ -510,7 +510,7 @@ void ospf6_network_lsa_originate(struct thread *thread) struct listnode *i; uint16_t type; - oi = (struct ospf6_interface *)THREAD_ARG(thread); + oi = (struct ospf6_interface *)EVENT_ARG(thread); /* The interface must be enabled until here. A Network-LSA of a disabled interface (but was once enabled) should be flushed @@ -746,7 +746,7 @@ static int ospf6_link_lsa_show(struct vty *vty, struct ospf6_lsa *lsa, return 0; } -void ospf6_link_lsa_originate(struct thread *thread) +void ospf6_link_lsa_originate(struct event *thread) { struct ospf6_interface *oi; @@ -758,7 +758,7 @@ void ospf6_link_lsa_originate(struct thread *thread) struct ospf6_route *route; struct ospf6_prefix *op; - oi = (struct ospf6_interface *)THREAD_ARG(thread); + oi = (struct ospf6_interface *)EVENT_ARG(thread); assert(oi->area); @@ -982,7 +982,7 @@ static int ospf6_intra_prefix_lsa_show(struct vty *vty, struct ospf6_lsa *lsa, return 0; } -void ospf6_intra_prefix_lsa_originate_stub(struct thread *thread) +void ospf6_intra_prefix_lsa_originate_stub(struct event *thread) { struct ospf6_area *oa; @@ -1001,7 +1001,7 @@ void ospf6_intra_prefix_lsa_originate_stub(struct thread *thread) struct ospf6_route_table *route_advertise; int ls_id = 0; - oa = (struct ospf6_area *)THREAD_ARG(thread); + oa = (struct ospf6_area *)EVENT_ARG(thread); if (oa->ospf6->gr_info.restart_in_progress) { if (IS_DEBUG_OSPF6_GR) @@ -1217,7 +1217,7 @@ void ospf6_intra_prefix_lsa_originate_stub(struct thread *thread) } -void ospf6_intra_prefix_lsa_originate_transit(struct thread *thread) +void ospf6_intra_prefix_lsa_originate_transit(struct event *thread) { struct ospf6_interface *oi; @@ -1237,7 +1237,7 @@ void ospf6_intra_prefix_lsa_originate_transit(struct thread *thread) char *start, *end, *current; uint16_t type; - oi = (struct ospf6_interface *)THREAD_ARG(thread); + oi = (struct ospf6_interface *)EVENT_ARG(thread); assert(oi->area); diff --git a/ospf6d/ospf6_intra.h b/ospf6d/ospf6_intra.h index 79b5eb0ed9..0f286f0ab1 100644 --- a/ospf6d/ospf6_intra.h +++ b/ospf6d/ospf6_intra.h @@ -139,32 +139,32 @@ struct ospf6_intra_prefix_lsa { #define OSPF6_ROUTER_LSA_SCHEDULE(oa) \ do { \ if (CHECK_FLAG((oa)->flag, OSPF6_AREA_ENABLE)) \ - thread_add_event(master, ospf6_router_lsa_originate, \ - oa, 0, &(oa)->thread_router_lsa); \ + event_add_event(master, ospf6_router_lsa_originate, \ + oa, 0, &(oa)->thread_router_lsa); \ } while (0) #define OSPF6_NETWORK_LSA_SCHEDULE(oi) \ do { \ if (!CHECK_FLAG((oi)->flag, OSPF6_INTERFACE_DISABLE)) \ - thread_add_event(master, ospf6_network_lsa_originate, \ - oi, 0, &(oi)->thread_network_lsa); \ + event_add_event(master, ospf6_network_lsa_originate, \ + oi, 0, &(oi)->thread_network_lsa); \ } while (0) #define OSPF6_LINK_LSA_SCHEDULE(oi) \ do { \ if (!CHECK_FLAG((oi)->flag, OSPF6_INTERFACE_DISABLE)) \ - thread_add_event(master, ospf6_link_lsa_originate, oi, \ - 0, &(oi)->thread_link_lsa); \ + event_add_event(master, ospf6_link_lsa_originate, oi, \ + 0, &(oi)->thread_link_lsa); \ } while (0) #define OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB(oa) \ do { \ if (CHECK_FLAG((oa)->flag, OSPF6_AREA_ENABLE)) \ - thread_add_event( \ + event_add_event( \ master, ospf6_intra_prefix_lsa_originate_stub, \ oa, 0, &(oa)->thread_intra_prefix_lsa); \ } while (0) #define OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT(oi) \ do { \ if (!CHECK_FLAG((oi)->flag, OSPF6_INTERFACE_DISABLE)) \ - thread_add_event( \ + event_add_event( \ master, \ ospf6_intra_prefix_lsa_originate_transit, oi, \ 0, &(oi)->thread_intra_prefix_lsa); \ @@ -173,42 +173,42 @@ struct ospf6_intra_prefix_lsa { #define OSPF6_AS_EXTERN_LSA_SCHEDULE(oi) \ do { \ if (!CHECK_FLAG((oi)->flag, OSPF6_INTERFACE_DISABLE)) \ - thread_add_event(master, ospf6_orig_as_external_lsa, \ - oi, 0, &(oi)->thread_as_extern_lsa); \ + event_add_event(master, ospf6_orig_as_external_lsa, \ + oi, 0, &(oi)->thread_as_extern_lsa); \ } while (0) #define OSPF6_ROUTER_LSA_EXECUTE(oa) \ do { \ if (CHECK_FLAG((oa)->flag, OSPF6_AREA_ENABLE)) \ - thread_execute(master, ospf6_router_lsa_originate, oa, \ - 0); \ + event_execute(master, ospf6_router_lsa_originate, oa, \ + 0); \ } while (0) #define OSPF6_NETWORK_LSA_EXECUTE(oi) \ do { \ - THREAD_OFF((oi)->thread_network_lsa); \ - thread_execute(master, ospf6_network_lsa_originate, oi, 0); \ + EVENT_OFF((oi)->thread_network_lsa); \ + event_execute(master, ospf6_network_lsa_originate, oi, 0); \ } while (0) #define OSPF6_LINK_LSA_EXECUTE(oi) \ do { \ if (!CHECK_FLAG((oi)->flag, OSPF6_INTERFACE_DISABLE)) \ - thread_execute(master, ospf6_link_lsa_originate, oi, \ - 0); \ + event_execute(master, ospf6_link_lsa_originate, oi, \ + 0); \ } while (0) #define OSPF6_INTRA_PREFIX_LSA_EXECUTE_TRANSIT(oi) \ do { \ - THREAD_OFF((oi)->thread_intra_prefix_lsa); \ - thread_execute(master, \ - ospf6_intra_prefix_lsa_originate_transit, oi, \ - 0); \ + EVENT_OFF((oi)->thread_intra_prefix_lsa); \ + event_execute(master, \ + ospf6_intra_prefix_lsa_originate_transit, oi, \ + 0); \ } while (0) #define OSPF6_AS_EXTERN_LSA_EXECUTE(oi) \ do { \ - THREAD_OFF((oi)->thread_as_extern_lsa); \ - thread_execute(master, ospf6_orig_as_external_lsa, oi, 0); \ + EVENT_OFF((oi)->thread_as_extern_lsa); \ + event_execute(master, ospf6_orig_as_external_lsa, oi, 0); \ } while (0) /* Function Prototypes */ @@ -220,14 +220,14 @@ extern char *ospf6_network_lsdesc_lookup(uint32_t router_id, struct ospf6_lsa *lsa); extern int ospf6_router_is_stub_router(struct ospf6_lsa *lsa); -extern void ospf6_router_lsa_originate(struct thread *thread); -extern void ospf6_network_lsa_originate(struct thread *thread); -extern void ospf6_link_lsa_originate(struct thread *thread); -extern void ospf6_intra_prefix_lsa_originate_transit(struct thread *thread); -extern void ospf6_intra_prefix_lsa_originate_stub(struct thread *thread); +extern void ospf6_router_lsa_originate(struct event *thread); +extern void ospf6_network_lsa_originate(struct event *thread); +extern void ospf6_link_lsa_originate(struct event *thread); +extern void ospf6_intra_prefix_lsa_originate_transit(struct event *thread); +extern void ospf6_intra_prefix_lsa_originate_stub(struct event *thread); extern void ospf6_intra_prefix_lsa_add(struct ospf6_lsa *lsa); extern void ospf6_intra_prefix_lsa_remove(struct ospf6_lsa *lsa); -extern void ospf6_orig_as_external_lsa(struct thread *thread); +extern void ospf6_orig_as_external_lsa(struct event *thread); extern void ospf6_intra_route_calculation(struct ospf6_area *oa); extern void ospf6_intra_brouter_calculation(struct ospf6_area *oa); extern void ospf6_intra_prefix_route_ecmp_path(struct ospf6_area *oa, diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c index fe085b4cb4..2b806afe06 100644 --- a/ospf6d/ospf6_lsa.c +++ b/ospf6d/ospf6_lsa.c @@ -12,7 +12,7 @@ #include "vty.h" #include "command.h" #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "checksum.h" #include "frrstr.h" @@ -302,8 +302,8 @@ void ospf6_lsa_premature_aging(struct ospf6_lsa *lsa) if (IS_OSPF6_DEBUG_LSA_TYPE(lsa->header->type)) zlog_debug("LSA: Premature aging: %s", lsa->name); - THREAD_OFF(lsa->expire); - THREAD_OFF(lsa->refresh); + EVENT_OFF(lsa->expire); + EVENT_OFF(lsa->refresh); /* * We clear the LSA from the neighbor retx lists now because it @@ -333,7 +333,7 @@ void ospf6_lsa_premature_aging(struct ospf6_lsa *lsa) ospf6_flood_clear(lsa); lsa->header->age = htons(OSPF_LSA_MAXAGE); - thread_execute(master, ospf6_lsa_expire, lsa, 0); + event_execute(master, ospf6_lsa_expire, lsa, 0); } /* check which is more recent. if a is more recent, return -1; @@ -760,8 +760,8 @@ void ospf6_lsa_delete(struct ospf6_lsa *lsa) assert(lsa->lock == 0); /* cancel threads */ - THREAD_OFF(lsa->expire); - THREAD_OFF(lsa->refresh); + EVENT_OFF(lsa->expire); + EVENT_OFF(lsa->refresh); /* do free */ XFREE(MTYPE_OSPF6_LSA_HEADER, lsa->header); @@ -812,18 +812,18 @@ struct ospf6_lsa *ospf6_lsa_unlock(struct ospf6_lsa *lsa) /* ospf6 lsa expiry */ -void ospf6_lsa_expire(struct thread *thread) +void ospf6_lsa_expire(struct event *thread) { struct ospf6_lsa *lsa; struct ospf6 *ospf6; - lsa = (struct ospf6_lsa *)THREAD_ARG(thread); + lsa = (struct ospf6_lsa *)EVENT_ARG(thread); assert(lsa && lsa->header); assert(OSPF6_LSA_IS_MAXAGE(lsa)); assert(!lsa->refresh); - lsa->expire = (struct thread *)NULL; + lsa->expire = (struct event *)NULL; if (IS_OSPF6_DEBUG_LSA_TYPE(lsa->header->type)) { zlog_debug("LSA Expire:"); @@ -845,15 +845,15 @@ void ospf6_lsa_expire(struct thread *thread) ospf6_maxage_remove(ospf6); } -void ospf6_lsa_refresh(struct thread *thread) +void ospf6_lsa_refresh(struct event *thread) { struct ospf6_lsa *old, *self, *new; struct ospf6_lsdb *lsdb_self; - old = (struct ospf6_lsa *)THREAD_ARG(thread); + old = (struct ospf6_lsa *)EVENT_ARG(thread); assert(old && old->header); - old->refresh = (struct thread *)NULL; + old->refresh = (struct event *)NULL; lsdb_self = ospf6_get_scoped_lsdb_self(old); self = ospf6_lsdb_lookup(old->header->type, old->header->id, @@ -875,8 +875,8 @@ void ospf6_lsa_refresh(struct thread *thread) new = ospf6_lsa_create(self->header); new->lsdb = old->lsdb; - thread_add_timer(master, ospf6_lsa_refresh, new, OSPF_LS_REFRESH_TIME, - &new->refresh); + event_add_timer(master, ospf6_lsa_refresh, new, OSPF_LS_REFRESH_TIME, + &new->refresh); /* store it in the LSDB for self-originated LSAs */ ospf6_lsdb_add(ospf6_lsa_copy(new), lsdb_self); diff --git a/ospf6d/ospf6_lsa.h b/ospf6d/ospf6_lsa.h index acb24d791d..be7b94f3d3 100644 --- a/ospf6d/ospf6_lsa.h +++ b/ospf6d/ospf6_lsa.h @@ -119,8 +119,8 @@ struct ospf6_lsa { struct timeval received; /* used by MinLSArrival check */ struct timeval installed; - struct thread *expire; - struct thread *refresh; /* For self-originated LSA */ + struct event *expire; + struct event *refresh; /* For self-originated LSA */ int retrans_count; @@ -241,8 +241,8 @@ extern struct ospf6_lsa *ospf6_lsa_copy(struct ospf6_lsa *lsa); extern struct ospf6_lsa *ospf6_lsa_lock(struct ospf6_lsa *lsa); extern struct ospf6_lsa *ospf6_lsa_unlock(struct ospf6_lsa *lsa); -extern void ospf6_lsa_expire(struct thread *thread); -extern void ospf6_lsa_refresh(struct thread *thread); +extern void ospf6_lsa_expire(struct event *thread); +extern void ospf6_lsa_refresh(struct event *thread); extern unsigned short ospf6_lsa_checksum(struct ospf6_lsa_header *lsah); extern int ospf6_lsa_checksum_valid(struct ospf6_lsa_header *lsah); diff --git a/ospf6d/ospf6_lsdb.c b/ospf6d/ospf6_lsdb.c index 586183731c..7925a8b2f4 100644 --- a/ospf6d/ospf6_lsdb.c +++ b/ospf6d/ospf6_lsdb.c @@ -395,8 +395,8 @@ int ospf6_lsdb_maxage_remover(struct ospf6_lsdb *lsdb) htonl(OSPF_MAX_SEQUENCE_NUMBER + 1); ospf6_lsa_checksum(lsa->header); - THREAD_OFF(lsa->refresh); - thread_execute(master, ospf6_lsa_refresh, lsa, 0); + EVENT_OFF(lsa->refresh); + event_execute(master, ospf6_lsa_refresh, lsa, 0); } else { zlog_debug("calling ospf6_lsdb_remove %s", lsa->name); ospf6_lsdb_remove(lsa, lsdb); diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c index abc460249d..fdb93475d4 100644 --- a/ospf6d/ospf6_main.c +++ b/ospf6d/ospf6_main.c @@ -9,7 +9,7 @@ #include #include "getopt.h" -#include "thread.h" +#include "frrevent.h" #include "log.h" #include "command.h" #include "vty.h" @@ -62,7 +62,7 @@ struct zebra_privs_t ospf6d_privs = { struct option longopts[] = {{0}}; /* Master of threads. */ -struct thread_master *master; +struct event_loop *master; static void __attribute__((noreturn)) ospf6_exit(int status) { diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c index a499190a11..14b02dac79 100644 --- a/ospf6d/ospf6_message.c +++ b/ospf6d/ospf6_message.c @@ -9,7 +9,7 @@ #include "log.h" #include "vty.h" #include "command.h" -#include "thread.h" +#include "frrevent.h" #include "linklist.h" #include "lib_errors.h" #include "checksum.h" @@ -535,9 +535,9 @@ static void ospf6_hello_recv(struct in6_addr *src, struct in6_addr *dst, oi->hello_in++; /* Execute neighbor events */ - thread_execute(master, hello_received, on, 0); + event_execute(master, hello_received, on, 0); if (twoway) - thread_execute(master, twoway_received, on, 0); + event_execute(master, twoway_received, on, 0); else { if (OSPF6_GR_IS_ACTIVE_HELPER(on)) { if (IS_DEBUG_OSPF6_GR) @@ -553,7 +553,7 @@ static void ospf6_hello_recv(struct in6_addr *src, struct in6_addr *dst, * receives one_way hellow when it acts as HELPER for * that specific neighbor. */ - thread_execute(master, oneway_received, on, 0); + event_execute(master, oneway_received, on, 0); } } @@ -594,9 +594,9 @@ static void ospf6_hello_recv(struct in6_addr *src, struct in6_addr *dst, /* Schedule interface events */ if (backupseen) - thread_add_event(master, backup_seen, oi, 0, NULL); + event_add_event(master, backup_seen, oi, 0, NULL); if (neighborchange) - thread_add_event(master, neighbor_change, oi, 0, NULL); + event_add_event(master, neighbor_change, oi, 0, NULL); if (neighbor_ifindex_change && on->state == OSPF6_NEIGHBOR_FULL) OSPF6_ROUTER_LSA_SCHEDULE(oi->area); @@ -624,7 +624,7 @@ static void ospf6_dbdesc_recv_master(struct ospf6_header *oh, return; case OSPF6_NEIGHBOR_INIT: - thread_execute(master, twoway_received, on, 0); + event_execute(master, twoway_received, on, 0); if (on->state != OSPF6_NEIGHBOR_EXSTART) { if (IS_OSPF6_DEBUG_MESSAGE(oh->type, RECV_HDR)) zlog_debug( @@ -640,7 +640,7 @@ static void ospf6_dbdesc_recv_master(struct ospf6_header *oh, && !CHECK_FLAG(dbdesc->bits, OSPF6_DBDESC_IBIT) && ntohl(dbdesc->seqnum) == on->dbdesc_seqnum) { /* execute NegotiationDone */ - thread_execute(master, negotiation_done, on, 0); + event_execute(master, negotiation_done, on, 0); /* Record neighbor options */ memcpy(on->options, dbdesc->options, @@ -667,24 +667,24 @@ static void ospf6_dbdesc_recv_master(struct ospf6_header *oh, zlog_warn( "DbDesc recv: Master/Slave bit mismatch Nbr %s", on->name); - thread_add_event(master, seqnumber_mismatch, on, 0, - NULL); + event_add_event(master, seqnumber_mismatch, on, 0, + NULL); return; } if (CHECK_FLAG(dbdesc->bits, OSPF6_DBDESC_IBIT)) { zlog_warn("DbDesc recv: Initialize bit mismatch Nbr %s", on->name); - thread_add_event(master, seqnumber_mismatch, on, 0, - NULL); + event_add_event(master, seqnumber_mismatch, on, 0, + NULL); return; } if (memcmp(on->options, dbdesc->options, sizeof(on->options))) { zlog_warn("DbDesc recv: Option field mismatch Nbr %s", on->name); - thread_add_event(master, seqnumber_mismatch, on, 0, - NULL); + event_add_event(master, seqnumber_mismatch, on, 0, + NULL); return; } @@ -693,7 +693,7 @@ static void ospf6_dbdesc_recv_master(struct ospf6_header *oh, "DbDesc recv: Sequence number mismatch Nbr %s (received %#lx, %#lx expected)", on->name, (unsigned long)ntohl(dbdesc->seqnum), (unsigned long)on->dbdesc_seqnum); - thread_add_event(master, seqnumber_mismatch, on, 0, + event_add_event(master, seqnumber_mismatch, on, 0, NULL); return; } @@ -714,7 +714,7 @@ static void ospf6_dbdesc_recv_master(struct ospf6_header *oh, zlog_warn( "DbDesc recv: Not duplicate dbdesc in state %s Nbr %s", ospf6_neighbor_state_str[on->state], on->name); - thread_add_event(master, seqnumber_mismatch, on, 0, NULL); + event_add_event(master, seqnumber_mismatch, on, 0, NULL); return; default: @@ -758,8 +758,8 @@ static void ospf6_dbdesc_recv_master(struct ospf6_header *oh, zlog_debug( "SeqNumMismatch (E-bit mismatch), discard"); ospf6_lsa_delete(his); - thread_add_event(master, seqnumber_mismatch, on, 0, - NULL); + event_add_event(master, seqnumber_mismatch, on, 0, + NULL); return; } @@ -787,19 +787,19 @@ static void ospf6_dbdesc_recv_master(struct ospf6_header *oh, /* schedule send lsreq */ if (on->request_list->count) - thread_add_event(master, ospf6_lsreq_send, on, 0, - &on->thread_send_lsreq); + event_add_event(master, ospf6_lsreq_send, on, 0, + &on->thread_send_lsreq); - THREAD_OFF(on->thread_send_dbdesc); + EVENT_OFF(on->thread_send_dbdesc); /* More bit check */ if (!CHECK_FLAG(dbdesc->bits, OSPF6_DBDESC_MBIT) && !CHECK_FLAG(on->dbdesc_bits, OSPF6_DBDESC_MBIT)) - thread_add_event(master, exchange_done, on, 0, - &on->thread_exchange_done); + event_add_event(master, exchange_done, on, 0, + &on->thread_exchange_done); else { - thread_add_event(master, ospf6_dbdesc_send_newone, on, 0, - &on->thread_send_dbdesc); + event_add_event(master, ospf6_dbdesc_send_newone, on, 0, + &on->thread_send_dbdesc); } /* save last received dbdesc */ @@ -828,7 +828,7 @@ static void ospf6_dbdesc_recv_slave(struct ospf6_header *oh, return; case OSPF6_NEIGHBOR_INIT: - thread_execute(master, twoway_received, on, 0); + event_execute(master, twoway_received, on, 0); if (on->state != OSPF6_NEIGHBOR_EXSTART) { if (IS_OSPF6_DEBUG_MESSAGE(oh->type, RECV_HDR)) zlog_debug( @@ -855,7 +855,7 @@ static void ospf6_dbdesc_recv_slave(struct ospf6_header *oh, on->dbdesc_seqnum = ntohl(dbdesc->seqnum); /* schedule NegotiationDone */ - thread_execute(master, negotiation_done, on, 0); + event_execute(master, negotiation_done, on, 0); /* Record neighbor options */ memcpy(on->options, dbdesc->options, @@ -875,9 +875,9 @@ static void ospf6_dbdesc_recv_slave(struct ospf6_header *oh, if (IS_OSPF6_DEBUG_MESSAGE(oh->type, RECV_HDR)) zlog_debug( "Duplicated dbdesc causes retransmit"); - THREAD_OFF(on->thread_send_dbdesc); - thread_add_event(master, ospf6_dbdesc_send, on, 0, - &on->thread_send_dbdesc); + EVENT_OFF(on->thread_send_dbdesc); + event_add_event(master, ospf6_dbdesc_send, on, 0, + &on->thread_send_dbdesc); return; } @@ -885,8 +885,8 @@ static void ospf6_dbdesc_recv_slave(struct ospf6_header *oh, zlog_warn( "DbDesc slave recv: Master/Slave bit mismatch Nbr %s", on->name); - thread_add_event(master, seqnumber_mismatch, on, 0, - NULL); + event_add_event(master, seqnumber_mismatch, on, 0, + NULL); return; } @@ -894,8 +894,8 @@ static void ospf6_dbdesc_recv_slave(struct ospf6_header *oh, zlog_warn( "DbDesc slave recv: Initialize bit mismatch Nbr %s", on->name); - thread_add_event(master, seqnumber_mismatch, on, 0, - NULL); + event_add_event(master, seqnumber_mismatch, on, 0, + NULL); return; } @@ -903,8 +903,8 @@ static void ospf6_dbdesc_recv_slave(struct ospf6_header *oh, zlog_warn( "DbDesc slave recv: Option field mismatch Nbr %s", on->name); - thread_add_event(master, seqnumber_mismatch, on, 0, - NULL); + event_add_event(master, seqnumber_mismatch, on, 0, + NULL); return; } @@ -913,7 +913,7 @@ static void ospf6_dbdesc_recv_slave(struct ospf6_header *oh, "DbDesc slave recv: Sequence number mismatch Nbr %s (received %#lx, %#lx expected)", on->name, (unsigned long)ntohl(dbdesc->seqnum), (unsigned long)on->dbdesc_seqnum + 1); - thread_add_event(master, seqnumber_mismatch, on, 0, + event_add_event(master, seqnumber_mismatch, on, 0, NULL); return; } @@ -928,16 +928,16 @@ static void ospf6_dbdesc_recv_slave(struct ospf6_header *oh, if (IS_OSPF6_DEBUG_MESSAGE(oh->type, RECV_HDR)) zlog_debug( "Duplicated dbdesc causes retransmit"); - THREAD_OFF(on->thread_send_dbdesc); - thread_add_event(master, ospf6_dbdesc_send, on, 0, - &on->thread_send_dbdesc); + EVENT_OFF(on->thread_send_dbdesc); + event_add_event(master, ospf6_dbdesc_send, on, 0, + &on->thread_send_dbdesc); return; } zlog_warn( "DbDesc slave recv: Not duplicate dbdesc in state %s Nbr %s", ospf6_neighbor_state_str[on->state], on->name); - thread_add_event(master, seqnumber_mismatch, on, 0, NULL); + event_add_event(master, seqnumber_mismatch, on, 0, NULL); return; default: @@ -977,8 +977,8 @@ static void ospf6_dbdesc_recv_slave(struct ospf6_header *oh, if (IS_OSPF6_DEBUG_MESSAGE(oh->type, RECV)) zlog_debug("E-bit mismatch with LSA Headers"); ospf6_lsa_delete(his); - thread_add_event(master, seqnumber_mismatch, on, 0, - NULL); + event_add_event(master, seqnumber_mismatch, on, 0, + NULL); return; } @@ -999,12 +999,12 @@ static void ospf6_dbdesc_recv_slave(struct ospf6_header *oh, /* schedule send lsreq */ if (on->request_list->count) - thread_add_event(master, ospf6_lsreq_send, on, 0, - &on->thread_send_lsreq); + event_add_event(master, ospf6_lsreq_send, on, 0, + &on->thread_send_lsreq); - THREAD_OFF(on->thread_send_dbdesc); - thread_add_event(master, ospf6_dbdesc_send_newone, on, 0, - &on->thread_send_dbdesc); + EVENT_OFF(on->thread_send_dbdesc); + event_add_event(master, ospf6_dbdesc_send_newone, on, 0, + &on->thread_send_dbdesc); /* save last received dbdesc */ memcpy(&on->dbdesc_last, dbdesc, sizeof(struct ospf6_dbdesc)); @@ -1126,7 +1126,7 @@ static void ospf6_lsreq_recv(struct in6_addr *src, struct in6_addr *dst, "Can't find requested lsa [%s Id:%pI4 Adv:%pI4] send badLSReq", ospf6_lstype_name(e->type), &e->id, &e->adv_router); - thread_add_event(master, bad_lsreq, on, 0, NULL); + event_add_event(master, bad_lsreq, on, 0, NULL); return; } @@ -1136,9 +1136,9 @@ static void ospf6_lsreq_recv(struct in6_addr *src, struct in6_addr *dst, assert(p == OSPF6_MESSAGE_END(oh)); /* schedule send lsupdate */ - THREAD_OFF(on->thread_send_lsupdate); - thread_add_event(master, ospf6_lsupdate_send_neighbor, on, 0, - &on->thread_send_lsupdate); + EVENT_OFF(on->thread_send_lsupdate); + event_add_event(master, ospf6_lsupdate_send_neighbor, on, 0, + &on->thread_send_lsupdate); } /* Verify, that the specified memory area contains exactly N valid IPv6 @@ -1907,18 +1907,18 @@ static int ospf6_read_helper(int sockfd, struct ospf6 *ospf6) return OSPF6_READ_CONTINUE; } -void ospf6_receive(struct thread *thread) +void ospf6_receive(struct event *thread) { int sockfd; struct ospf6 *ospf6; int count = 0; /* add next read thread */ - ospf6 = THREAD_ARG(thread); - sockfd = THREAD_FD(thread); + ospf6 = EVENT_ARG(thread); + sockfd = EVENT_FD(thread); - thread_add_read(master, ospf6_receive, ospf6, ospf6->fd, - &ospf6->t_ospf6_receive); + event_add_read(master, ospf6_receive, ospf6, ospf6->fd, + &ospf6->t_ospf6_receive); while (count < ospf6->write_oi_count) { count++; @@ -2082,9 +2082,9 @@ static uint16_t ospf6_make_hello(struct ospf6_interface *oi, struct stream *s) return length; } -static void ospf6_write(struct thread *thread) +static void ospf6_write(struct event *thread) { - struct ospf6 *ospf6 = THREAD_ARG(thread); + struct ospf6 *ospf6 = EVENT_ARG(thread); struct ospf6_interface *oi; struct ospf6_header *oh; struct ospf6_packet *op; @@ -2232,17 +2232,17 @@ static void ospf6_write(struct thread *thread) /* If packets still remain in queue, call write thread. */ if (!list_isempty(ospf6->oi_write_q)) - thread_add_write(master, ospf6_write, ospf6, ospf6->fd, - &ospf6->t_write); + event_add_write(master, ospf6_write, ospf6, ospf6->fd, + &ospf6->t_write); } -void ospf6_hello_send(struct thread *thread) +void ospf6_hello_send(struct event *thread) { struct ospf6_interface *oi; struct ospf6_packet *op; uint16_t length = OSPF6_HEADER_SIZE; - oi = (struct ospf6_interface *)THREAD_ARG(thread); + oi = (struct ospf6_interface *)EVENT_ARG(thread); if (oi->state <= OSPF6_INTERFACE_DOWN) { if (IS_OSPF6_DEBUG_MESSAGE(OSPF6_MESSAGE_TYPE_HELLO, SEND_HDR)) @@ -2279,8 +2279,8 @@ void ospf6_hello_send(struct thread *thread) ospf6_packet_add_top(oi, op); /* set next thread */ - thread_add_timer(master, ospf6_hello_send, oi, oi->hello_interval, - &oi->thread_send_hello); + event_add_timer(master, ospf6_hello_send, oi, oi->hello_interval, + &oi->thread_send_hello); OSPF6_MESSAGE_WRITE_ON(oi); } @@ -2333,13 +2333,13 @@ static uint16_t ospf6_make_dbdesc(struct ospf6_neighbor *on, struct stream *s) return length; } -void ospf6_dbdesc_send(struct thread *thread) +void ospf6_dbdesc_send(struct event *thread) { struct ospf6_neighbor *on; uint16_t length = OSPF6_HEADER_SIZE; struct ospf6_packet *op; - on = (struct ospf6_neighbor *)THREAD_ARG(thread); + on = (struct ospf6_neighbor *)EVENT_ARG(thread); if (on->state < OSPF6_NEIGHBOR_EXSTART) { if (IS_OSPF6_DEBUG_MESSAGE(OSPF6_MESSAGE_TYPE_DBDESC, SEND)) @@ -2351,9 +2351,9 @@ void ospf6_dbdesc_send(struct thread *thread) /* set next thread if master */ if (CHECK_FLAG(on->dbdesc_bits, OSPF6_DBDESC_MSBIT)) - thread_add_timer(master, ospf6_dbdesc_send, on, - on->ospf6_if->rxmt_interval, - &on->thread_send_dbdesc); + event_add_timer(master, ospf6_dbdesc_send, on, + on->ospf6_if->rxmt_interval, + &on->thread_send_dbdesc); op = ospf6_packet_new(on->ospf6_if->ifmtu); ospf6_make_header(OSPF6_MESSAGE_TYPE_DBDESC, on->ospf6_if, op->s); @@ -2376,13 +2376,13 @@ void ospf6_dbdesc_send(struct thread *thread) OSPF6_MESSAGE_WRITE_ON(on->ospf6_if); } -void ospf6_dbdesc_send_newone(struct thread *thread) +void ospf6_dbdesc_send_newone(struct event *thread) { struct ospf6_neighbor *on; struct ospf6_lsa *lsa, *lsanext; unsigned int size = 0; - on = (struct ospf6_neighbor *)THREAD_ARG(thread); + on = (struct ospf6_neighbor *)EVENT_ARG(thread); ospf6_lsdb_remove_all(on->dbdesc_list); /* move LSAs from summary_list to dbdesc_list (within neighbor @@ -2418,10 +2418,10 @@ void ospf6_dbdesc_send_newone(struct thread *thread) if (!CHECK_FLAG(on->dbdesc_bits, OSPF6_DBDESC_MSBIT) && /* Slave */ !CHECK_FLAG(on->dbdesc_last.bits, OSPF6_DBDESC_MBIT) && !CHECK_FLAG(on->dbdesc_bits, OSPF6_DBDESC_MBIT)) - thread_add_event(master, exchange_done, on, 0, - &on->thread_exchange_done); + event_add_event(master, exchange_done, on, 0, + &on->thread_exchange_done); - thread_execute(master, ospf6_dbdesc_send, on, 0); + event_execute(master, ospf6_dbdesc_send, on, 0); } static uint16_t ospf6_make_lsreq(struct ospf6_neighbor *on, struct stream *s) @@ -2498,13 +2498,13 @@ static uint16_t ospf6_make_lsack_neighbor(struct ospf6_neighbor *on, return length; } -void ospf6_lsreq_send(struct thread *thread) +void ospf6_lsreq_send(struct event *thread) { struct ospf6_neighbor *on; struct ospf6_packet *op; uint16_t length = OSPF6_HEADER_SIZE; - on = (struct ospf6_neighbor *)THREAD_ARG(thread); + on = (struct ospf6_neighbor *)EVENT_ARG(thread); /* LSReq will be sent only in ExStart or Loading */ if (on->state != OSPF6_NEIGHBOR_EXCHANGE @@ -2518,7 +2518,7 @@ void ospf6_lsreq_send(struct thread *thread) /* schedule loading_done if request list is empty */ if (on->request_list->count == 0) { - thread_add_event(master, loading_done, on, 0, NULL); + event_add_event(master, loading_done, on, 0, NULL); return; } @@ -2551,9 +2551,9 @@ void ospf6_lsreq_send(struct thread *thread) /* set next thread */ if (on->request_list->count != 0) { - thread_add_timer(master, ospf6_lsreq_send, on, - on->ospf6_if->rxmt_interval, - &on->thread_send_lsreq); + event_add_timer(master, ospf6_lsreq_send, on, + on->ospf6_if->rxmt_interval, + &on->thread_send_lsreq); } } @@ -2592,7 +2592,7 @@ static void ospf6_send_lsupdate(struct ospf6_neighbor *on, listnode_add(oi->area->ospf6->oi_write_q, oi); oi->on_write_q = 1; } - thread_execute(master, ospf6_write, oi->area->ospf6, 0); + event_execute(master, ospf6_write, oi->area->ospf6, 0); } else OSPF6_MESSAGE_WRITE_ON(oi); } @@ -2676,14 +2676,14 @@ static uint16_t ospf6_make_ls_retrans_list(struct ospf6_neighbor *on, return length; } -void ospf6_lsupdate_send_neighbor(struct thread *thread) +void ospf6_lsupdate_send_neighbor(struct event *thread) { struct ospf6_neighbor *on; struct ospf6_packet *op; uint16_t length = OSPF6_HEADER_SIZE; int lsa_cnt = 0; - on = (struct ospf6_neighbor *)THREAD_ARG(thread); + on = (struct ospf6_neighbor *)EVENT_ARG(thread); if (IS_OSPF6_DEBUG_MESSAGE(OSPF6_MESSAGE_TYPE_LSUPDATE, SEND_HDR)) zlog_debug("LSUpdate to neighbor %s", on->name); @@ -2734,12 +2734,12 @@ void ospf6_lsupdate_send_neighbor(struct thread *thread) ospf6_packet_free(op); if (on->lsupdate_list->count != 0) { - thread_add_event(master, ospf6_lsupdate_send_neighbor, on, 0, - &on->thread_send_lsupdate); + event_add_event(master, ospf6_lsupdate_send_neighbor, on, 0, + &on->thread_send_lsupdate); } else if (on->retrans_list->count != 0) { - thread_add_timer(master, ospf6_lsupdate_send_neighbor, on, - on->ospf6_if->rxmt_interval, - &on->thread_send_lsupdate); + event_add_timer(master, ospf6_lsupdate_send_neighbor, on, + on->ospf6_if->rxmt_interval, + &on->thread_send_lsupdate); } } @@ -2811,14 +2811,14 @@ static uint16_t ospf6_make_lsupdate_interface(struct ospf6_interface *oi, return length; } -void ospf6_lsupdate_send_interface(struct thread *thread) +void ospf6_lsupdate_send_interface(struct event *thread) { struct ospf6_interface *oi; struct ospf6_packet *op; uint16_t length = OSPF6_HEADER_SIZE; int lsa_cnt = 0; - oi = (struct ospf6_interface *)THREAD_ARG(thread); + oi = (struct ospf6_interface *)EVENT_ARG(thread); if (oi->state <= OSPF6_INTERFACE_WAITING) { if (IS_OSPF6_DEBUG_MESSAGE(OSPF6_MESSAGE_TYPE_LSUPDATE, @@ -2847,18 +2847,18 @@ void ospf6_lsupdate_send_interface(struct thread *thread) ospf6_packet_free(op); if (oi->lsupdate_list->count > 0) { - thread_add_event(master, ospf6_lsupdate_send_interface, oi, 0, - &oi->thread_send_lsupdate); + event_add_event(master, ospf6_lsupdate_send_interface, oi, 0, + &oi->thread_send_lsupdate); } } -void ospf6_lsack_send_neighbor(struct thread *thread) +void ospf6_lsack_send_neighbor(struct event *thread) { struct ospf6_neighbor *on; struct ospf6_packet *op; uint16_t length = OSPF6_HEADER_SIZE; - on = (struct ospf6_neighbor *)THREAD_ARG(thread); + on = (struct ospf6_neighbor *)EVENT_ARG(thread); if (on->state < OSPF6_NEIGHBOR_EXCHANGE) { if (IS_OSPF6_DEBUG_MESSAGE(OSPF6_MESSAGE_TYPE_LSACK, SEND_HDR)) @@ -2893,8 +2893,8 @@ void ospf6_lsack_send_neighbor(struct thread *thread) OSPF6_MESSAGE_WRITE_ON(on->ospf6_if); if (on->lsack_list->count > 0) - thread_add_event(master, ospf6_lsack_send_neighbor, on, 0, - &on->thread_send_lsack); + event_add_event(master, ospf6_lsack_send_neighbor, on, 0, + &on->thread_send_lsack); } static uint16_t ospf6_make_lsack_interface(struct ospf6_interface *oi, @@ -2909,9 +2909,9 @@ static uint16_t ospf6_make_lsack_interface(struct ospf6_interface *oi, > ospf6_packet_max(oi)) { /* if we run out of packet size/space here, better to try again soon. */ - THREAD_OFF(oi->thread_send_lsack); - thread_add_event(master, ospf6_lsack_send_interface, oi, - 0, &oi->thread_send_lsack); + EVENT_OFF(oi->thread_send_lsack); + event_add_event(master, ospf6_lsack_send_interface, oi, + 0, &oi->thread_send_lsack); ospf6_lsa_unlock(lsa); if (lsanext) @@ -2928,13 +2928,13 @@ static uint16_t ospf6_make_lsack_interface(struct ospf6_interface *oi, return length; } -void ospf6_lsack_send_interface(struct thread *thread) +void ospf6_lsack_send_interface(struct event *thread) { struct ospf6_interface *oi; struct ospf6_packet *op; uint16_t length = OSPF6_HEADER_SIZE; - oi = (struct ospf6_interface *)THREAD_ARG(thread); + oi = (struct ospf6_interface *)EVENT_ARG(thread); if (oi->state <= OSPF6_INTERFACE_WAITING) { if (IS_OSPF6_DEBUG_MESSAGE(OSPF6_MESSAGE_TYPE_LSACK, SEND_HDR)) @@ -2975,8 +2975,8 @@ void ospf6_lsack_send_interface(struct thread *thread) OSPF6_MESSAGE_WRITE_ON(oi); if (oi->lsack_list->count > 0) - thread_add_event(master, ospf6_lsack_send_interface, oi, 0, - &oi->thread_send_lsack); + event_add_event(master, ospf6_lsack_send_interface, oi, 0, + &oi->thread_send_lsack); } /* Commands */ diff --git a/ospf6d/ospf6_message.h b/ospf6d/ospf6_message.h index 1f6a7e86e0..2b25b07445 100644 --- a/ospf6d/ospf6_message.h +++ b/ospf6d/ospf6_message.h @@ -158,16 +158,16 @@ extern void ospf6_fifo_free(struct ospf6_fifo *fifo); extern int ospf6_iobuf_size(unsigned int size); extern void ospf6_message_terminate(void); -extern void ospf6_receive(struct thread *thread); +extern void ospf6_receive(struct event *thread); -extern void ospf6_hello_send(struct thread *thread); -extern void ospf6_dbdesc_send(struct thread *thread); -extern void ospf6_dbdesc_send_newone(struct thread *thread); -extern void ospf6_lsreq_send(struct thread *thread); -extern void ospf6_lsupdate_send_interface(struct thread *thread); -extern void ospf6_lsupdate_send_neighbor(struct thread *thread); -extern void ospf6_lsack_send_interface(struct thread *thread); -extern void ospf6_lsack_send_neighbor(struct thread *thread); +extern void ospf6_hello_send(struct event *thread); +extern void ospf6_dbdesc_send(struct event *thread); +extern void ospf6_dbdesc_send_newone(struct event *thread); +extern void ospf6_lsreq_send(struct event *thread); +extern void ospf6_lsupdate_send_interface(struct event *thread); +extern void ospf6_lsupdate_send_neighbor(struct event *thread); +extern void ospf6_lsack_send_interface(struct event *thread); +extern void ospf6_lsack_send_neighbor(struct event *thread); extern int config_write_ospf6_debug_message(struct vty *); extern void install_element_ospf6_debug_message(void); diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c index 5ab5a49a4b..42e4074522 100644 --- a/ospf6d/ospf6_neighbor.c +++ b/ospf6d/ospf6_neighbor.c @@ -7,7 +7,7 @@ #include "log.h" #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "command.h" @@ -163,18 +163,18 @@ void ospf6_neighbor_delete(struct ospf6_neighbor *on) ospf6_lsdb_delete(on->lsupdate_list); ospf6_lsdb_delete(on->lsack_list); - THREAD_OFF(on->inactivity_timer); + EVENT_OFF(on->inactivity_timer); - THREAD_OFF(on->last_dbdesc_release_timer); + EVENT_OFF(on->last_dbdesc_release_timer); - THREAD_OFF(on->thread_send_dbdesc); - THREAD_OFF(on->thread_send_lsreq); - THREAD_OFF(on->thread_send_lsupdate); - THREAD_OFF(on->thread_send_lsack); - THREAD_OFF(on->thread_exchange_done); - THREAD_OFF(on->thread_adj_ok); + EVENT_OFF(on->thread_send_dbdesc); + EVENT_OFF(on->thread_send_lsreq); + EVENT_OFF(on->thread_send_lsupdate); + EVENT_OFF(on->thread_send_lsack); + EVENT_OFF(on->thread_exchange_done); + EVENT_OFF(on->thread_adj_ok); - THREAD_OFF(on->gr_helper_info.t_grace_timer); + EVENT_OFF(on->gr_helper_info.t_grace_timer); bfd_sess_free(&on->bfd_session); XFREE(MTYPE_OSPF6_NEIGHBOR, on); @@ -272,31 +272,31 @@ static int need_adjacency(struct ospf6_neighbor *on) return 0; } -void hello_received(struct thread *thread) +void hello_received(struct event *thread) { struct ospf6_neighbor *on; - on = (struct ospf6_neighbor *)THREAD_ARG(thread); + on = (struct ospf6_neighbor *)EVENT_ARG(thread); assert(on); if (IS_OSPF6_DEBUG_NEIGHBOR(EVENT)) zlog_debug("Neighbor Event %s: *HelloReceived*", on->name); /* reset Inactivity Timer */ - THREAD_OFF(on->inactivity_timer); - thread_add_timer(master, inactivity_timer, on, - on->ospf6_if->dead_interval, &on->inactivity_timer); + EVENT_OFF(on->inactivity_timer); + event_add_timer(master, inactivity_timer, on, + on->ospf6_if->dead_interval, &on->inactivity_timer); if (on->state <= OSPF6_NEIGHBOR_DOWN) ospf6_neighbor_state_change(OSPF6_NEIGHBOR_INIT, on, OSPF6_NEIGHBOR_EVENT_HELLO_RCVD); } -void twoway_received(struct thread *thread) +void twoway_received(struct event *thread) { struct ospf6_neighbor *on; - on = (struct ospf6_neighbor *)THREAD_ARG(thread); + on = (struct ospf6_neighbor *)EVENT_ARG(thread); assert(on); if (on->state > OSPF6_NEIGHBOR_INIT) @@ -305,7 +305,7 @@ void twoway_received(struct thread *thread) if (IS_OSPF6_DEBUG_NEIGHBOR(EVENT)) zlog_debug("Neighbor Event %s: *2Way-Received*", on->name); - thread_add_event(master, neighbor_change, on->ospf6_if, 0, NULL); + event_add_event(master, neighbor_change, on->ospf6_if, 0, NULL); if (!need_adjacency(on)) { ospf6_neighbor_state_change(OSPF6_NEIGHBOR_TWOWAY, on, @@ -319,17 +319,17 @@ void twoway_received(struct thread *thread) SET_FLAG(on->dbdesc_bits, OSPF6_DBDESC_MBIT); SET_FLAG(on->dbdesc_bits, OSPF6_DBDESC_IBIT); - THREAD_OFF(on->thread_send_dbdesc); - thread_add_event(master, ospf6_dbdesc_send, on, 0, - &on->thread_send_dbdesc); + EVENT_OFF(on->thread_send_dbdesc); + event_add_event(master, ospf6_dbdesc_send, on, 0, + &on->thread_send_dbdesc); } -void negotiation_done(struct thread *thread) +void negotiation_done(struct event *thread) { struct ospf6_neighbor *on; struct ospf6_lsa *lsa, *lsanext; - on = (struct ospf6_neighbor *)THREAD_ARG(thread); + on = (struct ospf6_neighbor *)EVENT_ARG(thread); assert(on); if (on->state != OSPF6_NEIGHBOR_EXSTART) @@ -373,19 +373,19 @@ void negotiation_done(struct thread *thread) OSPF6_NEIGHBOR_EVENT_NEGOTIATION_DONE); } -static void ospf6_neighbor_last_dbdesc_release(struct thread *thread) +static void ospf6_neighbor_last_dbdesc_release(struct event *thread) { - struct ospf6_neighbor *on = THREAD_ARG(thread); + struct ospf6_neighbor *on = EVENT_ARG(thread); assert(on); memset(&on->dbdesc_last, 0, sizeof(struct ospf6_dbdesc)); } -void exchange_done(struct thread *thread) +void exchange_done(struct event *thread) { struct ospf6_neighbor *on; - on = (struct ospf6_neighbor *)THREAD_ARG(thread); + on = (struct ospf6_neighbor *)EVENT_ARG(thread); assert(on); if (on->state != OSPF6_NEIGHBOR_EXCHANGE) @@ -394,15 +394,15 @@ void exchange_done(struct thread *thread) if (IS_OSPF6_DEBUG_NEIGHBOR(EVENT)) zlog_debug("Neighbor Event %s: *ExchangeDone*", on->name); - THREAD_OFF(on->thread_send_dbdesc); + EVENT_OFF(on->thread_send_dbdesc); ospf6_lsdb_remove_all(on->dbdesc_list); /* RFC 2328 (10.8): Release the last dbdesc after dead_interval */ if (!CHECK_FLAG(on->dbdesc_bits, OSPF6_DBDESC_MSBIT)) { - THREAD_OFF(on->last_dbdesc_release_timer); - thread_add_timer(master, ospf6_neighbor_last_dbdesc_release, on, - on->ospf6_if->dead_interval, - &on->last_dbdesc_release_timer); + EVENT_OFF(on->last_dbdesc_release_timer); + event_add_timer(master, ospf6_neighbor_last_dbdesc_release, on, + on->ospf6_if->dead_interval, + &on->last_dbdesc_release_timer); } if (on->request_list->count == 0) @@ -412,8 +412,8 @@ void exchange_done(struct thread *thread) ospf6_neighbor_state_change(OSPF6_NEIGHBOR_LOADING, on, OSPF6_NEIGHBOR_EVENT_EXCHANGE_DONE); - thread_add_event(master, ospf6_lsreq_send, on, 0, - &on->thread_send_lsreq); + event_add_event(master, ospf6_lsreq_send, on, 0, + &on->thread_send_lsreq); } } @@ -428,20 +428,20 @@ void ospf6_check_nbr_loading(struct ospf6_neighbor *on) if ((on->state == OSPF6_NEIGHBOR_LOADING) || (on->state == OSPF6_NEIGHBOR_EXCHANGE)) { if (on->request_list->count == 0) - thread_add_event(master, loading_done, on, 0, NULL); + event_add_event(master, loading_done, on, 0, NULL); else if (on->last_ls_req == NULL) { - THREAD_OFF(on->thread_send_lsreq); - thread_add_event(master, ospf6_lsreq_send, on, 0, - &on->thread_send_lsreq); + EVENT_OFF(on->thread_send_lsreq); + event_add_event(master, ospf6_lsreq_send, on, 0, + &on->thread_send_lsreq); } } } -void loading_done(struct thread *thread) +void loading_done(struct event *thread) { struct ospf6_neighbor *on; - on = (struct ospf6_neighbor *)THREAD_ARG(thread); + on = (struct ospf6_neighbor *)EVENT_ARG(thread); assert(on); if (on->state != OSPF6_NEIGHBOR_LOADING) @@ -456,11 +456,11 @@ void loading_done(struct thread *thread) OSPF6_NEIGHBOR_EVENT_LOADING_DONE); } -void adj_ok(struct thread *thread) +void adj_ok(struct event *thread) { struct ospf6_neighbor *on; - on = (struct ospf6_neighbor *)THREAD_ARG(thread); + on = (struct ospf6_neighbor *)EVENT_ARG(thread); assert(on); if (IS_OSPF6_DEBUG_NEIGHBOR(EVENT)) @@ -473,9 +473,9 @@ void adj_ok(struct thread *thread) SET_FLAG(on->dbdesc_bits, OSPF6_DBDESC_MBIT); SET_FLAG(on->dbdesc_bits, OSPF6_DBDESC_IBIT); - THREAD_OFF(on->thread_send_dbdesc); - thread_add_event(master, ospf6_dbdesc_send, on, 0, - &on->thread_send_dbdesc); + EVENT_OFF(on->thread_send_dbdesc); + event_add_event(master, ospf6_dbdesc_send, on, 0, + &on->thread_send_dbdesc); } else if (on->state >= OSPF6_NEIGHBOR_EXSTART && !need_adjacency(on)) { ospf6_neighbor_state_change(OSPF6_NEIGHBOR_TWOWAY, on, @@ -484,11 +484,11 @@ void adj_ok(struct thread *thread) } } -void seqnumber_mismatch(struct thread *thread) +void seqnumber_mismatch(struct event *thread) { struct ospf6_neighbor *on; - on = (struct ospf6_neighbor *)THREAD_ARG(thread); + on = (struct ospf6_neighbor *)EVENT_ARG(thread); assert(on); if (on->state < OSPF6_NEIGHBOR_EXCHANGE) @@ -505,18 +505,18 @@ void seqnumber_mismatch(struct thread *thread) ospf6_neighbor_clear_ls_lists(on); - THREAD_OFF(on->thread_send_dbdesc); + EVENT_OFF(on->thread_send_dbdesc); on->dbdesc_seqnum++; /* Incr seqnum as per RFC2328, sec 10.3 */ - thread_add_event(master, ospf6_dbdesc_send, on, 0, - &on->thread_send_dbdesc); + event_add_event(master, ospf6_dbdesc_send, on, 0, + &on->thread_send_dbdesc); } -void bad_lsreq(struct thread *thread) +void bad_lsreq(struct event *thread) { struct ospf6_neighbor *on; - on = (struct ospf6_neighbor *)THREAD_ARG(thread); + on = (struct ospf6_neighbor *)EVENT_ARG(thread); assert(on); if (on->state < OSPF6_NEIGHBOR_EXCHANGE) @@ -533,19 +533,18 @@ void bad_lsreq(struct thread *thread) ospf6_neighbor_clear_ls_lists(on); - THREAD_OFF(on->thread_send_dbdesc); + EVENT_OFF(on->thread_send_dbdesc); on->dbdesc_seqnum++; /* Incr seqnum as per RFC2328, sec 10.3 */ - thread_add_event(master, ospf6_dbdesc_send, on, 0, - &on->thread_send_dbdesc); - + event_add_event(master, ospf6_dbdesc_send, on, 0, + &on->thread_send_dbdesc); } -void oneway_received(struct thread *thread) +void oneway_received(struct event *thread) { struct ospf6_neighbor *on; - on = (struct ospf6_neighbor *)THREAD_ARG(thread); + on = (struct ospf6_neighbor *)EVENT_ARG(thread); assert(on); if (on->state < OSPF6_NEIGHBOR_TWOWAY) @@ -556,23 +555,23 @@ void oneway_received(struct thread *thread) ospf6_neighbor_state_change(OSPF6_NEIGHBOR_INIT, on, OSPF6_NEIGHBOR_EVENT_ONEWAY_RCVD); - thread_add_event(master, neighbor_change, on->ospf6_if, 0, NULL); + event_add_event(master, neighbor_change, on->ospf6_if, 0, NULL); ospf6_neighbor_clear_ls_lists(on); - THREAD_OFF(on->thread_send_dbdesc); - THREAD_OFF(on->thread_send_lsreq); - THREAD_OFF(on->thread_send_lsupdate); - THREAD_OFF(on->thread_send_lsack); - THREAD_OFF(on->thread_exchange_done); - THREAD_OFF(on->thread_adj_ok); + EVENT_OFF(on->thread_send_dbdesc); + EVENT_OFF(on->thread_send_lsreq); + EVENT_OFF(on->thread_send_lsupdate); + EVENT_OFF(on->thread_send_lsack); + EVENT_OFF(on->thread_exchange_done); + EVENT_OFF(on->thread_adj_ok); } -void inactivity_timer(struct thread *thread) +void inactivity_timer(struct event *thread) { struct ospf6_neighbor *on; - on = (struct ospf6_neighbor *)THREAD_ARG(thread); + on = (struct ospf6_neighbor *)EVENT_ARG(thread); assert(on); if (IS_OSPF6_DEBUG_NEIGHBOR(EVENT)) @@ -588,8 +587,7 @@ void inactivity_timer(struct thread *thread) ospf6_neighbor_state_change( OSPF6_NEIGHBOR_DOWN, on, OSPF6_NEIGHBOR_EVENT_INACTIVITY_TIMER); - thread_add_event(master, neighbor_change, on->ospf6_if, 0, - NULL); + event_add_event(master, neighbor_change, on->ospf6_if, 0, NULL); listnode_delete(on->ospf6_if->neighbor_list, on); ospf6_neighbor_delete(on); @@ -600,9 +598,9 @@ void inactivity_timer(struct thread *thread) "%s, Acting as HELPER for this neighbour, So restart the dead timer.", __PRETTY_FUNCTION__); - thread_add_timer(master, inactivity_timer, on, - on->ospf6_if->dead_interval, - &on->inactivity_timer); + event_add_timer(master, inactivity_timer, on, + on->ospf6_if->dead_interval, + &on->inactivity_timer); } } @@ -817,7 +815,7 @@ static void ospf6_neighbor_show_detail(struct vty *vty, timerclear(&res); - if (thread_is_scheduled(on->thread_send_dbdesc)) + if (event_is_scheduled(on->thread_send_dbdesc)) timersub(&on->thread_send_dbdesc->u.sands, &now, &res); timerstring(&res, duration, sizeof(duration)); json_object_int_add(json_neighbor, "pendingLsaDbDescCount", @@ -826,8 +824,8 @@ static void ospf6_neighbor_show_detail(struct vty *vty, duration); json_object_string_add( json_neighbor, "dbDescSendThread", - (thread_is_scheduled(on->thread_send_dbdesc) ? "on" - : "off")); + (event_is_scheduled(on->thread_send_dbdesc) ? "on" + : "off")); json_array = json_object_new_array(); for (ALL_LSDB(on->dbdesc_list, lsa, lsanext)) json_object_array_add( @@ -836,7 +834,7 @@ static void ospf6_neighbor_show_detail(struct vty *vty, json_array); timerclear(&res); - if (thread_is_scheduled(on->thread_send_lsreq)) + if (event_is_scheduled(on->thread_send_lsreq)) timersub(&on->thread_send_lsreq->u.sands, &now, &res); timerstring(&res, duration, sizeof(duration)); json_object_int_add(json_neighbor, "pendingLsaLsReqCount", @@ -845,8 +843,8 @@ static void ospf6_neighbor_show_detail(struct vty *vty, duration); json_object_string_add( json_neighbor, "lsReqSendThread", - (thread_is_scheduled(on->thread_send_lsreq) ? "on" - : "off")); + (event_is_scheduled(on->thread_send_lsreq) ? "on" + : "off")); json_array = json_object_new_array(); for (ALL_LSDB(on->request_list, lsa, lsanext)) json_object_array_add( @@ -856,7 +854,7 @@ static void ospf6_neighbor_show_detail(struct vty *vty, timerclear(&res); - if (thread_is_scheduled(on->thread_send_lsupdate)) + if (event_is_scheduled(on->thread_send_lsupdate)) timersub(&on->thread_send_lsupdate->u.sands, &now, &res); timerstring(&res, duration, sizeof(duration)); @@ -866,9 +864,8 @@ static void ospf6_neighbor_show_detail(struct vty *vty, duration); json_object_string_add( json_neighbor, "lsUpdateSendThread", - (thread_is_scheduled(on->thread_send_lsupdate) - ? "on" - : "off")); + (event_is_scheduled(on->thread_send_lsupdate) ? "on" + : "off")); json_array = json_object_new_array(); for (ALL_LSDB(on->lsupdate_list, lsa, lsanext)) json_object_array_add( @@ -877,7 +874,7 @@ static void ospf6_neighbor_show_detail(struct vty *vty, json_array); timerclear(&res); - if (thread_is_scheduled(on->thread_send_lsack)) + if (event_is_scheduled(on->thread_send_lsack)) timersub(&on->thread_send_lsack->u.sands, &now, &res); timerstring(&res, duration, sizeof(duration)); json_object_int_add(json_neighbor, "pendingLsaLsAckCount", @@ -886,8 +883,8 @@ static void ospf6_neighbor_show_detail(struct vty *vty, duration); json_object_string_add( json_neighbor, "lsAckSendThread", - (thread_is_scheduled(on->thread_send_lsack) ? "on" - : "off")); + (event_is_scheduled(on->thread_send_lsack) ? "on" + : "off")); json_array = json_object_new_array(); for (ALL_LSDB(on->lsack_list, lsa, lsanext)) json_object_array_add( @@ -975,52 +972,51 @@ static void ospf6_neighbor_show_detail(struct vty *vty, vty_out(vty, " %s\n", lsa->name); timerclear(&res); - if (thread_is_scheduled(on->thread_send_dbdesc)) + if (event_is_scheduled(on->thread_send_dbdesc)) timersub(&on->thread_send_dbdesc->u.sands, &now, &res); timerstring(&res, duration, sizeof(duration)); vty_out(vty, " %d Pending LSAs for DbDesc in Time %s [thread %s]\n", on->dbdesc_list->count, duration, - (thread_is_scheduled(on->thread_send_dbdesc) ? "on" - : "off")); + (event_is_scheduled(on->thread_send_dbdesc) ? "on" + : "off")); for (ALL_LSDB(on->dbdesc_list, lsa, lsanext)) vty_out(vty, " %s\n", lsa->name); timerclear(&res); - if (thread_is_scheduled(on->thread_send_lsreq)) + if (event_is_scheduled(on->thread_send_lsreq)) timersub(&on->thread_send_lsreq->u.sands, &now, &res); timerstring(&res, duration, sizeof(duration)); vty_out(vty, " %d Pending LSAs for LSReq in Time %s [thread %s]\n", on->request_list->count, duration, - (thread_is_scheduled(on->thread_send_lsreq) ? "on" - : "off")); + (event_is_scheduled(on->thread_send_lsreq) ? "on" + : "off")); for (ALL_LSDB(on->request_list, lsa, lsanext)) vty_out(vty, " %s\n", lsa->name); timerclear(&res); - if (thread_is_scheduled(on->thread_send_lsupdate)) + if (event_is_scheduled(on->thread_send_lsupdate)) timersub(&on->thread_send_lsupdate->u.sands, &now, &res); timerstring(&res, duration, sizeof(duration)); vty_out(vty, " %d Pending LSAs for LSUpdate in Time %s [thread %s]\n", on->lsupdate_list->count, duration, - (thread_is_scheduled(on->thread_send_lsupdate) - ? "on" - : "off")); + (event_is_scheduled(on->thread_send_lsupdate) ? "on" + : "off")); for (ALL_LSDB(on->lsupdate_list, lsa, lsanext)) vty_out(vty, " %s\n", lsa->name); timerclear(&res); - if (thread_is_scheduled(on->thread_send_lsack)) + if (event_is_scheduled(on->thread_send_lsack)) timersub(&on->thread_send_lsack->u.sands, &now, &res); timerstring(&res, duration, sizeof(duration)); vty_out(vty, " %d Pending LSAs for LSAck in Time %s [thread %s]\n", on->lsack_list->count, duration, - (thread_is_scheduled(on->thread_send_lsack) ? "on" - : "off")); + (event_is_scheduled(on->thread_send_lsack) ? "on" + : "off")); for (ALL_LSDB(on->lsack_list, lsa, lsanext)) vty_out(vty, " %s\n", lsa->name); diff --git a/ospf6d/ospf6_neighbor.h b/ospf6d/ospf6_neighbor.h index d9abd1ff94..5ec754d3a4 100644 --- a/ospf6d/ospf6_neighbor.h +++ b/ospf6d/ospf6_neighbor.h @@ -36,7 +36,7 @@ struct ospf6_helper_info { * helper until this timer until * this timer expires. */ - struct thread *t_grace_timer; + struct event *t_grace_timer; /* Helper status */ uint32_t gr_helper_status; @@ -111,18 +111,18 @@ struct ospf6_neighbor { struct ospf6_lsa *last_ls_req; /* Inactivity timer */ - struct thread *inactivity_timer; + struct event *inactivity_timer; /* Timer to release the last dbdesc packet */ - struct thread *last_dbdesc_release_timer; + struct event *last_dbdesc_release_timer; /* Thread for sending message */ - struct thread *thread_send_dbdesc; - struct thread *thread_send_lsreq; - struct thread *thread_send_lsupdate; - struct thread *thread_send_lsack; - struct thread *thread_exchange_done; - struct thread *thread_adj_ok; + struct event *thread_send_dbdesc; + struct event *thread_send_lsreq; + struct event *thread_send_lsupdate; + struct event *thread_send_lsack; + struct event *thread_exchange_done; + struct event *thread_adj_ok; /* BFD information */ struct bfd_session_params *bfd_session; @@ -190,16 +190,16 @@ struct ospf6_neighbor *ospf6_neighbor_create(uint32_t router_id, void ospf6_neighbor_delete(struct ospf6_neighbor *on); /* Neighbor event */ -extern void hello_received(struct thread *thread); -extern void twoway_received(struct thread *thread); -extern void negotiation_done(struct thread *thread); -extern void exchange_done(struct thread *thread); -extern void loading_done(struct thread *thread); -extern void adj_ok(struct thread *thread); -extern void seqnumber_mismatch(struct thread *thread); -extern void bad_lsreq(struct thread *thread); -extern void oneway_received(struct thread *thread); -extern void inactivity_timer(struct thread *thread); +extern void hello_received(struct event *thread); +extern void twoway_received(struct event *thread); +extern void negotiation_done(struct event *thread); +extern void exchange_done(struct event *thread); +extern void loading_done(struct event *thread); +extern void adj_ok(struct event *thread); +extern void seqnumber_mismatch(struct event *thread); +extern void bad_lsreq(struct event *thread); +extern void oneway_received(struct event *thread); +extern void inactivity_timer(struct event *thread); extern void ospf6_check_nbr_loading(struct ospf6_neighbor *on); extern void ospf6_neighbor_init(void); diff --git a/ospf6d/ospf6_network.h b/ospf6d/ospf6_network.h index c5627212f8..60b7cc59e9 100644 --- a/ospf6d/ospf6_network.h +++ b/ospf6d/ospf6_network.h @@ -29,11 +29,11 @@ extern int ospf6_recvmsg(struct in6_addr *src, struct in6_addr *dst, listnode_add(oi->area->ospf6->oi_write_q, (oi)); \ (oi)->on_write_q = 1; \ } \ - if (list_was_empty \ - && !list_isempty(oi->area->ospf6->oi_write_q)) \ - thread_add_write(master, ospf6_write, oi->area->ospf6, \ - oi->area->ospf6->fd, \ - &oi->area->ospf6->t_write); \ + if (list_was_empty && \ + !list_isempty(oi->area->ospf6->oi_write_q)) \ + event_add_write(master, ospf6_write, oi->area->ospf6, \ + oi->area->ospf6->fd, \ + &oi->area->ospf6->t_write); \ } while (0) #endif /* OSPF6_NETWORK_H */ diff --git a/ospf6d/ospf6_nssa.c b/ospf6d/ospf6_nssa.c index d62a3a6322..e7a10eba41 100644 --- a/ospf6d/ospf6_nssa.c +++ b/ospf6d/ospf6_nssa.c @@ -13,7 +13,7 @@ #include "vty.h" #include "linklist.h" #include "command.h" -#include "thread.h" +#include "frrevent.h" #include "plist.h" #include "filter.h" @@ -976,9 +976,9 @@ int ospf6_redistribute_check(struct ospf6 *ospf6, struct ospf6_route *route, } /* This function performs ABR related processing */ -static void ospf6_abr_task_timer(struct thread *thread) +static void ospf6_abr_task_timer(struct event *thread) { - struct ospf6 *ospf6 = THREAD_ARG(thread); + struct ospf6 *ospf6 = EVENT_ARG(thread); if (IS_OSPF6_DEBUG_ABR) zlog_debug("Running ABR task on timer"); @@ -992,7 +992,7 @@ static void ospf6_abr_task_timer(struct thread *thread) void ospf6_schedule_abr_task(struct ospf6 *ospf6) { - if (thread_is_scheduled(ospf6->t_abr_task)) { + if (event_is_scheduled(ospf6->t_abr_task)) { if (IS_OSPF6_DEBUG_ABR) zlog_debug("ABR task already scheduled"); return; @@ -1001,8 +1001,8 @@ void ospf6_schedule_abr_task(struct ospf6 *ospf6) if (IS_OSPF6_DEBUG_ABR) zlog_debug("Scheduling ABR task"); - thread_add_timer(master, ospf6_abr_task_timer, ospf6, - OSPF6_ABR_TASK_DELAY, &ospf6->t_abr_task); + event_add_timer(master, ospf6_abr_task_timer, ospf6, + OSPF6_ABR_TASK_DELAY, &ospf6->t_abr_task); } /* Flush the NSSA LSAs from the area */ @@ -1089,9 +1089,9 @@ static void ospf6_ase_lsa_refresh(struct ospf6 *o) route->path.origin.id, o->router_id, o->lsdb); if (old) { - THREAD_OFF(old->refresh); - thread_add_event(master, ospf6_lsa_refresh, old, 0, - &old->refresh); + EVENT_OFF(old->refresh); + event_add_event(master, ospf6_lsa_refresh, old, 0, + &old->refresh); } else { ospf6_as_external_lsa_originate(route, o); } @@ -1164,9 +1164,9 @@ void ospf6_area_nssa_update(struct ospf6_area *area) lsa)) { if (IS_OSPF6_DEBUG_NSSA) ospf6_lsa_header_print(lsa); - THREAD_OFF(lsa->refresh); - thread_add_event(master, ospf6_lsa_refresh, lsa, - 0, &lsa->refresh); + EVENT_OFF(lsa->refresh); + event_add_event(master, ospf6_lsa_refresh, lsa, + 0, &lsa->refresh); } } } @@ -1436,7 +1436,7 @@ DEFPY (no_area_nssa_range, SET_FLAG(range->flag, OSPF6_ROUTE_REMOVE); /* Redo summaries if required */ - thread_execute(master, ospf6_abr_task_timer, ospf6, 0); + event_execute(master, ospf6_abr_task_timer, ospf6, 0); } ospf6_route_remove(range, oa->nssa_range_table); diff --git a/ospf6d/ospf6_snmp.c b/ospf6d/ospf6_snmp.c index 46fa27dd9e..f88667bfd0 100644 --- a/ospf6d/ospf6_snmp.c +++ b/ospf6d/ospf6_snmp.c @@ -1383,7 +1383,7 @@ static int ospf6TrapIfStateChange(struct ospf6_interface *oi, int next_state, } /* Register OSPFv3-MIB. */ -static int ospf6_snmp_init(struct thread_master *master) +static int ospf6_snmp_init(struct event_loop *master) { smux_init(master); REGISTER_MIB("OSPFv3MIB", ospfv3_variables, variable, ospfv3_oid); diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c index 112934bf1e..3cc0d5e963 100644 --- a/ospf6d/ospf6_spf.c +++ b/ospf6d/ospf6_spf.c @@ -13,7 +13,7 @@ #include "vty.h" #include "prefix.h" #include "linklist.h" -#include "thread.h" +#include "frrevent.h" #include "lib_errors.h" #include "ospf6_lsa.h" @@ -590,7 +590,7 @@ static void ospf6_spf_log_database(struct ospf6_area *oa) zlog_debug("%s", buffer); } -static void ospf6_spf_calculation_thread(struct thread *t) +static void ospf6_spf_calculation_thread(struct event *t) { struct ospf6_area *oa; struct ospf6 *ospf6; @@ -599,7 +599,7 @@ static void ospf6_spf_calculation_thread(struct thread *t) int areas_processed = 0; char rbuf[32]; - ospf6 = (struct ospf6 *)THREAD_ARG(t); + ospf6 = (struct ospf6 *)EVENT_ARG(t); /* execute SPF calculation */ monotime(&start); @@ -687,7 +687,7 @@ void ospf6_spf_schedule(struct ospf6 *ospf6, unsigned int reason) } /* SPF calculation timer is already scheduled. */ - if (thread_is_scheduled(ospf6->t_spf_calc)) { + if (event_is_scheduled(ospf6->t_spf_calc)) { if (IS_OSPF6_DEBUG_SPF(PROCESS) || IS_OSPF6_DEBUG_SPF(TIME)) zlog_debug( "SPF: calculation timer is already scheduled: %p", @@ -724,9 +724,9 @@ void ospf6_spf_schedule(struct ospf6 *ospf6, unsigned int reason) if (IS_OSPF6_DEBUG_SPF(PROCESS) || IS_OSPF6_DEBUG_SPF(TIME)) zlog_debug("SPF: Rescheduling in %ld msec", delay); - THREAD_OFF(ospf6->t_spf_calc); - thread_add_timer_msec(master, ospf6_spf_calculation_thread, ospf6, - delay, &ospf6->t_spf_calc); + EVENT_OFF(ospf6->t_spf_calc); + event_add_timer_msec(master, ospf6_spf_calculation_thread, ospf6, delay, + &ospf6->t_spf_calc); } void ospf6_spf_display_subtree(struct vty *vty, const char *prefix, int rest, @@ -1228,7 +1228,7 @@ int ospf6_ase_calculate_route(struct ospf6 *ospf6, struct ospf6_lsa *lsa, return 0; } -static void ospf6_ase_calculate_timer(struct thread *t) +static void ospf6_ase_calculate_timer(struct event *t) { struct ospf6 *ospf6; struct ospf6_lsa *lsa; @@ -1236,7 +1236,7 @@ static void ospf6_ase_calculate_timer(struct thread *t) struct ospf6_area *area; uint16_t type; - ospf6 = THREAD_ARG(t); + ospf6 = EVENT_ARG(t); /* Calculate external route for each AS-external-LSA */ type = htons(OSPF6_LSTYPE_AS_EXTERNAL); @@ -1272,6 +1272,6 @@ void ospf6_ase_calculate_timer_add(struct ospf6 *ospf6) if (ospf6 == NULL) return; - thread_add_timer(master, ospf6_ase_calculate_timer, ospf6, - OSPF6_ASE_CALC_INTERVAL, &ospf6->t_ase_calc); + event_add_timer(master, ospf6_ase_calculate_timer, ospf6, + OSPF6_ASE_CALC_INTERVAL, &ospf6->t_ase_calc); } diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index bd5aedb45e..c2aa3abeed 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -11,7 +11,7 @@ #include "linklist.h" #include "prefix.h" #include "table.h" -#include "thread.h" +#include "frrevent.h" #include "command.h" #include "defaults.h" #include "lib/json.h" @@ -176,7 +176,7 @@ static int ospf6_vrf_disable(struct vrf *vrf) * from VRF and make it "down". */ ospf6_vrf_unlink(ospf6, vrf); - thread_cancel(&ospf6->t_ospf6_receive); + event_cancel(&ospf6->t_ospf6_receive); close(ospf6->fd); ospf6->fd = -1; } @@ -207,8 +207,8 @@ static int ospf6_vrf_enable(struct vrf *vrf) ret = ospf6_serv_sock(ospf6); if (ret < 0 || ospf6->fd <= 0) return 0; - thread_add_read(master, ospf6_receive, ospf6, ospf6->fd, - &ospf6->t_ospf6_receive); + event_add_read(master, ospf6_receive, ospf6, ospf6->fd, + &ospf6->t_ospf6_receive); ospf6_router_id_update(ospf6, true); } @@ -471,8 +471,8 @@ struct ospf6 *ospf6_instance_create(const char *name) */ ospf6_gr_nvm_read(ospf6); - thread_add_read(master, ospf6_receive, ospf6, ospf6->fd, - &ospf6->t_ospf6_receive); + event_add_read(master, ospf6_receive, ospf6, ospf6->fd, + &ospf6->t_ospf6_receive); return ospf6; } @@ -552,19 +552,19 @@ static void ospf6_disable(struct ospf6 *o) ospf6_route_remove_all(o->route_table); ospf6_route_remove_all(o->brouter_table); - THREAD_OFF(o->maxage_remover); - THREAD_OFF(o->t_spf_calc); - THREAD_OFF(o->t_ase_calc); - THREAD_OFF(o->t_distribute_update); - THREAD_OFF(o->t_ospf6_receive); - THREAD_OFF(o->t_external_aggr); - THREAD_OFF(o->gr_info.t_grace_period); - THREAD_OFF(o->t_write); - THREAD_OFF(o->t_abr_task); + EVENT_OFF(o->maxage_remover); + EVENT_OFF(o->t_spf_calc); + EVENT_OFF(o->t_ase_calc); + EVENT_OFF(o->t_distribute_update); + EVENT_OFF(o->t_ospf6_receive); + EVENT_OFF(o->t_external_aggr); + EVENT_OFF(o->gr_info.t_grace_period); + EVENT_OFF(o->t_write); + EVENT_OFF(o->t_abr_task); } } -void ospf6_master_init(struct thread_master *master) +void ospf6_master_init(struct event_loop *master) { memset(&ospf6_master, 0, sizeof(ospf6_master)); @@ -573,9 +573,9 @@ void ospf6_master_init(struct thread_master *master) om6->master = master; } -static void ospf6_maxage_remover(struct thread *thread) +static void ospf6_maxage_remover(struct event *thread) { - struct ospf6 *o = (struct ospf6 *)THREAD_ARG(thread); + struct ospf6 *o = (struct ospf6 *)EVENT_ARG(thread); struct ospf6_area *oa; struct ospf6_interface *oi; struct ospf6_neighbor *on; @@ -619,9 +619,9 @@ static void ospf6_maxage_remover(struct thread *thread) void ospf6_maxage_remove(struct ospf6 *o) { if (o) - thread_add_timer(master, ospf6_maxage_remover, o, - OSPF_LSA_MAXAGE_REMOVE_DELAY_DEFAULT, - &o->maxage_remover); + event_add_timer(master, ospf6_maxage_remover, o, + OSPF_LSA_MAXAGE_REMOVE_DELAY_DEFAULT, + &o->maxage_remover); } bool ospf6_router_id_update(struct ospf6 *ospf6, bool init) @@ -1359,7 +1359,7 @@ static void ospf6_show(struct vty *vty, struct ospf6 *o, json_object *json, } else json_object_boolean_false_add(json, "spfHasRun"); - if (thread_is_scheduled(o->t_spf_calc)) { + if (event_is_scheduled(o->t_spf_calc)) { long time_store; json_object_boolean_true_add(json, "spfTimerActive"); @@ -1452,8 +1452,7 @@ static void ospf6_show(struct vty *vty, struct ospf6 *o, json_object *json, threadtimer_string(now, o->t_spf_calc, buf, sizeof(buf)); vty_out(vty, " SPF timer %s%s\n", - (thread_is_scheduled(o->t_spf_calc) ? "due in " - : "is "), + (event_is_scheduled(o->t_spf_calc) ? "due in " : "is "), buf); if (CHECK_FLAG(o->flag, OSPF6_STUB_ROUTER)) diff --git a/ospf6d/ospf6_top.h b/ospf6d/ospf6_top.h index 08595a69d0..8fdd291122 100644 --- a/ospf6d/ospf6_top.h +++ b/ospf6d/ospf6_top.h @@ -13,7 +13,7 @@ struct ospf6_master { /* OSPFv3 instance. */ struct list *ospf6; /* OSPFv3 thread master. */ - struct thread_master *master; + struct event_loop *master; }; /* ospf6->config_flags */ @@ -51,7 +51,7 @@ struct ospf6_gr_info { bool prepare_in_progress; bool finishing_restart; uint32_t grace_period; - struct thread *t_grace_period; + struct event *t_grace_period; }; struct ospf6_gr_helper { @@ -168,14 +168,14 @@ struct ospf6 { int fd; /* Threads */ - struct thread *t_spf_calc; /* SPF calculation timer. */ - struct thread *t_ase_calc; /* ASE calculation timer. */ - struct thread *maxage_remover; - struct thread *t_distribute_update; /* Distirbute update timer. */ - struct thread *t_ospf6_receive; /* OSPF6 receive timer */ - struct thread *t_external_aggr; /* OSPF6 aggregation timer */ + struct event *t_spf_calc; /* SPF calculation timer. */ + struct event *t_ase_calc; /* ASE calculation timer. */ + struct event *maxage_remover; + struct event *t_distribute_update; /* Distirbute update timer. */ + struct event *t_ospf6_receive; /* OSPF6 receive timer */ + struct event *t_external_aggr; /* OSPF6 aggregation timer */ #define OSPF6_WRITE_INTERFACE_COUNT_DEFAULT 20 - struct thread *t_write; + struct event *t_write; int write_oi_count; /* Num of packets sent per thread invocation */ uint32_t ref_bandwidth; @@ -205,7 +205,7 @@ struct ospf6 { /* Count of NSSA areas */ uint8_t anyNSSA; - struct thread *t_abr_task; /* ABR task timer. */ + struct event *t_abr_task; /* ABR task timer. */ struct list *oi_write_q; uint32_t redist_count; @@ -233,7 +233,7 @@ extern struct ospf6 *ospf6; extern struct ospf6_master *om6; /* prototypes */ -extern void ospf6_master_init(struct thread_master *master); +extern void ospf6_master_init(struct event_loop *master); extern void install_element_ospf6_clear_process(void); extern void ospf6_top_init(void); extern void ospf6_delete(struct ospf6 *o); diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c index 0ccbb4d65d..6b3d4955da 100644 --- a/ospf6d/ospf6_zebra.c +++ b/ospf6d/ospf6_zebra.c @@ -750,7 +750,7 @@ static zclient_handler *const ospf6_handlers[] = { [ZEBRA_NEXTHOP_UPDATE] = ospf6_zebra_import_check_update, }; -void ospf6_zebra_init(struct thread_master *master) +void ospf6_zebra_init(struct event_loop *master) { /* Allocate zebra structure. */ zclient = zclient_new(master, &zclient_options_default, ospf6_handlers, diff --git a/ospf6d/ospf6_zebra.h b/ospf6d/ospf6_zebra.h index eb6d919b37..9f41dfca9a 100644 --- a/ospf6d/ospf6_zebra.h +++ b/ospf6d/ospf6_zebra.h @@ -39,7 +39,7 @@ extern void ospf6_zebra_redistribute(int, vrf_id_t vrf_id); extern void ospf6_zebra_no_redistribute(int, vrf_id_t vrf_id); #define ospf6_zebra_is_redistribute(type, vrf_id) \ vrf_bitmap_check(zclient->redist[AFI_IP6][type], vrf_id) -extern void ospf6_zebra_init(struct thread_master *tm); +extern void ospf6_zebra_init(struct event_loop *tm); extern void ospf6_zebra_import_default_route(struct ospf6 *ospf6, bool unreg); extern void ospf6_zebra_add_discard(struct ospf6_route *request, struct ospf6 *ospf6); diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c index 257a0f2b0e..214007d041 100644 --- a/ospf6d/ospf6d.c +++ b/ospf6d/ospf6d.c @@ -5,7 +5,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "command.h" @@ -1375,7 +1375,7 @@ DEFUN(show_ipv6_ospf6_linkstate_detail, show_ipv6_ospf6_linkstate_detail_cmd, } /* Install ospf related commands. */ -void ospf6_init(struct thread_master *master) +void ospf6_init(struct event_loop *master) { ospf6_top_init(); ospf6_area_init(); diff --git a/ospf6d/ospf6d.h b/ospf6d/ospf6d.h index 234a0e881d..980a365265 100644 --- a/ospf6d/ospf6d.h +++ b/ospf6d/ospf6d.h @@ -7,13 +7,13 @@ #define OSPF6D_H #include "libospf.h" -#include "thread.h" +#include "frrevent.h" #include "memory.h" DECLARE_MGROUP(OSPF6D); /* global variables */ -extern struct thread_master *master; +extern struct event_loop *master; /* Historical for KAME. */ #ifndef IPV6_JOIN_GROUP @@ -109,6 +109,6 @@ extern struct zebra_privs_t ospf6d_privs; extern struct route_node *route_prev(struct route_node *node); extern void ospf6_debug(void); -extern void ospf6_init(struct thread_master *master); +extern void ospf6_init(struct event_loop *master); #endif /* OSPF6D_H */ diff --git a/ospfclient/ospf_apiclient.c b/ospfclient/ospf_apiclient.c index c5bbc01501..a1193001fa 100644 --- a/ospfclient/ospf_apiclient.c +++ b/ospfclient/ospf_apiclient.c @@ -8,7 +8,7 @@ #include #include "getopt.h" -#include "thread.h" +#include "frrevent.h" #include "prefix.h" #include "linklist.h" #include "if.h" diff --git a/ospfclient/ospfclient.c b/ospfclient/ospfclient.c index cbc53ad353..24ff08561d 100644 --- a/ospfclient/ospfclient.c +++ b/ospfclient/ospfclient.c @@ -43,7 +43,7 @@ struct zebra_privs_t ospfd_privs = {.user = NULL, free to use any thread library (like pthreads). */ #include "ospfd/ospf_dump.h" /* for ospf_lsa_header_dump */ -#include "thread.h" +#include "frrevent.h" #include "log.h" /* Local portnumber for async channel. Note that OSPF API library will also @@ -51,7 +51,7 @@ struct zebra_privs_t ospfd_privs = {.user = NULL, #define ASYNCPORT 4000 /* Master thread */ -struct thread_master *master; +struct event_loop *master; /* Global variables */ struct ospf_apiclient *oclient; @@ -69,13 +69,13 @@ struct my_opaque_lsa { * --------------------------------------------------------- */ -static void lsa_delete(struct thread *t) +static void lsa_delete(struct event *t) { struct ospf_apiclient *oclient; struct in_addr area_id; int rc; - oclient = THREAD_ARG(t); + oclient = EVENT_ARG(t); rc = inet_aton(args[6], &area_id); if (rc <= 0) { @@ -92,7 +92,7 @@ static void lsa_delete(struct thread *t) printf("done, return code is = %d\n", rc); } -static void lsa_inject(struct thread *t) +static void lsa_inject(struct event *t) { struct ospf_apiclient *cl; struct in_addr ifaddr; @@ -106,7 +106,7 @@ static void lsa_inject(struct thread *t) static uint32_t counter = 1; /* Incremented each time invoked */ int rc; - cl = THREAD_ARG(t); + cl = EVENT_ARG(t); rc = inet_aton(args[5], &ifaddr); if (rc <= 0) { @@ -138,7 +138,7 @@ static void lsa_inject(struct thread *t) /* This thread handles asynchronous messages coming in from the OSPF API server */ -static void lsa_read(struct thread *thread) +static void lsa_read(struct event *thread) { struct ospf_apiclient *oclient; int fd; @@ -146,8 +146,8 @@ static void lsa_read(struct thread *thread) printf("lsa_read called\n"); - oclient = THREAD_ARG(thread); - fd = THREAD_FD(thread); + oclient = EVENT_ARG(thread); + fd = EVENT_FD(thread); /* Handle asynchronous message */ ret = ospf_apiclient_handle_async(oclient); @@ -157,7 +157,7 @@ static void lsa_read(struct thread *thread) } /* Reschedule read thread */ - thread_add_read(master, lsa_read, oclient, fd, NULL); + event_add_read(master, lsa_read, oclient, fd, NULL); } /* --------------------------------------------------------- @@ -209,13 +209,13 @@ static void ready_callback(uint8_t lsa_type, uint8_t opaque_type, lsa_type, opaque_type, &addr); /* Schedule opaque LSA originate in 5 secs */ - thread_add_timer(master, lsa_inject, oclient, 5, NULL); + event_add_timer(master, lsa_inject, oclient, 5, NULL); /* Schedule opaque LSA update with new value */ - thread_add_timer(master, lsa_inject, oclient, 10, NULL); + event_add_timer(master, lsa_inject, oclient, 10, NULL); /* Schedule delete */ - thread_add_timer(master, lsa_delete, oclient, 30, NULL); + event_add_timer(master, lsa_delete, oclient, 30, NULL); } static void new_if_callback(struct in_addr ifaddr, struct in_addr area_id) @@ -269,7 +269,7 @@ static int usage(void) int main(int argc, char *argv[]) { - struct thread thread; + struct event thread; args = argv; @@ -293,7 +293,7 @@ int main(int argc, char *argv[]) /* Initialization */ zprivs_preinit(&ospfd_privs); zprivs_init(&ospfd_privs); - master = thread_master_create(NULL); + master = event_master_create(NULL); /* Open connection to OSPF daemon */ oclient = ospf_apiclient_connect(args[1], ASYNCPORT); @@ -316,12 +316,12 @@ int main(int argc, char *argv[]) ospf_apiclient_sync_lsdb(oclient); /* Schedule thread that handles asynchronous messages */ - thread_add_read(master, lsa_read, oclient, oclient->fd_async, NULL); + event_add_read(master, lsa_read, oclient, oclient->fd_async, NULL); /* Now connection is established, run loop */ while (1) { - thread_fetch(master, &thread); - thread_call(&thread); + event_fetch(master, &thread); + event_call(&thread); } /* Never reached */ diff --git a/ospfd/ospf_abr.c b/ospfd/ospf_abr.c index 8f177cbce1..e14586c5ee 100644 --- a/ospfd/ospf_abr.c +++ b/ospfd/ospf_abr.c @@ -7,7 +7,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" @@ -1727,13 +1727,13 @@ bool ospf_check_fr_enabled_all(struct ospf *ospf) * @param thread * @return 0. */ -static void ospf_abr_announce_non_dna_routers(struct thread *thread) +static void ospf_abr_announce_non_dna_routers(struct event *thread) { struct ospf_area *area; struct listnode *node; - struct ospf *ospf = THREAD_ARG(thread); + struct ospf *ospf = EVENT_ARG(thread); - THREAD_OFF(ospf->t_abr_fr); + EVENT_OFF(ospf->t_abr_fr); if (!IS_OSPF_ABR(ospf)) return; @@ -2040,9 +2040,9 @@ void ospf_abr_task(struct ospf *ospf) * giving time for route synchronization in * all the routers. */ - thread_add_timer( - master, ospf_abr_announce_non_dna_routers, ospf, - OSPF_ABR_DNA_TIMER, &ospf->t_abr_fr); + event_add_timer(master, + ospf_abr_announce_non_dna_routers, ospf, + OSPF_ABR_DNA_TIMER, &ospf->t_abr_fr); } } @@ -2056,9 +2056,9 @@ void ospf_abr_task(struct ospf *ospf) zlog_debug("%s: Stop", __func__); } -static void ospf_abr_task_timer(struct thread *thread) +static void ospf_abr_task_timer(struct event *thread) { - struct ospf *ospf = THREAD_ARG(thread); + struct ospf *ospf = EVENT_ARG(thread); ospf->t_abr_task = 0; @@ -2077,6 +2077,6 @@ void ospf_schedule_abr_task(struct ospf *ospf) if (IS_DEBUG_OSPF_EVENT) zlog_debug("Scheduling ABR task"); - thread_add_timer(master, ospf_abr_task_timer, ospf, OSPF_ABR_TASK_DELAY, - &ospf->t_abr_task); + event_add_timer(master, ospf_abr_task_timer, ospf, OSPF_ABR_TASK_DELAY, + &ospf->t_abr_task); } diff --git a/ospfd/ospf_api.c b/ospfd/ospf_api.c index 3cb1287be5..213ee8c1fd 100644 --- a/ospfd/ospf_api.c +++ b/ospfd/ospf_api.c @@ -18,7 +18,7 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "thread.h" +#include "frrevent.h" #include "hash.h" #include "sockunion.h" /* for inet_aton() */ #include "buffer.h" diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c index 086b5660b1..1aacc341aa 100644 --- a/ospfd/ospf_apiserver.c +++ b/ospfd/ospf_apiserver.c @@ -18,14 +18,14 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "thread.h" +#include "frrevent.h" #include "hash.h" #include "sockunion.h" /* for inet_aton() */ #include "buffer.h" #include -#include "ospfd/ospfd.h" /* for "struct thread_master" */ +#include "ospfd/ospfd.h" /* for "struct event_loop" */ #include "ospfd/ospf_interface.h" #include "ospfd/ospf_ism.h" #include "ospfd/ospf_asbr.h" @@ -278,28 +278,28 @@ void ospf_apiserver_event(enum ospf_apiserver_event event, int fd, { switch (event) { case OSPF_APISERVER_ACCEPT: - (void)thread_add_read(master, ospf_apiserver_accept, apiserv, - fd, NULL); + (void)event_add_read(master, ospf_apiserver_accept, apiserv, fd, + NULL); break; case OSPF_APISERVER_SYNC_READ: apiserv->t_sync_read = NULL; - thread_add_read(master, ospf_apiserver_read, apiserv, fd, - &apiserv->t_sync_read); + event_add_read(master, ospf_apiserver_read, apiserv, fd, + &apiserv->t_sync_read); break; #ifdef USE_ASYNC_READ case OSPF_APISERVER_ASYNC_READ: apiserv->t_async_read = NULL; - thread_add_read(master, ospf_apiserver_read, apiserv, fd, - &apiserv->t_async_read); + event_add_read(master, ospf_apiserver_read, apiserv, fd, + &apiserv->t_async_read); break; #endif /* USE_ASYNC_READ */ case OSPF_APISERVER_SYNC_WRITE: - thread_add_write(master, ospf_apiserver_sync_write, apiserv, fd, - &apiserv->t_sync_write); + event_add_write(master, ospf_apiserver_sync_write, apiserv, fd, + &apiserv->t_sync_write); break; case OSPF_APISERVER_ASYNC_WRITE: - thread_add_write(master, ospf_apiserver_async_write, apiserv, - fd, &apiserv->t_async_write); + event_add_write(master, ospf_apiserver_async_write, apiserv, fd, + &apiserv->t_async_write); break; } } @@ -312,12 +312,12 @@ void ospf_apiserver_free(struct ospf_apiserver *apiserv) struct listnode *node; /* Cancel read and write threads. */ - THREAD_OFF(apiserv->t_sync_read); + EVENT_OFF(apiserv->t_sync_read); #ifdef USE_ASYNC_READ - THREAD_OFF(apiserv->t_async_read); + EVENT_OFF(apiserv->t_async_read); #endif /* USE_ASYNC_READ */ - THREAD_OFF(apiserv->t_sync_write); - THREAD_OFF(apiserv->t_async_write); + EVENT_OFF(apiserv->t_sync_write); + EVENT_OFF(apiserv->t_async_write); /* Unregister all opaque types that application registered and flush opaque LSAs if still in LSDB. */ @@ -360,15 +360,15 @@ void ospf_apiserver_free(struct ospf_apiserver *apiserv) XFREE(MTYPE_APISERVER, apiserv); } -void ospf_apiserver_read(struct thread *thread) +void ospf_apiserver_read(struct event *thread) { struct ospf_apiserver *apiserv; struct msg *msg; int fd; enum ospf_apiserver_event event; - apiserv = THREAD_ARG(thread); - fd = THREAD_FD(thread); + apiserv = EVENT_ARG(thread); + fd = EVENT_FD(thread); if (fd == apiserv->fd_sync) { event = OSPF_APISERVER_SYNC_READ; @@ -419,16 +419,16 @@ void ospf_apiserver_read(struct thread *thread) msg_free(msg); } -void ospf_apiserver_sync_write(struct thread *thread) +void ospf_apiserver_sync_write(struct event *thread) { struct ospf_apiserver *apiserv; struct msg *msg; int fd; int rc = -1; - apiserv = THREAD_ARG(thread); + apiserv = EVENT_ARG(thread); assert(apiserv); - fd = THREAD_FD(thread); + fd = EVENT_FD(thread); apiserv->t_sync_write = NULL; @@ -479,16 +479,16 @@ out: } -void ospf_apiserver_async_write(struct thread *thread) +void ospf_apiserver_async_write(struct event *thread) { struct ospf_apiserver *apiserv; struct msg *msg; int fd; int rc = -1; - apiserv = THREAD_ARG(thread); + apiserv = EVENT_ARG(thread); assert(apiserv); - fd = THREAD_FD(thread); + fd = EVENT_FD(thread); apiserv->t_async_write = NULL; @@ -577,7 +577,7 @@ int ospf_apiserver_serv_sock_family(unsigned short port, int family) /* Accept connection request from external applications. For each accepted connection allocate own connection instance. */ -void ospf_apiserver_accept(struct thread *thread) +void ospf_apiserver_accept(struct event *thread) { int accept_sock; int new_sync_sock; @@ -589,8 +589,8 @@ void ospf_apiserver_accept(struct thread *thread) unsigned int peerlen; int ret; - /* THREAD_ARG (thread) is NULL */ - accept_sock = THREAD_FD(thread); + /* EVENT_ARG (thread) is NULL */ + accept_sock = EVENT_FD(thread); /* Keep hearing on socket for further connections. */ ospf_apiserver_event(OSPF_APISERVER_ACCEPT, accept_sock, NULL); diff --git a/ospfd/ospf_apiserver.h b/ospfd/ospf_apiserver.h index a90d18573b..0aaf67c1f3 100644 --- a/ospfd/ospf_apiserver.h +++ b/ospfd/ospf_apiserver.h @@ -48,12 +48,12 @@ struct ospf_apiserver { struct msg_fifo *out_async_fifo; /* Read and write threads */ - struct thread *t_sync_read; + struct event *t_sync_read; #ifdef USE_ASYNC_READ - struct thread *t_async_read; + struct event *t_async_read; #endif /* USE_ASYNC_READ */ - struct thread *t_sync_write; - struct thread *t_async_write; + struct event *t_sync_write; + struct event *t_async_write; }; enum ospf_apiserver_event { @@ -79,10 +79,10 @@ extern void ospf_apiserver_free(struct ospf_apiserver *apiserv); extern void ospf_apiserver_event(enum ospf_apiserver_event event, int fd, struct ospf_apiserver *apiserv); extern int ospf_apiserver_serv_sock_family(unsigned short port, int family); -extern void ospf_apiserver_accept(struct thread *thread); -extern void ospf_apiserver_read(struct thread *thread); -extern void ospf_apiserver_sync_write(struct thread *thread); -extern void ospf_apiserver_async_write(struct thread *thread); +extern void ospf_apiserver_accept(struct event *thread); +extern void ospf_apiserver_read(struct event *thread); +extern void ospf_apiserver_sync_write(struct event *thread); +extern void ospf_apiserver_async_write(struct event *thread); extern int ospf_apiserver_send_reply(struct ospf_apiserver *apiserv, uint32_t seqnr, uint8_t rc); diff --git a/ospfd/ospf_asbr.c b/ospfd/ospf_asbr.c index 6eada0b1a4..7befcc1086 100644 --- a/ospfd/ospf_asbr.c +++ b/ospfd/ospf_asbr.c @@ -6,7 +6,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" @@ -264,9 +264,9 @@ void ospf_asbr_status_update(struct ospf *ospf, uint8_t status) /* If there's redistribution configured, we need to refresh external * LSAs in order to install Type-7 and flood to all NSSA Areas */ -static void ospf_asbr_nssa_redist_update_timer(struct thread *thread) +static void ospf_asbr_nssa_redist_update_timer(struct event *thread) { - struct ospf *ospf = THREAD_ARG(thread); + struct ospf *ospf = EVENT_ARG(thread); int type; ospf->t_asbr_nssa_redist_update = NULL; @@ -297,9 +297,9 @@ void ospf_schedule_asbr_nssa_redist_update(struct ospf *ospf) if (IS_DEBUG_OSPF_EVENT) zlog_debug("Scheduling ASBR NSSA redistribution update"); - thread_add_timer(master, ospf_asbr_nssa_redist_update_timer, ospf, - OSPF_ASBR_NSSA_REDIST_UPDATE_DELAY, - &ospf->t_asbr_nssa_redist_update); + event_add_timer(master, ospf_asbr_nssa_redist_update_timer, ospf, + OSPF_ASBR_NSSA_REDIST_UPDATE_DELAY, + &ospf->t_asbr_nssa_redist_update); } void ospf_redistribute_withdraw(struct ospf *ospf, uint8_t type, @@ -1040,9 +1040,9 @@ static void ospf_handle_external_aggr_update(struct ospf *ospf) } } -static void ospf_asbr_external_aggr_process(struct thread *thread) +static void ospf_asbr_external_aggr_process(struct event *thread) { - struct ospf *ospf = THREAD_ARG(thread); + struct ospf *ospf = EVENT_ARG(thread); int operation = 0; ospf->t_external_aggr = NULL; @@ -1084,7 +1084,7 @@ static void ospf_external_aggr_timer(struct ospf *ospf, zlog_debug( "%s, Restarting Aggregator delay timer.", __func__); - THREAD_OFF(ospf->t_external_aggr); + EVENT_OFF(ospf->t_external_aggr); } } @@ -1093,8 +1093,8 @@ static void ospf_external_aggr_timer(struct ospf *ospf, __func__, ospf->aggr_delay_interval); ospf->aggr_action = operation; - thread_add_timer(master, ospf_asbr_external_aggr_process, ospf, - ospf->aggr_delay_interval, &ospf->t_external_aggr); + event_add_timer(master, ospf_asbr_external_aggr_process, ospf, + ospf->aggr_delay_interval, &ospf->t_external_aggr); } int ospf_asbr_external_aggregator_set(struct ospf *ospf, struct prefix_ipv4 *p, diff --git a/ospfd/ospf_ase.c b/ospfd/ospf_ase.c index b43f0cb378..80390af505 100644 --- a/ospfd/ospf_ase.c +++ b/ospfd/ospf_ase.c @@ -6,7 +6,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "hash.h" #include "linklist.h" @@ -549,7 +549,7 @@ static int ospf_ase_compare_tables(struct ospf *ospf, return 0; } -static void ospf_ase_calculate_timer(struct thread *t) +static void ospf_ase_calculate_timer(struct event *t) { struct ospf *ospf; struct ospf_lsa *lsa; @@ -558,7 +558,7 @@ static void ospf_ase_calculate_timer(struct thread *t) struct ospf_area *area; struct timeval start_time, stop_time; - ospf = THREAD_ARG(t); + ospf = EVENT_ARG(t); ospf->t_ase_calc = NULL; if (ospf->ase_calc) { @@ -630,8 +630,8 @@ void ospf_ase_calculate_timer_add(struct ospf *ospf) if (ospf == NULL) return; - thread_add_timer(master, ospf_ase_calculate_timer, ospf, - OSPF_ASE_CALC_INTERVAL, &ospf->t_ase_calc); + event_add_timer(master, ospf_ase_calculate_timer, ospf, + OSPF_ASE_CALC_INTERVAL, &ospf->t_ase_calc); } void ospf_ase_register_external_lsa(struct ospf_lsa *lsa, struct ospf *top) diff --git a/ospfd/ospf_bfd.c b/ospfd/ospf_bfd.c index 0b0016745d..7d4c7c06b8 100644 --- a/ospfd/ospf_bfd.c +++ b/ospfd/ospf_bfd.c @@ -12,7 +12,7 @@ #include "linklist.h" #include "memory.h" #include "prefix.h" -#include "thread.h" +#include "frrevent.h" #include "buffer.h" #include "stream.h" #include "zclient.h" @@ -310,7 +310,7 @@ DEFUN (no_ip_ospf_bfd, return CMD_SUCCESS; } -void ospf_bfd_init(struct thread_master *tm) +void ospf_bfd_init(struct event_loop *tm) { bfd_protocol_integration_init(zclient, tm); diff --git a/ospfd/ospf_bfd.h b/ospfd/ospf_bfd.h index 3c4e1e6c5f..d454f9c97b 100644 --- a/ospfd/ospf_bfd.h +++ b/ospfd/ospf_bfd.h @@ -11,7 +11,7 @@ #include "ospfd/ospf_interface.h" #include "json.h" -extern void ospf_bfd_init(struct thread_master *tm); +extern void ospf_bfd_init(struct event_loop *tm); extern void ospf_bfd_write_config(struct vty *vty, const struct ospf_if_params *params); diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c index b74b84e37d..dbe6dd97d0 100644 --- a/ospfd/ospf_dump.c +++ b/ospfd/ospf_dump.c @@ -9,7 +9,7 @@ #include "lib/bfd.h" #include "monotime.h" #include "linklist.h" -#include "thread.h" +#include "frrevent.h" #include "prefix.h" #include "command.h" #include "stream.h" @@ -235,7 +235,7 @@ const char *ospf_timeval_dump(struct timeval *t, char *buf, size_t size) return buf; } -const char *ospf_timer_dump(struct thread *t, char *buf, size_t size) +const char *ospf_timer_dump(struct event *t, char *buf, size_t size) { struct timeval result; if (!t) diff --git a/ospfd/ospf_dump.h b/ospfd/ospf_dump.h index 0f217971ee..0d47be2565 100644 --- a/ospfd/ospf_dump.h +++ b/ospfd/ospf_dump.h @@ -136,15 +136,15 @@ extern unsigned long term_debug_ospf_client_api; extern char *ospf_lsa_type_str[]; /* Prototypes. */ -extern const char *ospf_area_name_string(struct ospf_area *); -extern const char *ospf_area_desc_string(struct ospf_area *); -extern const char *ospf_if_name_string(struct ospf_interface *); +extern const char *ospf_area_name_string(struct ospf_area *area); +extern const char *ospf_area_desc_string(struct ospf_area *area); +extern const char *ospf_if_name_string(struct ospf_interface *oip); extern int ospf_nbr_ism_state(struct ospf_neighbor *nbr); extern void ospf_nbr_ism_state_message(struct ospf_neighbor *nbr, char *buf, size_t size); -extern const char *ospf_timer_dump(struct thread *, char *, size_t); -extern const char *ospf_timeval_dump(struct timeval *, char *, size_t); -extern void ospf_packet_dump(struct stream *); +extern const char *ospf_timer_dump(struct event *e, char *buf, size_t size); +extern const char *ospf_timeval_dump(struct timeval *t, char *buf, size_t size); +extern void ospf_packet_dump(struct stream *s); extern void ospf_debug_init(void); /* Appropriate buffer size to use with ospf_timer_dump and ospf_timeval_dump: */ diff --git a/ospfd/ospf_ext.c b/ospfd/ospf_ext.c index 5faaed076b..75b58035a3 100644 --- a/ospfd/ospf_ext.c +++ b/ospfd/ospf_ext.c @@ -25,7 +25,7 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "thread.h" +#include "frrevent.h" #include "hash.h" #include "sockunion.h" /* for inet_aton() */ #include "network.h" diff --git a/ospfd/ospf_flood.c b/ospfd/ospf_flood.c index d0453bbc4a..f3fe504a07 100644 --- a/ospfd/ospf_flood.c +++ b/ospfd/ospf_flood.c @@ -12,7 +12,7 @@ #include "if.h" #include "command.h" #include "table.h" -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "log.h" #include "zclient.h" diff --git a/ospfd/ospf_gr.c b/ospfd/ospf_gr.c index e83ff1dccf..f60f0e863e 100644 --- a/ospfd/ospf_gr.c +++ b/ospfd/ospf_gr.c @@ -201,7 +201,7 @@ static void ospf_gr_restart_exit(struct ospf *ospf, const char *reason) zlog_debug("GR: exiting graceful restart: %s", reason); ospf->gr_info.restart_in_progress = false; - THREAD_OFF(ospf->gr_info.t_grace_period); + EVENT_OFF(ospf->gr_info.t_grace_period); /* Record in non-volatile memory that the restart is complete. */ ospf_gr_nvm_delete(ospf); @@ -495,9 +495,9 @@ void ospf_gr_check_adjs(struct ospf *ospf) } /* Handling of grace period expiry. */ -static void ospf_gr_grace_period_expired(struct thread *thread) +static void ospf_gr_grace_period_expired(struct event *thread) { - struct ospf *ospf = THREAD_ARG(thread); + struct ospf *ospf = EVENT_ARG(thread); ospf->gr_info.t_grace_period = NULL; ospf_gr_restart_exit(ospf, "grace period has expired"); @@ -648,9 +648,9 @@ void ospf_gr_nvm_read(struct ospf *ospf) zlog_debug( "GR: remaining time until grace period expires: %lu(s)", remaining_time); - thread_add_timer(master, ospf_gr_grace_period_expired, - ospf, remaining_time, - &ospf->gr_info.t_grace_period); + event_add_timer(master, ospf_gr_grace_period_expired, + ospf, remaining_time, + &ospf->gr_info.t_grace_period); } } diff --git a/ospfd/ospf_gr.h b/ospfd/ospf_gr.h index 65aa91d421..9760bb1728 100644 --- a/ospfd/ospf_gr.h +++ b/ospfd/ospf_gr.h @@ -90,7 +90,7 @@ struct ospf_helper_info { * helper until this timer until * this timer expires. */ - struct thread *t_grace_timer; + struct event *t_grace_timer; /* Helper status */ uint32_t gr_helper_status; diff --git a/ospfd/ospf_gr_helper.c b/ospfd/ospf_gr_helper.c index 07ce0d66ea..b97b6802b2 100644 --- a/ospfd/ospf_gr_helper.c +++ b/ospfd/ospf_gr_helper.c @@ -8,7 +8,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" @@ -329,9 +329,9 @@ static int ospf_extract_grace_lsa_fields(struct ospf_lsa *lsa, * Returns: * Nothing */ -static void ospf_handle_grace_timer_expiry(struct thread *thread) +static void ospf_handle_grace_timer_expiry(struct event *thread) { - struct ospf_neighbor *nbr = THREAD_ARG(thread); + struct ospf_neighbor *nbr = EVENT_ARG(thread); nbr->gr_helper_info.t_grace_timer = NULL; @@ -500,7 +500,7 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa, if (OSPF_GR_IS_ACTIVE_HELPER(restarter)) { if (restarter->gr_helper_info.t_grace_timer) - THREAD_OFF(restarter->gr_helper_info.t_grace_timer); + EVENT_OFF(restarter->gr_helper_info.t_grace_timer); if (ospf->active_restarter_cnt > 0) ospf->active_restarter_cnt--; @@ -533,9 +533,9 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa, actual_grace_interval); /* Start the grace timer */ - thread_add_timer(master, ospf_handle_grace_timer_expiry, restarter, - actual_grace_interval, - &restarter->gr_helper_info.t_grace_timer); + event_add_timer(master, ospf_handle_grace_timer_expiry, restarter, + actual_grace_interval, + &restarter->gr_helper_info.t_grace_timer); return OSPF_GR_ACTIVE_HELPER; } @@ -699,7 +699,7 @@ void ospf_gr_helper_exit(struct ospf_neighbor *nbr, * expiry, stop the grace timer. */ if (reason != OSPF_GR_HELPER_GRACE_TIMEOUT) - THREAD_OFF(nbr->gr_helper_info.t_grace_timer); + EVENT_OFF(nbr->gr_helper_info.t_grace_timer); /* check exit triggered due to successful completion * of graceful restart. diff --git a/ospfd/ospf_ia.c b/ospfd/ospf_ia.c index d3c9626d9a..59112b2cd2 100644 --- a/ospfd/ospf_ia.c +++ b/ospfd/ospf_ia.c @@ -7,7 +7,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "hash.h" #include "linklist.h" diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c index 4ea367ecad..dcecffa6a5 100644 --- a/ospfd/ospf_interface.c +++ b/ospfd/ospf_interface.c @@ -6,7 +6,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "linklist.h" #include "prefix.h" #include "if.h" @@ -289,7 +289,7 @@ void ospf_if_cleanup(struct ospf_interface *oi) /* oi->nbrs and oi->nbr_nbma should be deleted on InterfaceDown event */ /* delete all static neighbors attached to this interface */ for (ALL_LIST_ELEMENTS(oi->nbr_nbma, node, nnode, nbr_nbma)) { - THREAD_OFF(nbr_nbma->t_poll); + EVENT_OFF(nbr_nbma->t_poll); if (nbr_nbma->nbr) { nbr_nbma->nbr->nbr_nbma = NULL; @@ -356,7 +356,7 @@ void ospf_if_free(struct ospf_interface *oi) listnode_delete(oi->ospf->oiflist, oi); listnode_delete(oi->area->oiflist, oi); - thread_cancel_event(master, oi); + event_cancel_event(master, oi); memset(oi, 0, sizeof(*oi)); XFREE(MTYPE_OSPF_IF, oi); @@ -492,7 +492,7 @@ void ospf_interface_fifo_flush(struct ospf_interface *oi) if (oi->on_write_q) { listnode_delete(ospf->oi_write_q, oi); if (list_isempty(ospf->oi_write_q)) - THREAD_OFF(ospf->t_write); + EVENT_OFF(ospf->t_write); oi->on_write_q = 0; } } @@ -1471,7 +1471,7 @@ void ospf_reset_hello_timer(struct interface *ifp, struct in_addr addr, ospf_hello_send(oi); /* Restart hello timer for this interface */ - THREAD_OFF(oi->t_hello); + EVENT_OFF(oi->t_hello); OSPF_HELLO_TIMER_ON(oi); } @@ -1495,7 +1495,7 @@ void ospf_reset_hello_timer(struct interface *ifp, struct in_addr addr, ospf_hello_send(oi); /* Restart the hello timer. */ - THREAD_OFF(oi->t_hello); + EVENT_OFF(oi->t_hello); OSPF_HELLO_TIMER_ON(oi); } } diff --git a/ospfd/ospf_interface.h b/ospfd/ospf_interface.h index 0ee0cd4a3c..8625a72ac1 100644 --- a/ospfd/ospf_interface.h +++ b/ospfd/ospf_interface.h @@ -228,12 +228,12 @@ struct ospf_interface { uint32_t v_ls_ack; /* Delayed Link State Acknowledgment */ /* Threads. */ - struct thread *t_hello; /* timer */ - struct thread *t_wait; /* timer */ - struct thread *t_ls_ack; /* timer */ - struct thread *t_ls_ack_direct; /* event */ - struct thread *t_ls_upd_event; /* event */ - struct thread *t_opaque_lsa_self; /* Type-9 Opaque-LSAs */ + struct event *t_hello; /* timer */ + struct event *t_wait; /* timer */ + struct event *t_ls_ack; /* timer */ + struct event *t_ls_ack_direct; /* event */ + struct event *t_ls_upd_event; /* event */ + struct event *t_opaque_lsa_self; /* Type-9 Opaque-LSAs */ int on_write_q; diff --git a/ospfd/ospf_ism.c b/ospfd/ospf_ism.c index 173ebdf207..9f795ea918 100644 --- a/ospfd/ospf_ism.c +++ b/ospfd/ospf_ism.c @@ -7,7 +7,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "linklist.h" #include "prefix.h" #include "if.h" @@ -237,11 +237,11 @@ int ospf_dr_election(struct ospf_interface *oi) } -void ospf_hello_timer(struct thread *thread) +void ospf_hello_timer(struct event *thread) { struct ospf_interface *oi; - oi = THREAD_ARG(thread); + oi = EVENT_ARG(thread); oi->t_hello = NULL; if (IS_DEBUG_OSPF(ism, ISM_TIMERS)) @@ -254,11 +254,11 @@ void ospf_hello_timer(struct thread *thread) OSPF_HELLO_TIMER_ON(oi); } -static void ospf_wait_timer(struct thread *thread) +static void ospf_wait_timer(struct event *thread) { struct ospf_interface *oi; - oi = THREAD_ARG(thread); + oi = EVENT_ARG(thread); oi->t_wait = NULL; if (IS_DEBUG_OSPF(ism, ISM_TIMERS)) @@ -279,16 +279,16 @@ static void ism_timer_set(struct ospf_interface *oi) interface parameters must be set to initial values, and timers are reset also. */ - THREAD_OFF(oi->t_hello); - THREAD_OFF(oi->t_wait); - THREAD_OFF(oi->t_ls_ack); + EVENT_OFF(oi->t_hello); + EVENT_OFF(oi->t_wait); + EVENT_OFF(oi->t_ls_ack); break; case ISM_Loopback: /* In this state, the interface may be looped back and will be unavailable for regular data traffic. */ - THREAD_OFF(oi->t_hello); - THREAD_OFF(oi->t_wait); - THREAD_OFF(oi->t_ls_ack); + EVENT_OFF(oi->t_hello); + EVENT_OFF(oi->t_wait); + EVENT_OFF(oi->t_ls_ack); break; case ISM_Waiting: /* The router is trying to determine the identity of DRouter and @@ -298,7 +298,7 @@ static void ism_timer_set(struct ospf_interface *oi) OSPF_ISM_TIMER_MSEC_ON(oi->t_hello, ospf_hello_timer, 1); OSPF_ISM_TIMER_ON(oi->t_wait, ospf_wait_timer, OSPF_IF_PARAM(oi, v_wait)); - THREAD_OFF(oi->t_ls_ack); + EVENT_OFF(oi->t_ls_ack); break; case ISM_PointToPoint: /* The interface connects to a physical Point-to-point network @@ -307,7 +307,7 @@ static void ism_timer_set(struct ospf_interface *oi) neighboring router. Hello packets are also sent. */ /* send first hello immediately */ OSPF_ISM_TIMER_MSEC_ON(oi->t_hello, ospf_hello_timer, 1); - THREAD_OFF(oi->t_wait); + EVENT_OFF(oi->t_wait); OSPF_ISM_TIMER_ON(oi->t_ls_ack, ospf_ls_ack_timer, oi->v_ls_ack); break; @@ -317,7 +317,7 @@ static void ism_timer_set(struct ospf_interface *oi) and the router itself is neither Designated Router nor Backup Designated Router. */ OSPF_HELLO_TIMER_ON(oi); - THREAD_OFF(oi->t_wait); + EVENT_OFF(oi->t_wait); OSPF_ISM_TIMER_ON(oi->t_ls_ack, ospf_ls_ack_timer, oi->v_ls_ack); break; @@ -326,7 +326,7 @@ static void ism_timer_set(struct ospf_interface *oi) network, and the router is Backup Designated Router. */ OSPF_HELLO_TIMER_ON(oi); - THREAD_OFF(oi->t_wait); + EVENT_OFF(oi->t_wait); OSPF_ISM_TIMER_ON(oi->t_ls_ack, ospf_ls_ack_timer, oi->v_ls_ack); break; @@ -335,7 +335,7 @@ static void ism_timer_set(struct ospf_interface *oi) network, and the router is Designated Router. */ OSPF_HELLO_TIMER_ON(oi); - THREAD_OFF(oi->t_wait); + EVENT_OFF(oi->t_wait); OSPF_ISM_TIMER_ON(oi->t_ls_ack, ospf_ls_ack_timer, oi->v_ls_ack); break; @@ -560,14 +560,14 @@ static void ism_change_state(struct ospf_interface *oi, int state) } /* Execute ISM event process. */ -void ospf_ism_event(struct thread *thread) +void ospf_ism_event(struct event *thread) { int event; int next_state; struct ospf_interface *oi; - oi = THREAD_ARG(thread); - event = THREAD_VAL(thread); + oi = EVENT_ARG(thread); + event = EVENT_VAL(thread); /* Call function. */ next_state = (*(ISM[oi->state][event].func))(oi); diff --git a/ospfd/ospf_ism.h b/ospfd/ospf_ism.h index d0516f61a1..426dda7733 100644 --- a/ospfd/ospf_ism.h +++ b/ospfd/ospf_ism.h @@ -39,15 +39,15 @@ oi->on_write_q = 1; \ } \ if (!list_isempty((O)->oi_write_q)) \ - thread_add_write(master, ospf_write, (O), (O)->fd, \ - &(O)->t_write); \ + event_add_write(master, ospf_write, (O), (O)->fd, \ + &(O)->t_write); \ } while (0) /* Macro for OSPF ISM timer turn on. */ -#define OSPF_ISM_TIMER_ON(T, F, V) thread_add_timer(master, (F), oi, (V), &(T)) +#define OSPF_ISM_TIMER_ON(T, F, V) event_add_timer(master, (F), oi, (V), &(T)) #define OSPF_ISM_TIMER_MSEC_ON(T, F, V) \ - thread_add_timer_msec(master, (F), oi, (V), &(T)) + event_add_timer_msec(master, (F), oi, (V), &(T)) /* convenience macro to set hello timer correctly, according to * whether fast-hello is set or not @@ -65,16 +65,16 @@ /* Macro for OSPF schedule event. */ #define OSPF_ISM_EVENT_SCHEDULE(I, E) \ - thread_add_event(master, ospf_ism_event, (I), (E), NULL) + event_add_event(master, ospf_ism_event, (I), (E), NULL) /* Macro for OSPF execute event. */ #define OSPF_ISM_EVENT_EXECUTE(I, E) \ - thread_execute(master, ospf_ism_event, (I), (E)) + event_execute(master, ospf_ism_event, (I), (E)) /* Prototypes. */ -extern void ospf_ism_event(struct thread *thread); +extern void ospf_ism_event(struct event *thread); extern void ism_change_status(struct ospf_interface *, int); -extern void ospf_hello_timer(struct thread *thread); +extern void ospf_hello_timer(struct event *thread); extern int ospf_dr_election(struct ospf_interface *oi); DECLARE_HOOK(ospf_ism_change, diff --git a/ospfd/ospf_ldp_sync.c b/ospfd/ospf_ldp_sync.c index d3da5003aa..b97e87faa0 100644 --- a/ospfd/ospf_ldp_sync.c +++ b/ospfd/ospf_ldp_sync.c @@ -9,7 +9,7 @@ #include "monotime.h" #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "prefix.h" #include "table.h" #include "vty.h" @@ -190,7 +190,7 @@ void ospf_ldp_sync_if_complete(struct interface *ifp) if (ldp_sync_info && ldp_sync_info->enabled == LDP_IGP_SYNC_ENABLED) { if (ldp_sync_info->state == LDP_IGP_SYNC_STATE_REQUIRED_NOT_UP) ldp_sync_info->state = LDP_IGP_SYNC_STATE_REQUIRED_UP; - THREAD_OFF(ldp_sync_info->t_holddown); + EVENT_OFF(ldp_sync_info->t_holddown); ospf_if_recalculate_output_cost(ifp); } } @@ -241,7 +241,7 @@ void ospf_ldp_sync_ldp_fail(struct interface *ifp) if (ldp_sync_info && ldp_sync_info->enabled == LDP_IGP_SYNC_ENABLED && ldp_sync_info->state != LDP_IGP_SYNC_STATE_NOT_REQUIRED) { - THREAD_OFF(ldp_sync_info->t_holddown); + EVENT_OFF(ldp_sync_info->t_holddown); ldp_sync_info->state = LDP_IGP_SYNC_STATE_REQUIRED_NOT_UP; ospf_if_recalculate_output_cost(ifp); } @@ -305,7 +305,7 @@ void ospf_ldp_sync_if_remove(struct interface *ifp, bool remove) */ ols_debug("%s: Removed from if %s", __func__, ifp->name); - THREAD_OFF(ldp_sync_info->t_holddown); + EVENT_OFF(ldp_sync_info->t_holddown); ldp_sync_info->state = LDP_IGP_SYNC_STATE_NOT_REQUIRED; ospf_if_recalculate_output_cost(ifp); @@ -339,7 +339,7 @@ static int ospf_ldp_sync_ism_change(struct ospf_interface *oi, int state, /* * LDP-SYNC holddown timer routines */ -static void ospf_ldp_sync_holddown_timer(struct thread *thread) +static void ospf_ldp_sync_holddown_timer(struct event *thread) { struct interface *ifp; struct ospf_if_params *params; @@ -349,7 +349,7 @@ static void ospf_ldp_sync_holddown_timer(struct thread *thread) * didn't receive msg from LDP indicating sync-complete * restore interface cost to original value */ - ifp = THREAD_ARG(thread); + ifp = EVENT_ARG(thread); params = IF_DEF_PARAMS(ifp); if (params->ldp_sync_info) { ldp_sync_info = params->ldp_sync_info; @@ -383,9 +383,8 @@ void ospf_ldp_sync_holddown_timer_add(struct interface *ifp) ols_debug("%s: start holddown timer for %s time %d", __func__, ifp->name, ldp_sync_info->holddown); - thread_add_timer(master, ospf_ldp_sync_holddown_timer, - ifp, ldp_sync_info->holddown, - &ldp_sync_info->t_holddown); + event_add_timer(master, ospf_ldp_sync_holddown_timer, ifp, + ldp_sync_info->holddown, &ldp_sync_info->t_holddown); } /* @@ -899,7 +898,7 @@ DEFPY (no_mpls_ldp_sync, SET_FLAG(ldp_sync_info->flags, LDP_SYNC_FLAG_IF_CONFIG); ldp_sync_info->enabled = LDP_IGP_SYNC_DEFAULT; ldp_sync_info->state = LDP_IGP_SYNC_STATE_NOT_REQUIRED; - THREAD_OFF(ldp_sync_info->t_holddown); + EVENT_OFF(ldp_sync_info->t_holddown); ospf_if_recalculate_output_cost(ifp); return CMD_SUCCESS; diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c index 8b34ce6d76..82f7b96fd5 100644 --- a/ospfd/ospf_lsa.c +++ b/ospfd/ospf_lsa.c @@ -14,7 +14,7 @@ #include "memory.h" #include "stream.h" #include "log.h" -#include "thread.h" +#include "frrevent.h" #include "hash.h" #include "sockunion.h" /* for inet_aton() */ #include "checksum.h" @@ -742,9 +742,9 @@ void ospf_router_lsa_body_set(struct stream **s, struct ospf_area *area) stream_putw_at(*s, putp, cnt); } -static void ospf_stub_router_timer(struct thread *t) +static void ospf_stub_router_timer(struct event *t) { - struct ospf_area *area = THREAD_ARG(t); + struct ospf_area *area = EVENT_ARG(t); area->t_stub_router = NULL; @@ -3042,9 +3042,9 @@ int ospf_check_nbr_status(struct ospf *ospf) } -void ospf_maxage_lsa_remover(struct thread *thread) +void ospf_maxage_lsa_remover(struct event *thread) { - struct ospf *ospf = THREAD_ARG(thread); + struct ospf *ospf = EVENT_ARG(thread); struct ospf_lsa *lsa, *old; struct route_node *rn; int reschedule = 0; @@ -3074,7 +3074,7 @@ void ospf_maxage_lsa_remover(struct thread *thread) } /* TODO: maybe convert this function to a work-queue */ - if (thread_should_yield(thread)) { + if (event_should_yield(thread)) { OSPF_TIMER_ON(ospf->t_maxage, ospf_maxage_lsa_remover, 0); route_unlock_node( @@ -3290,9 +3290,9 @@ static int ospf_lsa_maxage_walker_remover(struct ospf *ospf, } /* Periodical check of MaxAge LSA. */ -void ospf_lsa_maxage_walker(struct thread *thread) +void ospf_lsa_maxage_walker(struct event *thread) { - struct ospf *ospf = THREAD_ARG(thread); + struct ospf *ospf = EVENT_ARG(thread); struct route_node *rn; struct ospf_lsa *lsa; struct ospf_area *area; @@ -3652,8 +3652,8 @@ void ospf_flush_self_originated_lsas_now(struct ospf *ospf) * without conflicting to other threads. */ if (ospf->t_maxage != NULL) { - THREAD_OFF(ospf->t_maxage); - thread_execute(master, ospf_maxage_lsa_remover, ospf, 0); + EVENT_OFF(ospf->t_maxage); + event_execute(master, ospf_maxage_lsa_remover, ospf, 0); } return; @@ -3838,11 +3838,11 @@ struct lsa_action { struct ospf_lsa *lsa; }; -static void ospf_lsa_action(struct thread *t) +static void ospf_lsa_action(struct event *t) { struct lsa_action *data; - data = THREAD_ARG(t); + data = EVENT_ARG(t); if (IS_DEBUG_OSPF(lsa, LSA) == OSPF_DEBUG_LSA) zlog_debug("LSA[Action]: Performing scheduled LSA action: %d", @@ -3870,7 +3870,7 @@ void ospf_schedule_lsa_flood_area(struct ospf_area *area, struct ospf_lsa *lsa) data->area = area; data->lsa = ospf_lsa_lock(lsa); /* Message / Flood area */ - thread_add_event(master, ospf_lsa_action, data, 0, NULL); + event_add_event(master, ospf_lsa_action, data, 0, NULL); } void ospf_schedule_lsa_flush_area(struct ospf_area *area, struct ospf_lsa *lsa) @@ -3882,7 +3882,7 @@ void ospf_schedule_lsa_flush_area(struct ospf_area *area, struct ospf_lsa *lsa) data->area = area; data->lsa = ospf_lsa_lock(lsa); /* Message / Flush area */ - thread_add_event(master, ospf_lsa_action, data, 0, NULL); + event_add_event(master, ospf_lsa_action, data, 0, NULL); } @@ -4029,11 +4029,11 @@ void ospf_refresher_unregister_lsa(struct ospf *ospf, struct ospf_lsa *lsa) } } -void ospf_lsa_refresh_walker(struct thread *t) +void ospf_lsa_refresh_walker(struct event *t) { struct list *refresh_list; struct listnode *node, *nnode; - struct ospf *ospf = THREAD_ARG(t); + struct ospf *ospf = EVENT_ARG(t); struct ospf_lsa *lsa; int i; struct list *lsa_to_refresh = list_new(); @@ -4091,8 +4091,8 @@ void ospf_lsa_refresh_walker(struct thread *t) } ospf->t_lsa_refresher = NULL; - thread_add_timer(master, ospf_lsa_refresh_walker, ospf, - ospf->lsa_refresh_interval, &ospf->t_lsa_refresher); + event_add_timer(master, ospf_lsa_refresh_walker, ospf, + ospf->lsa_refresh_interval, &ospf->t_lsa_refresher); ospf->lsa_refresher_started = monotime(NULL); for (ALL_LIST_ELEMENTS(lsa_to_refresh, node, nnode, lsa)) { diff --git a/ospfd/ospf_lsa.h b/ospfd/ospf_lsa.h index 3c7ea3fda5..8ab293f4db 100644 --- a/ospfd/ospf_lsa.h +++ b/ospfd/ospf_lsa.h @@ -300,7 +300,7 @@ extern struct ospf_lsa *ospf_lsa_lookup_by_prefix(struct ospf_lsdb *, uint8_t, extern void ospf_lsa_maxage(struct ospf *, struct ospf_lsa *); extern uint32_t get_metric(uint8_t *); -extern void ospf_lsa_maxage_walker(struct thread *thread); +extern void ospf_lsa_maxage_walker(struct event *thread); extern struct ospf_lsa *ospf_lsa_refresh(struct ospf *, struct ospf_lsa *); extern void ospf_external_lsa_refresh_default(struct ospf *); @@ -320,7 +320,7 @@ extern void ospf_schedule_lsa_flush_area(struct ospf_area *, struct ospf_lsa *); extern void ospf_refresher_register_lsa(struct ospf *, struct ospf_lsa *); extern void ospf_refresher_unregister_lsa(struct ospf *, struct ospf_lsa *); -extern void ospf_lsa_refresh_walker(struct thread *thread); +extern void ospf_lsa_refresh_walker(struct event *thread); extern void ospf_lsa_maxage_delete(struct ospf *, struct ospf_lsa *); @@ -346,7 +346,7 @@ extern void ospf_check_and_gen_init_seq_lsa(struct ospf_interface *oi, struct ospf_lsa *lsa); extern void ospf_flush_lsa_from_area(struct ospf *ospf, struct in_addr area_id, int type); -extern void ospf_maxage_lsa_remover(struct thread *thread); +extern void ospf_maxage_lsa_remover(struct event *thread); extern bool ospf_check_dna_lsa(const struct ospf_lsa *lsa); extern void ospf_refresh_area_self_lsas(struct ospf_area *area); diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c index 05fc5c95d1..1f476a7e3d 100644 --- a/ospfd/ospf_main.c +++ b/ospfd/ospf_main.c @@ -9,7 +9,7 @@ #include #include "bfd.h" #include "getopt.h" -#include "thread.h" +#include "frrevent.h" #include "prefix.h" #include "linklist.h" #include "if.h" @@ -70,7 +70,7 @@ const struct option longopts[] = { /* OSPFd program name */ /* Master of threads. */ -struct thread_master *master; +struct event_loop *master; #ifdef SUPPORT_OSPF_API extern int ospf_apiserver_enable; diff --git a/ospfd/ospf_neighbor.c b/ospfd/ospf_neighbor.c index 8338c43077..c238f051df 100644 --- a/ospfd/ospf_neighbor.c +++ b/ospfd/ospf_neighbor.c @@ -11,7 +11,7 @@ #include "prefix.h" #include "memory.h" #include "command.h" -#include "thread.h" +#include "frrevent.h" #include "stream.h" #include "table.h" #include "log.h" @@ -125,17 +125,17 @@ void ospf_nbr_free(struct ospf_neighbor *nbr) } /* Cancel all timers. */ - THREAD_OFF(nbr->t_inactivity); - THREAD_OFF(nbr->t_db_desc); - THREAD_OFF(nbr->t_ls_req); - THREAD_OFF(nbr->t_ls_upd); + EVENT_OFF(nbr->t_inactivity); + EVENT_OFF(nbr->t_db_desc); + EVENT_OFF(nbr->t_ls_req); + EVENT_OFF(nbr->t_ls_upd); /* Cancel all events. */ /* Thread lookup cost would be negligible. */ - thread_cancel_event(master, nbr); + event_cancel_event(master, nbr); bfd_sess_free(&nbr->bfd_session); - THREAD_OFF(nbr->gr_helper_info.t_grace_timer); + EVENT_OFF(nbr->gr_helper_info.t_grace_timer); nbr->oi = NULL; XFREE(MTYPE_OSPF_NEIGHBOR, nbr); @@ -441,7 +441,7 @@ static struct ospf_neighbor *ospf_nbr_add(struct ospf_interface *oi, nbr->nbr_nbma = nbr_nbma; if (nbr_nbma->t_poll) - THREAD_OFF(nbr_nbma->t_poll); + EVENT_OFF(nbr_nbma->t_poll); nbr->state_change = nbr_nbma->state_change + 1; } diff --git a/ospfd/ospf_neighbor.h b/ospfd/ospf_neighbor.h index 7bd5b1209d..07d095f03d 100644 --- a/ospfd/ospf_neighbor.h +++ b/ospfd/ospf_neighbor.h @@ -57,11 +57,11 @@ struct ospf_neighbor { uint32_t v_ls_upd; /* Threads. */ - struct thread *t_inactivity; - struct thread *t_db_desc; - struct thread *t_ls_req; - struct thread *t_ls_upd; - struct thread *t_hello_reply; + struct event *t_inactivity; + struct event *t_db_desc; + struct event *t_ls_req; + struct event *t_ls_upd; + struct event *t_hello_reply; /* NBMA configured neighbour */ struct ospf_nbr_nbma *nbr_nbma; diff --git a/ospfd/ospf_network.c b/ospfd/ospf_network.c index e89ad020b1..d3f30ce1ee 100644 --- a/ospfd/ospf_network.c +++ b/ospfd/ospf_network.c @@ -6,7 +6,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "linklist.h" #include "prefix.h" #include "if.h" diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c index 64bb454006..bcbe028795 100644 --- a/ospfd/ospf_nsm.c +++ b/ospfd/ospf_nsm.c @@ -7,7 +7,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "hash.h" #include "linklist.h" @@ -44,11 +44,11 @@ DEFINE_HOOK(ospf_nsm_change, static void nsm_clear_adj(struct ospf_neighbor *); /* OSPF NSM Timer functions. */ -static void ospf_inactivity_timer(struct thread *thread) +static void ospf_inactivity_timer(struct event *thread) { struct ospf_neighbor *nbr; - nbr = THREAD_ARG(thread); + nbr = EVENT_ARG(thread); nbr->t_inactivity = NULL; if (IS_DEBUG_OSPF(nsm, NSM_TIMERS)) @@ -71,11 +71,11 @@ static void ospf_inactivity_timer(struct thread *thread) } } -static void ospf_db_desc_timer(struct thread *thread) +static void ospf_db_desc_timer(struct event *thread) { struct ospf_neighbor *nbr; - nbr = THREAD_ARG(thread); + nbr = EVENT_ARG(thread); nbr->t_db_desc = NULL; if (IS_DEBUG_OSPF(nsm, NSM_TIMERS)) @@ -105,32 +105,32 @@ static void nsm_timer_set(struct ospf_neighbor *nbr) switch (nbr->state) { case NSM_Deleted: case NSM_Down: - THREAD_OFF(nbr->t_inactivity); - THREAD_OFF(nbr->t_hello_reply); + EVENT_OFF(nbr->t_inactivity); + EVENT_OFF(nbr->t_hello_reply); /* fallthru */ case NSM_Attempt: case NSM_Init: case NSM_TwoWay: - THREAD_OFF(nbr->t_db_desc); - THREAD_OFF(nbr->t_ls_upd); - THREAD_OFF(nbr->t_ls_req); + EVENT_OFF(nbr->t_db_desc); + EVENT_OFF(nbr->t_ls_upd); + EVENT_OFF(nbr->t_ls_req); break; case NSM_ExStart: OSPF_NSM_TIMER_ON(nbr->t_db_desc, ospf_db_desc_timer, nbr->v_db_desc); - THREAD_OFF(nbr->t_ls_upd); - THREAD_OFF(nbr->t_ls_req); + EVENT_OFF(nbr->t_ls_upd); + EVENT_OFF(nbr->t_ls_req); break; case NSM_Exchange: OSPF_NSM_TIMER_ON(nbr->t_ls_upd, ospf_ls_upd_timer, nbr->v_ls_upd); if (!IS_SET_DD_MS(nbr->dd_flags)) - THREAD_OFF(nbr->t_db_desc); + EVENT_OFF(nbr->t_db_desc); break; case NSM_Loading: case NSM_Full: default: - THREAD_OFF(nbr->t_db_desc); + EVENT_OFF(nbr->t_db_desc); break; } } @@ -161,13 +161,13 @@ int nsm_should_adj(struct ospf_neighbor *nbr) static int nsm_hello_received(struct ospf_neighbor *nbr) { /* Start or Restart Inactivity Timer. */ - THREAD_OFF(nbr->t_inactivity); + EVENT_OFF(nbr->t_inactivity); OSPF_NSM_TIMER_ON(nbr->t_inactivity, ospf_inactivity_timer, nbr->v_inactivity); if (nbr->oi->type == OSPF_IFTYPE_NBMA && nbr->nbr_nbma) - THREAD_OFF(nbr->nbr_nbma->t_poll); + EVENT_OFF(nbr->nbr_nbma->t_poll); /* Send proactive ARP requests */ if (nbr->state < NSM_Exchange) @@ -179,9 +179,9 @@ static int nsm_hello_received(struct ospf_neighbor *nbr) static int nsm_start(struct ospf_neighbor *nbr) { if (nbr->nbr_nbma) - THREAD_OFF(nbr->nbr_nbma->t_poll); + EVENT_OFF(nbr->nbr_nbma->t_poll); - THREAD_OFF(nbr->t_inactivity); + EVENT_OFF(nbr->t_inactivity); OSPF_NSM_TIMER_ON(nbr->t_inactivity, ospf_inactivity_timer, nbr->v_inactivity); @@ -791,14 +791,14 @@ static void nsm_change_state(struct ospf_neighbor *nbr, int state) } /* Execute NSM event process. */ -void ospf_nsm_event(struct thread *thread) +void ospf_nsm_event(struct event *thread) { int event; int next_state; struct ospf_neighbor *nbr; - nbr = THREAD_ARG(thread); - event = THREAD_VAL(thread); + nbr = EVENT_ARG(thread); + event = EVENT_VAL(thread); if (IS_DEBUG_OSPF(nsm, NSM_EVENTS)) zlog_debug("NSM[%s:%pI4:%s]: %s (%s)", IF_NAME(nbr->oi), diff --git a/ospfd/ospf_nsm.h b/ospfd/ospf_nsm.h index b53a05914f..9973b4870d 100644 --- a/ospfd/ospf_nsm.h +++ b/ospfd/ospf_nsm.h @@ -41,22 +41,22 @@ #define OSPF_NSM_EVENT_MAX 14 /* Macro for OSPF NSM timer turn on. */ -#define OSPF_NSM_TIMER_ON(T,F,V) thread_add_timer (master, (F), nbr, (V), &(T)) +#define OSPF_NSM_TIMER_ON(T, F, V) event_add_timer(master, (F), nbr, (V), &(T)) /* Macro for OSPF NSM schedule event. */ #define OSPF_NSM_EVENT_SCHEDULE(N, E) \ - thread_add_event(master, ospf_nsm_event, (N), (E), NULL) + event_add_event(master, ospf_nsm_event, (N), (E), NULL) /* Macro for OSPF NSM execute event. */ #define OSPF_NSM_EVENT_EXECUTE(N, E) \ - thread_execute(master, ospf_nsm_event, (N), (E)) + event_execute(master, ospf_nsm_event, (N), (E)) /* Prototypes. */ -extern void ospf_nsm_event(struct thread *); -extern void ospf_check_nbr_loading(struct ospf_neighbor *); -extern int ospf_db_summary_isempty(struct ospf_neighbor *); -extern int ospf_db_summary_count(struct ospf_neighbor *); -extern void ospf_db_summary_clear(struct ospf_neighbor *); +extern void ospf_nsm_event(struct event *e); +extern void ospf_check_nbr_loading(struct ospf_neighbor *nbr); +extern int ospf_db_summary_isempty(struct ospf_neighbor *nbr); +extern int ospf_db_summary_count(struct ospf_neighbor *nbr); +extern void ospf_db_summary_clear(struct ospf_neighbor *nbr); extern int nsm_should_adj(struct ospf_neighbor *nbr); DECLARE_HOOK(ospf_nsm_change, (struct ospf_neighbor * on, int state, int oldstate), diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c index fa04f092dc..6f66ee10a1 100644 --- a/ospfd/ospf_opaque.c +++ b/ospfd/ospf_opaque.c @@ -16,7 +16,7 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "thread.h" +#include "frrevent.h" #include "hash.h" #include "sockunion.h" /* for inet_aton() */ #include "printfrr.h" @@ -137,7 +137,7 @@ int ospf_opaque_type9_lsa_init(struct ospf_interface *oi) void ospf_opaque_type9_lsa_term(struct ospf_interface *oi) { - THREAD_OFF(oi->t_opaque_lsa_self); + EVENT_OFF(oi->t_opaque_lsa_self); if (oi->opaque_lsa_self != NULL) list_delete(&oi->opaque_lsa_self); oi->opaque_lsa_self = NULL; @@ -166,7 +166,7 @@ void ospf_opaque_type10_lsa_term(struct ospf_area *area) area->lsdb->new_lsa_hook = area->lsdb->del_lsa_hook = NULL; #endif /* MONITOR_LSDB_CHANGE */ - THREAD_OFF(area->t_opaque_lsa_self); + EVENT_OFF(area->t_opaque_lsa_self); if (area->opaque_lsa_self != NULL) list_delete(&area->opaque_lsa_self); return; @@ -194,7 +194,7 @@ void ospf_opaque_type11_lsa_term(struct ospf *top) top->lsdb->new_lsa_hook = top->lsdb->del_lsa_hook = NULL; #endif /* MONITOR_LSDB_CHANGE */ - THREAD_OFF(top->t_opaque_lsa_self); + EVENT_OFF(top->t_opaque_lsa_self); if (top->opaque_lsa_self != NULL) list_delete(&top->opaque_lsa_self); return; @@ -479,7 +479,7 @@ struct opaque_info_per_type { * to (re-)originate their own Opaque-LSAs out-of-sync with others. * This thread is prepared for that specific purpose. */ - struct thread *t_opaque_lsa_self; + struct event *t_opaque_lsa_self; /* * Backpointer to an "owner" which is LSA-type dependent. @@ -501,7 +501,7 @@ struct opaque_info_per_id { uint32_t opaque_id; /* Thread for refresh/flush scheduling for this opaque-type/id. */ - struct thread *t_opaque_lsa_self; + struct event *t_opaque_lsa_self; /* Backpointer to Opaque-LSA control information per opaque-type. */ struct opaque_info_per_type *opqctl_type; @@ -590,7 +590,7 @@ static void free_opaque_info_per_type(struct opaque_info_per_type *oipt, ospf_opaque_lsa_flush_schedule(lsa); } - THREAD_OFF(oipt->t_opaque_lsa_self); + EVENT_OFF(oipt->t_opaque_lsa_self); list_delete(&oipt->id_list); if (cleanup_owner) { /* Remove from its owner's self-originated LSA list. */ @@ -697,7 +697,7 @@ static void free_opaque_info_per_id(void *val) { struct opaque_info_per_id *oipi = (struct opaque_info_per_id *)val; - THREAD_OFF(oipi->t_opaque_lsa_self); + EVENT_OFF(oipi->t_opaque_lsa_self); if (oipi->lsa != NULL) ospf_lsa_unlock(&oipi->lsa); XFREE(MTYPE_OPAQUE_INFO_PER_ID, oipi); @@ -1284,9 +1284,9 @@ out: * Following are Opaque-LSA origination/refresh management functions. *------------------------------------------------------------------------*/ -static void ospf_opaque_type9_lsa_originate(struct thread *t); -static void ospf_opaque_type10_lsa_originate(struct thread *t); -static void ospf_opaque_type11_lsa_originate(struct thread *t); +static void ospf_opaque_type9_lsa_originate(struct event *t); +static void ospf_opaque_type10_lsa_originate(struct event *t); +static void ospf_opaque_type11_lsa_originate(struct event *t); static void ospf_opaque_lsa_reoriginate_resume(struct list *listtop, void *arg); void ospf_opaque_lsa_originate_schedule(struct ospf_interface *oi, int *delay0) @@ -1332,8 +1332,8 @@ void ospf_opaque_lsa_originate_schedule(struct ospf_interface *oi, int *delay0) "Schedule Type-9 Opaque-LSA origination in %d ms later.", delay); oi->t_opaque_lsa_self = NULL; - thread_add_timer_msec(master, ospf_opaque_type9_lsa_originate, - oi, delay, &oi->t_opaque_lsa_self); + event_add_timer_msec(master, ospf_opaque_type9_lsa_originate, + oi, delay, &oi->t_opaque_lsa_self); delay += top->min_ls_interval; } @@ -1350,8 +1350,8 @@ void ospf_opaque_lsa_originate_schedule(struct ospf_interface *oi, int *delay0) "Schedule Type-10 Opaque-LSA origination in %d ms later.", delay); area->t_opaque_lsa_self = NULL; - thread_add_timer_msec(master, ospf_opaque_type10_lsa_originate, - area, delay, &area->t_opaque_lsa_self); + event_add_timer_msec(master, ospf_opaque_type10_lsa_originate, + area, delay, &area->t_opaque_lsa_self); delay += top->min_ls_interval; } @@ -1368,8 +1368,8 @@ void ospf_opaque_lsa_originate_schedule(struct ospf_interface *oi, int *delay0) "Schedule Type-11 Opaque-LSA origination in %d ms later.", delay); top->t_opaque_lsa_self = NULL; - thread_add_timer_msec(master, ospf_opaque_type11_lsa_originate, - top, delay, &top->t_opaque_lsa_self); + event_add_timer_msec(master, ospf_opaque_type11_lsa_originate, + top, delay, &top->t_opaque_lsa_self); delay += top->min_ls_interval; } @@ -1456,11 +1456,11 @@ void ospf_opaque_lsa_originate_schedule(struct ospf_interface *oi, int *delay0) *delay0 = delay; } -static void ospf_opaque_type9_lsa_originate(struct thread *t) +static void ospf_opaque_type9_lsa_originate(struct event *t) { struct ospf_interface *oi; - oi = THREAD_ARG(t); + oi = EVENT_ARG(t); oi->t_opaque_lsa_self = NULL; if (IS_DEBUG_OSPF_EVENT) @@ -1470,11 +1470,11 @@ static void ospf_opaque_type9_lsa_originate(struct thread *t) opaque_lsa_originate_callback(ospf_opaque_type9_funclist, oi); } -static void ospf_opaque_type10_lsa_originate(struct thread *t) +static void ospf_opaque_type10_lsa_originate(struct event *t) { struct ospf_area *area; - area = THREAD_ARG(t); + area = EVENT_ARG(t); area->t_opaque_lsa_self = NULL; if (IS_DEBUG_OSPF_EVENT) @@ -1485,11 +1485,11 @@ static void ospf_opaque_type10_lsa_originate(struct thread *t) opaque_lsa_originate_callback(ospf_opaque_type10_funclist, area); } -static void ospf_opaque_type11_lsa_originate(struct thread *t) +static void ospf_opaque_type11_lsa_originate(struct event *t) { struct ospf *top; - top = THREAD_ARG(t); + top = EVENT_ARG(t); top->t_opaque_lsa_self = NULL; if (IS_DEBUG_OSPF_EVENT) @@ -1643,15 +1643,16 @@ struct ospf_lsa *ospf_opaque_lsa_refresh(struct ospf_lsa *lsa) * triggered by external interventions (vty session, signaling, etc). *------------------------------------------------------------------------*/ -#define OSPF_OPAQUE_TIMER_ON(T,F,L,V) thread_add_timer_msec (master, (F), (L), (V), &(T)) +#define OSPF_OPAQUE_TIMER_ON(T, F, L, V) \ + event_add_timer_msec(master, (F), (L), (V), &(T)) static struct ospf_lsa *pseudo_lsa(struct ospf_interface *oi, struct ospf_area *area, uint8_t lsa_type, uint8_t opaque_type); -static void ospf_opaque_type9_lsa_reoriginate_timer(struct thread *t); -static void ospf_opaque_type10_lsa_reoriginate_timer(struct thread *t); -static void ospf_opaque_type11_lsa_reoriginate_timer(struct thread *t); -static void ospf_opaque_lsa_refresh_timer(struct thread *t); +static void ospf_opaque_type9_lsa_reoriginate_timer(struct event *t); +static void ospf_opaque_type10_lsa_reoriginate_timer(struct event *t); +static void ospf_opaque_type11_lsa_reoriginate_timer(struct event *t); +static void ospf_opaque_lsa_refresh_timer(struct event *t); void ospf_opaque_lsa_reoriginate_schedule(void *lsa_type_dependent, uint8_t lsa_type, uint8_t opaque_type) @@ -1662,7 +1663,7 @@ void ospf_opaque_lsa_reoriginate_schedule(void *lsa_type_dependent, struct ospf_lsa *lsa; struct opaque_info_per_type *oipt; - void (*func)(struct thread * t) = NULL; + void (*func)(struct event * t) = NULL; int delay; switch (lsa_type) { @@ -1822,14 +1823,14 @@ static struct ospf_lsa *pseudo_lsa(struct ospf_interface *oi, return &lsa; } -static void ospf_opaque_type9_lsa_reoriginate_timer(struct thread *t) +static void ospf_opaque_type9_lsa_reoriginate_timer(struct event *t) { struct opaque_info_per_type *oipt; struct ospf_opaque_functab *functab; struct ospf *top; struct ospf_interface *oi; - oipt = THREAD_ARG(t); + oipt = EVENT_ARG(t); if ((functab = oipt->functab) == NULL || functab->lsa_originator == NULL) { @@ -1863,7 +1864,7 @@ static void ospf_opaque_type9_lsa_reoriginate_timer(struct thread *t) (*functab->lsa_originator)(oi); } -static void ospf_opaque_type10_lsa_reoriginate_timer(struct thread *t) +static void ospf_opaque_type10_lsa_reoriginate_timer(struct event *t) { struct opaque_info_per_type *oipt; struct ospf_opaque_functab *functab; @@ -1873,7 +1874,7 @@ static void ospf_opaque_type10_lsa_reoriginate_timer(struct thread *t) struct ospf_interface *oi; int n; - oipt = THREAD_ARG(t); + oipt = EVENT_ARG(t); if ((functab = oipt->functab) == NULL || functab->lsa_originator == NULL) { @@ -1912,13 +1913,13 @@ static void ospf_opaque_type10_lsa_reoriginate_timer(struct thread *t) (*functab->lsa_originator)(area); } -static void ospf_opaque_type11_lsa_reoriginate_timer(struct thread *t) +static void ospf_opaque_type11_lsa_reoriginate_timer(struct event *t) { struct opaque_info_per_type *oipt; struct ospf_opaque_functab *functab; struct ospf *top; - oipt = THREAD_ARG(t); + oipt = EVENT_ARG(t); if ((functab = oipt->functab) == NULL || functab->lsa_originator == NULL) { @@ -2012,7 +2013,7 @@ out: return; } -static void ospf_opaque_lsa_refresh_timer(struct thread *t) +static void ospf_opaque_lsa_refresh_timer(struct event *t) { struct opaque_info_per_id *oipi; struct ospf_opaque_functab *functab; @@ -2021,7 +2022,7 @@ static void ospf_opaque_lsa_refresh_timer(struct thread *t) if (IS_DEBUG_OSPF_EVENT) zlog_debug("Timer[Opaque-LSA]: (Opaque-LSA Refresh expire)"); - oipi = THREAD_ARG(t); + oipi = EVENT_ARG(t); if ((lsa = oipi->lsa) != NULL) if ((functab = oipi->opqctl_type->functab) != NULL) diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index c4bccb3bc4..5f7d49e0bb 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -7,7 +7,7 @@ #include #include "monotime.h" -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" @@ -439,11 +439,11 @@ static int ospf_make_md5_digest(struct ospf_interface *oi, } -static void ospf_ls_req_timer(struct thread *thread) +static void ospf_ls_req_timer(struct event *thread) { struct ospf_neighbor *nbr; - nbr = THREAD_ARG(thread); + nbr = EVENT_ARG(thread); nbr->t_ls_req = NULL; /* Send Link State Request. */ @@ -456,17 +456,17 @@ static void ospf_ls_req_timer(struct thread *thread) void ospf_ls_req_event(struct ospf_neighbor *nbr) { - THREAD_OFF(nbr->t_ls_req); - thread_add_event(master, ospf_ls_req_timer, nbr, 0, &nbr->t_ls_req); + EVENT_OFF(nbr->t_ls_req); + event_add_event(master, ospf_ls_req_timer, nbr, 0, &nbr->t_ls_req); } /* Cyclic timer function. Fist registered in ospf_nbr_new () in ospf_neighbor.c */ -void ospf_ls_upd_timer(struct thread *thread) +void ospf_ls_upd_timer(struct event *thread) { struct ospf_neighbor *nbr; - nbr = THREAD_ARG(thread); + nbr = EVENT_ARG(thread); nbr->t_ls_upd = NULL; /* Send Link State Update. */ @@ -520,11 +520,11 @@ void ospf_ls_upd_timer(struct thread *thread) OSPF_NSM_TIMER_ON(nbr->t_ls_upd, ospf_ls_upd_timer, nbr->v_ls_upd); } -void ospf_ls_ack_timer(struct thread *thread) +void ospf_ls_ack_timer(struct event *thread) { struct ospf_interface *oi; - oi = THREAD_ARG(thread); + oi = EVENT_ARG(thread); oi->t_ls_ack = NULL; /* Send Link State Acknowledgment. */ @@ -608,9 +608,9 @@ static void ospf_write_frags(int fd, struct ospf_packet *op, struct ip *iph, } #endif /* WANT_OSPF_WRITE_FRAGMENT */ -static void ospf_write(struct thread *thread) +static void ospf_write(struct event *thread) { - struct ospf *ospf = THREAD_ARG(thread); + struct ospf *ospf = EVENT_ARG(thread); struct ospf_interface *oi; struct ospf_packet *op; struct sockaddr_in sa_dst; @@ -847,8 +847,8 @@ static void ospf_write(struct thread *thread) /* If packets still remain in queue, call write thread. */ if (!list_isempty(ospf->oi_write_q)) - thread_add_write(master, ospf_write, ospf, ospf->fd, - &ospf->t_write); + event_add_write(master, ospf_write, ospf, ospf->fd, + &ospf->t_write); } /* OSPF Hello message read -- RFC2328 Section 10.5. */ @@ -3203,17 +3203,17 @@ static enum ospf_read_return_enum ospf_read_helper(struct ospf *ospf) } /* Starting point of packet process function. */ -void ospf_read(struct thread *thread) +void ospf_read(struct event *thread) { struct ospf *ospf; int32_t count = 0; enum ospf_read_return_enum ret; /* first of all get interface pointer. */ - ospf = THREAD_ARG(thread); + ospf = EVENT_ARG(thread); /* prepare for next packet. */ - thread_add_read(master, ospf_read, ospf, ospf->fd, &ospf->t_read); + event_add_read(master, ospf_read, ospf, ospf->fd, &ospf->t_read); while (count < ospf->write_oi_count) { count++; @@ -3738,11 +3738,11 @@ static void ospf_poll_send(struct ospf_nbr_nbma *nbr_nbma) ospf_hello_send_sub(oi, nbr_nbma->addr.s_addr); } -void ospf_poll_timer(struct thread *thread) +void ospf_poll_timer(struct event *thread) { struct ospf_nbr_nbma *nbr_nbma; - nbr_nbma = THREAD_ARG(thread); + nbr_nbma = EVENT_ARG(thread); nbr_nbma->t_poll = NULL; if (IS_DEBUG_OSPF(nsm, NSM_TIMERS)) @@ -3757,11 +3757,11 @@ void ospf_poll_timer(struct thread *thread) } -void ospf_hello_reply_timer(struct thread *thread) +void ospf_hello_reply_timer(struct event *thread) { struct ospf_neighbor *nbr; - nbr = THREAD_ARG(thread); + nbr = EVENT_ARG(thread); nbr->t_hello_reply = NULL; if (IS_DEBUG_OSPF(nsm, NSM_TIMERS)) @@ -4072,7 +4072,7 @@ static void ospf_ls_upd_queue_send(struct ospf_interface *oi, ospf_packet_add(oi, op); /* Call ospf_write() right away to send ospf packets to neighbors */ if (send_lsupd_now) { - struct thread os_packet_thd; + struct event os_packet_thd; os_packet_thd.arg = (void *)oi->ospf; if (oi->on_write_q == 0) { @@ -4096,16 +4096,16 @@ static void ospf_ls_upd_queue_send(struct ospf_interface *oi, * is actually turned off. */ if (list_isempty(oi->ospf->oi_write_q)) - THREAD_OFF(oi->ospf->t_write); + EVENT_OFF(oi->ospf->t_write); } else { /* Hook thread to write packet. */ OSPF_ISM_WRITE_ON(oi->ospf); } } -static void ospf_ls_upd_send_queue_event(struct thread *thread) +static void ospf_ls_upd_send_queue_event(struct event *thread) { - struct ospf_interface *oi = THREAD_ARG(thread); + struct ospf_interface *oi = EVENT_ARG(thread); struct route_node *rn; struct route_node *rnext; struct list *update; @@ -4140,8 +4140,8 @@ static void ospf_ls_upd_send_queue_event(struct thread *thread) "%s: update lists not cleared, %d nodes to try again, raising new event", __func__, again); oi->t_ls_upd_event = NULL; - thread_add_event(master, ospf_ls_upd_send_queue_event, oi, 0, - &oi->t_ls_upd_event); + event_add_event(master, ospf_ls_upd_send_queue_event, oi, 0, + &oi->t_ls_upd_event); } if (IS_DEBUG_OSPF_EVENT) @@ -4212,8 +4212,8 @@ void ospf_ls_upd_send(struct ospf_neighbor *nbr, struct list *update, int flag, rn->p.u.prefix4, 1); } } else - thread_add_event(master, ospf_ls_upd_send_queue_event, oi, 0, - &oi->t_ls_upd_event); + event_add_event(master, ospf_ls_upd_send_queue_event, oi, 0, + &oi->t_ls_upd_event); } static void ospf_ls_ack_send_list(struct ospf_interface *oi, struct list *ack, @@ -4250,9 +4250,9 @@ static void ospf_ls_ack_send_list(struct ospf_interface *oi, struct list *ack, OSPF_ISM_WRITE_ON(oi->ospf); } -static void ospf_ls_ack_send_event(struct thread *thread) +static void ospf_ls_ack_send_event(struct event *thread) { - struct ospf_interface *oi = THREAD_ARG(thread); + struct ospf_interface *oi = EVENT_ARG(thread); oi->t_ls_ack_direct = NULL; @@ -4276,8 +4276,8 @@ void ospf_ls_ack_send(struct ospf_neighbor *nbr, struct ospf_lsa *lsa) listnode_add(oi->ls_ack_direct.ls_ack, ospf_lsa_lock(lsa)); - thread_add_event(master, ospf_ls_ack_send_event, oi, 0, - &oi->t_ls_ack_direct); + event_add_event(master, ospf_ls_ack_send_event, oi, 0, + &oi->t_ls_ack_direct); } /* Send Link State Acknowledgment delayed. */ diff --git a/ospfd/ospf_packet.h b/ospfd/ospf_packet.h index e8b279b9d8..4003e2add6 100644 --- a/ospfd/ospf_packet.h +++ b/ospfd/ospf_packet.h @@ -124,7 +124,7 @@ extern struct ospf_packet *ospf_fifo_head(struct ospf_fifo *); extern void ospf_fifo_flush(struct ospf_fifo *); extern void ospf_fifo_free(struct ospf_fifo *); -extern void ospf_read(struct thread *thread); +extern void ospf_read(struct event *thread); extern void ospf_hello_send(struct ospf_interface *); extern void ospf_db_desc_send(struct ospf_neighbor *); extern void ospf_db_desc_resend(struct ospf_neighbor *); @@ -137,10 +137,10 @@ extern void ospf_ls_ack_send_delayed(struct ospf_interface *); extern void ospf_ls_retransmit(struct ospf_interface *, struct ospf_lsa *); extern void ospf_ls_req_event(struct ospf_neighbor *); -extern void ospf_ls_upd_timer(struct thread *thread); -extern void ospf_ls_ack_timer(struct thread *thread); -extern void ospf_poll_timer(struct thread *thread); -extern void ospf_hello_reply_timer(struct thread *thread); +extern void ospf_ls_upd_timer(struct event *thread); +extern void ospf_ls_ack_timer(struct event *thread); +extern void ospf_poll_timer(struct event *thread); +extern void ospf_hello_reply_timer(struct event *thread); extern const struct message ospf_packet_type_str[]; extern const size_t ospf_packet_type_str_max; diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c index a808ddc9f6..0179f9ee0b 100644 --- a/ospfd/ospf_ri.c +++ b/ospfd/ospf_ri.c @@ -20,7 +20,7 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "thread.h" +#include "frrevent.h" #include "hash.h" #include "sockunion.h" /* for inet_aton() */ #include "mpls.h" diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c index fb9f36349a..2982cc7d6f 100644 --- a/ospfd/ospf_snmp.c +++ b/ospfd/ospf_snmp.c @@ -2525,7 +2525,7 @@ static int ospf_snmp_ism_change(struct ospf_interface *oi, int state, } /* Register OSPF2-MIB. */ -static int ospf_snmp_init(struct thread_master *tm) +static int ospf_snmp_init(struct event_loop *tm) { ospf_snmp_iflist = list_new(); ospf_snmp_vl_table = route_table_init(); diff --git a/ospfd/ospf_spf.c b/ospfd/ospf_spf.c index f731d1cf18..274d5bc9af 100644 --- a/ospfd/ospf_spf.c +++ b/ospfd/ospf_spf.c @@ -6,7 +6,7 @@ #include #include "monotime.h" -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "hash.h" #include "linklist.h" @@ -1842,9 +1842,9 @@ void ospf_spf_calculate_areas(struct ospf *ospf, struct route_table *new_table, } /* Worker for SPF calculation scheduler. */ -static void ospf_spf_calculate_schedule_worker(struct thread *thread) +static void ospf_spf_calculate_schedule_worker(struct event *thread) { - struct ospf *ospf = THREAD_ARG(thread); + struct ospf *ospf = EVENT_ARG(thread); struct route_table *new_table, *new_rtrs; struct route_table *all_rtrs = NULL; struct timeval start_time, spf_start_time; @@ -2044,8 +2044,8 @@ void ospf_spf_calculate_schedule(struct ospf *ospf, ospf_spf_reason_t reason) zlog_debug("SPF: calculation timer delay = %ld msec", delay); ospf->t_spf_calc = NULL; - thread_add_timer_msec(master, ospf_spf_calculate_schedule_worker, ospf, - delay, &ospf->t_spf_calc); + event_add_timer_msec(master, ospf_spf_calculate_schedule_worker, ospf, + delay, &ospf->t_spf_calc); } /* Restart OSPF SPF algorithm*/ diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c index d1af08c652..467cb0504d 100644 --- a/ospfd/ospf_sr.c +++ b/ospfd/ospf_sr.c @@ -37,7 +37,7 @@ #include "sockunion.h" /* for inet_aton() */ #include "stream.h" #include "table.h" -#include "thread.h" +#include "frrevent.h" #include "vty.h" #include "zclient.h" #include "sbuf.h" @@ -457,11 +457,11 @@ int ospf_sr_local_block_release_label(mpls_label_t label) * * @return 1 on success */ -static void sr_start_label_manager(struct thread *start) +static void sr_start_label_manager(struct event *start) { struct ospf *ospf; - ospf = THREAD_ARG(start); + ospf = EVENT_ARG(start); /* re-attempt to start SR & Label Manager connection */ ospf_sr_start(ospf); @@ -496,8 +496,8 @@ static int ospf_sr_start(struct ospf *ospf) if (!ospf_zebra_label_manager_ready()) if (ospf_zebra_label_manager_connect() < 0) { /* Re-attempt to connect to Label Manager in 1 sec. */ - thread_add_timer(master, sr_start_label_manager, ospf, - 1, &OspfSR.t_start_lm); + event_add_timer(master, sr_start_label_manager, ospf, 1, + &OspfSR.t_start_lm); osr_debug(" |- Failed to start the Label Manager"); return -1; } @@ -565,7 +565,7 @@ static void ospf_sr_stop(void) osr_debug("SR (%s): Stop Segment Routing", __func__); /* Disable any re-attempt to connect to Label Manager */ - THREAD_OFF(OspfSR.t_start_lm); + EVENT_OFF(OspfSR.t_start_lm); /* Release SRGB if active */ sr_global_block_delete(); diff --git a/ospfd/ospf_sr.h b/ospfd/ospf_sr.h index 2c189083be..fa61f669a7 100644 --- a/ospfd/ospf_sr.h +++ b/ospfd/ospf_sr.h @@ -243,7 +243,7 @@ struct ospf_sr_db { uint8_t msd; /* Thread timer to start Label Manager */ - struct thread *t_start_lm; + struct event *t_start_lm; }; /* Structure aggregating all received SR info from LSAs by node */ diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c index e3869abe59..dc9dd34303 100644 --- a/ospfd/ospf_te.c +++ b/ospfd/ospf_te.c @@ -24,7 +24,7 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "thread.h" +#include "frrevent.h" #include "hash.h" #include "sockunion.h" /* for inet_aton() */ #include "network.h" diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 262f805468..8c0afd8527 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -10,7 +10,7 @@ #include "printfrr.h" #include "monotime.h" #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "prefix.h" #include "table.h" #include "vty.h" @@ -9639,7 +9639,7 @@ DEFUN (no_ospf_max_metric_router_lsa_startup, for (ALL_LIST_ELEMENTS_RO(ospf->areas, ln, area)) { SET_FLAG(area->stub_router_state, OSPF_AREA_WAS_START_STUB_ROUTED); - THREAD_OFF(area->t_stub_router); + EVENT_OFF(area->t_stub_router); /* Don't trample on admin stub routed */ if (!CHECK_FLAG(area->stub_router_state, @@ -10136,9 +10136,9 @@ static int ospf_show_gr_helper_details(struct vty *vty, struct ospf *ospf, .actual_grace_period); vty_out(vty, " Remaining GraceTime:%ld(in seconds).\n", - thread_timer_remain_second( + event_timer_remain_second( nbr->gr_helper_info - .t_grace_timer)); + .t_grace_timer)); vty_out(vty, " Graceful Restart reason: %s.\n\n", ospf_restart_reason2str( @@ -10169,9 +10169,9 @@ static int ospf_show_gr_helper_details(struct vty *vty, struct ospf *ospf, .actual_grace_period); json_object_int_add( json_neigh, "remainGracetime", - thread_timer_remain_second( + event_timer_remain_second( nbr->gr_helper_info - .t_grace_timer)); + .t_grace_timer)); json_object_string_add( json_neigh, "restartReason", ospf_restart_reason2str( @@ -12802,7 +12802,7 @@ DEFPY_HIDDEN(ospf_maxage_delay_timer, ospf_maxage_delay_timer_cmd, else ospf->maxage_delay = value; - THREAD_OFF(ospf->t_maxage); + EVENT_OFF(ospf->t_maxage); OSPF_TIMER_ON(ospf->t_maxage, ospf_maxage_lsa_remover, ospf->maxage_delay); diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index d321a69668..3e02d3c33e 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -6,7 +6,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "command.h" #include "network.h" #include "prefix.h" @@ -49,7 +49,7 @@ struct zclient *zclient = NULL; static struct zclient *zclient_sync; /* For registering threads. */ -extern struct thread_master *master; +extern struct event_loop *master; /* Router-id update message from zebra. */ static int ospf_router_id_update_zebra(ZAPI_CALLBACK_ARGS) @@ -509,10 +509,10 @@ bool ospf_external_default_routemap_apply_walk(struct ospf *ospf, * Function to originate or flush default after applying * route-map on all ei. */ -static void ospf_external_lsa_default_routemap_timer(struct thread *thread) +static void ospf_external_lsa_default_routemap_timer(struct event *thread) { struct list *ext_list; - struct ospf *ospf = THREAD_ARG(thread); + struct ospf *ospf = EVENT_ARG(thread); struct prefix_ipv4 p; int type; int ret = 0; @@ -579,8 +579,8 @@ void ospf_external_del(struct ospf *ospf, uint8_t type, unsigned short instance) /* * Check if default needs to be flushed too. */ - thread_add_event(master, ospf_external_lsa_default_routemap_timer, ospf, - 0, &ospf->t_default_routemap_timer); + event_add_event(master, ospf_external_lsa_default_routemap_timer, ospf, + 0, &ospf->t_default_routemap_timer); } /* Update NHLFE for Prefix SID */ @@ -1124,9 +1124,9 @@ static bool ospf_external_lsa_default_routemap_apply(struct ospf *ospf, * there are any other external info which can still trigger * default route origination else flush it. */ - thread_add_event(master, - ospf_external_lsa_default_routemap_timer, ospf, - 0, &ospf->t_default_routemap_timer); + event_add_event(master, + ospf_external_lsa_default_routemap_timer, ospf, + 0, &ospf->t_default_routemap_timer); } return true; @@ -1510,14 +1510,14 @@ int ospf_distribute_list_out_unset(struct ospf *ospf, int type, } /* distribute-list update timer. */ -static void ospf_distribute_list_update_timer(struct thread *thread) +static void ospf_distribute_list_update_timer(struct event *thread) { struct route_node *rn; struct external_info *ei; struct route_table *rt; struct ospf_lsa *lsa; int type, default_refresh = 0; - struct ospf *ospf = THREAD_ARG(thread); + struct ospf *ospf = EVENT_ARG(thread); if (ospf == NULL) return; @@ -1641,9 +1641,8 @@ void ospf_distribute_list_update(struct ospf *ospf, int type, return; /* Set timer. If timer is already started, this call does nothing. */ - thread_add_timer_msec(master, ospf_distribute_list_update_timer, ospf, - ospf->min_ls_interval, - &ospf->t_distribute_update); + event_add_timer_msec(master, ospf_distribute_list_update_timer, ospf, + ospf->min_ls_interval, &ospf->t_distribute_update); } /* If access-list is updated, apply some check. */ @@ -2139,7 +2138,7 @@ static zclient_handler *const ospf_handlers[] = { [ZEBRA_CLIENT_CLOSE_NOTIFY] = ospf_zebra_client_close_notify, }; -void ospf_zebra_init(struct thread_master *master, unsigned short instance) +void ospf_zebra_init(struct event_loop *master, unsigned short instance) { /* Allocate zebra structure. */ zclient = zclient_new(master, &zclient_options_default, ospf_handlers, diff --git a/ospfd/ospf_zebra.h b/ospfd/ospf_zebra.h index adc338fb1a..711b1e7a61 100644 --- a/ospfd/ospf_zebra.h +++ b/ospfd/ospf_zebra.h @@ -79,7 +79,7 @@ extern int ospf_distance_set(struct vty *, struct ospf *, const char *, const char *, const char *); extern int ospf_distance_unset(struct vty *, struct ospf *, const char *, const char *, const char *); -extern void ospf_zebra_init(struct thread_master *, unsigned short); +extern void ospf_zebra_init(struct event_loop *m, unsigned short instance); extern void ospf_zebra_vrf_register(struct ospf *ospf); extern void ospf_zebra_vrf_deregister(struct ospf *ospf); bool ospf_external_default_routemap_apply_walk( diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c index 0296d9d9f5..112ddfedb7 100644 --- a/ospfd/ospfd.c +++ b/ospfd/ospfd.c @@ -5,7 +5,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "linklist.h" @@ -385,8 +385,8 @@ struct ospf *ospf_new_alloc(unsigned short instance, const char *name) new->maxage_delay = OSPF_LSA_MAXAGE_REMOVE_DELAY_DEFAULT; new->maxage_lsa = route_table_init(); new->t_maxage_walker = NULL; - thread_add_timer(master, ospf_lsa_maxage_walker, new, - OSPF_LSA_MAXAGE_CHECK_INTERVAL, &new->t_maxage_walker); + event_add_timer(master, ospf_lsa_maxage_walker, new, + OSPF_LSA_MAXAGE_CHECK_INTERVAL, &new->t_maxage_walker); /* Max paths initialization */ new->max_multipath = MULTIPATH_NUM; @@ -398,8 +398,8 @@ struct ospf *ospf_new_alloc(unsigned short instance, const char *name) new->lsa_refresh_interval = OSPF_LSA_REFRESH_INTERVAL_DEFAULT; new->lsa_refresh_timer = OSPF_LS_REFRESH_TIME; new->t_lsa_refresher = NULL; - thread_add_timer(master, ospf_lsa_refresh_walker, new, - new->lsa_refresh_interval, &new->t_lsa_refresher); + event_add_timer(master, ospf_lsa_refresh_walker, new, + new->lsa_refresh_interval, &new->t_lsa_refresher); new->lsa_refresher_started = monotime(NULL); new->ibuf = stream_new(OSPF_MAX_PACKET_SIZE + 1); @@ -441,7 +441,7 @@ static struct ospf *ospf_new(unsigned short instance, const char *name) return new; } - thread_add_read(master, ospf_read, new, new->fd, &new->t_read); + event_add_read(master, ospf_read, new, new->fd, &new->t_read); new->oi_running = 1; ospf_router_id_update(new); @@ -579,7 +579,7 @@ static struct ospf *ospf_lookup_by_name(const char *vrf_name) static void ospf_deferred_shutdown_finish(struct ospf *ospf) { ospf->stub_router_shutdown_time = OSPF_STUB_ROUTER_UNCONFIGURED; - THREAD_OFF(ospf->t_deferred_shutdown); + EVENT_OFF(ospf->t_deferred_shutdown); ospf_finish_final(ospf); @@ -596,9 +596,9 @@ static void ospf_deferred_shutdown_finish(struct ospf *ospf) } /* Timer thread for G-R */ -static void ospf_deferred_shutdown_timer(struct thread *t) +static void ospf_deferred_shutdown_timer(struct event *t) { - struct ospf *ospf = THREAD_ARG(t); + struct ospf *ospf = EVENT_ARG(t); ospf_deferred_shutdown_finish(ospf); } @@ -761,7 +761,7 @@ static void ospf_finish_final(struct ospf *ospf) /* Clear static neighbors */ for (rn = route_top(ospf->nbr_nbma); rn; rn = route_next(rn)) if ((nbr_nbma = rn->info)) { - THREAD_OFF(nbr_nbma->t_poll); + EVENT_OFF(nbr_nbma->t_poll); if (nbr_nbma->nbr) { nbr_nbma->nbr->nbr_nbma = NULL; @@ -797,23 +797,23 @@ static void ospf_finish_final(struct ospf *ospf) } /* Cancel all timers. */ - THREAD_OFF(ospf->t_read); - THREAD_OFF(ospf->t_write); - THREAD_OFF(ospf->t_spf_calc); - THREAD_OFF(ospf->t_ase_calc); - THREAD_OFF(ospf->t_maxage); - THREAD_OFF(ospf->t_maxage_walker); - THREAD_OFF(ospf->t_abr_task); - THREAD_OFF(ospf->t_abr_fr); - THREAD_OFF(ospf->t_asbr_check); - THREAD_OFF(ospf->t_asbr_nssa_redist_update); - THREAD_OFF(ospf->t_distribute_update); - THREAD_OFF(ospf->t_lsa_refresher); - THREAD_OFF(ospf->t_opaque_lsa_self); - THREAD_OFF(ospf->t_sr_update); - THREAD_OFF(ospf->t_default_routemap_timer); - THREAD_OFF(ospf->t_external_aggr); - THREAD_OFF(ospf->gr_info.t_grace_period); + EVENT_OFF(ospf->t_read); + EVENT_OFF(ospf->t_write); + EVENT_OFF(ospf->t_spf_calc); + EVENT_OFF(ospf->t_ase_calc); + EVENT_OFF(ospf->t_maxage); + EVENT_OFF(ospf->t_maxage_walker); + EVENT_OFF(ospf->t_abr_task); + EVENT_OFF(ospf->t_abr_fr); + EVENT_OFF(ospf->t_asbr_check); + EVENT_OFF(ospf->t_asbr_nssa_redist_update); + EVENT_OFF(ospf->t_distribute_update); + EVENT_OFF(ospf->t_lsa_refresher); + EVENT_OFF(ospf->t_opaque_lsa_self); + EVENT_OFF(ospf->t_sr_update); + EVENT_OFF(ospf->t_default_routemap_timer); + EVENT_OFF(ospf->t_external_aggr); + EVENT_OFF(ospf->gr_info.t_grace_period); LSDB_LOOP (OPAQUE_AS_LSDB(ospf), rn, lsa) ospf_discard_from_db(ospf, ospf->lsdb, lsa); @@ -1015,8 +1015,8 @@ static void ospf_area_free(struct ospf_area *area) free(IMPORT_NAME(area)); /* Cancel timer. */ - THREAD_OFF(area->t_stub_router); - THREAD_OFF(area->t_opaque_lsa_self); + EVENT_OFF(area->t_stub_router); + EVENT_OFF(area->t_opaque_lsa_self); if (OSPF_IS_AREA_BACKBONE(area)) area->ospf->backbone = NULL; @@ -1451,7 +1451,7 @@ void ospf_ls_upd_queue_empty(struct ospf_interface *oi) } /* remove update event */ - THREAD_OFF(oi->t_ls_upd_event); + EVENT_OFF(oi->t_ls_upd_event); } void ospf_if_update(struct ospf *ospf, struct interface *ifp) @@ -1859,9 +1859,9 @@ int ospf_timers_refresh_set(struct ospf *ospf, int interval) - (monotime(NULL) - ospf->lsa_refresher_started); if (time_left > interval) { - THREAD_OFF(ospf->t_lsa_refresher); - thread_add_timer(master, ospf_lsa_refresh_walker, ospf, - interval, &ospf->t_lsa_refresher); + EVENT_OFF(ospf->t_lsa_refresher); + event_add_timer(master, ospf_lsa_refresh_walker, ospf, interval, + &ospf->t_lsa_refresher); } ospf->lsa_refresh_interval = interval; @@ -1876,11 +1876,11 @@ int ospf_timers_refresh_unset(struct ospf *ospf) - (monotime(NULL) - ospf->lsa_refresher_started); if (time_left > OSPF_LSA_REFRESH_INTERVAL_DEFAULT) { - THREAD_OFF(ospf->t_lsa_refresher); + EVENT_OFF(ospf->t_lsa_refresher); ospf->t_lsa_refresher = NULL; - thread_add_timer(master, ospf_lsa_refresh_walker, ospf, - OSPF_LSA_REFRESH_INTERVAL_DEFAULT, - &ospf->t_lsa_refresher); + event_add_timer(master, ospf_lsa_refresh_walker, ospf, + OSPF_LSA_REFRESH_INTERVAL_DEFAULT, + &ospf->t_lsa_refresher); } ospf->lsa_refresh_interval = OSPF_LSA_REFRESH_INTERVAL_DEFAULT; @@ -1928,7 +1928,7 @@ static void ospf_nbr_nbma_delete(struct ospf *ospf, static void ospf_nbr_nbma_down(struct ospf_nbr_nbma *nbr_nbma) { - THREAD_OFF(nbr_nbma->t_poll); + EVENT_OFF(nbr_nbma->t_poll); if (nbr_nbma->nbr) { nbr_nbma->nbr->nbr_nbma = NULL; @@ -2117,7 +2117,7 @@ int ospf_nbr_nbma_poll_interval_set(struct ospf *ospf, struct in_addr nbr_addr, if (nbr_nbma->v_poll != interval) { nbr_nbma->v_poll = interval; if (nbr_nbma->oi && ospf_if_is_up(nbr_nbma->oi)) { - THREAD_OFF(nbr_nbma->t_poll); + EVENT_OFF(nbr_nbma->t_poll); OSPF_POLL_TIMER_ON(nbr_nbma->t_poll, ospf_poll_timer, nbr_nbma->v_poll); } @@ -2140,7 +2140,7 @@ int ospf_nbr_nbma_poll_interval_unset(struct ospf *ospf, struct in_addr addr) return 1; } -void ospf_master_init(struct thread_master *master) +void ospf_master_init(struct event_loop *master) { memset(&ospf_master, 0, sizeof(ospf_master)); @@ -2247,8 +2247,8 @@ static int ospf_vrf_enable(struct vrf *vrf) ret = ospf_sock_init(ospf); if (ret < 0 || ospf->fd <= 0) return 0; - thread_add_read(master, ospf_read, ospf, ospf->fd, - &ospf->t_read); + event_add_read(master, ospf_read, ospf, ospf->fd, + &ospf->t_read); ospf->oi_running = 1; ospf_router_id_update(ospf); } @@ -2286,7 +2286,7 @@ static int ospf_vrf_disable(struct vrf *vrf) if (IS_DEBUG_OSPF_EVENT) zlog_debug("%s: ospf old_vrf_id %d unlinked", __func__, old_vrf_id); - THREAD_OFF(ospf->t_read); + EVENT_OFF(ospf->t_read); close(ospf->fd); ospf->fd = -1; } diff --git a/ospfd/ospfd.h b/ospfd/ospfd.h index 4df65ea759..6727d802a6 100644 --- a/ospfd/ospfd.h +++ b/ospfd/ospfd.h @@ -78,7 +78,7 @@ struct ospf_master { struct list *ospf; /* OSPF thread master. */ - struct thread_master *master; + struct event_loop *master; /* Various OSPF global configuration. */ uint8_t options; @@ -145,7 +145,7 @@ struct ospf_gr_info { bool prepare_in_progress; bool finishing_restart; uint32_t grace_period; - struct thread *t_grace_period; + struct event *t_grace_period; }; /* OSPF instance structure. */ @@ -257,31 +257,30 @@ struct ospf { int redistribute; /* Num of redistributed protocols. */ /* Threads. */ - struct thread *t_abr_task; /* ABR task timer. */ - struct thread *t_abr_fr; /* ABR FR timer. */ - struct thread *t_asbr_check; /* ASBR check timer. */ - struct thread *t_asbr_nssa_redist_update; /* ASBR NSSA redistribution + struct event *t_abr_task; /* ABR task timer. */ + struct event *t_abr_fr; /* ABR FR timer. */ + struct event *t_asbr_check; /* ASBR check timer. */ + struct event *t_asbr_nssa_redist_update; /* ASBR NSSA redistribution update timer. */ - struct thread *t_distribute_update; /* Distirbute list update timer. */ - struct thread *t_spf_calc; /* SPF calculation timer. */ - struct thread *t_ase_calc; /* ASE calculation timer. */ - struct thread - *t_opaque_lsa_self; /* Type-11 Opaque-LSAs origin event. */ - struct thread *t_sr_update; /* Segment Routing update timer */ + struct event *t_distribute_update; /* Distirbute list update timer. */ + struct event *t_spf_calc; /* SPF calculation timer. */ + struct event *t_ase_calc; /* ASE calculation timer. */ + struct event *t_opaque_lsa_self; /* Type-11 Opaque-LSAs origin event. */ + struct event *t_sr_update; /* Segment Routing update timer */ unsigned int maxage_delay; /* Delay on Maxage remover timer, sec */ - struct thread *t_maxage; /* MaxAge LSA remover timer. */ - struct thread *t_maxage_walker; /* MaxAge LSA checking timer. */ + struct event *t_maxage; /* MaxAge LSA remover timer. */ + struct event *t_maxage_walker; /* MaxAge LSA checking timer. */ - struct thread + struct event *t_deferred_shutdown; /* deferred/stub-router shutdown timer*/ - struct thread *t_write; + struct event *t_write; #define OSPF_WRITE_INTERFACE_COUNT_DEFAULT 20 - struct thread *t_default_routemap_timer; + struct event *t_default_routemap_timer; int write_oi_count; /* Num of packets sent per thread invocation */ - struct thread *t_read; + struct event *t_read; int fd; struct stream *ibuf; struct list *oi_write_q; @@ -313,7 +312,7 @@ struct ospf { struct list *qs[OSPF_LSA_REFRESHER_SLOTS]; } lsa_refresh_queue; - struct thread *t_lsa_refresher; + struct event *t_lsa_refresher; time_t lsa_refresher_started; #define OSPF_LSA_REFRESH_INTERVAL_DEFAULT 10 uint16_t lsa_refresh_interval; @@ -382,7 +381,7 @@ struct ospf { /* delay timer to process external routes * with summary address. */ - struct thread *t_external_aggr; + struct event *t_external_aggr; /* delay interval in seconds */ uint16_t aggr_delay_interval; @@ -578,8 +577,8 @@ struct ospf_area { struct p_spaces_head *p_spaces; /* Threads. */ - struct thread *t_stub_router; /* Stub-router timer */ - struct thread *t_opaque_lsa_self; /* Type-10 Opaque-LSAs origin. */ + struct event *t_stub_router; /* Stub-router timer */ + struct event *t_opaque_lsa_self; /* Type-10 Opaque-LSAs origin. */ /* Statistics field. */ uint32_t spf_calculation; /* SPF Calculation Count. */ @@ -627,7 +626,7 @@ struct ospf_nbr_nbma { uint32_t v_poll; /* Poll timer thread. */ - struct thread *t_poll; + struct event *t_poll; /* State change. */ uint32_t state_change; @@ -654,16 +653,18 @@ struct ospf_nbr_nbma { #define LSA_OPTIONS_NSSA_GET(area) \ (((area)->external_routing == OSPF_AREA_NSSA) ? OSPF_OPTION_NP : 0) -#define OSPF_TIMER_ON(T,F,V) thread_add_timer (master,(F),ospf,(V),&(T)) -#define OSPF_AREA_TIMER_ON(T,F,V) thread_add_timer (master, (F), area, (V), &(T)) -#define OSPF_POLL_TIMER_ON(T,F,V) thread_add_timer (master, (F), nbr_nbma, (V), &(T)) +#define OSPF_TIMER_ON(T, F, V) event_add_timer(master, (F), ospf, (V), &(T)) +#define OSPF_AREA_TIMER_ON(T, F, V) \ + event_add_timer(master, (F), area, (V), &(T)) +#define OSPF_POLL_TIMER_ON(T, F, V) \ + event_add_timer(master, (F), nbr_nbma, (V), &(T)) /* Extern variables. */ extern struct ospf_master *om; extern unsigned short ospf_instance; extern const int ospf_redistributed_proto_max; extern struct zclient *zclient; -extern struct thread_master *master; +extern struct event_loop *master; extern int ospf_zlog; extern struct zebra_privs_t ospfd_privs; @@ -757,7 +758,7 @@ extern void ospf_interface_area_unset(struct ospf *ospf, struct interface *ifp); extern void ospf_route_map_init(void); -extern void ospf_master_init(struct thread_master *master); +extern void ospf_master_init(struct event_loop *master); extern void ospf_vrf_init(void); extern void ospf_vrf_terminate(void); extern void ospf_vrf_link(struct ospf *ospf, struct vrf *vrf); diff --git a/pathd/path_main.c b/pathd/path_main.c index 3d35b9f9b3..c333162f2b 100644 --- a/pathd/path_main.c +++ b/pathd/path_main.c @@ -6,7 +6,7 @@ #include #include "getopt.h" -#include "thread.h" +#include "frrevent.h" #include "command.h" #include "log.h" #include "memory.h" @@ -41,7 +41,7 @@ struct zebra_privs_t pathd_privs = { struct option longopts[] = {{0}}; /* Master of threads. */ -struct thread_master *master; +struct event_loop *master; static struct frr_daemon_info pathd_di; diff --git a/pathd/path_pcep.c b/pathd/path_pcep.c index 0c5e495044..ec9d8adfc1 100644 --- a/pathd/path_pcep.c +++ b/pathd/path_pcep.c @@ -58,7 +58,7 @@ static void notify_status(struct path *path, bool not_changed); /* Module Functions */ static int pcep_module_finish(void); -static int pcep_module_late_init(struct thread_master *tm); +static int pcep_module_late_init(struct event_loop *tm); static int pcep_module_init(void); /* ------------ Path Helper Functions ------------ */ @@ -310,7 +310,7 @@ int pathd_candidate_removed_handler(struct srte_candidate *candidate) * run before config load, so the CLI commands don't try to touch things that * aren't set up yet... */ -static int pcep_module_config_pre(struct thread_master *tm) +static int pcep_module_config_pre(struct event_loop *tm) { assert(pcep_g->fpt == NULL); assert(pcep_g->master == NULL); @@ -329,7 +329,7 @@ static int pcep_module_config_pre(struct thread_master *tm) return 0; } -static int pcep_module_late_init(struct thread_master *tm) +static int pcep_module_late_init(struct event_loop *tm) { hook_register(pathd_candidate_created, pathd_candidate_created_handler); hook_register(pathd_candidate_updated, pathd_candidate_updated_handler); diff --git a/pathd/path_pcep.h b/pathd/path_pcep.h index 6f92d76362..5c6a02372f 100644 --- a/pathd/path_pcep.h +++ b/pathd/path_pcep.h @@ -294,7 +294,7 @@ struct path { struct pcep_glob { struct debug dbg; - struct thread_master *master; + struct event_loop *master; struct frr_pthread *fpt; uint8_t num_pce_opts_cli; struct pce_opts_cli *pce_opts_cli[MAX_PCE]; diff --git a/pathd/path_pcep_config.c b/pathd/path_pcep_config.c index 21d127bcfe..da7ee89f2f 100644 --- a/pathd/path_pcep_config.c +++ b/pathd/path_pcep_config.c @@ -13,7 +13,7 @@ #include "pathd/path_pcep.h" #include "pathd/path_pcep_config.h" #include "pathd/path_pcep_debug.h" -#include "thread.h" +#include "frrevent.h" #define MAX_XPATH 256 #define MAX_FLOAT_LEN 22 diff --git a/pathd/path_pcep_controller.c b/pathd/path_pcep_controller.c index 405749b50f..a00a114086 100644 --- a/pathd/path_pcep_controller.c +++ b/pathd/path_pcep_controller.c @@ -78,28 +78,28 @@ struct get_pcep_session_args { /* Internal Functions Called From Main Thread */ static int pcep_ctrl_halt_cb(struct frr_pthread *fpt, void **res); -static void pcep_refine_path_event_cb(struct thread *thread); +static void pcep_refine_path_event_cb(struct event *thread); /* Internal Functions Called From Controller Thread */ -static void pcep_thread_finish_event_handler(struct thread *thread); +static void pcep_thread_finish_event_handler(struct event *thread); /* Controller Thread Timer Handler */ static int schedule_thread_timer(struct ctrl_state *ctrl_state, int pcc_id, enum pcep_ctrl_timer_type timer_type, enum pcep_ctrl_timeout_type timeout_type, uint32_t delay, void *payload, - struct thread **thread); + struct event **thread); static int schedule_thread_timer_with_cb( struct ctrl_state *ctrl_state, int pcc_id, enum pcep_ctrl_timer_type timer_type, enum pcep_ctrl_timeout_type timeout_type, uint32_t delay, void *payload, - struct thread **thread, pcep_ctrl_thread_callback timer_cb); -static void pcep_thread_timer_handler(struct thread *thread); + struct event **thread, pcep_ctrl_thread_callback timer_cb); +static void pcep_thread_timer_handler(struct event *thread); /* Controller Thread Socket read/write Handler */ static int schedule_thread_socket(struct ctrl_state *ctrl_state, int pcc_id, enum pcep_ctrl_socket_type type, bool is_read, - void *payload, int fd, struct thread **thread, + void *payload, int fd, struct event **thread, pcep_ctrl_thread_callback cb); /* Controller Thread Event Handler */ @@ -110,7 +110,7 @@ static int send_to_thread_with_cb(struct ctrl_state *ctrl_state, int pcc_id, enum pcep_ctrl_event_type type, uint32_t sub_type, void *payload, pcep_ctrl_thread_callback event_cb); -static void pcep_thread_event_handler(struct thread *thread); +static void pcep_thread_event_handler(struct event *thread); static int pcep_thread_event_update_pcc_options(struct ctrl_state *ctrl_state, struct pcc_opts *opts); static int pcep_thread_event_update_pce_options(struct ctrl_state *ctrl_state, @@ -135,7 +135,7 @@ pcep_thread_path_refined_event(struct ctrl_state *ctrl_state, /* Main Thread Event Handler */ static int send_to_main(struct ctrl_state *ctrl_state, int pcc_id, enum pcep_main_event_type type, void *payload); -static void pcep_main_event_handler(struct thread *thread); +static void pcep_main_event_handler(struct event *thread); /* Helper functions */ static void set_ctrl_state(struct frr_pthread *fpt, @@ -152,7 +152,7 @@ static const char *timeout_type_name(enum pcep_ctrl_timeout_type type); /* ------------ API Functions Called from Main Thread ------------ */ -int pcep_ctrl_initialize(struct thread_master *main_thread, +int pcep_ctrl_initialize(struct event_loop *main_thread, struct frr_pthread **fpt, pcep_main_event_handler_t event_handler) { @@ -319,16 +319,16 @@ int pcep_ctrl_send_error(struct frr_pthread *fpt, int pcc_id, int pcep_ctrl_halt_cb(struct frr_pthread *fpt, void **res) { - thread_add_event(fpt->master, pcep_thread_finish_event_handler, - (void *)fpt, 0, NULL); + event_add_event(fpt->master, pcep_thread_finish_event_handler, + (void *)fpt, 0, NULL); pthread_join(fpt->thread, res); return 0; } -void pcep_refine_path_event_cb(struct thread *thread) +void pcep_refine_path_event_cb(struct event *thread) { - struct pcep_refine_path_event_data *data = THREAD_ARG(thread); + struct pcep_refine_path_event_data *data = EVENT_ARG(thread); assert(data != NULL); struct ctrl_state *ctrl_state = data->ctrl_state; struct path *path = data->path; @@ -377,20 +377,20 @@ void pcep_thread_remove_candidate_path_segments(struct ctrl_state *ctrl_state, void pcep_thread_schedule_sync_best_pce(struct ctrl_state *ctrl_state, int pcc_id, int delay, - struct thread **thread) + struct event **thread) { schedule_thread_timer(ctrl_state, pcc_id, TM_CALCULATE_BEST_PCE, TO_UNDEFINED, delay, NULL, thread); } -void pcep_thread_cancel_timer(struct thread **thread) +void pcep_thread_cancel_timer(struct event **thread) { if (thread == NULL || *thread == NULL) { return; } - struct pcep_ctrl_timer_data *data = THREAD_ARG(*thread); + struct pcep_ctrl_timer_data *data = EVENT_ARG(*thread); PCEP_DEBUG("Timer %s / %s canceled", timer_type_name(data->timer_type), timeout_type_name(data->timeout_type)); if (data != NULL) { @@ -398,14 +398,14 @@ void pcep_thread_cancel_timer(struct thread **thread) } if ((*thread)->master->owner == pthread_self()) { - thread_cancel(thread); + event_cancel(thread); } else { - thread_cancel_async((*thread)->master, thread, NULL); + event_cancel_async((*thread)->master, thread, NULL); } } void pcep_thread_schedule_reconnect(struct ctrl_state *ctrl_state, int pcc_id, - int retry_count, struct thread **thread) + int retry_count, struct event **thread) { uint32_t delay = backoff_delay(MAX_RECONNECT_DELAY, 1, retry_count); PCEP_DEBUG("Schedule RECONNECT_PCC for %us (retry %u)", delay, @@ -417,7 +417,7 @@ void pcep_thread_schedule_reconnect(struct ctrl_state *ctrl_state, int pcc_id, void pcep_thread_schedule_timeout(struct ctrl_state *ctrl_state, int pcc_id, enum pcep_ctrl_timeout_type timeout_type, uint32_t delay, void *param, - struct thread **thread) + struct event **thread) { assert(timeout_type > TO_UNDEFINED); assert(timeout_type < TO_MAX); @@ -429,7 +429,7 @@ void pcep_thread_schedule_timeout(struct ctrl_state *ctrl_state, int pcc_id, void pcep_thread_schedule_pceplib_timer(struct ctrl_state *ctrl_state, int delay, void *payload, - struct thread **thread, + struct event **thread, pcep_ctrl_thread_callback timer_cb) { PCEP_DEBUG("Schedule PCEPLIB_TIMER for %us", delay); @@ -440,7 +440,7 @@ void pcep_thread_schedule_pceplib_timer(struct ctrl_state *ctrl_state, void pcep_thread_schedule_session_timeout(struct ctrl_state *ctrl_state, int pcc_id, int delay, - struct thread **thread) + struct event **thread) { PCEP_DEBUG("Schedule session_timeout interval for %us", delay); schedule_thread_timer(ctrl_state, pcc_id, TM_SESSION_TIMEOUT_PCC, @@ -469,8 +469,8 @@ int pcep_thread_refine_path(struct ctrl_state *ctrl_state, int pcc_id, data->continue_lsp_update_handler = cb; data->payload = payload; - thread_add_event(ctrl_state->main, pcep_refine_path_event_cb, - (void *)data, 0, NULL); + event_add_event(ctrl_state->main, pcep_refine_path_event_cb, + (void *)data, 0, NULL); return 0; } @@ -493,10 +493,10 @@ void pcep_thread_path_refined_event(struct ctrl_state *ctrl_state, /* ------------ Internal Functions Called From Controller Thread ------------ */ -void pcep_thread_finish_event_handler(struct thread *thread) +void pcep_thread_finish_event_handler(struct event *thread) { int i; - struct frr_pthread *fpt = THREAD_ARG(thread); + struct frr_pthread *fpt = EVENT_ARG(thread); struct ctrl_state *ctrl_state = fpt->data; assert(ctrl_state != NULL); @@ -521,7 +521,7 @@ int schedule_thread_timer_with_cb(struct ctrl_state *ctrl_state, int pcc_id, enum pcep_ctrl_timer_type timer_type, enum pcep_ctrl_timeout_type timeout_type, uint32_t delay, void *payload, - struct thread **thread, + struct event **thread, pcep_ctrl_thread_callback timer_cb) { assert(thread != NULL); @@ -535,8 +535,8 @@ int schedule_thread_timer_with_cb(struct ctrl_state *ctrl_state, int pcc_id, data->pcc_id = pcc_id; data->payload = payload; - thread_add_timer(ctrl_state->self, timer_cb, (void *)data, delay, - thread); + event_add_timer(ctrl_state->self, timer_cb, (void *)data, delay, + thread); return 0; } @@ -544,17 +544,17 @@ int schedule_thread_timer_with_cb(struct ctrl_state *ctrl_state, int pcc_id, int schedule_thread_timer(struct ctrl_state *ctrl_state, int pcc_id, enum pcep_ctrl_timer_type timer_type, enum pcep_ctrl_timeout_type timeout_type, - uint32_t delay, void *payload, struct thread **thread) + uint32_t delay, void *payload, struct event **thread) { return schedule_thread_timer_with_cb(ctrl_state, pcc_id, timer_type, timeout_type, delay, payload, thread, pcep_thread_timer_handler); } -void pcep_thread_timer_handler(struct thread *thread) +void pcep_thread_timer_handler(struct event *thread) { /* data unpacking */ - struct pcep_ctrl_timer_data *data = THREAD_ARG(thread); + struct pcep_ctrl_timer_data *data = EVENT_ARG(thread); assert(data != NULL); struct ctrl_state *ctrl_state = data->ctrl_state; assert(ctrl_state != NULL); @@ -598,9 +598,9 @@ void pcep_thread_timer_handler(struct thread *thread) } } -void pcep_thread_pcep_event(struct thread *thread) +void pcep_thread_pcep_event(struct event *thread) { - struct pcep_ctrl_event_data *data = THREAD_ARG(thread); + struct pcep_ctrl_event_data *data = EVENT_ARG(thread); assert(data != NULL); struct ctrl_state *ctrl_state = data->ctrl_state; pcep_event *event = data->payload; @@ -624,7 +624,7 @@ void pcep_thread_pcep_event(struct thread *thread) int schedule_thread_socket(struct ctrl_state *ctrl_state, int pcc_id, enum pcep_ctrl_socket_type type, bool is_read, - void *payload, int fd, struct thread **thread, + void *payload, int fd, struct event **thread, pcep_ctrl_thread_callback socket_cb) { assert(thread != NULL); @@ -640,11 +640,11 @@ int schedule_thread_socket(struct ctrl_state *ctrl_state, int pcc_id, data->payload = payload; if (is_read) { - thread_add_read(ctrl_state->self, socket_cb, (void *)data, fd, - thread); + event_add_read(ctrl_state->self, socket_cb, (void *)data, fd, + thread); } else { - thread_add_write(ctrl_state->self, socket_cb, (void *)data, fd, - thread); + event_add_write(ctrl_state->self, socket_cb, (void *)data, fd, + thread); } return 0; @@ -656,7 +656,7 @@ int pcep_thread_socket_write(void *fpt, void **thread, int fd, void *payload, struct ctrl_state *ctrl_state = ((struct frr_pthread *)fpt)->data; return schedule_thread_socket(ctrl_state, 0, SOCK_PCEPLIB, false, - payload, fd, (struct thread **)thread, + payload, fd, (struct event **)thread, socket_cb); } @@ -666,7 +666,7 @@ int pcep_thread_socket_read(void *fpt, void **thread, int fd, void *payload, struct ctrl_state *ctrl_state = ((struct frr_pthread *)fpt)->data; return schedule_thread_socket(ctrl_state, 0, SOCK_PCEPLIB, true, - payload, fd, (struct thread **)thread, + payload, fd, (struct event **)thread, socket_cb); } @@ -702,15 +702,15 @@ int send_to_thread_with_cb(struct ctrl_state *ctrl_state, int pcc_id, data->pcc_id = pcc_id; data->payload = payload; - thread_add_event(ctrl_state->self, event_cb, (void *)data, 0, NULL); + event_add_event(ctrl_state->self, event_cb, (void *)data, 0, NULL); return 0; } -void pcep_thread_event_handler(struct thread *thread) +void pcep_thread_event_handler(struct event *thread) { /* data unpacking */ - struct pcep_ctrl_event_data *data = THREAD_ARG(thread); + struct pcep_ctrl_event_data *data = EVENT_ARG(thread); assert(data != NULL); struct ctrl_state *ctrl_state = data->ctrl_state; assert(ctrl_state != NULL); @@ -964,15 +964,15 @@ int send_to_main(struct ctrl_state *ctrl_state, int pcc_id, data->pcc_id = pcc_id; data->payload = payload; - thread_add_event(ctrl_state->main, pcep_main_event_handler, - (void *)data, 0, NULL); + event_add_event(ctrl_state->main, pcep_main_event_handler, (void *)data, + 0, NULL); return 0; } -void pcep_main_event_handler(struct thread *thread) +void pcep_main_event_handler(struct event *thread) { /* data unpacking */ - struct pcep_main_event_data *data = THREAD_ARG(thread); + struct pcep_main_event_data *data = EVENT_ARG(thread); assert(data != NULL); pcep_main_event_handler_t handler = data->handler; enum pcep_main_event_type type = data->type; diff --git a/pathd/path_pcep_controller.h b/pathd/path_pcep_controller.h index c2359beb23..236b267715 100644 --- a/pathd/path_pcep_controller.h +++ b/pathd/path_pcep_controller.h @@ -33,8 +33,8 @@ enum pcep_pathd_event_type { }; struct ctrl_state { - struct thread_master *main; - struct thread_master *self; + struct event_loop *main; + struct event_loop *self; pcep_main_event_handler_t main_event_handler; struct pcc_opts *pcc_opts; int pcc_count; @@ -77,7 +77,7 @@ struct pcep_ctrl_socket_data { void *payload; }; -typedef void (*pcep_ctrl_thread_callback)(struct thread *); +typedef void (*pcep_ctrl_thread_callback)(struct event *); /* PCC connection information, populated in a thread-safe * manner with pcep_ctrl_get_pcc_info() */ @@ -97,7 +97,7 @@ struct pcep_pcc_info { }; /* Functions called from the main thread */ -int pcep_ctrl_initialize(struct thread_master *main_thread, +int pcep_ctrl_initialize(struct event_loop *main_thread, struct frr_pthread **fpt, pcep_main_event_handler_t event_handler); int pcep_ctrl_finalize(struct frr_pthread **fpt); @@ -134,25 +134,25 @@ void pcep_thread_update_path(struct ctrl_state *ctrl_state, int pcc_id, struct path *path); void pcep_thread_initiate_path(struct ctrl_state *ctrl_state, int pcc_id, struct path *path); -void pcep_thread_cancel_timer(struct thread **thread); +void pcep_thread_cancel_timer(struct event **thread); void pcep_thread_schedule_reconnect(struct ctrl_state *ctrl_state, int pcc_id, - int retry_count, struct thread **thread); + int retry_count, struct event **thread); void pcep_thread_schedule_timeout(struct ctrl_state *ctrl_state, int pcc_id, enum pcep_ctrl_timeout_type type, uint32_t delay, void *param, - struct thread **thread); + struct event **thread); void pcep_thread_schedule_session_timeout(struct ctrl_state *ctrl_state, int pcc_id, int delay, - struct thread **thread); + struct event **thread); void pcep_thread_remove_candidate_path_segments(struct ctrl_state *ctrl_state, struct pcc_state *pcc_state); void pcep_thread_schedule_sync_best_pce(struct ctrl_state *ctrl_state, int pcc_id, int delay, - struct thread **thread); + struct event **thread); void pcep_thread_schedule_pceplib_timer(struct ctrl_state *ctrl_state, int delay, void *payload, - struct thread **thread, + struct event **thread, pcep_ctrl_thread_callback cb); int pcep_thread_socket_read(void *fpt, void **thread, int fd, void *payload, pcep_ctrl_thread_callback cb); @@ -161,7 +161,7 @@ int pcep_thread_socket_write(void *fpt, void **thread, int fd, void *payload, int pcep_thread_send_ctrl_event(void *fpt, void *payload, pcep_ctrl_thread_callback cb); -void pcep_thread_pcep_event(struct thread *thread); +void pcep_thread_pcep_event(struct event *thread); int pcep_thread_pcc_count(struct ctrl_state *ctrl_state); /* Called by the PCC to refine a path in the main thread */ int pcep_thread_refine_path(struct ctrl_state *ctrl_state, int pcc_id, diff --git a/pathd/path_pcep_lib.c b/pathd/path_pcep_lib.c index 502f2336c7..d43fdb083e 100644 --- a/pathd/path_pcep_lib.c +++ b/pathd/path_pcep_lib.c @@ -33,8 +33,8 @@ static int pcep_lib_pceplib_socket_read_cb(void *fpt, void **thread, int fd, void *payload); static int pcep_lib_pceplib_socket_write_cb(void *fpt, void **thread, int fd, void *payload); -static void pcep_lib_socket_read_ready(struct thread *thread); -static void pcep_lib_socket_write_ready(struct thread *thread); +static void pcep_lib_socket_read_ready(struct event *thread); +static void pcep_lib_socket_write_ready(struct event *thread); /* pceplib pcep_event callbacks */ static void pcep_lib_pceplib_event_cb(void *fpt, pcep_event *event); @@ -229,18 +229,18 @@ int pcep_lib_pceplib_socket_read_cb(void *fpt, void **thread, int fd, /* Callbacks called by path_pcep_controller when a socket is ready to read/write */ -void pcep_lib_socket_write_ready(struct thread *thread) +void pcep_lib_socket_write_ready(struct event *thread) { - struct pcep_ctrl_socket_data *data = THREAD_ARG(thread); + struct pcep_ctrl_socket_data *data = EVENT_ARG(thread); assert(data != NULL); pceplib_external_socket_write(data->fd, data->payload); XFREE(MTYPE_PCEP, data); } -void pcep_lib_socket_read_ready(struct thread *thread) +void pcep_lib_socket_read_ready(struct event *thread) { - struct pcep_ctrl_socket_data *data = THREAD_ARG(thread); + struct pcep_ctrl_socket_data *data = EVENT_ARG(thread); assert(data != NULL); pceplib_external_socket_read(data->fd, data->payload); diff --git a/pathd/path_pcep_pcc.c b/pathd/path_pcep_pcc.c index 0ff0b4403a..f18eff2888 100644 --- a/pathd/path_pcep_pcc.c +++ b/pathd/path_pcep_pcc.c @@ -190,17 +190,17 @@ void pcep_pcc_finalize(struct ctrl_state *ctrl_state, } if (pcc_state->t_reconnect != NULL) { - thread_cancel(&pcc_state->t_reconnect); + event_cancel(&pcc_state->t_reconnect); pcc_state->t_reconnect = NULL; } if (pcc_state->t_update_best != NULL) { - thread_cancel(&pcc_state->t_update_best); + event_cancel(&pcc_state->t_update_best); pcc_state->t_update_best = NULL; } if (pcc_state->t_session_timeout != NULL) { - thread_cancel(&pcc_state->t_session_timeout); + event_cancel(&pcc_state->t_session_timeout); pcc_state->t_session_timeout = NULL; } @@ -340,7 +340,7 @@ int pcep_pcc_enable(struct ctrl_state *ctrl_state, struct pcc_state *pcc_state) assert(pcc_state->sess == NULL); if (pcc_state->t_reconnect != NULL) { - thread_cancel(&pcc_state->t_reconnect); + event_cancel(&pcc_state->t_reconnect); pcc_state->t_reconnect = NULL; } @@ -408,7 +408,7 @@ int pcep_pcc_enable(struct ctrl_state *ctrl_state, struct pcc_state *pcc_state) // In case some best pce alternative were waiting to activate if (pcc_state->t_update_best != NULL) { - thread_cancel(&pcc_state->t_update_best); + event_cancel(&pcc_state->t_update_best); pcc_state->t_update_best = NULL; } diff --git a/pathd/path_pcep_pcc.h b/pathd/path_pcep_pcc.h index 039d67d2e2..f3d0f290a5 100644 --- a/pathd/path_pcep_pcc.h +++ b/pathd/path_pcep_pcc.h @@ -41,7 +41,7 @@ struct req_map_data { struct req_entry { RB_ENTRY(req_entry) entry; - struct thread *t_retry; + struct event *t_retry; int retry_count; bool was_sent; struct path *path; @@ -66,9 +66,9 @@ struct pcc_state { pcep_session *sess; uint32_t retry_count; bool synchronized; - struct thread *t_reconnect; - struct thread *t_update_best; - struct thread *t_session_timeout; + struct event *t_reconnect; + struct event *t_update_best; + struct event *t_session_timeout; uint32_t next_reqid; uint32_t next_plspid; struct plspid_map_head plspid_map; diff --git a/pathd/path_ted.c b/pathd/path_ted.c index bc0da969e3..d8ddd8cdc8 100644 --- a/pathd/path_ted.c +++ b/pathd/path_ted.c @@ -28,8 +28,8 @@ static void path_ted_unregister_vty(void); static uint32_t path_ted_start_importing_igp(const char *daemon_str); static uint32_t path_ted_stop_importing_igp(void); static enum zclient_send_status path_ted_link_state_sync(void); -static void path_ted_timer_handler_sync(struct thread *thread); -static void path_ted_timer_handler_refresh(struct thread *thread); +static void path_ted_timer_handler_sync(struct event *thread); +static void path_ted_timer_handler_refresh(struct event *thread); static int path_ted_cli_debug_config_write(struct vty *vty); static int path_ted_cli_debug_set_all(uint32_t flags, bool set); @@ -41,7 +41,7 @@ struct ted_state ted_state_g = {}; * path_path_ted public API function implementations */ -void path_ted_init(struct thread_master *master) +void path_ted_init(struct event_loop *master) { ted_state_g.main = master; ted_state_g.link_state_delay_interval = TIMER_RETRY_DELAY; @@ -583,9 +583,9 @@ enum zclient_send_status path_ted_link_state_sync(void) PATH_TED_DEBUG("%s: PATHD-TED: Opaque asked for TED sync ", __func__); } - thread_add_timer(ted_state_g.main, path_ted_timer_handler_sync, - &ted_state_g, ted_state_g.link_state_delay_interval, - &ted_state_g.t_link_state_sync); + event_add_timer(ted_state_g.main, path_ted_timer_handler_sync, + &ted_state_g, ted_state_g.link_state_delay_interval, + &ted_state_g.t_link_state_sync); return status; } @@ -597,10 +597,10 @@ enum zclient_send_status path_ted_link_state_sync(void) * * @return status */ -void path_ted_timer_handler_sync(struct thread *thread) +void path_ted_timer_handler_sync(struct event *thread) { /* data unpacking */ - struct ted_state *data = THREAD_ARG(thread); + struct ted_state *data = EVENT_ARG(thread); assert(data != NULL); /* Retry the sync */ @@ -619,10 +619,9 @@ int path_ted_segment_list_refresh(void) int status = 0; path_ted_timer_refresh_cancel(); - thread_add_timer(ted_state_g.main, path_ted_timer_handler_refresh, - &ted_state_g, - ted_state_g.segment_list_refresh_interval, - &ted_state_g.t_segment_list_refresh); + event_add_timer(ted_state_g.main, path_ted_timer_handler_refresh, + &ted_state_g, ted_state_g.segment_list_refresh_interval, + &ted_state_g.t_segment_list_refresh); return status; } @@ -634,14 +633,14 @@ int path_ted_segment_list_refresh(void) * * @return status */ -void path_ted_timer_handler_refresh(struct thread *thread) +void path_ted_timer_handler_refresh(struct event *thread) { if (!path_ted_is_initialized()) return; PATH_TED_DEBUG("%s: PATHD-TED: Refresh sid from current TED", __func__); /* data unpacking */ - struct ted_state *data = THREAD_ARG(thread); + struct ted_state *data = EVENT_ARG(thread); assert(data != NULL); @@ -658,7 +657,7 @@ void path_ted_timer_handler_refresh(struct thread *thread) void path_ted_timer_sync_cancel(void) { if (ted_state_g.t_link_state_sync != NULL) { - thread_cancel(&ted_state_g.t_link_state_sync); + event_cancel(&ted_state_g.t_link_state_sync); ted_state_g.t_link_state_sync = NULL; } } @@ -673,7 +672,7 @@ void path_ted_timer_sync_cancel(void) void path_ted_timer_refresh_cancel(void) { if (ted_state_g.t_segment_list_refresh != NULL) { - thread_cancel(&ted_state_g.t_segment_list_refresh); + event_cancel(&ted_state_g.t_segment_list_refresh); ted_state_g.t_segment_list_refresh = NULL; } } diff --git a/pathd/path_ted.h b/pathd/path_ted.h index 10cdd545f1..a1bc784b7f 100644 --- a/pathd/path_ted.h +++ b/pathd/path_ted.h @@ -41,7 +41,7 @@ enum igp_import { IMPORT_OSPFv3 }; struct ted_state { - struct thread_master *main; + struct event_loop *main; /* Status of TED: enable or disable */ bool enabled; /* From which igp is going to receive data */ @@ -49,9 +49,9 @@ struct ted_state { /* The TED itself as in link_state.h */ struct ls_ted *ted; /* Timer for ted sync */ - struct thread *t_link_state_sync; + struct event *t_link_state_sync; /* Timer for refresh sid in segment list */ - struct thread *t_segment_list_refresh; + struct event *t_segment_list_refresh; /* delay interval in seconds */ uint32_t link_state_delay_interval; /* delay interval refresh in seconds */ @@ -84,7 +84,7 @@ struct ted_state { /* TED management functions */ bool path_ted_is_initialized(void); -void path_ted_init(struct thread_master *master); +void path_ted_init(struct event_loop *master); uint32_t path_ted_teardown(void); void path_ted_timer_sync_cancel(void); void path_ted_timer_refresh_cancel(void); diff --git a/pathd/path_zebra.c b/pathd/path_zebra.c index efc016f750..dad26383e9 100644 --- a/pathd/path_zebra.c +++ b/pathd/path_zebra.c @@ -5,7 +5,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "log.h" #include "lib_errors.h" #include "if.h" @@ -318,7 +318,7 @@ static zclient_handler *const path_handlers[] = { * * @param master The master thread */ -void path_zebra_init(struct thread_master *master) +void path_zebra_init(struct event_loop *master) { struct zclient_options options = zclient_options_default; options.synchronous = true; diff --git a/pathd/path_zebra.h b/pathd/path_zebra.h index 0d435bb519..74a62e38b3 100644 --- a/pathd/path_zebra.h +++ b/pathd/path_zebra.h @@ -16,7 +16,7 @@ void path_zebra_add_sr_policy(struct srte_policy *policy, void path_zebra_delete_sr_policy(struct srte_policy *policy); int path_zebra_request_label(mpls_label_t label); void path_zebra_release_label(mpls_label_t label); -void path_zebra_init(struct thread_master *master); +void path_zebra_init(struct event_loop *master); void path_zebra_stop(void); #endif /* _FRR_PATH_MPLS_H_ */ diff --git a/pathd/pathd.c b/pathd/pathd.c index 86501f7ad8..6c13503c7d 100644 --- a/pathd/pathd.c +++ b/pathd/pathd.c @@ -45,9 +45,9 @@ struct debug path_policy_debug; static void trigger_pathd_candidate_created(struct srte_candidate *candidate); -static void trigger_pathd_candidate_created_timer(struct thread *thread); +static void trigger_pathd_candidate_created_timer(struct event *thread); static void trigger_pathd_candidate_updated(struct srte_candidate *candidate); -static void trigger_pathd_candidate_updated_timer(struct thread *thread); +static void trigger_pathd_candidate_updated_timer(struct event *thread); static void trigger_pathd_candidate_removed(struct srte_candidate *candidate); static const char * srte_candidate_metric_name(enum srte_candidate_metric_type type); @@ -1293,13 +1293,13 @@ void trigger_pathd_candidate_created(struct srte_candidate *candidate) from changing the candidate by hand with the console */ if (candidate->hook_timer != NULL) return; - thread_add_timer(master, trigger_pathd_candidate_created_timer, - (void *)candidate, HOOK_DELAY, &candidate->hook_timer); + event_add_timer(master, trigger_pathd_candidate_created_timer, + (void *)candidate, HOOK_DELAY, &candidate->hook_timer); } -void trigger_pathd_candidate_created_timer(struct thread *thread) +void trigger_pathd_candidate_created_timer(struct event *thread) { - struct srte_candidate *candidate = THREAD_ARG(thread); + struct srte_candidate *candidate = EVENT_ARG(thread); candidate->hook_timer = NULL; hook_call(pathd_candidate_created, candidate); } @@ -1313,13 +1313,13 @@ void trigger_pathd_candidate_updated(struct srte_candidate *candidate) from changing the candidate by hand with the console */ if (candidate->hook_timer != NULL) return; - thread_add_timer(master, trigger_pathd_candidate_updated_timer, - (void *)candidate, HOOK_DELAY, &candidate->hook_timer); + event_add_timer(master, trigger_pathd_candidate_updated_timer, + (void *)candidate, HOOK_DELAY, &candidate->hook_timer); } -void trigger_pathd_candidate_updated_timer(struct thread *thread) +void trigger_pathd_candidate_updated_timer(struct event *thread) { - struct srte_candidate *candidate = THREAD_ARG(thread); + struct srte_candidate *candidate = EVENT_ARG(thread); candidate->hook_timer = NULL; hook_call(pathd_candidate_updated, candidate); } @@ -1329,7 +1329,7 @@ void trigger_pathd_candidate_removed(struct srte_candidate *candidate) /* The hook needs to be call synchronously, otherwise the candidate path will be already deleted when the handler is called */ if (candidate->hook_timer != NULL) { - thread_cancel(&candidate->hook_timer); + event_cancel(&candidate->hook_timer); candidate->hook_timer = NULL; } hook_call(pathd_candidate_removed, candidate); diff --git a/pathd/pathd.h b/pathd/pathd.h index f1a59b1167..73ad49226e 100644 --- a/pathd/pathd.h +++ b/pathd/pathd.h @@ -311,7 +311,7 @@ struct srte_candidate { uint32_t affinity_filters[MAX_AFFINITY_FILTER_TYPE]; /* Hooks delaying timer */ - struct thread *hook_timer; + struct event *hook_timer; }; RB_HEAD(srte_candidate_head, srte_candidate); @@ -371,7 +371,7 @@ extern struct srte_policy_head srte_policies; extern struct zebra_privs_t pathd_privs; /* master thread, defined in path_main.c */ -extern struct thread_master *master; +extern struct event_loop *master; /* pathd.c */ struct srte_segment_list *srte_segment_list_add(const char *name); diff --git a/pbrd/pbr_main.c b/pbrd/pbr_main.c index 9b34815c4d..c4708d3f08 100644 --- a/pbrd/pbr_main.c +++ b/pbrd/pbr_main.c @@ -8,7 +8,7 @@ #include #include "getopt.h" -#include "thread.h" +#include "frrevent.h" #include "prefix.h" #include "linklist.h" #include "if.h" @@ -56,7 +56,7 @@ struct zebra_privs_t pbr_privs = { struct option longopts[] = { { 0 } }; /* Master of threads. */ -struct thread_master *master; +struct event_loop *master; /* SIGHUP handler. */ static void sighup(void) diff --git a/pbrd/pbr_map.c b/pbrd/pbr_map.c index 0e18f1198d..16cea3b4cd 100644 --- a/pbrd/pbr_map.c +++ b/pbrd/pbr_map.c @@ -6,7 +6,7 @@ */ #include -#include "thread.h" +#include "frrevent.h" #include "linklist.h" #include "prefix.h" #include "table.h" diff --git a/pbrd/pbr_zebra.c b/pbrd/pbr_zebra.c index 1b18853d2b..097c9f2964 100644 --- a/pbrd/pbr_zebra.c +++ b/pbrd/pbr_zebra.c @@ -6,7 +6,7 @@ */ #include -#include "thread.h" +#include "frrevent.h" #include "command.h" #include "network.h" #include "prefix.h" diff --git a/pbrd/pbr_zebra.h b/pbrd/pbr_zebra.h index 850e5f06d1..ef844ef797 100644 --- a/pbrd/pbr_zebra.h +++ b/pbrd/pbr_zebra.h @@ -11,7 +11,7 @@ struct pbr_interface { char mapname[100]; }; -extern struct thread_master *master; +extern struct event_loop *master; extern void pbr_zebra_init(void); diff --git a/pimd/pim6_mld.c b/pimd/pim6_mld.c index fa699cca5e..1d84a9941b 100644 --- a/pimd/pim6_mld.c +++ b/pimd/pim6_mld.c @@ -19,7 +19,7 @@ #include "lib/jhash.h" #include "lib/prefix.h" #include "lib/checksum.h" -#include "lib/thread.h" +#include "lib/frrevent.h" #include "termtable.h" #include "pimd/pim6_mld.h" @@ -45,7 +45,7 @@ DEFINE_MTYPE_STATIC(PIMD, GM_SG, "MLD (S,G)"); DEFINE_MTYPE_STATIC(PIMD, GM_GRP_PENDING, "MLD group query state"); DEFINE_MTYPE_STATIC(PIMD, GM_GSQ_PENDING, "MLD group/source query aggregate"); -static void gm_t_query(struct thread *t); +static void gm_t_query(struct event *t); static void gm_trigger_specific(struct gm_sg *sg); static void gm_sg_timer_start(struct gm_if *gm_ifp, struct gm_sg *sg, struct timeval expire_wait); @@ -329,7 +329,7 @@ static void gm_expiry_calc(struct gm_query_timers *timers) static void gm_sg_free(struct gm_sg *sg) { /* t_sg_expiry is handled before this is reached */ - THREAD_OFF(sg->t_sg_query); + EVENT_OFF(sg->t_sg_query); gm_packet_sg_subs_fini(sg->subs_negative); gm_packet_sg_subs_fini(sg->subs_positive); XFREE(MTYPE_GM_SG, sg); @@ -404,7 +404,7 @@ static void gm_sg_update(struct gm_sg *sg, bool has_expired) gm_expiry_calc(&timers); gm_sg_timer_start(gm_ifp, sg, timers.expire_wait); - THREAD_OFF(sg->t_sg_query); + EVENT_OFF(sg->t_sg_query); sg->n_query = gm_ifp->cur_lmqc; sg->query_sbit = false; gm_trigger_specific(sg); @@ -443,7 +443,7 @@ static void gm_sg_update(struct gm_sg *sg, bool has_expired) * another path. */ if (has_expired) - THREAD_OFF(sg->t_sg_expire); + EVENT_OFF(sg->t_sg_expire); assertf((!sg->t_sg_expire && !gm_packet_sg_subs_count(sg->subs_positive) && @@ -582,7 +582,7 @@ static void gm_sg_expiry_cancel(struct gm_sg *sg) { if (sg->t_sg_expire && PIM_DEBUG_GM_TRACE) zlog_debug(log_sg(sg, "alive, cancelling expiry timer")); - THREAD_OFF(sg->t_sg_expire); + EVENT_OFF(sg->t_sg_expire); sg->query_sbit = true; } @@ -1029,9 +1029,9 @@ static void gm_handle_v1_leave(struct gm_if *gm_ifp, * its own path too and won't hit this. This is really only triggered when a * host straight up disappears. */ -static void gm_t_expire(struct thread *t) +static void gm_t_expire(struct event *t) { - struct gm_if *gm_ifp = THREAD_ARG(t); + struct gm_if *gm_ifp = EVENT_ARG(t); struct gm_packet_state *pkt; zlog_info(log_ifp("general expiry timer")); @@ -1048,8 +1048,8 @@ static void gm_t_expire(struct thread *t) log_ifp("next general expiry in %" PRId64 "ms"), remain_ms / 1000); - thread_add_timer_tv(router->master, gm_t_expire, gm_ifp, - &remain, &gm_ifp->t_expire); + event_add_timer_tv(router->master, gm_t_expire, gm_ifp, + &remain, &gm_ifp->t_expire); return; } @@ -1103,7 +1103,7 @@ static void gm_handle_q_general(struct gm_if *gm_ifp, gm_ifp->n_pending--; if (!gm_ifp->n_pending) - THREAD_OFF(gm_ifp->t_expire); + EVENT_OFF(gm_ifp->t_expire); } /* people might be messing with their configs or something */ @@ -1119,16 +1119,16 @@ static void gm_handle_q_general(struct gm_if *gm_ifp, zlog_debug( log_ifp("starting general timer @ 0: %pTVMu"), &pend->expiry); - thread_add_timer_tv(router->master, gm_t_expire, gm_ifp, - &timers->expire_wait, &gm_ifp->t_expire); + event_add_timer_tv(router->master, gm_t_expire, gm_ifp, + &timers->expire_wait, &gm_ifp->t_expire); } else if (PIM_DEBUG_GM_TRACE) zlog_debug(log_ifp("appending general timer @ %u: %pTVMu"), gm_ifp->n_pending, &pend->expiry); } -static void gm_t_sg_expire(struct thread *t) +static void gm_t_sg_expire(struct event *t) { - struct gm_sg *sg = THREAD_ARG(t); + struct gm_sg *sg = EVENT_ARG(t); struct gm_if *gm_ifp = sg->iface; struct gm_packet_sg *item; @@ -1208,15 +1208,15 @@ static void gm_sg_timer_start(struct gm_if *gm_ifp, struct gm_sg *sg, if (sg->t_sg_expire) { struct timeval remain; - remain = thread_timer_remain(sg->t_sg_expire); + remain = event_timer_remain(sg->t_sg_expire); if (timercmp(&remain, &expire_wait, <=)) return; - THREAD_OFF(sg->t_sg_expire); + EVENT_OFF(sg->t_sg_expire); } - thread_add_timer_tv(router->master, gm_t_sg_expire, sg, &expire_wait, - &sg->t_sg_expire); + event_add_timer_tv(router->master, gm_t_sg_expire, sg, &expire_wait, + &sg->t_sg_expire); } static void gm_handle_q_groupsrc(struct gm_if *gm_ifp, @@ -1232,7 +1232,7 @@ static void gm_handle_q_groupsrc(struct gm_if *gm_ifp, } } -static void gm_t_grp_expire(struct thread *t) +static void gm_t_grp_expire(struct event *t) { /* if we're here, that means when we received the group-specific query * there was one or more active S,G for this group. For *,G the timer @@ -1240,7 +1240,7 @@ static void gm_t_grp_expire(struct thread *t) * receive a report, so that work is left to gm_t_sg_expire and we * shouldn't worry about it here. */ - struct gm_grp_pending *pend = THREAD_ARG(t); + struct gm_grp_pending *pend = EVENT_ARG(t); struct gm_if *gm_ifp = pend->iface; struct gm_sg *sg, *sg_start, sg_ref = {}; @@ -1269,7 +1269,7 @@ static void gm_t_grp_expire(struct thread *t) * parallel. But if we received nothing for the *,G query, * the S,G query is kinda irrelevant. */ - THREAD_OFF(sg->t_sg_expire); + EVENT_OFF(sg->t_sg_expire); frr_each_safe (gm_packet_sg_subs, sg->subs_positive, item) /* this will also drop the EXCLUDE S,G lists */ @@ -1316,11 +1316,11 @@ static void gm_handle_q_group(struct gm_if *gm_ifp, if (pend) { struct timeval remain; - remain = thread_timer_remain(pend->t_expire); + remain = event_timer_remain(pend->t_expire); if (timercmp(&remain, &timers->expire_wait, <=)) return; - THREAD_OFF(pend->t_expire); + EVENT_OFF(pend->t_expire); } else { pend = XCALLOC(MTYPE_GM_GRP_PENDING, sizeof(*pend)); pend->grp = grp; @@ -1329,8 +1329,8 @@ static void gm_handle_q_group(struct gm_if *gm_ifp, } monotime(&pend->query); - thread_add_timer_tv(router->master, gm_t_grp_expire, pend, - &timers->expire_wait, &pend->t_expire); + event_add_timer_tv(router->master, gm_t_grp_expire, pend, + &timers->expire_wait, &pend->t_expire); if (PIM_DEBUG_GM_TRACE) zlog_debug(log_ifp("*,%pPAs S,G timer started: %pTHD"), &grp, @@ -1341,7 +1341,7 @@ static void gm_bump_querier(struct gm_if *gm_ifp) { struct pim_interface *pim_ifp = gm_ifp->ifp->info; - THREAD_OFF(gm_ifp->t_query); + EVENT_OFF(gm_ifp->t_query); if (pim_addr_is_any(pim_ifp->ll_lowest)) return; @@ -1350,12 +1350,12 @@ static void gm_bump_querier(struct gm_if *gm_ifp) gm_ifp->n_startup = gm_ifp->cur_qrv; - thread_execute(router->master, gm_t_query, gm_ifp, 0); + event_execute(router->master, gm_t_query, gm_ifp, 0); } -static void gm_t_other_querier(struct thread *t) +static void gm_t_other_querier(struct event *t) { - struct gm_if *gm_ifp = THREAD_ARG(t); + struct gm_if *gm_ifp = EVENT_ARG(t); struct pim_interface *pim_ifp = gm_ifp->ifp->info; zlog_info(log_ifp("other querier timer expired")); @@ -1363,7 +1363,7 @@ static void gm_t_other_querier(struct thread *t) gm_ifp->querier = pim_ifp->ll_lowest; gm_ifp->n_startup = gm_ifp->cur_qrv; - thread_execute(router->master, gm_t_query, gm_ifp, 0); + event_execute(router->master, gm_t_query, gm_ifp, 0); } static void gm_handle_query(struct gm_if *gm_ifp, @@ -1466,13 +1466,12 @@ static void gm_handle_query(struct gm_if *gm_ifp, if (IPV6_ADDR_CMP(&pkt_src->sin6_addr, &pim_ifp->ll_lowest) < 0) { unsigned int other_ms; - THREAD_OFF(gm_ifp->t_query); - THREAD_OFF(gm_ifp->t_other_querier); + EVENT_OFF(gm_ifp->t_query); + EVENT_OFF(gm_ifp->t_other_querier); other_ms = timers.qrv * timers.qqic_ms + timers.max_resp_ms / 2; - thread_add_timer_msec(router->master, gm_t_other_querier, - gm_ifp, other_ms, - &gm_ifp->t_other_querier); + event_add_timer_msec(router->master, gm_t_other_querier, gm_ifp, + other_ms, &gm_ifp->t_other_querier); } if (len == sizeof(struct mld_v1_pkt)) { @@ -1586,9 +1585,9 @@ static bool ip6_check_hopopts_ra(uint8_t *hopopts, size_t hopopt_len, return false; } -static void gm_t_recv(struct thread *t) +static void gm_t_recv(struct event *t) { - struct pim_instance *pim = THREAD_ARG(t); + struct pim_instance *pim = EVENT_ARG(t); union { char buf[CMSG_SPACE(sizeof(struct in6_pktinfo)) + CMSG_SPACE(256) /* hop options */ + @@ -1607,8 +1606,8 @@ static void gm_t_recv(struct thread *t) ssize_t nread; size_t pktlen; - thread_add_read(router->master, gm_t_recv, pim, pim->gm_socket, - &pim->t_gm_recv); + event_add_read(router->master, gm_t_recv, pim, pim->gm_socket, + &pim->t_gm_recv); iov->iov_base = rxbuf; iov->iov_len = sizeof(rxbuf); @@ -1858,9 +1857,9 @@ static void gm_send_query(struct gm_if *gm_ifp, pim_addr grp, } } -static void gm_t_query(struct thread *t) +static void gm_t_query(struct event *t) { - struct gm_if *gm_ifp = THREAD_ARG(t); + struct gm_if *gm_ifp = EVENT_ARG(t); unsigned int timer_ms = gm_ifp->cur_query_intv; if (gm_ifp->n_startup) { @@ -1868,15 +1867,15 @@ static void gm_t_query(struct thread *t) gm_ifp->n_startup--; } - thread_add_timer_msec(router->master, gm_t_query, gm_ifp, timer_ms, - &gm_ifp->t_query); + event_add_timer_msec(router->master, gm_t_query, gm_ifp, timer_ms, + &gm_ifp->t_query); gm_send_query(gm_ifp, PIMADDR_ANY, NULL, 0, false); } -static void gm_t_sg_query(struct thread *t) +static void gm_t_sg_query(struct event *t) { - struct gm_sg *sg = THREAD_ARG(t); + struct gm_sg *sg = EVENT_ARG(t); gm_trigger_specific(sg); } @@ -1895,9 +1894,9 @@ static void gm_send_specific(struct gm_gsq_pending *pend_gsq) XFREE(MTYPE_GM_GSQ_PENDING, pend_gsq); } -static void gm_t_gsq_pend(struct thread *t) +static void gm_t_gsq_pend(struct event *t) { - struct gm_gsq_pending *pend_gsq = THREAD_ARG(t); + struct gm_gsq_pending *pend_gsq = EVENT_ARG(t); gm_send_specific(pend_gsq); } @@ -1910,9 +1909,9 @@ static void gm_trigger_specific(struct gm_sg *sg) sg->n_query--; if (sg->n_query) - thread_add_timer_msec(router->master, gm_t_sg_query, sg, - gm_ifp->cur_query_intv_trig, - &sg->t_sg_query); + event_add_timer_msec(router->master, gm_t_sg_query, sg, + gm_ifp->cur_query_intv_trig, + &sg->t_sg_query); if (!IPV6_ADDR_SAME(&gm_ifp->querier, &pim_ifp->ll_lowest)) return; @@ -1938,9 +1937,8 @@ static void gm_trigger_specific(struct gm_sg *sg) pend_gsq->iface = gm_ifp; gm_gsq_pends_add(gm_ifp->gsq_pends, pend_gsq); - thread_add_timer_tv(router->master, gm_t_gsq_pend, pend_gsq, - &gm_ifp->cfg_timing_fuzz, - &pend_gsq->t_send); + event_add_timer_tv(router->master, gm_t_gsq_pend, pend_gsq, + &gm_ifp->cfg_timing_fuzz, &pend_gsq->t_send); } assert(pend_gsq->n_src < array_size(pend_gsq->srcs)); @@ -1949,7 +1947,7 @@ static void gm_trigger_specific(struct gm_sg *sg) pend_gsq->n_src++; if (pend_gsq->n_src == array_size(pend_gsq->srcs)) { - THREAD_OFF(pend_gsq->t_send); + EVENT_OFF(pend_gsq->t_send); gm_send_specific(pend_gsq); pend_gsq = NULL; } @@ -2046,8 +2044,8 @@ static void gm_vrf_socket_incref(struct pim_instance *pim) vrf->name); } - thread_add_read(router->master, gm_t_recv, pim, pim->gm_socket, - &pim->t_gm_recv); + event_add_read(router->master, gm_t_recv, pim, pim->gm_socket, + &pim->t_gm_recv); } static void gm_vrf_socket_decref(struct pim_instance *pim) @@ -2055,7 +2053,7 @@ static void gm_vrf_socket_decref(struct pim_instance *pim) if (--pim->gm_socket_if_count) return; - THREAD_OFF(pim->t_gm_recv); + EVENT_OFF(pim->t_gm_recv); close(pim->gm_socket); pim->gm_socket = -1; } @@ -2128,17 +2126,17 @@ void gm_group_delete(struct gm_if *gm_ifp) gm_packet_drop(pkt, false); while ((pend_grp = gm_grp_pends_pop(gm_ifp->grp_pends))) { - THREAD_OFF(pend_grp->t_expire); + EVENT_OFF(pend_grp->t_expire); XFREE(MTYPE_GM_GRP_PENDING, pend_grp); } while ((pend_gsq = gm_gsq_pends_pop(gm_ifp->gsq_pends))) { - THREAD_OFF(pend_gsq->t_send); + EVENT_OFF(pend_gsq->t_send); XFREE(MTYPE_GM_GSQ_PENDING, pend_gsq); } while ((sg = gm_sgs_pop(gm_ifp->sgs))) { - THREAD_OFF(sg->t_sg_expire); + EVENT_OFF(sg->t_sg_expire); assertf(!gm_packet_sg_subs_count(sg->subs_negative), "%pSG", &sg->sgaddr); assertf(!gm_packet_sg_subs_count(sg->subs_positive), "%pSG", @@ -2166,9 +2164,9 @@ void gm_ifp_teardown(struct interface *ifp) if (PIM_DEBUG_GM_EVENTS) zlog_debug(log_ifp("MLD stop")); - THREAD_OFF(gm_ifp->t_query); - THREAD_OFF(gm_ifp->t_other_querier); - THREAD_OFF(gm_ifp->t_expire); + EVENT_OFF(gm_ifp->t_query); + EVENT_OFF(gm_ifp->t_other_querier); + EVENT_OFF(gm_ifp->t_expire); frr_with_privs (&pimd_privs) { struct ipv6_mreq mreq; @@ -2211,7 +2209,7 @@ static void gm_update_ll(struct interface *ifp) gm_ifp->cur_ll_lowest = pim_ifp->ll_lowest; if (was_querier) gm_ifp->querier = pim_ifp->ll_lowest; - THREAD_OFF(gm_ifp->t_query); + EVENT_OFF(gm_ifp->t_query); if (pim_addr_is_any(gm_ifp->cur_ll_lowest)) { if (was_querier) @@ -2232,7 +2230,7 @@ static void gm_update_ll(struct interface *ifp) return; gm_ifp->n_startup = gm_ifp->cur_qrv; - thread_execute(router->master, gm_t_query, gm_ifp, 0); + event_execute(router->master, gm_t_query, gm_ifp, 0); } void gm_ifp_update(struct interface *ifp) diff --git a/pimd/pim6_mld.h b/pimd/pim6_mld.h index 2af1c77c24..d3f1d39257 100644 --- a/pimd/pim6_mld.h +++ b/pimd/pim6_mld.h @@ -10,7 +10,7 @@ #include "typesafe.h" #include "pim_addr.h" -struct thread; +struct event; struct pim_instance; struct gm_packet_sg; struct gm_if; @@ -65,14 +65,14 @@ struct gm_sg { * (implies we haven't received any report yet, since it's cancelled * by that) */ - struct thread *t_sg_expire; + struct event *t_sg_expire; /* last-member-left triggered queries (group/group-source specific) * * this timer will be running even if we aren't the elected querier, * in case the election result changes midway through. */ - struct thread *t_sg_query; + struct event *t_sg_query; /* we must keep sending (QRV) queries even if we get a positive * response, to make sure other routers are updated. query_sbit @@ -226,7 +226,7 @@ struct gm_grp_pending { pim_addr grp; struct timeval query; - struct thread *t_expire; + struct event *t_expire; }; /* guaranteed MTU for IPv6 is 1280 bytes. IPv6 header is 40 bytes, MLDv2 @@ -247,7 +247,7 @@ struct gm_gsq_pending { struct gm_gsq_pends_item itm; struct gm_if *iface; - struct thread *t_send; + struct event *t_send; pim_addr grp; bool s_bit; @@ -300,7 +300,7 @@ struct gm_if_stats { struct gm_if { struct interface *ifp; struct pim_instance *pim; - struct thread *t_query, *t_other_querier, *t_expire; + struct event *t_query, *t_other_querier, *t_expire; bool stopping; diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c index e46fa2cfac..86d9a745ea 100644 --- a/pimd/pim_assert.c +++ b/pimd/pim_assert.c @@ -493,12 +493,12 @@ static int pim_assert_cancel(struct pim_ifchannel *ch) return pim_assert_do(ch, metric); } -static void on_assert_timer(struct thread *t) +static void on_assert_timer(struct event *t) { struct pim_ifchannel *ch; struct interface *ifp; - ch = THREAD_ARG(t); + ch = EVENT_ARG(t); ifp = ch->interface; @@ -535,7 +535,7 @@ static void assert_timer_off(struct pim_ifchannel *ch) __func__, ch->sg_str, ch->interface->name); } } - THREAD_OFF(ch->t_ifassert_timer); + EVENT_OFF(ch->t_ifassert_timer); } static void pim_assert_timer_set(struct pim_ifchannel *ch, int interval) @@ -547,8 +547,8 @@ static void pim_assert_timer_set(struct pim_ifchannel *ch, int interval) __func__, ch->sg_str, interval, ch->interface->name); } - thread_add_timer(router->master, on_assert_timer, ch, interval, - &ch->t_ifassert_timer); + event_add_timer(router->master, on_assert_timer, ch, interval, + &ch->t_ifassert_timer); } static void pim_assert_timer_reset(struct pim_ifchannel *ch) diff --git a/pimd/pim_bsm.c b/pimd/pim_bsm.c index c249f323df..b36e006311 100644 --- a/pimd/pim_bsm.c +++ b/pimd/pim_bsm.c @@ -54,7 +54,7 @@ void pim_bsm_write_config(struct vty *vty, struct interface *ifp) static void pim_bsm_rpinfo_free(struct bsm_rpinfo *bsrp_info) { - THREAD_OFF(bsrp_info->g2rp_timer); + EVENT_OFF(bsrp_info->g2rp_timer); XFREE(MTYPE_PIM_BSRP_INFO, bsrp_info); } @@ -140,15 +140,15 @@ static struct bsgrp_node *pim_bsm_new_bsgrp_node(struct route_table *rt, return bsgrp; } -static void pim_on_bs_timer(struct thread *t) +static void pim_on_bs_timer(struct event *t) { struct route_node *rn; struct bsm_scope *scope; struct bsgrp_node *bsgrp_node; struct bsm_rpinfo *bsrp; - scope = THREAD_ARG(t); - THREAD_OFF(scope->bs_timer); + scope = EVENT_ARG(t); + EVENT_OFF(scope->bs_timer); if (PIM_DEBUG_BSM) zlog_debug("%s: Bootstrap Timer expired for scope: %d", @@ -189,7 +189,7 @@ static void pim_bs_timer_stop(struct bsm_scope *scope) if (PIM_DEBUG_BSM) zlog_debug("%s : BS timer being stopped of sz: %d", __func__, scope->sz_id); - THREAD_OFF(scope->bs_timer); + EVENT_OFF(scope->bs_timer); } static void pim_bs_timer_start(struct bsm_scope *scope, int bs_timeout) @@ -199,13 +199,13 @@ static void pim_bs_timer_start(struct bsm_scope *scope, int bs_timeout) zlog_debug("%s : Invalid scope(NULL).", __func__); return; } - THREAD_OFF(scope->bs_timer); + EVENT_OFF(scope->bs_timer); if (PIM_DEBUG_BSM) zlog_debug( "%s : starting bs timer for scope %d with timeout %d secs", __func__, scope->sz_id, bs_timeout); - thread_add_timer(router->master, pim_on_bs_timer, scope, bs_timeout, - &scope->bs_timer); + event_add_timer(router->master, pim_on_bs_timer, scope, bs_timeout, + &scope->bs_timer); } static inline void pim_bs_timer_restart(struct bsm_scope *scope, int bs_timeout) @@ -257,7 +257,7 @@ static bool is_hold_time_elapsed(void *data) return true; } -static void pim_on_g2rp_timer(struct thread *t) +static void pim_on_g2rp_timer(struct event *t) { struct bsm_rpinfo *bsrp; struct bsm_rpinfo *bsrp_node; @@ -268,8 +268,8 @@ static void pim_on_g2rp_timer(struct thread *t) uint16_t elapse; pim_addr bsrp_addr; - bsrp = THREAD_ARG(t); - THREAD_OFF(bsrp->g2rp_timer); + bsrp = EVENT_ARG(t); + EVENT_OFF(bsrp->g2rp_timer); bsgrp_node = bsrp->bsgrp_node; /* elapse time is the hold time of expired node */ @@ -331,15 +331,15 @@ static void pim_g2rp_timer_start(struct bsm_rpinfo *bsrp, int hold_time) zlog_debug("%s : Invalid brsp(NULL).", __func__); return; } - THREAD_OFF(bsrp->g2rp_timer); + EVENT_OFF(bsrp->g2rp_timer); if (PIM_DEBUG_BSM) zlog_debug( "%s : starting g2rp timer for grp: %pFX - rp: %pPAs with timeout %d secs(Actual Hold time : %d secs)", __func__, &bsrp->bsgrp_node->group, &bsrp->rp_address, hold_time, bsrp->rp_holdtime); - thread_add_timer(router->master, pim_on_g2rp_timer, bsrp, hold_time, - &bsrp->g2rp_timer); + event_add_timer(router->master, pim_on_g2rp_timer, bsrp, hold_time, + &bsrp->g2rp_timer); } static inline void pim_g2rp_timer_restart(struct bsm_rpinfo *bsrp, @@ -358,7 +358,7 @@ static void pim_g2rp_timer_stop(struct bsm_rpinfo *bsrp) __func__, &bsrp->bsgrp_node->group, &bsrp->rp_address); - THREAD_OFF(bsrp->g2rp_timer); + EVENT_OFF(bsrp->g2rp_timer); } static bool is_hold_time_zero(void *data) diff --git a/pimd/pim_bsm.h b/pimd/pim_bsm.h index 5e40adb806..fb09e3b1cc 100644 --- a/pimd/pim_bsm.h +++ b/pimd/pim_bsm.h @@ -59,7 +59,7 @@ struct bsm_scope { struct bsm_frags_head bsm_frags[1]; struct route_table *bsrp_table; /* group2rp mapping rcvd from BSR */ - struct thread *bs_timer; /* Boot strap timer */ + struct event *bs_timer; /* Boot strap timer */ }; /* BSM packet (= fragment) - this is stored as list in bsm_frags inside scope @@ -103,7 +103,7 @@ struct bsm_rpinfo { uint16_t rp_holdtime; /* RP holdtime - g2rp timer value */ pim_addr rp_address; /* RP Address */ struct bsgrp_node *bsgrp_node; /* Back ptr to bsgrp_node */ - struct thread *g2rp_timer; /* Run only for elected RP node */ + struct event *g2rp_timer; /* Run only for elected RP node */ }; extern int pim_bsm_rpinfo_cmp(const struct bsm_rpinfo *a, diff --git a/pimd/pim_iface.h b/pimd/pim_iface.h index 83079020b8..0aff56d558 100644 --- a/pimd/pim_iface.h +++ b/pimd/pim_iface.h @@ -104,10 +104,10 @@ struct pim_interface { struct gm_if *mld; int pim_sock_fd; /* PIM socket file descriptor */ - struct thread *t_pim_sock_read; /* thread for reading PIM socket */ + struct event *t_pim_sock_read; /* thread for reading PIM socket */ int64_t pim_sock_creation; /* timestamp of PIM socket creation */ - struct thread *t_pim_hello_timer; + struct event *t_pim_hello_timer; int pim_hello_period; int pim_default_holdtime; int pim_triggered_hello_delay; diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index 136498beb7..bc6b84ff2c 100644 --- a/pimd/pim_ifchannel.c +++ b/pimd/pim_ifchannel.c @@ -7,7 +7,7 @@ #include #include "linklist.h" -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "if.h" #include "vrf.h" @@ -193,9 +193,9 @@ void pim_ifchannel_delete(struct pim_ifchannel *ch) ch->upstream = NULL; - THREAD_OFF(ch->t_ifjoin_expiry_timer); - THREAD_OFF(ch->t_ifjoin_prune_pending_timer); - THREAD_OFF(ch->t_ifassert_timer); + EVENT_OFF(ch->t_ifjoin_expiry_timer); + EVENT_OFF(ch->t_ifjoin_prune_pending_timer); + EVENT_OFF(ch->t_ifassert_timer); if (ch->parent) { listnode_delete(ch->parent->sources, ch); @@ -411,7 +411,7 @@ const char *pim_ifchannel_ifassert_name(enum pim_ifassert_state ifassert_state) */ void reset_ifassert_state(struct pim_ifchannel *ch) { - THREAD_OFF(ch->t_ifassert_timer); + EVENT_OFF(ch->t_ifassert_timer); pim_ifassert_winner_set(ch, PIM_IFASSERT_NOINFO, PIMADDR_ANY, router->infinite_assert_metric); @@ -628,11 +628,11 @@ static void ifjoin_to_noinfo(struct pim_ifchannel *ch) delete_on_noinfo(ch); } -static void on_ifjoin_expiry_timer(struct thread *t) +static void on_ifjoin_expiry_timer(struct event *t) { struct pim_ifchannel *ch; - ch = THREAD_ARG(t); + ch = EVENT_ARG(t); if (PIM_DEBUG_PIM_TRACE) zlog_debug("%s: ifchannel %s expiry timer", __func__, @@ -642,14 +642,14 @@ static void on_ifjoin_expiry_timer(struct thread *t) /* ch may have been deleted */ } -static void on_ifjoin_prune_pending_timer(struct thread *t) +static void on_ifjoin_prune_pending_timer(struct event *t) { struct pim_ifchannel *ch; int send_prune_echo; /* boolean */ struct interface *ifp; struct pim_interface *pim_ifp; - ch = THREAD_ARG(t); + ch = EVENT_ARG(t); if (PIM_DEBUG_PIM_TRACE) zlog_debug("%s: IFCHANNEL%pSG %s Prune Pending Timer Popped", @@ -896,7 +896,7 @@ void pim_ifchannel_join_add(struct interface *ifp, pim_addr neigh_addr, previously received join message with holdtime=0xFFFF. */ if (ch->t_ifjoin_expiry_timer) { - unsigned long remain = thread_timer_remain_second( + unsigned long remain = event_timer_remain_second( ch->t_ifjoin_expiry_timer); if (remain > holdtime) { /* @@ -920,13 +920,13 @@ void pim_ifchannel_join_add(struct interface *ifp, pim_addr neigh_addr, return; } } - THREAD_OFF(ch->t_ifjoin_expiry_timer); + EVENT_OFF(ch->t_ifjoin_expiry_timer); break; case PIM_IFJOIN_PRUNE: if (source_flags & PIM_ENCODE_RPT_BIT) { pim_ifchannel_ifjoin_switch(__func__, ch, PIM_IFJOIN_NOINFO); - THREAD_OFF(ch->t_ifjoin_expiry_timer); + EVENT_OFF(ch->t_ifjoin_expiry_timer); delete_on_noinfo(ch); return; } else @@ -943,7 +943,7 @@ void pim_ifchannel_join_add(struct interface *ifp, pim_addr neigh_addr, * maximum of its current value and the HoldTime from the * triggering Join/Prune message. */ - THREAD_OFF(ch->t_ifjoin_prune_pending_timer); + EVENT_OFF(ch->t_ifjoin_prune_pending_timer); /* Check if SGRpt join Received */ if ((source_flags & PIM_ENCODE_RPT_BIT) && @@ -955,7 +955,7 @@ void pim_ifchannel_join_add(struct interface *ifp, pim_addr neigh_addr, * I transitions to the NoInfo state.The ET and PPT are * cancelled. */ - THREAD_OFF(ch->t_ifjoin_expiry_timer); + EVENT_OFF(ch->t_ifjoin_expiry_timer); pim_ifchannel_ifjoin_switch(__func__, ch, PIM_IFJOIN_NOINFO); return; @@ -964,13 +964,13 @@ void pim_ifchannel_join_add(struct interface *ifp, pim_addr neigh_addr, pim_ifchannel_ifjoin_handler(ch, pim_ifp); if (ch->t_ifjoin_expiry_timer) { - unsigned long remain = thread_timer_remain_second( + unsigned long remain = event_timer_remain_second( ch->t_ifjoin_expiry_timer); if (remain > holdtime) return; } - THREAD_OFF(ch->t_ifjoin_expiry_timer); + EVENT_OFF(ch->t_ifjoin_expiry_timer); break; case PIM_IFJOIN_PRUNE_TMP: @@ -980,8 +980,8 @@ void pim_ifchannel_join_add(struct interface *ifp, pim_addr neigh_addr, } if (holdtime != 0xFFFF) { - thread_add_timer(router->master, on_ifjoin_expiry_timer, ch, - holdtime, &ch->t_ifjoin_expiry_timer); + event_add_timer(router->master, on_ifjoin_expiry_timer, ch, + holdtime, &ch->t_ifjoin_expiry_timer); } } @@ -1030,15 +1030,15 @@ void pim_ifchannel_prune(struct interface *ifp, pim_addr upstream, be taken not to use "ch" afterwards since it would be deleted. */ - THREAD_OFF(ch->t_ifjoin_prune_pending_timer); - THREAD_OFF(ch->t_ifjoin_expiry_timer); - thread_add_timer_msec( - router->master, on_ifjoin_prune_pending_timer, - ch, jp_override_interval_msec, - &ch->t_ifjoin_prune_pending_timer); - thread_add_timer(router->master, on_ifjoin_expiry_timer, - ch, holdtime, - &ch->t_ifjoin_expiry_timer); + EVENT_OFF(ch->t_ifjoin_prune_pending_timer); + EVENT_OFF(ch->t_ifjoin_expiry_timer); + event_add_timer_msec(router->master, + on_ifjoin_prune_pending_timer, ch, + jp_override_interval_msec, + &ch->t_ifjoin_prune_pending_timer); + event_add_timer(router->master, on_ifjoin_expiry_timer, + ch, holdtime, + &ch->t_ifjoin_expiry_timer); pim_upstream_update_join_desired(pim_ifp->pim, ch->upstream); } @@ -1068,15 +1068,15 @@ void pim_ifchannel_prune(struct interface *ifp, pim_addr upstream, /* If we called ifjoin_prune() directly instead, care should be taken not to use "ch" afterwards since it would be deleted. */ - THREAD_OFF(ch->t_ifjoin_prune_pending_timer); - thread_add_timer_msec(router->master, - on_ifjoin_prune_pending_timer, ch, - jp_override_interval_msec, - &ch->t_ifjoin_prune_pending_timer); + EVENT_OFF(ch->t_ifjoin_prune_pending_timer); + event_add_timer_msec(router->master, + on_ifjoin_prune_pending_timer, ch, + jp_override_interval_msec, + &ch->t_ifjoin_prune_pending_timer); break; case PIM_IFJOIN_PRUNE: if (source_flags & PIM_ENCODE_RPT_BIT) { - THREAD_OFF(ch->t_ifjoin_prune_pending_timer); + EVENT_OFF(ch->t_ifjoin_prune_pending_timer); /* * While in Prune State, Receive SGRpt Prune. * RFC 7761 Sec 4.5.3: @@ -1087,35 +1087,35 @@ void pim_ifchannel_prune(struct interface *ifp, pim_addr upstream, * Join/Prune message. */ if (ch->t_ifjoin_expiry_timer) { - unsigned long rem = thread_timer_remain_second( + unsigned long rem = event_timer_remain_second( ch->t_ifjoin_expiry_timer); if (rem > holdtime) return; - THREAD_OFF(ch->t_ifjoin_expiry_timer); + EVENT_OFF(ch->t_ifjoin_expiry_timer); } - thread_add_timer(router->master, on_ifjoin_expiry_timer, - ch, holdtime, - &ch->t_ifjoin_expiry_timer); + event_add_timer(router->master, on_ifjoin_expiry_timer, + ch, holdtime, + &ch->t_ifjoin_expiry_timer); } break; case PIM_IFJOIN_PRUNE_TMP: if (source_flags & PIM_ENCODE_RPT_BIT) { ch->ifjoin_state = PIM_IFJOIN_PRUNE; - THREAD_OFF(ch->t_ifjoin_expiry_timer); - thread_add_timer(router->master, on_ifjoin_expiry_timer, - ch, holdtime, - &ch->t_ifjoin_expiry_timer); + EVENT_OFF(ch->t_ifjoin_expiry_timer); + event_add_timer(router->master, on_ifjoin_expiry_timer, + ch, holdtime, + &ch->t_ifjoin_expiry_timer); } break; case PIM_IFJOIN_PRUNE_PENDING_TMP: if (source_flags & PIM_ENCODE_RPT_BIT) { ch->ifjoin_state = PIM_IFJOIN_PRUNE_PENDING; - THREAD_OFF(ch->t_ifjoin_expiry_timer); - thread_add_timer(router->master, on_ifjoin_expiry_timer, - ch, holdtime, - &ch->t_ifjoin_expiry_timer); + EVENT_OFF(ch->t_ifjoin_expiry_timer); + event_add_timer(router->master, on_ifjoin_expiry_timer, + ch, holdtime, + &ch->t_ifjoin_expiry_timer); } break; } @@ -1466,8 +1466,8 @@ void pim_ifchannel_set_star_g_join_state(struct pim_ifchannel *ch, int eom, break; if (child->ifjoin_state == PIM_IFJOIN_PRUNE_PENDING_TMP) - THREAD_OFF(child->t_ifjoin_prune_pending_timer); - THREAD_OFF(child->t_ifjoin_expiry_timer); + EVENT_OFF(child->t_ifjoin_prune_pending_timer); + EVENT_OFF(child->t_ifjoin_expiry_timer); PIM_IF_FLAG_UNSET_S_G_RPT(child->flags); child->ifjoin_state = PIM_IFJOIN_NOINFO; diff --git a/pimd/pim_ifchannel.h b/pimd/pim_ifchannel.h index 7ab491e99b..4b0ff955f9 100644 --- a/pimd/pim_ifchannel.h +++ b/pimd/pim_ifchannel.h @@ -86,13 +86,13 @@ struct pim_ifchannel { /* Per-interface (S,G) Join/Prune State (Section 4.1.4 of RFC4601) */ enum pim_ifjoin_state ifjoin_state; - struct thread *t_ifjoin_expiry_timer; - struct thread *t_ifjoin_prune_pending_timer; + struct event *t_ifjoin_expiry_timer; + struct event *t_ifjoin_prune_pending_timer; int64_t ifjoin_creation; /* Record uptime of ifjoin state */ /* Per-interface (S,G) Assert State (Section 4.6.1 of RFC4601) */ enum pim_ifassert_state ifassert_state; - struct thread *t_ifassert_timer; + struct event *t_ifassert_timer; pim_addr ifassert_winner; struct pim_assert_metric ifassert_winner_metric; int64_t ifassert_creation; /* Record uptime of ifassert state */ diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c index bff0c0683e..063ba6edd2 100644 --- a/pimd/pim_igmp.c +++ b/pimd/pim_igmp.c @@ -29,7 +29,7 @@ #include "pim_tib.h" static void group_timer_off(struct gm_group *group); -static void pim_igmp_general_query(struct thread *t); +static void pim_igmp_general_query(struct event *t); void igmp_anysource_forward_start(struct pim_instance *pim, struct gm_group *group) @@ -325,11 +325,11 @@ struct gm_sock *pim_igmp_sock_lookup_ifaddr(struct list *igmp_sock_list, return NULL; } -static void pim_igmp_other_querier_expire(struct thread *t) +static void pim_igmp_other_querier_expire(struct event *t) { struct gm_sock *igmp; - igmp = THREAD_ARG(t); + igmp = EVENT_ARG(t); assert(!igmp->t_igmp_query_timer); @@ -377,7 +377,7 @@ void pim_igmp_other_querier_timer_on(struct gm_sock *igmp) "Querier %s resetting TIMER event for Other-Querier-Present", ifaddr_str); } - THREAD_OFF(igmp->t_other_querier_timer); + EVENT_OFF(igmp->t_other_querier_timer); } else { /* We are the current querier, then stop sending general queries: @@ -420,9 +420,9 @@ void pim_igmp_other_querier_timer_on(struct gm_sock *igmp) other_querier_present_interval_msec % 1000); } - thread_add_timer_msec(router->master, pim_igmp_other_querier_expire, - igmp, other_querier_present_interval_msec, - &igmp->t_other_querier_timer); + event_add_timer_msec(router->master, pim_igmp_other_querier_expire, + igmp, other_querier_present_interval_msec, + &igmp->t_other_querier_timer); } void pim_igmp_other_querier_timer_off(struct gm_sock *igmp) @@ -439,7 +439,7 @@ void pim_igmp_other_querier_timer_off(struct gm_sock *igmp) ifaddr_str, igmp->fd, igmp->interface->name); } } - THREAD_OFF(igmp->t_other_querier_timer); + EVENT_OFF(igmp->t_other_querier_timer); } int igmp_validate_checksum(char *igmp_msg, int igmp_msg_len) @@ -865,8 +865,8 @@ void pim_igmp_general_query_on(struct gm_sock *igmp) ifaddr_str, query_interval, startup_mode ? "startup" : "non-startup", igmp->fd); } - thread_add_timer(router->master, pim_igmp_general_query, igmp, - query_interval, &igmp->t_igmp_query_timer); + event_add_timer(router->master, pim_igmp_general_query, igmp, + query_interval, &igmp->t_igmp_query_timer); } void pim_igmp_general_query_off(struct gm_sock *igmp) @@ -883,11 +883,11 @@ void pim_igmp_general_query_off(struct gm_sock *igmp) ifaddr_str, igmp->fd, igmp->interface->name); } } - THREAD_OFF(igmp->t_igmp_query_timer); + EVENT_OFF(igmp->t_igmp_query_timer); } /* Issue IGMP general query */ -static void pim_igmp_general_query(struct thread *t) +static void pim_igmp_general_query(struct event *t) { struct gm_sock *igmp; struct in_addr dst_addr; @@ -895,7 +895,7 @@ static void pim_igmp_general_query(struct thread *t) struct pim_interface *pim_ifp; int query_buf_size; - igmp = THREAD_ARG(t); + igmp = EVENT_ARG(t); assert(igmp->interface); assert(igmp->interface->info); @@ -953,7 +953,7 @@ static void sock_close(struct gm_sock *igmp) igmp->interface->name); } } - THREAD_OFF(igmp->t_igmp_read); + EVENT_OFF(igmp->t_igmp_read); if (close(igmp->fd)) { flog_err( @@ -1045,7 +1045,7 @@ void igmp_group_delete(struct gm_group *group) igmp_source_delete(src); } - THREAD_OFF(group->t_group_query_retransmit_timer); + EVENT_OFF(group->t_group_query_retransmit_timer); group_timer_off(group); igmp_group_count_decr(pim_ifp); @@ -1208,10 +1208,10 @@ static struct gm_sock *igmp_sock_new(int fd, struct in_addr ifaddr, static void igmp_read_on(struct gm_sock *igmp); -static void pim_igmp_read(struct thread *t) +static void pim_igmp_read(struct event *t) { uint8_t buf[10000]; - struct gm_sock *igmp = (struct gm_sock *)THREAD_ARG(t); + struct gm_sock *igmp = (struct gm_sock *)EVENT_ARG(t); struct sockaddr_storage from; struct sockaddr_storage to; socklen_t fromlen = sizeof(from); @@ -1243,8 +1243,8 @@ static void igmp_read_on(struct gm_sock *igmp) zlog_debug("Scheduling READ event on IGMP socket fd=%d", igmp->fd); } - thread_add_read(router->master, pim_igmp_read, igmp, igmp->fd, - &igmp->t_igmp_read); + event_add_read(router->master, pim_igmp_read, igmp, igmp->fd, + &igmp->t_igmp_read); } struct gm_sock *pim_igmp_sock_add(struct list *igmp_sock_list, @@ -1300,11 +1300,11 @@ struct gm_sock *pim_igmp_sock_add(struct list *igmp_sock_list, source records. Source records whose timers are zero (from the previous EXCLUDE mode) are deleted. */ -static void igmp_group_timer(struct thread *t) +static void igmp_group_timer(struct event *t) { struct gm_group *group; - group = THREAD_ARG(t); + group = EVENT_ARG(t); if (PIM_DEBUG_GM_TRACE) { char group_str[INET_ADDRSTRLEN]; @@ -1348,7 +1348,7 @@ static void group_timer_off(struct gm_group *group) zlog_debug("Cancelling TIMER event for group %s on %s", group_str, group->interface->name); } - THREAD_OFF(group->t_group_timer); + EVENT_OFF(group->t_group_timer); } void igmp_group_timer_on(struct gm_group *group, long interval_msec, @@ -1375,8 +1375,8 @@ void igmp_group_timer_on(struct gm_group *group, long interval_msec, */ assert(group->group_filtermode_isexcl); - thread_add_timer_msec(router->master, igmp_group_timer, group, - interval_msec, &group->t_group_timer); + event_add_timer_msec(router->master, igmp_group_timer, group, + interval_msec, &group->t_group_timer); } struct gm_group *find_group_by_addr(struct gm_sock *igmp, diff --git a/pimd/pim_igmp.h b/pimd/pim_igmp.h index e275b5b398..a1f19b3c6e 100644 --- a/pimd/pim_igmp.h +++ b/pimd/pim_igmp.h @@ -64,10 +64,10 @@ struct gm_sock { pim_addr ifaddr; time_t sock_creation; - struct thread *t_igmp_read; /* read: IGMP sockets */ - struct thread - *t_igmp_query_timer; /* timer: issue IGMP general queries */ - struct thread *t_other_querier_timer; /* timer: other querier present */ + struct event *t_igmp_read; /* read: IGMP sockets */ + /* timer: issue IGMP general queries */ + struct event *t_igmp_query_timer; + struct event *t_other_querier_timer; /* timer: other querier present */ pim_addr querier_addr; /* IP address of the querier */ int querier_query_interval; /* QQI */ int querier_robustness_variable; /* QRV */ @@ -144,7 +144,7 @@ static inline void pim_igmp_other_querier_timer_off(struct gm_sock *igmp) struct gm_source { pim_addr source_addr; - struct thread *t_source_timer; + struct event *t_source_timer; struct gm_group *source_group; /* back pointer */ time_t source_creation; uint32_t source_flags; @@ -165,11 +165,11 @@ struct gm_group { represents the time for the *filter-mode* of the group to expire and switch to INCLUDE mode. */ - struct thread *t_group_timer; + struct event *t_group_timer; /* Shared between group-specific and group-and-source-specific retransmissions */ - struct thread *t_group_query_retransmit_timer; + struct event *t_group_query_retransmit_timer; /* Counter exclusive for group-specific retransmissions (not used by group-and-source-specific retransmissions, diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c index f10bcaf04b..15078dd1ec 100644 --- a/pimd/pim_igmpv3.c +++ b/pimd/pim_igmpv3.c @@ -107,12 +107,12 @@ void igmp_group_reset_gmi(struct gm_group *group) igmp_group_timer_on(group, group_membership_interval_msec, ifp->name); } -static void igmp_source_timer(struct thread *t) +static void igmp_source_timer(struct event *t) { struct gm_source *source; struct gm_group *group; - source = THREAD_ARG(t); + source = EVENT_ARG(t); group = source->source_group; @@ -187,7 +187,7 @@ static void source_timer_off(struct gm_group *group, struct gm_source *source) group_str, source_str, group->interface->name); } - THREAD_OFF(source->t_source_timer); + EVENT_OFF(source->t_source_timer); } static void igmp_source_timer_on(struct gm_group *group, @@ -209,8 +209,8 @@ static void igmp_source_timer_on(struct gm_group *group, source_str, group->interface->name); } - thread_add_timer_msec(router->master, igmp_source_timer, source, - interval_msec, &source->t_source_timer); + event_add_timer_msec(router->master, igmp_source_timer, source, + interval_msec, &source->t_source_timer); /* RFC 3376: 6.3. IGMPv3 Source-Specific Forwarding Rules @@ -1200,13 +1200,13 @@ static int group_retransmit_sources(struct gm_group *group, return num_retransmit_sources_left; } -static void igmp_group_retransmit(struct thread *t) +static void igmp_group_retransmit(struct event *t) { struct gm_group *group; int num_retransmit_sources_left; int send_with_sflag_set; /* boolean */ - group = THREAD_ARG(t); + group = EVENT_ARG(t); if (PIM_DEBUG_GM_TRACE) { char group_str[INET_ADDRSTRLEN]; @@ -1281,9 +1281,8 @@ static void group_retransmit_timer_on(struct gm_group *group) group->interface->name); } - thread_add_timer_msec(router->master, igmp_group_retransmit, group, - lmqi_msec, - &group->t_group_query_retransmit_timer); + event_add_timer_msec(router->master, igmp_group_retransmit, group, + lmqi_msec, &group->t_group_query_retransmit_timer); } static long igmp_group_timer_remain_msec(struct gm_group *group) diff --git a/pimd/pim_instance.h b/pimd/pim_instance.h index fa90e38a16..11577ae46d 100644 --- a/pimd/pim_instance.h +++ b/pimd/pim_instance.h @@ -64,7 +64,7 @@ enum pim_mlag_flags { }; struct pim_router { - struct thread_master *master; + struct event_loop *master; uint32_t debugs; @@ -92,7 +92,7 @@ struct pim_router { /* Holds the client data(unencoded) that need to be pushed to MCLAGD*/ struct stream_fifo *mlag_fifo; struct stream *mlag_stream; - struct thread *zpthread_mlag_write; + struct event *zpthread_mlag_write; struct in_addr anycast_vtep_ip; struct in_addr local_vtep_ip; struct pim_mlag_stats mlag_stats; @@ -120,7 +120,7 @@ struct pim_instance { int send_v6_secondary; - struct thread *thread; + struct event *thread; int mroute_socket; int reg_sock; /* Socket to send register msg */ int64_t mroute_socket_creation; @@ -157,7 +157,7 @@ struct pim_instance { unsigned int gm_socket_if_count; int gm_socket; - struct thread *t_gm_recv; + struct event *t_gm_recv; unsigned int gm_group_count; unsigned int gm_watermark_limit; @@ -176,7 +176,7 @@ struct pim_instance { uint64_t bsm_dropped; /* If we need to rescan all our upstreams */ - struct thread *rpf_cache_refresher; + struct event *rpf_cache_refresher; int64_t rpf_cache_refresh_requests; int64_t rpf_cache_refresh_events; int64_t rpf_cache_refresh_last; diff --git a/pimd/pim_join.c b/pimd/pim_join.c index 20821d58b8..671f7a37a5 100644 --- a/pimd/pim_join.c +++ b/pimd/pim_join.c @@ -326,10 +326,9 @@ int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh, if (PIM_IF_FLAG_TEST_S_G_RPT(child->flags)) { if (child->ifjoin_state == PIM_IFJOIN_PRUNE_PENDING_TMP) - THREAD_OFF( + EVENT_OFF( child->t_ifjoin_prune_pending_timer); - THREAD_OFF( - child->t_ifjoin_expiry_timer); + EVENT_OFF(child->t_ifjoin_expiry_timer); PIM_IF_FLAG_UNSET_S_G_RPT(child->flags); child->ifjoin_state = PIM_IFJOIN_NOINFO; delete_on_noinfo(child); diff --git a/pimd/pim_main.c b/pimd/pim_main.c index ce4326c616..7db0a7676b 100644 --- a/pimd/pim_main.c +++ b/pimd/pim_main.c @@ -11,7 +11,7 @@ #include "lib/version.h" #include #include "command.h" -#include "thread.h" +#include "frrevent.h" #include #include "memory.h" diff --git a/pimd/pim_mlag.c b/pimd/pim_mlag.c index 61cf2860fd..5d72eb6581 100644 --- a/pimd/pim_mlag.c +++ b/pimd/pim_mlag.c @@ -921,7 +921,7 @@ int pim_zebra_mlag_process_down(ZAPI_CALLBACK_ARGS) return 0; } -static void pim_mlag_register_handler(struct thread *thread) +static void pim_mlag_register_handler(struct event *thread) { uint32_t bit_mask = 0; @@ -952,11 +952,11 @@ void pim_mlag_register(void) router->mlag_process_register = true; - thread_add_event(router->master, pim_mlag_register_handler, NULL, 0, - NULL); + event_add_event(router->master, pim_mlag_register_handler, NULL, 0, + NULL); } -static void pim_mlag_deregister_handler(struct thread *thread) +static void pim_mlag_deregister_handler(struct event *thread) { if (!zclient) return; @@ -980,8 +980,8 @@ void pim_mlag_deregister(void) router->mlag_process_register = false; - thread_add_event(router->master, pim_mlag_deregister_handler, NULL, 0, - NULL); + event_add_event(router->master, pim_mlag_deregister_handler, NULL, 0, + NULL); } void pim_if_configure_mlag_dualactive(struct pim_interface *pim_ifp) diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c index adf0540f65..4d5da31827 100644 --- a/pimd/pim_mroute.c +++ b/pimd/pim_mroute.c @@ -767,7 +767,7 @@ int pim_mroute_msg(struct pim_instance *pim, const char *buf, size_t buf_size, return 0; } -static void mroute_read(struct thread *t) +static void mroute_read(struct event *t) { struct pim_instance *pim; static long long count; @@ -775,7 +775,7 @@ static void mroute_read(struct thread *t) int cont = 1; int rd; ifindex_t ifindex; - pim = THREAD_ARG(t); + pim = EVENT_ARG(t); while (cont) { rd = pim_socket_recvfromto(pim->mroute_socket, (uint8_t *)buf, @@ -809,13 +809,13 @@ done: static void mroute_read_on(struct pim_instance *pim) { - thread_add_read(router->master, mroute_read, pim, pim->mroute_socket, - &pim->thread); + event_add_read(router->master, mroute_read, pim, pim->mroute_socket, + &pim->thread); } static void mroute_read_off(struct pim_instance *pim) { - THREAD_OFF(pim->thread); + EVENT_OFF(pim->thread); } int pim_mroute_socket_enable(struct pim_instance *pim) diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c index 9d29a33a52..b1b6958fe1 100644 --- a/pimd/pim_msdp.c +++ b/pimd/pim_msdp.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -54,9 +54,9 @@ static void pim_msdp_sa_timer_expiry_log(struct pim_msdp_sa *sa, } /* RFC-3618:Sec-5.1 - global active source advertisement timer */ -static void pim_msdp_sa_adv_timer_cb(struct thread *t) +static void pim_msdp_sa_adv_timer_cb(struct event *t) { - struct pim_instance *pim = THREAD_ARG(t); + struct pim_instance *pim = EVENT_ARG(t); if (PIM_DEBUG_MSDP_EVENTS) { zlog_debug("MSDP SA advertisement timer expired"); @@ -68,20 +68,20 @@ static void pim_msdp_sa_adv_timer_cb(struct thread *t) static void pim_msdp_sa_adv_timer_setup(struct pim_instance *pim, bool start) { - THREAD_OFF(pim->msdp.sa_adv_timer); + EVENT_OFF(pim->msdp.sa_adv_timer); if (start) { - thread_add_timer(pim->msdp.master, pim_msdp_sa_adv_timer_cb, - pim, PIM_MSDP_SA_ADVERTISMENT_TIME, - &pim->msdp.sa_adv_timer); + event_add_timer(pim->msdp.master, pim_msdp_sa_adv_timer_cb, pim, + PIM_MSDP_SA_ADVERTISMENT_TIME, + &pim->msdp.sa_adv_timer); } } /* RFC-3618:Sec-5.3 - SA cache state timer */ -static void pim_msdp_sa_state_timer_cb(struct thread *t) +static void pim_msdp_sa_state_timer_cb(struct event *t) { struct pim_msdp_sa *sa; - sa = THREAD_ARG(t); + sa = EVENT_ARG(t); if (PIM_DEBUG_MSDP_EVENTS) { pim_msdp_sa_timer_expiry_log(sa, "state"); @@ -92,11 +92,11 @@ static void pim_msdp_sa_state_timer_cb(struct thread *t) static void pim_msdp_sa_state_timer_setup(struct pim_msdp_sa *sa, bool start) { - THREAD_OFF(sa->sa_state_timer); + EVENT_OFF(sa->sa_state_timer); if (start) { - thread_add_timer(sa->pim->msdp.master, - pim_msdp_sa_state_timer_cb, sa, - PIM_MSDP_SA_HOLD_TIME, &sa->sa_state_timer); + event_add_timer(sa->pim->msdp.master, + pim_msdp_sa_state_timer_cb, sa, + PIM_MSDP_SA_HOLD_TIME, &sa->sa_state_timer); } } @@ -861,11 +861,11 @@ static void pim_msdp_peer_timer_expiry_log(struct pim_msdp_peer *mp, } /* RFC-3618:Sec-5.4 - peer hold timer */ -static void pim_msdp_peer_hold_timer_cb(struct thread *t) +static void pim_msdp_peer_hold_timer_cb(struct event *t) { struct pim_msdp_peer *mp; - mp = THREAD_ARG(t); + mp = EVENT_ARG(t); if (PIM_DEBUG_MSDP_EVENTS) { pim_msdp_peer_timer_expiry_log(mp, "hold"); @@ -884,20 +884,20 @@ static void pim_msdp_peer_hold_timer_cb(struct thread *t) static void pim_msdp_peer_hold_timer_setup(struct pim_msdp_peer *mp, bool start) { struct pim_instance *pim = mp->pim; - THREAD_OFF(mp->hold_timer); + EVENT_OFF(mp->hold_timer); if (start) { - thread_add_timer(pim->msdp.master, pim_msdp_peer_hold_timer_cb, - mp, pim->msdp.hold_time, &mp->hold_timer); + event_add_timer(pim->msdp.master, pim_msdp_peer_hold_timer_cb, + mp, pim->msdp.hold_time, &mp->hold_timer); } } /* RFC-3618:Sec-5.5 - peer keepalive timer */ -static void pim_msdp_peer_ka_timer_cb(struct thread *t) +static void pim_msdp_peer_ka_timer_cb(struct event *t) { struct pim_msdp_peer *mp; - mp = THREAD_ARG(t); + mp = EVENT_ARG(t); if (PIM_DEBUG_MSDP_EVENTS) { pim_msdp_peer_timer_expiry_log(mp, "ka"); @@ -909,11 +909,10 @@ static void pim_msdp_peer_ka_timer_cb(struct thread *t) static void pim_msdp_peer_ka_timer_setup(struct pim_msdp_peer *mp, bool start) { - THREAD_OFF(mp->ka_timer); + EVENT_OFF(mp->ka_timer); if (start) { - thread_add_timer(mp->pim->msdp.master, - pim_msdp_peer_ka_timer_cb, mp, - mp->pim->msdp.keep_alive, &mp->ka_timer); + event_add_timer(mp->pim->msdp.master, pim_msdp_peer_ka_timer_cb, + mp, mp->pim->msdp.keep_alive, &mp->ka_timer); } } @@ -954,11 +953,11 @@ static void pim_msdp_peer_active_connect(struct pim_msdp_peer *mp) } /* RFC-3618:Sec-5.6 - connection retry on active peer */ -static void pim_msdp_peer_cr_timer_cb(struct thread *t) +static void pim_msdp_peer_cr_timer_cb(struct event *t) { struct pim_msdp_peer *mp; - mp = THREAD_ARG(t); + mp = EVENT_ARG(t); if (PIM_DEBUG_MSDP_EVENTS) { pim_msdp_peer_timer_expiry_log(mp, "connect-retry"); @@ -973,11 +972,11 @@ static void pim_msdp_peer_cr_timer_cb(struct thread *t) static void pim_msdp_peer_cr_timer_setup(struct pim_msdp_peer *mp, bool start) { - THREAD_OFF(mp->cr_timer); + EVENT_OFF(mp->cr_timer); if (start) { - thread_add_timer(mp->pim->msdp.master, - pim_msdp_peer_cr_timer_cb, mp, - mp->pim->msdp.connection_retry, &mp->cr_timer); + event_add_timer(mp->pim->msdp.master, pim_msdp_peer_cr_timer_cb, + mp, mp->pim->msdp.connection_retry, + &mp->cr_timer); } } @@ -1334,7 +1333,7 @@ static void pim_msdp_enable(struct pim_instance *pim) } /* MSDP init */ -void pim_msdp_init(struct pim_instance *pim, struct thread_master *master) +void pim_msdp_init(struct pim_instance *pim, struct event_loop *master) { pim->msdp.master = master; char hash_name[64]; diff --git a/pimd/pim_msdp.h b/pimd/pim_msdp.h index f0a03f076b..ddc015f9b6 100644 --- a/pimd/pim_msdp.h +++ b/pimd/pim_msdp.h @@ -74,7 +74,7 @@ struct pim_msdp_sa { /* rfc-3618 is missing default value for SA-hold-down-Period. pulled * this number from industry-standards */ #define PIM_MSDP_SA_HOLD_TIME ((3*60)+30) - struct thread *sa_state_timer; // 5.6 + struct event *sa_state_timer; // 5.6 int64_t uptime; struct pim_upstream *up; @@ -109,18 +109,18 @@ struct pim_msdp_peer { /* protocol timers */ #define PIM_MSDP_PEER_HOLD_TIME 75 - struct thread *hold_timer; // 5.4 + struct event *hold_timer; // 5.4 #define PIM_MSDP_PEER_KA_TIME 60 - struct thread *ka_timer; // 5.5 + struct event *ka_timer; // 5.5 #define PIM_MSDP_PEER_CONNECT_RETRY_TIME 30 - struct thread *cr_timer; // 5.6 + struct event *cr_timer; // 5.6 /* packet thread and buffers */ uint32_t packet_size; struct stream *ibuf; struct stream_fifo *obuf; - struct thread *t_read; - struct thread *t_write; + struct event *t_read; + struct event *t_write; /* stats */ uint32_t conn_attempts; @@ -167,12 +167,12 @@ enum pim_msdp_flags { struct pim_msdp_listener { int fd; union sockunion su; - struct thread *thread; + struct event *thread; }; struct pim_msdp { enum pim_msdp_flags flags; - struct thread_master *master; + struct event_loop *master; struct pim_msdp_listener listener; uint32_t rejected_accepts; @@ -182,7 +182,7 @@ struct pim_msdp { /* MSDP active-source info */ #define PIM_MSDP_SA_ADVERTISMENT_TIME 60 - struct thread *sa_adv_timer; // 5.6 + struct event *sa_adv_timer; // 5.6 struct hash *sa_hash; struct list *sa_list; uint32_t local_cnt; @@ -204,20 +204,20 @@ struct pim_msdp { }; #define PIM_MSDP_PEER_READ_ON(mp) \ - thread_add_read(mp->pim->msdp.master, pim_msdp_read, mp, mp->fd, \ - &mp->t_read) + event_add_read(mp->pim->msdp.master, pim_msdp_read, mp, mp->fd, \ + &mp->t_read) #define PIM_MSDP_PEER_WRITE_ON(mp) \ - thread_add_write(mp->pim->msdp.master, pim_msdp_write, mp, mp->fd, \ - &mp->t_write) + event_add_write(mp->pim->msdp.master, pim_msdp_write, mp, mp->fd, \ + &mp->t_write) -#define PIM_MSDP_PEER_READ_OFF(mp) thread_cancel(&mp->t_read) -#define PIM_MSDP_PEER_WRITE_OFF(mp) thread_cancel(&mp->t_write) +#define PIM_MSDP_PEER_READ_OFF(mp) event_cancel(&mp->t_read) +#define PIM_MSDP_PEER_WRITE_OFF(mp) event_cancel(&mp->t_write) #if PIM_IPV != 6 // struct pim_msdp *msdp; struct pim_instance; -void pim_msdp_init(struct pim_instance *pim, struct thread_master *master); +void pim_msdp_init(struct pim_instance *pim, struct event_loop *master); void pim_msdp_exit(struct pim_instance *pim); char *pim_msdp_state_dump(enum pim_msdp_peer_state state, char *buf, int buf_size); @@ -227,7 +227,7 @@ void pim_msdp_peer_established(struct pim_msdp_peer *mp); void pim_msdp_peer_pkt_rxed(struct pim_msdp_peer *mp); void pim_msdp_peer_stop_tcp_conn(struct pim_msdp_peer *mp, bool chg_state); void pim_msdp_peer_reset_tcp_conn(struct pim_msdp_peer *mp, const char *rc_str); -void pim_msdp_write(struct thread *thread); +void pim_msdp_write(struct event *thread); int pim_msdp_config_write(struct pim_instance *pim, struct vty *vty, const char *spaces); bool pim_msdp_peer_config_write(struct vty *vty, struct pim_instance *pim, @@ -308,7 +308,7 @@ void pim_msdp_peer_change_source(struct pim_msdp_peer *mp, #else /* PIM_IPV == 6 */ static inline void pim_msdp_init(struct pim_instance *pim, - struct thread_master *master) + struct event_loop *master) { } diff --git a/pimd/pim_msdp_packet.c b/pimd/pim_msdp_packet.c index a6f318e61e..a414736ccc 100644 --- a/pimd/pim_msdp_packet.c +++ b/pimd/pim_msdp_packet.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include "frrevent.h" #include #include @@ -190,7 +190,7 @@ static void pim_msdp_write_proceed_actions(struct pim_msdp_peer *mp) } } -void pim_msdp_write(struct thread *thread) +void pim_msdp_write(struct event *thread) { struct pim_msdp_peer *mp; struct stream *s; @@ -200,7 +200,7 @@ void pim_msdp_write(struct thread *thread) int work_cnt = 0; int work_max_cnt = 100; - mp = THREAD_ARG(thread); + mp = EVENT_ARG(thread); mp->t_write = NULL; if (PIM_DEBUG_MSDP_INTERNAL) { @@ -686,13 +686,13 @@ static int pim_msdp_read_packet(struct pim_msdp_peer *mp) return 0; } -void pim_msdp_read(struct thread *thread) +void pim_msdp_read(struct event *thread) { struct pim_msdp_peer *mp; int rc; uint32_t len; - mp = THREAD_ARG(thread); + mp = EVENT_ARG(thread); mp->t_read = NULL; if (PIM_DEBUG_MSDP_INTERNAL) { diff --git a/pimd/pim_msdp_packet.h b/pimd/pim_msdp_packet.h index efb14cdf72..1584a24539 100644 --- a/pimd/pim_msdp_packet.h +++ b/pimd/pim_msdp_packet.h @@ -51,7 +51,7 @@ #define PIM_MSDP_PKT_TYPE_STRLEN 16 void pim_msdp_pkt_ka_tx(struct pim_msdp_peer *mp); -void pim_msdp_read(struct thread *thread); +void pim_msdp_read(struct event *thread); void pim_msdp_pkt_sa_tx(struct pim_instance *pim); void pim_msdp_pkt_sa_tx_one(struct pim_msdp_sa *sa); void pim_msdp_pkt_sa_tx_to_one_peer(struct pim_msdp_peer *mp); diff --git a/pimd/pim_msdp_socket.c b/pimd/pim_msdp_socket.c index a6b5ee11b6..fe8d5e934a 100644 --- a/pimd/pim_msdp_socket.c +++ b/pimd/pim_msdp_socket.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include "frrevent.h" #include #include #include @@ -50,10 +50,10 @@ static void pim_msdp_update_sock_send_buffer_size(int fd) } /* passive peer socket accept */ -static void pim_msdp_sock_accept(struct thread *thread) +static void pim_msdp_sock_accept(struct event *thread) { union sockunion su; - struct pim_instance *pim = THREAD_ARG(thread); + struct pim_instance *pim = EVENT_ARG(thread); int accept_sock; int msdp_sock; struct pim_msdp_peer *mp; @@ -61,15 +61,15 @@ static void pim_msdp_sock_accept(struct thread *thread) sockunion_init(&su); /* re-register accept thread */ - accept_sock = THREAD_FD(thread); + accept_sock = EVENT_FD(thread); if (accept_sock < 0) { flog_err(EC_LIB_DEVELOPMENT, "accept_sock is negative value %d", accept_sock); return; } pim->msdp.listener.thread = NULL; - thread_add_read(router->master, pim_msdp_sock_accept, pim, accept_sock, - &pim->msdp.listener.thread); + event_add_read(router->master, pim_msdp_sock_accept, pim, accept_sock, + &pim->msdp.listener.thread); /* accept client connection. */ msdp_sock = sockunion_accept(accept_sock, &su); @@ -192,8 +192,8 @@ int pim_msdp_sock_listen(struct pim_instance *pim) /* add accept thread */ listener->fd = sock; memcpy(&listener->su, &sin, socklen); - thread_add_read(pim->msdp.master, pim_msdp_sock_accept, pim, sock, - &listener->thread); + event_add_read(pim->msdp.master, pim_msdp_sock_accept, pim, sock, + &listener->thread); pim->msdp.flags |= PIM_MSDPF_LISTENER; return 0; diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c index 0b7ea0ad9d..3d0ecb1bf4 100644 --- a/pimd/pim_neighbor.c +++ b/pimd/pim_neighbor.c @@ -188,13 +188,13 @@ static void update_dr_priority(struct pim_neighbor *neigh, } } -static void on_neighbor_timer(struct thread *t) +static void on_neighbor_timer(struct event *t) { struct pim_neighbor *neigh; struct interface *ifp; char msg[100]; - neigh = THREAD_ARG(t); + neigh = EVENT_ARG(t); ifp = neigh->interface; @@ -220,7 +220,7 @@ void pim_neighbor_timer_reset(struct pim_neighbor *neigh, uint16_t holdtime) { neigh->holdtime = holdtime; - THREAD_OFF(neigh->t_expire_timer); + EVENT_OFF(neigh->t_expire_timer); /* 0xFFFF is request for no holdtime @@ -234,13 +234,13 @@ void pim_neighbor_timer_reset(struct pim_neighbor *neigh, uint16_t holdtime) __func__, neigh->holdtime, &neigh->source_addr, neigh->interface->name); - thread_add_timer(router->master, on_neighbor_timer, neigh, - neigh->holdtime, &neigh->t_expire_timer); + event_add_timer(router->master, on_neighbor_timer, neigh, + neigh->holdtime, &neigh->t_expire_timer); } -static void on_neighbor_jp_timer(struct thread *t) +static void on_neighbor_jp_timer(struct event *t) { - struct pim_neighbor *neigh = THREAD_ARG(t); + struct pim_neighbor *neigh = EVENT_ARG(t); struct pim_rpf rpf; if (PIM_DEBUG_PIM_TRACE) @@ -253,15 +253,15 @@ static void on_neighbor_jp_timer(struct thread *t) rpf.rpf_addr = neigh->source_addr; pim_joinprune_send(&rpf, neigh->upstream_jp_agg); - thread_add_timer(router->master, on_neighbor_jp_timer, neigh, - router->t_periodic, &neigh->jp_timer); + event_add_timer(router->master, on_neighbor_jp_timer, neigh, + router->t_periodic, &neigh->jp_timer); } static void pim_neighbor_start_jp_timer(struct pim_neighbor *neigh) { - THREAD_OFF(neigh->jp_timer); - thread_add_timer(router->master, on_neighbor_jp_timer, neigh, - router->t_periodic, &neigh->jp_timer); + EVENT_OFF(neigh->jp_timer); + event_add_timer(router->master, on_neighbor_jp_timer, neigh, + router->t_periodic, &neigh->jp_timer); } static struct pim_neighbor * @@ -375,7 +375,7 @@ void pim_neighbor_free(struct pim_neighbor *neigh) delete_prefix_list(neigh); list_delete(&neigh->upstream_jp_agg); - THREAD_OFF(neigh->jp_timer); + EVENT_OFF(neigh->jp_timer); bfd_sess_free(&neigh->bfd_session); @@ -579,7 +579,7 @@ void pim_neighbor_delete(struct interface *ifp, struct pim_neighbor *neigh, zlog_notice("PIM NEIGHBOR DOWN: neighbor %pPA on interface %s: %s", &neigh->source_addr, ifp->name, delete_message); - THREAD_OFF(neigh->t_expire_timer); + EVENT_OFF(neigh->t_expire_timer); pim_if_assert_on_neighbor_down(ifp, neigh->source_addr); diff --git a/pimd/pim_neighbor.h b/pimd/pim_neighbor.h index f7375745a1..69e9976de5 100644 --- a/pimd/pim_neighbor.h +++ b/pimd/pim_neighbor.h @@ -27,10 +27,10 @@ struct pim_neighbor { uint32_t dr_priority; uint32_t generation_id; struct list *prefix_list; /* list of struct prefix */ - struct thread *t_expire_timer; + struct event *t_expire_timer; struct interface *interface; - struct thread *jp_timer; + struct event *jp_timer; struct list *upstream_jp_agg; struct bfd_session_params *bfd_session; }; diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c index 1248db3de4..4a272a4802 100644 --- a/pimd/pim_pim.c +++ b/pimd/pim_pim.c @@ -7,7 +7,7 @@ #include #include "log.h" -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "if.h" #include "network.h" @@ -31,7 +31,7 @@ #include "pim_bsm.h" #include -static void on_pim_hello_send(struct thread *t); +static void on_pim_hello_send(struct event *t); static const char *pim_pim_msgtype2str(enum pim_msg_type type) { @@ -70,7 +70,7 @@ static void sock_close(struct interface *ifp) pim_ifp->pim_sock_fd, ifp->name); } } - THREAD_OFF(pim_ifp->t_pim_sock_read); + EVENT_OFF(pim_ifp->t_pim_sock_read); if (PIM_DEBUG_PIM_TRACE) { if (pim_ifp->t_pim_hello_timer) { @@ -79,7 +79,7 @@ static void sock_close(struct interface *ifp) ifp->name); } } - THREAD_OFF(pim_ifp->t_pim_hello_timer); + EVENT_OFF(pim_ifp->t_pim_hello_timer); if (PIM_DEBUG_PIM_TRACE) { zlog_debug("Deleting PIM socket fd=%d on interface %s", @@ -334,7 +334,7 @@ int pim_pim_packet(struct interface *ifp, uint8_t *buf, size_t len, static void pim_sock_read_on(struct interface *ifp); -static void pim_sock_read(struct thread *t) +static void pim_sock_read(struct event *t) { struct interface *ifp, *orig_ifp; struct pim_interface *pim_ifp; @@ -350,8 +350,8 @@ static void pim_sock_read(struct thread *t) static long long count = 0; int cont = 1; - orig_ifp = ifp = THREAD_ARG(t); - fd = THREAD_FD(t); + orig_ifp = ifp = EVENT_ARG(t); + fd = EVENT_FD(t); pim_ifp = ifp->info; @@ -431,8 +431,8 @@ static void pim_sock_read_on(struct interface *ifp) zlog_debug("Scheduling READ event on PIM socket fd=%d", pim_ifp->pim_sock_fd); } - thread_add_read(router->master, pim_sock_read, ifp, - pim_ifp->pim_sock_fd, &pim_ifp->t_pim_sock_read); + event_add_read(router->master, pim_sock_read, ifp, pim_ifp->pim_sock_fd, + &pim_ifp->t_pim_sock_read); } static int pim_sock_open(struct interface *ifp) @@ -821,21 +821,20 @@ static void hello_resched(struct interface *ifp) zlog_debug("Rescheduling %d sec hello on interface %s", pim_ifp->pim_hello_period, ifp->name); } - THREAD_OFF(pim_ifp->t_pim_hello_timer); - thread_add_timer(router->master, on_pim_hello_send, ifp, - pim_ifp->pim_hello_period, - &pim_ifp->t_pim_hello_timer); + EVENT_OFF(pim_ifp->t_pim_hello_timer); + event_add_timer(router->master, on_pim_hello_send, ifp, + pim_ifp->pim_hello_period, &pim_ifp->t_pim_hello_timer); } /* Periodic hello timer */ -static void on_pim_hello_send(struct thread *t) +static void on_pim_hello_send(struct event *t) { struct pim_interface *pim_ifp; struct interface *ifp; - ifp = THREAD_ARG(t); + ifp = EVENT_ARG(t); pim_ifp = ifp->info; /* @@ -924,7 +923,7 @@ void pim_hello_restart_triggered(struct interface *ifp) return; } - THREAD_OFF(pim_ifp->t_pim_hello_timer); + EVENT_OFF(pim_ifp->t_pim_hello_timer); } random_msec = triggered_hello_delay_msec; @@ -935,8 +934,8 @@ void pim_hello_restart_triggered(struct interface *ifp) random_msec, ifp->name); } - thread_add_timer_msec(router->master, on_pim_hello_send, ifp, - random_msec, &pim_ifp->t_pim_hello_timer); + event_add_timer_msec(router->master, on_pim_hello_send, ifp, + random_msec, &pim_ifp->t_pim_hello_timer); } int pim_sock_add(struct interface *ifp) diff --git a/pimd/pim_register.c b/pimd/pim_register.c index 5144fe67b8..b5d9df6f2a 100644 --- a/pimd/pim_register.c +++ b/pimd/pim_register.c @@ -9,7 +9,7 @@ #include "log.h" #include "if.h" -#include "thread.h" +#include "frrevent.h" #include "prefix.h" #include "vty.h" #include "plist.h" @@ -32,7 +32,7 @@ #include "pim_vxlan.h" #include "pim_addr.h" -struct thread *send_test_packet_timer = NULL; +struct event *send_test_packet_timer = NULL; void pim_register_join(struct pim_upstream *up) { @@ -743,7 +743,7 @@ void pim_reg_del_on_couldreg_fail(struct interface *ifp) && (up->reg_state != PIM_REG_NOINFO)) { pim_channel_del_oif(up->channel_oil, pim->regiface, PIM_OIF_FLAG_PROTO_PIM, __func__); - THREAD_OFF(up->t_rs_timer); + EVENT_OFF(up->t_rs_timer); up->reg_state = PIM_REG_NOINFO; } } diff --git a/pimd/pim_ssmpingd.c b/pimd/pim_ssmpingd.c index 2fc30b4915..dadf29f535 100644 --- a/pimd/pim_ssmpingd.c +++ b/pimd/pim_ssmpingd.c @@ -196,7 +196,7 @@ static void ssmpingd_delete(struct ssmpingd_sock *ss) { assert(ss); - THREAD_OFF(ss->t_sock_read); + EVENT_OFF(ss->t_sock_read); if (close(ss->sock_fd)) { zlog_warn( @@ -286,11 +286,11 @@ static int ssmpingd_read_msg(struct ssmpingd_sock *ss) return 0; } -static void ssmpingd_sock_read(struct thread *t) +static void ssmpingd_sock_read(struct event *t) { struct ssmpingd_sock *ss; - ss = THREAD_ARG(t); + ss = EVENT_ARG(t); ssmpingd_read_msg(ss); @@ -300,8 +300,8 @@ static void ssmpingd_sock_read(struct thread *t) static void ssmpingd_read_on(struct ssmpingd_sock *ss) { - thread_add_read(router->master, ssmpingd_sock_read, ss, ss->sock_fd, - &ss->t_sock_read); + event_add_read(router->master, ssmpingd_sock_read, ss, ss->sock_fd, + &ss->t_sock_read); } static struct ssmpingd_sock *ssmpingd_new(struct pim_instance *pim, diff --git a/pimd/pim_ssmpingd.h b/pimd/pim_ssmpingd.h index fe15839793..71286e4964 100644 --- a/pimd/pim_ssmpingd.h +++ b/pimd/pim_ssmpingd.h @@ -17,7 +17,7 @@ struct ssmpingd_sock { struct pim_instance *pim; int sock_fd; /* socket */ - struct thread *t_sock_read; /* thread for reading socket */ + struct event *t_sock_read; /* thread for reading socket */ pim_addr source_addr; /* source address */ int64_t creation; /* timestamp of socket creation */ int64_t requests; /* counter */ diff --git a/pimd/pim_time.c b/pimd/pim_time.c index c9555f5310..205945e5ae 100644 --- a/pimd/pim_time.c +++ b/pimd/pim_time.c @@ -11,7 +11,7 @@ #include #include "log.h" -#include "thread.h" +#include "frrevent.h" #include "lib_errors.h" #include "pim_time.h" @@ -121,21 +121,21 @@ static int pim_time_hhmmss(char *buf, int buf_size, long sec) return wr != 8; } -void pim_time_timer_to_mmss(char *buf, int buf_size, struct thread *t_timer) +void pim_time_timer_to_mmss(char *buf, int buf_size, struct event *t_timer) { if (t_timer) { pim_time_mmss(buf, buf_size, - thread_timer_remain_second(t_timer)); + event_timer_remain_second(t_timer)); } else { snprintf(buf, buf_size, "--:--"); } } -void pim_time_timer_to_hhmmss(char *buf, int buf_size, struct thread *t_timer) +void pim_time_timer_to_hhmmss(char *buf, int buf_size, struct event *t_timer) { if (t_timer) { pim_time_hhmmss(buf, buf_size, - thread_timer_remain_second(t_timer)); + event_timer_remain_second(t_timer)); } else { snprintf(buf, buf_size, "--:--:--"); } @@ -156,9 +156,9 @@ void pim_time_uptime_begin(char *buf, int buf_size, int64_t now, int64_t begin) snprintf(buf, buf_size, "--:--:--"); } -long pim_time_timer_remain_msec(struct thread *t_timer) +long pim_time_timer_remain_msec(struct event *t_timer) { /* no timer thread running means timer has expired: return 0 */ - return t_timer ? thread_timer_remain_msec(t_timer) : 0; + return t_timer ? event_timer_remain_msec(t_timer) : 0; } diff --git a/pimd/pim_time.h b/pimd/pim_time.h index fd1e79e2bb..6c0e07396a 100644 --- a/pimd/pim_time.h +++ b/pimd/pim_time.h @@ -10,16 +10,16 @@ #include #include -#include "thread.h" +#include "frrevent.h" int64_t pim_time_monotonic_sec(void); int64_t pim_time_monotonic_dsec(void); int64_t pim_time_monotonic_usec(void); int pim_time_mmss(char *buf, int buf_size, long sec); -void pim_time_timer_to_mmss(char *buf, int buf_size, struct thread *t); -void pim_time_timer_to_hhmmss(char *buf, int buf_size, struct thread *t); +void pim_time_timer_to_mmss(char *buf, int buf_size, struct event *t); +void pim_time_timer_to_hhmmss(char *buf, int buf_size, struct event *t); void pim_time_uptime(char *buf, int buf_size, int64_t uptime_sec); void pim_time_uptime_begin(char *buf, int buf_size, int64_t now, int64_t begin); -long pim_time_timer_remain_msec(struct thread *t_timer); +long pim_time_timer_remain_msec(struct event *t_timer); #endif /* PIM_TIME_H */ diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index b0f1158596..8fa7b7cf96 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -9,7 +9,7 @@ #include "log.h" #include "zclient.h" #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "plist.h" @@ -166,10 +166,10 @@ static void upstream_channel_oil_detach(struct pim_upstream *up) static void pim_upstream_timers_stop(struct pim_upstream *up) { - THREAD_OFF(up->t_ka_timer); - THREAD_OFF(up->t_rs_timer); - THREAD_OFF(up->t_msdp_reg_timer); - THREAD_OFF(up->t_join_timer); + EVENT_OFF(up->t_ka_timer); + EVENT_OFF(up->t_rs_timer); + EVENT_OFF(up->t_msdp_reg_timer); + EVENT_OFF(up->t_join_timer); } struct pim_upstream *pim_upstream_del(struct pim_instance *pim, @@ -289,11 +289,11 @@ void pim_upstream_send_join(struct pim_upstream *up) pim_jp_agg_single_upstream_send(&up->rpf, up, 1 /* join */); } -static void on_join_timer(struct thread *t) +static void on_join_timer(struct event *t) { struct pim_upstream *up; - up = THREAD_ARG(t); + up = EVENT_ARG(t); if (!up->rpf.source_nexthop.interface) { if (PIM_DEBUG_PIM_TRACE) @@ -323,7 +323,7 @@ static void join_timer_stop(struct pim_upstream *up) { struct pim_neighbor *nbr = NULL; - THREAD_OFF(up->t_join_timer); + EVENT_OFF(up->t_join_timer); if (up->rpf.source_nexthop.interface) nbr = pim_neighbor_find(up->rpf.source_nexthop.interface, @@ -353,9 +353,9 @@ void join_timer_start(struct pim_upstream *up) if (nbr) pim_jp_agg_add_group(nbr->upstream_jp_agg, up, 1, nbr); else { - THREAD_OFF(up->t_join_timer); - thread_add_timer(router->master, on_join_timer, up, - router->t_periodic, &up->t_join_timer); + EVENT_OFF(up->t_join_timer); + event_add_timer(router->master, on_join_timer, up, + router->t_periodic, &up->t_join_timer); } pim_jp_agg_upstream_verification(up, true); } @@ -370,7 +370,7 @@ void join_timer_start(struct pim_upstream *up) void pim_upstream_join_timer_restart(struct pim_upstream *up, struct pim_rpf *old) { - // THREAD_OFF(up->t_join_timer); + // EVENT_OFF(up->t_join_timer); join_timer_start(up); } @@ -382,9 +382,9 @@ static void pim_upstream_join_timer_restart_msec(struct pim_upstream *up, __func__, interval_msec, up->sg_str); } - THREAD_OFF(up->t_join_timer); - thread_add_timer_msec(router->master, on_join_timer, up, interval_msec, - &up->t_join_timer); + EVENT_OFF(up->t_join_timer); + event_add_timer_msec(router->master, on_join_timer, up, interval_msec, + &up->t_join_timer); } void pim_update_suppress_timers(uint32_t suppress_time) @@ -1361,7 +1361,7 @@ static void pim_upstream_fhr_kat_expiry(struct pim_instance *pim, up->sg_str); /* stop reg-stop timer */ - THREAD_OFF(up->t_rs_timer); + EVENT_OFF(up->t_rs_timer); /* remove regiface from the OIL if it is there*/ pim_channel_del_oif(up->channel_oil, pim->regiface, PIM_OIF_FLAG_PROTO_PIM, __func__); @@ -1461,11 +1461,11 @@ struct pim_upstream *pim_upstream_keep_alive_timer_proc( return up; } -static void pim_upstream_keep_alive_timer(struct thread *t) +static void pim_upstream_keep_alive_timer(struct event *t) { struct pim_upstream *up; - up = THREAD_ARG(t); + up = EVENT_ARG(t); /* pull the stats and re-check */ if (pim_upstream_sg_running_proc(up)) @@ -1482,9 +1482,9 @@ void pim_upstream_keep_alive_timer_start(struct pim_upstream *up, uint32_t time) zlog_debug("kat start on %s with no stream reference", up->sg_str); } - THREAD_OFF(up->t_ka_timer); - thread_add_timer(router->master, pim_upstream_keep_alive_timer, up, - time, &up->t_ka_timer); + EVENT_OFF(up->t_ka_timer); + event_add_timer(router->master, pim_upstream_keep_alive_timer, up, time, + &up->t_ka_timer); /* any time keepalive is started against a SG we will have to * re-evaluate our active source database */ @@ -1494,9 +1494,9 @@ void pim_upstream_keep_alive_timer_start(struct pim_upstream *up, uint32_t time) } /* MSDP on RP needs to know if a source is registerable to this RP */ -static void pim_upstream_msdp_reg_timer(struct thread *t) +static void pim_upstream_msdp_reg_timer(struct event *t) { - struct pim_upstream *up = THREAD_ARG(t); + struct pim_upstream *up = EVENT_ARG(t); struct pim_instance *pim = up->channel_oil->pim; /* source is no longer active - pull the SA from MSDP's cache */ @@ -1505,9 +1505,9 @@ static void pim_upstream_msdp_reg_timer(struct thread *t) void pim_upstream_msdp_reg_timer_start(struct pim_upstream *up) { - THREAD_OFF(up->t_msdp_reg_timer); - thread_add_timer(router->master, pim_upstream_msdp_reg_timer, up, - PIM_MSDP_REG_RXED_PERIOD, &up->t_msdp_reg_timer); + EVENT_OFF(up->t_msdp_reg_timer); + event_add_timer(router->master, pim_upstream_msdp_reg_timer, up, + PIM_MSDP_REG_RXED_PERIOD, &up->t_msdp_reg_timer); pim_msdp_sa_local_update(up); } @@ -1680,12 +1680,12 @@ const char *pim_reg_state2str(enum pim_reg_state reg_state, char *state_str, return state_str; } -static void pim_upstream_register_stop_timer(struct thread *t) +static void pim_upstream_register_stop_timer(struct event *t) { struct pim_interface *pim_ifp; struct pim_instance *pim; struct pim_upstream *up; - up = THREAD_ARG(t); + up = EVENT_ARG(t); pim = up->channel_oil->pim; if (PIM_DEBUG_PIM_TRACE) { @@ -1749,7 +1749,7 @@ void pim_upstream_start_register_stop_timer(struct pim_upstream *up, { uint32_t time; - THREAD_OFF(up->t_rs_timer); + EVENT_OFF(up->t_rs_timer); if (!null_register) { uint32_t lower = (0.5 * router->register_suppress_time); @@ -1768,8 +1768,8 @@ void pim_upstream_start_register_stop_timer(struct pim_upstream *up, "%s: (S,G)=%s Starting upstream register stop timer %d", __func__, up->sg_str, time); } - thread_add_timer(router->master, pim_upstream_register_stop_timer, up, - time, &up->t_rs_timer); + event_add_timer(router->master, pim_upstream_register_stop_timer, up, + time, &up->t_rs_timer); } int pim_upstream_inherited_olist_decide(struct pim_instance *pim, diff --git a/pimd/pim_upstream.h b/pimd/pim_upstream.h index 890ba7d169..4e0926e294 100644 --- a/pimd/pim_upstream.h +++ b/pimd/pim_upstream.h @@ -237,19 +237,19 @@ struct pim_upstream { struct pim_up_mlag mlag; - struct thread *t_join_timer; + struct event *t_join_timer; /* * RST(S,G) */ - struct thread *t_rs_timer; + struct event *t_rs_timer; #define PIM_REGISTER_SUPPRESSION_PERIOD (60) #define PIM_REGISTER_PROBE_PERIOD (5) /* * KAT(S,G) */ - struct thread *t_ka_timer; + struct event *t_ka_timer; #define PIM_KEEPALIVE_PERIOD (210) #define PIM_RP_KEEPALIVE_PERIOD \ (3 * router->register_suppress_time + router->register_probe_time) @@ -257,7 +257,7 @@ struct pim_upstream { /* on the RP we restart a timer to indicate if registers are being rxed * for * SG. This is needed by MSDP to determine its local SA cache */ - struct thread *t_msdp_reg_timer; + struct event *t_msdp_reg_timer; #define PIM_MSDP_REG_RXED_PERIOD (3 * (1.5 * router->register_suppress_time)) int64_t state_transition; /* Record current state uptime */ diff --git a/pimd/pim_vxlan.c b/pimd/pim_vxlan.c index 91ec9d69a2..8df3c90f00 100644 --- a/pimd/pim_vxlan.c +++ b/pimd/pim_vxlan.c @@ -169,7 +169,7 @@ void pim_vxlan_update_sg_reg_state(struct pim_instance *pim, pim_vxlan_del_work(vxlan_sg); } -static void pim_vxlan_work_timer_cb(struct thread *t) +static void pim_vxlan_work_timer_cb(struct event *t) { pim_vxlan_do_reg_work(); pim_vxlan_work_timer_setup(true /* start */); @@ -178,10 +178,10 @@ static void pim_vxlan_work_timer_cb(struct thread *t) /* global 1second timer used for periodic processing */ static void pim_vxlan_work_timer_setup(bool start) { - THREAD_OFF(vxlan_info.work_timer); + EVENT_OFF(vxlan_info.work_timer); if (start) - thread_add_timer(router->master, pim_vxlan_work_timer_cb, NULL, - PIM_VXLAN_WORK_TIME, &vxlan_info.work_timer); + event_add_timer(router->master, pim_vxlan_work_timer_cb, NULL, + PIM_VXLAN_WORK_TIME, &vxlan_info.work_timer); } /**************************** vxlan origination mroutes *********************** @@ -225,7 +225,7 @@ static void pim_vxlan_orig_mr_up_del(struct pim_vxlan_sg *vxlan_sg) * if there are no other references. */ if (PIM_UPSTREAM_FLAG_TEST_SRC_STREAM(up->flags)) { - THREAD_OFF(up->t_ka_timer); + EVENT_OFF(up->t_ka_timer); up = pim_upstream_keep_alive_timer_proc(up); } else { /* this is really unexpected as we force vxlan diff --git a/pimd/pim_vxlan.h b/pimd/pim_vxlan.h index 6e1e066f07..9a135ca6b8 100644 --- a/pimd/pim_vxlan.h +++ b/pimd/pim_vxlan.h @@ -75,7 +75,7 @@ enum pim_vxlan_flags { struct pim_vxlan { enum pim_vxlan_flags flags; - struct thread *work_timer; + struct event *work_timer; struct list *work_list; struct listnode *next_work; int max_work_cnt; diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c index f4e3032867..97b68c0a32 100644 --- a/pimd/pim_zebra.c +++ b/pimd/pim_zebra.c @@ -397,9 +397,9 @@ void pim_scan_oil(struct pim_instance *pim) pim_upstream_mroute_iif_update(c_oil, __func__); } -static void on_rpf_cache_refresh(struct thread *t) +static void on_rpf_cache_refresh(struct event *t) { - struct pim_instance *pim = THREAD_ARG(t); + struct pim_instance *pim = EVENT_ARG(t); /* update kernel multicast forwarding cache (MFC) */ pim_scan_oil(pim); @@ -429,9 +429,9 @@ void sched_rpf_cache_refresh(struct pim_instance *pim) router->rpf_cache_refresh_delay_msec); } - thread_add_timer_msec(router->master, on_rpf_cache_refresh, pim, - router->rpf_cache_refresh_delay_msec, - &pim->rpf_cache_refresher); + event_add_timer_msec(router->master, on_rpf_cache_refresh, pim, + router->rpf_cache_refresh_delay_msec, + &pim->rpf_cache_refresher); } static void pim_zebra_connected(struct zclient *zclient) diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c index 08807d0dcc..05a72269d6 100644 --- a/pimd/pim_zlookup.c +++ b/pimd/pim_zlookup.c @@ -11,7 +11,7 @@ #include "zclient.h" #include "stream.h" #include "network.h" -#include "thread.h" +#include "frrevent.h" #include "prefix.h" #include "vty.h" #include "lib_errors.h" @@ -27,17 +27,17 @@ #include "pim_addr.h" static struct zclient *zlookup = NULL; -struct thread *zlookup_read; +struct event *zlookup_read; static void zclient_lookup_sched(struct zclient *zlookup, int delay); -static void zclient_lookup_read_pipe(struct thread *thread); +static void zclient_lookup_read_pipe(struct event *thread); /* Connect to zebra for nexthop lookup. */ -static void zclient_lookup_connect(struct thread *t) +static void zclient_lookup_connect(struct event *t) { struct zclient *zlookup; - zlookup = THREAD_ARG(t); + zlookup = EVENT_ARG(t); if (zlookup->sock >= 0) { return; @@ -65,15 +65,15 @@ static void zclient_lookup_connect(struct thread *t) return; } - thread_add_timer(router->master, zclient_lookup_read_pipe, zlookup, 60, - &zlookup_read); + event_add_timer(router->master, zclient_lookup_read_pipe, zlookup, 60, + &zlookup_read); } /* Schedule connection with delay. */ static void zclient_lookup_sched(struct zclient *zlookup, int delay) { - thread_add_timer(router->master, zclient_lookup_connect, zlookup, delay, - &zlookup->t_connect); + event_add_timer(router->master, zclient_lookup_connect, zlookup, delay, + &zlookup->t_connect); zlog_notice("%s: zclient lookup connection scheduled for %d seconds", __func__, delay); @@ -82,8 +82,8 @@ static void zclient_lookup_sched(struct zclient *zlookup, int delay) /* Schedule connection for now. */ static void zclient_lookup_sched_now(struct zclient *zlookup) { - thread_add_event(router->master, zclient_lookup_connect, zlookup, 0, - &zlookup->t_connect); + event_add_event(router->master, zclient_lookup_connect, zlookup, 0, + &zlookup->t_connect); zlog_notice("%s: zclient lookup immediate connection scheduled", __func__); @@ -114,7 +114,7 @@ static void zclient_lookup_failed(struct zclient *zlookup) void zclient_lookup_free(void) { - THREAD_OFF(zlookup_read); + EVENT_OFF(zlookup_read); zclient_stop(zlookup); zclient_free(zlookup); zlookup = NULL; @@ -364,9 +364,9 @@ static int zclient_lookup_nexthop_once(struct pim_instance *pim, return zclient_read_nexthop(pim, zlookup, nexthop_tab, tab_size, addr); } -void zclient_lookup_read_pipe(struct thread *thread) +void zclient_lookup_read_pipe(struct event *thread) { - struct zclient *zlookup = THREAD_ARG(thread); + struct zclient *zlookup = EVENT_ARG(thread); struct pim_instance *pim = pim_get_pim_instance(VRF_DEFAULT); struct pim_zlookup_nexthop nexthop_tab[10]; pim_addr l = PIMADDR_ANY; @@ -378,8 +378,8 @@ void zclient_lookup_read_pipe(struct thread *thread) } zclient_lookup_nexthop_once(pim, nexthop_tab, 10, l); - thread_add_timer(router->master, zclient_lookup_read_pipe, zlookup, 60, - &zlookup_read); + event_add_timer(router->master, zclient_lookup_read_pipe, zlookup, 60, + &zlookup_read); } int zclient_lookup_nexthop(struct pim_instance *pim, diff --git a/pimd/pim_zpthread.c b/pimd/pim_zpthread.c index bc515f27ed..d6b2621ff4 100644 --- a/pimd/pim_zpthread.c +++ b/pimd/pim_zpthread.c @@ -133,7 +133,7 @@ static void pim_mlag_zebra_check_for_buffer_flush(uint32_t curr_msg_type, * Thsi thread reads the clients data from the Gloabl queue and encodes with * protobuf and pass on to the MLAG socket. */ -static void pim_mlag_zthread_handler(struct thread *event) +static void pim_mlag_zthread_handler(struct event *event) { struct stream *read_s; uint32_t wr_count = 0; @@ -209,8 +209,8 @@ int pim_mlag_signal_zpthread(void) if (PIM_DEBUG_MLAG) zlog_debug(":%s: Scheduling PIM MLAG write Thread", __func__); - thread_add_event(router->master, pim_mlag_zthread_handler, NULL, - 0, &router->zpthread_mlag_write); + event_add_event(router->master, pim_mlag_zthread_handler, NULL, + 0, &router->zpthread_mlag_write); } return (0); } diff --git a/python/xref2vtysh.py b/python/xref2vtysh.py index b5873a3aac..c325979d24 100644 --- a/python/xref2vtysh.py +++ b/python/xref2vtysh.py @@ -44,7 +44,7 @@ daemon_flags = { "lib/routemap.c": "VTYSH_RMAP", "lib/routemap_cli.c": "VTYSH_RMAP", "lib/spf_backoff.c": "VTYSH_ISISD", - "lib/thread.c": "VTYSH_ALL", + "lib/event.c": "VTYSH_ALL", "lib/vrf.c": "VTYSH_VRF", "lib/vty.c": "VTYSH_ALL", } diff --git a/python/xrelfo.py b/python/xrelfo.py index 4c956ca6ac..a40b19e5fb 100644 --- a/python/xrelfo.py +++ b/python/xrelfo.py @@ -40,7 +40,7 @@ tool available) could not be found. It should be included with the sources. # constants, need to be kept in sync manually... -XREFT_THREADSCHED = 0x100 +XREFT_EVENTSCHED = 0x100 XREFT_LOGMSG = 0x200 XREFT_DEFUN = 0x300 XREFT_INSTALL_ELEMENT = 0x301 @@ -110,7 +110,7 @@ class XrefThreadSched(ELFDissectStruct, XrelfoJson): struct = "xref_threadsched" -Xref.containers[XREFT_THREADSCHED] = XrefThreadSched +Xref.containers[XREFT_EVENTSCHED] = XrefThreadSched class XrefLogmsg(ELFDissectStruct, XrelfoJson): diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index 3e62321725..0b92f174b1 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -14,7 +14,7 @@ #include "table.h" #include "log.h" #include "stream.h" -#include "thread.h" +#include "frrevent.h" #include "zclient.h" #include "filter.h" #include "sockopt.h" @@ -413,7 +413,7 @@ static void rip_interface_clean(struct rip_interface *ri) ri->enable_interface = 0; ri->running = 0; - THREAD_OFF(ri->t_wakeup); + EVENT_OFF(ri->t_wakeup); } void rip_interfaces_clean(struct rip *rip) @@ -472,7 +472,7 @@ int rip_if_down(struct interface *ifp) ri = ifp->info; - THREAD_OFF(ri->t_wakeup); + EVENT_OFF(ri->t_wakeup); rip = ri->rip; if (rip) { @@ -774,13 +774,13 @@ int rip_enable_if_delete(struct rip *rip, const char *ifname) } /* Join to multicast group and send request to the interface. */ -static void rip_interface_wakeup(struct thread *t) +static void rip_interface_wakeup(struct event *t) { struct interface *ifp; struct rip_interface *ri; /* Get interface. */ - ifp = THREAD_ARG(t); + ifp = EVENT_ARG(t); ri = ifp->info; @@ -885,8 +885,8 @@ void rip_enable_apply(struct interface *ifp) zlog_debug("turn on %s", ifp->name); /* Add interface wake up thread. */ - thread_add_timer(master, rip_interface_wakeup, ifp, 1, - &ri->t_wakeup); + event_add_timer(master, rip_interface_wakeup, ifp, 1, + &ri->t_wakeup); rip_connect_set(ifp, 1); } else if (ri->running) { /* Might as well clean up the route table as well diff --git a/ripd/rip_main.c b/ripd/rip_main.c index e26424adeb..a6e4ad776b 100644 --- a/ripd/rip_main.c +++ b/ripd/rip_main.c @@ -7,7 +7,7 @@ #include #include "getopt.h" -#include "thread.h" +#include "frrevent.h" #include "command.h" #include "memory.h" #include "prefix.h" @@ -47,7 +47,7 @@ struct zebra_privs_t ripd_privs = { .cap_num_i = 0}; /* Master of threads. */ -struct thread_master *master; +struct event_loop *master; static struct frr_daemon_info ripd_di; diff --git a/ripd/rip_nb_rpcs.c b/ripd/rip_nb_rpcs.c index be55284819..bbe3d0f0f8 100644 --- a/ripd/rip_nb_rpcs.c +++ b/ripd/rip_nb_rpcs.c @@ -51,8 +51,8 @@ static void clear_rip_route(struct rip *rip) } if (rinfo) { - THREAD_OFF(rinfo->t_timeout); - THREAD_OFF(rinfo->t_garbage_collect); + EVENT_OFF(rinfo->t_timeout); + EVENT_OFF(rinfo->t_garbage_collect); listnode_delete(list, rinfo); rip_info_free(rinfo); } diff --git a/ripd/rip_peer.c b/ripd/rip_peer.c index a3cba598d2..9410ef380e 100644 --- a/ripd/rip_peer.c +++ b/ripd/rip_peer.c @@ -9,7 +9,7 @@ #include "prefix.h" #include "command.h" #include "linklist.h" -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "ripd/ripd.h" @@ -23,7 +23,7 @@ static struct rip_peer *rip_peer_new(void) static void rip_peer_free(struct rip_peer *peer) { - THREAD_OFF(peer->t_timeout); + EVENT_OFF(peer->t_timeout); XFREE(MTYPE_RIP_PEER, peer); } @@ -52,11 +52,11 @@ struct rip_peer *rip_peer_lookup_next(struct rip *rip, struct in_addr *addr) } /* RIP peer is timeout. */ -static void rip_peer_timeout(struct thread *t) +static void rip_peer_timeout(struct event *t) { struct rip_peer *peer; - peer = THREAD_ARG(t); + peer = EVENT_ARG(t); listnode_delete(peer->rip->peer_list, peer); rip_peer_free(peer); } @@ -69,7 +69,7 @@ static struct rip_peer *rip_peer_get(struct rip *rip, struct in_addr *addr) peer = rip_peer_lookup(rip, addr); if (peer) { - THREAD_OFF(peer->t_timeout); + EVENT_OFF(peer->t_timeout); } else { peer = rip_peer_new(); peer->rip = rip; @@ -78,8 +78,8 @@ static struct rip_peer *rip_peer_get(struct rip *rip, struct in_addr *addr) } /* Update timeout thread. */ - thread_add_timer(master, rip_peer_timeout, peer, RIP_PEER_TIMER_DEFAULT, - &peer->t_timeout); + event_add_timer(master, rip_peer_timeout, peer, RIP_PEER_TIMER_DEFAULT, + &peer->t_timeout); /* Last update time set. */ time(&peer->uptime); diff --git a/ripd/rip_snmp.c b/ripd/rip_snmp.c index ab80dd1b8a..0e5d4d54c9 100644 --- a/ripd/rip_snmp.c +++ b/ripd/rip_snmp.c @@ -135,7 +135,7 @@ static struct variable rip_variables[] = { {RIP2PEERRCVBADPACKETS, COUNTER, RONLY, rip2PeerTable, 3, {4, 1, 5}}, {RIP2PEERRCVBADROUTES, COUNTER, RONLY, rip2PeerTable, 3, {4, 1, 6}}}; -extern struct thread_master *master; +extern struct event_loop *master; static uint8_t *rip2Globals(struct variable *v, oid name[], size_t *length, int exact, size_t *var_len, @@ -553,7 +553,7 @@ static uint8_t *rip2PeerTable(struct variable *v, oid name[], size_t *length, } /* Register RIPv2-MIB. */ -static int rip_snmp_init(struct thread_master *master) +static int rip_snmp_init(struct event_loop *master) { rip_ifaddr_table = route_table_init(); diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c index 4a58d1225e..35c4b1f1be 100644 --- a/ripd/rip_zebra.c +++ b/ripd/rip_zebra.c @@ -223,7 +223,7 @@ zclient_handler *const rip_handlers[] = { [ZEBRA_REDISTRIBUTE_ROUTE_DEL] = rip_zebra_read_route, }; -void rip_zclient_init(struct thread_master *master) +void rip_zclient_init(struct event_loop *master) { /* Set default value to the zebra client structure. */ zclient = zclient_new(master, &zclient_options_default, rip_handlers, diff --git a/ripd/ripd.c b/ripd/ripd.c index bde7e858f1..ae4d93b4f5 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -11,7 +11,7 @@ #include "command.h" #include "prefix.h" #include "table.h" -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "log.h" #include "stream.h" @@ -50,7 +50,7 @@ DEFINE_MTYPE_STATIC(RIPD, RIP_DISTANCE, "RIP distance"); /* Prototypes. */ static void rip_output_process(struct connected *, struct sockaddr_in *, int, uint8_t); -static void rip_triggered_update(struct thread *); +static void rip_triggered_update(struct event *); static int rip_update_jitter(unsigned long); static void rip_distance_table_node_cleanup(struct route_table *table, struct route_node *node); @@ -121,15 +121,15 @@ struct rip *rip_info_get_instance(const struct rip_info *rinfo) } /* RIP route garbage collect timer. */ -static void rip_garbage_collect(struct thread *t) +static void rip_garbage_collect(struct event *t) { struct rip_info *rinfo; struct route_node *rp; - rinfo = THREAD_ARG(t); + rinfo = EVENT_ARG(t); /* Off timeout timer. */ - THREAD_OFF(rinfo->t_timeout); + EVENT_OFF(rinfo->t_timeout); /* Get route_node pointer. */ rp = rinfo->rp; @@ -211,14 +211,14 @@ struct rip_info *rip_ecmp_replace(struct rip *rip, struct rip_info *rinfo_new) if (tmp_rinfo == rinfo) continue; - THREAD_OFF(tmp_rinfo->t_timeout); - THREAD_OFF(tmp_rinfo->t_garbage_collect); + EVENT_OFF(tmp_rinfo->t_timeout); + EVENT_OFF(tmp_rinfo->t_garbage_collect); list_delete_node(list, node); rip_info_free(tmp_rinfo); } - THREAD_OFF(rinfo->t_timeout); - THREAD_OFF(rinfo->t_garbage_collect); + EVENT_OFF(rinfo->t_timeout); + EVENT_OFF(rinfo->t_garbage_collect); memcpy(rinfo, rinfo_new, sizeof(struct rip_info)); if (rip_route_rte(rinfo)) { @@ -247,12 +247,12 @@ struct rip_info *rip_ecmp_delete(struct rip *rip, struct rip_info *rinfo) struct route_node *rp = rinfo->rp; struct list *list = (struct list *)rp->info; - THREAD_OFF(rinfo->t_timeout); + EVENT_OFF(rinfo->t_timeout); if (listcount(list) > 1) { /* Some other ECMP entries still exist. Just delete this entry. */ - THREAD_OFF(rinfo->t_garbage_collect); + EVENT_OFF(rinfo->t_garbage_collect); listnode_delete(list, rinfo); if (rip_route_rte(rinfo) && CHECK_FLAG(rinfo->flags, RIP_RTF_FIB)) @@ -287,9 +287,9 @@ struct rip_info *rip_ecmp_delete(struct rip *rip, struct rip_info *rinfo) } /* Timeout RIP routes. */ -static void rip_timeout(struct thread *t) +static void rip_timeout(struct event *t) { - struct rip_info *rinfo = THREAD_ARG(t); + struct rip_info *rinfo = EVENT_ARG(t); struct rip *rip = rip_info_get_instance(rinfo); rip_ecmp_delete(rip, rinfo); @@ -298,9 +298,9 @@ static void rip_timeout(struct thread *t) static void rip_timeout_update(struct rip *rip, struct rip_info *rinfo) { if (rinfo->metric != RIP_METRIC_INFINITY) { - THREAD_OFF(rinfo->t_timeout); - thread_add_timer(master, rip_timeout, rinfo, rip->timeout_time, - &rinfo->t_timeout); + EVENT_OFF(rinfo->t_timeout); + event_add_timer(master, rip_timeout, rinfo, rip->timeout_time, + &rinfo->t_timeout); } } @@ -644,8 +644,8 @@ static void rip_rte_process(struct rte *rte, struct sockaddr_in *from, assert(newinfo.metric != RIP_METRIC_INFINITY); - THREAD_OFF(rinfo->t_timeout); - THREAD_OFF(rinfo->t_garbage_collect); + EVENT_OFF(rinfo->t_timeout); + EVENT_OFF(rinfo->t_garbage_collect); memcpy(rinfo, &newinfo, sizeof(struct rip_info)); rip_timeout_update(rip, rinfo); @@ -1598,7 +1598,7 @@ void rip_redistribute_delete(struct rip *rip, int type, int sub_type, RIP_TIMER_ON(rinfo->t_garbage_collect, rip_garbage_collect, rip->garbage_time); - THREAD_OFF(rinfo->t_timeout); + EVENT_OFF(rinfo->t_timeout); rinfo->flags |= RIP_RTF_CHANGED; if (IS_RIP_DEBUG_EVENT) @@ -1697,9 +1697,9 @@ static void rip_request_process(struct rip_packet *packet, int size, } /* First entry point of RIP packet. */ -static void rip_read(struct thread *t) +static void rip_read(struct event *t) { - struct rip *rip = THREAD_ARG(t); + struct rip *rip = EVENT_ARG(t); int sock; int ret; int rtenum; @@ -1715,7 +1715,7 @@ static void rip_read(struct thread *t) struct prefix p; /* Fetch socket then register myself. */ - sock = THREAD_FD(t); + sock = EVENT_FD(t); /* Add myself to tne next event */ rip_event(rip, RIP_READ, sock); @@ -2478,9 +2478,9 @@ static void rip_update_process(struct rip *rip, int route_type) } /* RIP's periodical timer. */ -static void rip_update(struct thread *t) +static void rip_update(struct event *t) { - struct rip *rip = THREAD_ARG(t); + struct rip *rip = EVENT_ARG(t); if (IS_RIP_DEBUG_EVENT) zlog_debug("update timer fire!"); @@ -2490,7 +2490,7 @@ static void rip_update(struct thread *t) /* Triggered updates may be suppressed if a regular update is due by the time the triggered update would be sent. */ - THREAD_OFF(rip->t_triggered_interval); + EVENT_OFF(rip->t_triggered_interval); rip->trigger = 0; /* Register myself. */ @@ -2520,9 +2520,9 @@ static void rip_clear_changed_flag(struct rip *rip) } /* Triggered update interval timer. */ -static void rip_triggered_interval(struct thread *t) +static void rip_triggered_interval(struct event *t) { - struct rip *rip = THREAD_ARG(t); + struct rip *rip = EVENT_ARG(t); if (rip->trigger) { rip->trigger = 0; @@ -2531,13 +2531,13 @@ static void rip_triggered_interval(struct thread *t) } /* Execute triggered update. */ -static void rip_triggered_update(struct thread *t) +static void rip_triggered_update(struct event *t) { - struct rip *rip = THREAD_ARG(t); + struct rip *rip = EVENT_ARG(t); int interval; /* Cancel interval timer. */ - THREAD_OFF(rip->t_triggered_interval); + EVENT_OFF(rip->t_triggered_interval); rip->trigger = 0; /* Logging triggered update. */ @@ -2558,8 +2558,8 @@ static void rip_triggered_update(struct thread *t) update is triggered when the timer expires. */ interval = (frr_weak_random() % 5) + 1; - thread_add_timer(master, rip_triggered_interval, rip, interval, - &rip->t_triggered_interval); + event_add_timer(master, rip_triggered_interval, rip, interval, + &rip->t_triggered_interval); } /* Withdraw redistributed route. */ @@ -2587,7 +2587,7 @@ void rip_redistribute_withdraw(struct rip *rip, int type) rinfo->metric = RIP_METRIC_INFINITY; RIP_TIMER_ON(rinfo->t_garbage_collect, rip_garbage_collect, rip->garbage_time); - THREAD_OFF(rinfo->t_timeout); + EVENT_OFF(rinfo->t_timeout); rinfo->flags |= RIP_RTF_CHANGED; if (IS_RIP_DEBUG_EVENT) { @@ -2766,21 +2766,21 @@ void rip_event(struct rip *rip, enum rip_event event, int sock) switch (event) { case RIP_READ: - thread_add_read(master, rip_read, rip, sock, &rip->t_read); + event_add_read(master, rip_read, rip, sock, &rip->t_read); break; case RIP_UPDATE_EVENT: - THREAD_OFF(rip->t_update); + EVENT_OFF(rip->t_update); jitter = rip_update_jitter(rip->update_time); - thread_add_timer(master, rip_update, rip, - sock ? 2 : rip->update_time + jitter, - &rip->t_update); + event_add_timer(master, rip_update, rip, + sock ? 2 : rip->update_time + jitter, + &rip->t_update); break; case RIP_TRIGGERED_UPDATE: if (rip->t_triggered_interval) rip->trigger = 1; else - thread_add_event(master, rip_triggered_update, rip, 0, - &rip->t_triggered_update); + event_add_event(master, rip_triggered_update, rip, 0, + &rip->t_triggered_update); break; default: break; @@ -2899,8 +2899,8 @@ void rip_ecmp_disable(struct rip *rip) if (tmp_rinfo == rinfo) continue; - THREAD_OFF(tmp_rinfo->t_timeout); - THREAD_OFF(tmp_rinfo->t_garbage_collect); + EVENT_OFF(tmp_rinfo->t_timeout); + EVENT_OFF(tmp_rinfo->t_garbage_collect); list_delete_node(list, node); rip_info_free(tmp_rinfo); } @@ -2923,15 +2923,15 @@ static void rip_vty_out_uptime(struct vty *vty, struct rip_info *rinfo) struct tm tm; #define TIME_BUF 25 char timebuf[TIME_BUF]; - struct thread *thread; + struct event *thread; if ((thread = rinfo->t_timeout) != NULL) { - clock = thread_timer_remain_second(thread); + clock = event_timer_remain_second(thread); gmtime_r(&clock, &tm); strftime(timebuf, TIME_BUF, "%M:%S", &tm); vty_out(vty, "%5s", timebuf); } else if ((thread = rinfo->t_garbage_collect) != NULL) { - clock = thread_timer_remain_second(thread); + clock = event_timer_remain_second(thread); gmtime_r(&clock, &tm); strftime(timebuf, TIME_BUF, "%M:%S", &tm); vty_out(vty, "%5s", timebuf); @@ -3106,7 +3106,7 @@ DEFUN (show_ip_rip_status, vty_out(vty, " Sending updates every %u seconds with +/-50%%,", rip->update_time); vty_out(vty, " next due in %lu seconds\n", - thread_timer_remain_second(rip->t_update)); + event_timer_remain_second(rip->t_update)); vty_out(vty, " Timeout after %u seconds,", rip->timeout_time); vty_out(vty, " garbage collect after %u seconds\n", rip->garbage_time); @@ -3492,8 +3492,8 @@ static void rip_instance_disable(struct rip *rip) rip_zebra_ipv4_delete(rip, rp); for (ALL_LIST_ELEMENTS_RO(list, listnode, rinfo)) { - THREAD_OFF(rinfo->t_timeout); - THREAD_OFF(rinfo->t_garbage_collect); + EVENT_OFF(rinfo->t_timeout); + EVENT_OFF(rinfo->t_garbage_collect); rip_info_free(rinfo); } list_delete(&list); @@ -3505,12 +3505,12 @@ static void rip_instance_disable(struct rip *rip) rip_redistribute_disable(rip); /* Cancel RIP related timers. */ - THREAD_OFF(rip->t_update); - THREAD_OFF(rip->t_triggered_update); - THREAD_OFF(rip->t_triggered_interval); + EVENT_OFF(rip->t_update); + EVENT_OFF(rip->t_triggered_update); + EVENT_OFF(rip->t_triggered_interval); /* Cancel read thread. */ - THREAD_OFF(rip->t_read); + EVENT_OFF(rip->t_read); /* Close RIP socket. */ close(rip->sock); diff --git a/ripd/ripd.h b/ripd/ripd.h index 4894cb8632..176a3bfc37 100644 --- a/ripd/ripd.h +++ b/ripd/ripd.h @@ -117,15 +117,15 @@ struct rip { struct list *peer_list; /* RIP threads. */ - struct thread *t_read; + struct event *t_read; /* Update and garbage timer. */ - struct thread *t_update; + struct event *t_update; /* Triggered update hack. */ int trigger; - struct thread *t_triggered_update; - struct thread *t_triggered_interval; + struct event *t_triggered_update; + struct event *t_triggered_interval; /* RIP timer values. */ uint32_t update_time; @@ -239,8 +239,8 @@ struct rip_info { uint8_t flags; /* Garbage collect timer. */ - struct thread *t_timeout; - struct thread *t_garbage_collect; + struct event *t_timeout; + struct event *t_garbage_collect; /* Route-map futures - this variables can be changed. */ struct in_addr nexthop_out; @@ -309,7 +309,7 @@ struct rip_interface { struct route_map *routemap[RIP_FILTER_MAX]; /* Wake up thread. */ - struct thread *t_wakeup; + struct event *t_wakeup; /* Interface statistics. */ int recv_badpackets; @@ -342,7 +342,7 @@ struct rip_peer { int recv_badroutes; /* Timeout thread. */ - struct thread *t_timeout; + struct event *t_timeout; }; struct rip_distance { @@ -387,7 +387,7 @@ enum rip_event { }; /* Macro for timer turn on. */ -#define RIP_TIMER_ON(T,F,V) thread_add_timer (master, (F), rinfo, (V), &(T)) +#define RIP_TIMER_ON(T, F, V) event_add_timer(master, (F), rinfo, (V), &(T)) #define RIP_OFFSET_LIST_IN 0 #define RIP_OFFSET_LIST_OUT 1 @@ -418,7 +418,7 @@ extern void rip_if_init(void); extern void rip_route_map_init(void); extern void rip_zebra_vrf_register(struct vrf *vrf); extern void rip_zebra_vrf_deregister(struct vrf *vrf); -extern void rip_zclient_init(struct thread_master *); +extern void rip_zclient_init(struct event_loop *e); extern void rip_zclient_stop(void); extern int if_check_address(struct rip *rip, struct in_addr addr); extern struct rip *rip_lookup_by_vrf_id(vrf_id_t vrf_id); @@ -509,7 +509,7 @@ extern struct zebra_privs_t ripd_privs; extern struct rip_instance_head rip_instances; /* Master thread structure. */ -extern struct thread_master *master; +extern struct event_loop *master; DECLARE_HOOK(rip_ifaddr_add, (struct connected * ifc), (ifc)); DECLARE_HOOK(rip_ifaddr_del, (struct connected * ifc), (ifc)); diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c index 1fc6f2553e..1d9d53e47a 100644 --- a/ripngd/ripng_interface.c +++ b/ripngd/ripng_interface.c @@ -17,7 +17,7 @@ #include "zclient.h" #include "command.h" #include "agg_table.h" -#include "thread.h" +#include "frrevent.h" #include "privs.h" #include "vrf.h" #include "lib_errors.h" @@ -155,7 +155,7 @@ static int ripng_if_down(struct interface *ifp) ri = ifp->info; - THREAD_OFF(ri->t_wakeup); + EVENT_OFF(ri->t_wakeup); ripng = ri->ripng; @@ -301,7 +301,7 @@ void ripng_interface_clean(struct ripng *ripng) ri->enable_interface = 0; ri->running = 0; - THREAD_OFF(ri->t_wakeup); + EVENT_OFF(ri->t_wakeup); } } @@ -586,13 +586,13 @@ int ripng_enable_if_delete(struct ripng *ripng, const char *ifname) } /* Wake up interface. */ -static void ripng_interface_wakeup(struct thread *t) +static void ripng_interface_wakeup(struct event *t) { struct interface *ifp; struct ripng_interface *ri; /* Get interface. */ - ifp = THREAD_ARG(t); + ifp = EVENT_ARG(t); ri = ifp->info; @@ -698,8 +698,8 @@ void ripng_enable_apply(struct interface *ifp) zlog_info("RIPng INTERFACE ON %s", ifp->name); /* Add interface wake up thread. */ - thread_add_timer(master, ripng_interface_wakeup, ifp, 1, - &ri->t_wakeup); + event_add_timer(master, ripng_interface_wakeup, ifp, 1, + &ri->t_wakeup); ripng_connect_set(ifp, 1); } else { diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c index 14e69834ca..1d392efdde 100644 --- a/ripngd/ripng_main.c +++ b/ripngd/ripng_main.c @@ -12,7 +12,7 @@ #include "vty.h" #include "command.h" #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "log.h" #include "prefix.h" #include "if.h" @@ -48,7 +48,7 @@ struct zebra_privs_t ripngd_privs = { /* Master of threads. */ -struct thread_master *master; +struct event_loop *master; static struct frr_daemon_info ripngd_di; diff --git a/ripngd/ripng_nb_rpcs.c b/ripngd/ripng_nb_rpcs.c index 381ff717c1..b23572d492 100644 --- a/ripngd/ripng_nb_rpcs.c +++ b/ripngd/ripng_nb_rpcs.c @@ -53,8 +53,8 @@ static void clear_ripng_route(struct ripng *ripng) } if (rinfo) { - THREAD_OFF(rinfo->t_timeout); - THREAD_OFF(rinfo->t_garbage_collect); + EVENT_OFF(rinfo->t_timeout); + EVENT_OFF(rinfo->t_garbage_collect); listnode_delete(list, rinfo); ripng_info_free(rinfo); } diff --git a/ripngd/ripng_peer.c b/ripngd/ripng_peer.c index 75a9ed77fe..901b548a42 100644 --- a/ripngd/ripng_peer.c +++ b/ripngd/ripng_peer.c @@ -13,7 +13,7 @@ #include "prefix.h" #include "command.h" #include "linklist.h" -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "ripngd/ripngd.h" @@ -28,7 +28,7 @@ static struct ripng_peer *ripng_peer_new(void) static void ripng_peer_free(struct ripng_peer *peer) { - THREAD_OFF(peer->t_timeout); + EVENT_OFF(peer->t_timeout); XFREE(MTYPE_RIPNG_PEER, peer); } @@ -60,11 +60,11 @@ struct ripng_peer *ripng_peer_lookup_next(struct ripng *ripng, /* RIPng peer is timeout. * Garbage collector. **/ -static void ripng_peer_timeout(struct thread *t) +static void ripng_peer_timeout(struct event *t) { struct ripng_peer *peer; - peer = THREAD_ARG(t); + peer = EVENT_ARG(t); listnode_delete(peer->ripng->peer_list, peer); ripng_peer_free(peer); } @@ -78,7 +78,7 @@ static struct ripng_peer *ripng_peer_get(struct ripng *ripng, peer = ripng_peer_lookup(ripng, addr); if (peer) { - THREAD_OFF(peer->t_timeout); + EVENT_OFF(peer->t_timeout); } else { peer = ripng_peer_new(); peer->ripng = ripng; @@ -87,8 +87,8 @@ static struct ripng_peer *ripng_peer_get(struct ripng *ripng, } /* Update timeout thread. */ - thread_add_timer(master, ripng_peer_timeout, peer, - RIPNG_PEER_TIMER_DEFAULT, &peer->t_timeout); + event_add_timer(master, ripng_peer_timeout, peer, + RIPNG_PEER_TIMER_DEFAULT, &peer->t_timeout); /* Last update time set. */ time(&peer->uptime); diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c index b126a15b5b..d974d65df5 100644 --- a/ripngd/ripng_zebra.c +++ b/ripngd/ripng_zebra.c @@ -228,7 +228,7 @@ static zclient_handler *const ripng_handlers[] = { }; /* Initialize zebra structure and it's commands. */ -void zebra_init(struct thread_master *master) +void zebra_init(struct event_loop *master) { /* Allocate zebra structure. */ zclient = zclient_new(master, &zclient_options_default, ripng_handlers, diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c index f01371f41e..79e8871f6a 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -8,7 +8,7 @@ #include "prefix.h" #include "filter.h" #include "log.h" -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "if.h" #include "stream.h" @@ -46,7 +46,7 @@ void ripng_output_process(struct interface *, struct sockaddr_in6 *, int); static void ripng_instance_enable(struct ripng *ripng, struct vrf *vrf, int sock); static void ripng_instance_disable(struct ripng *ripng); -static void ripng_triggered_update(struct thread *); +static void ripng_triggered_update(struct event *); static void ripng_if_rmap_update(struct if_rmap_ctx *ctx, struct if_rmap *if_rmap); @@ -408,15 +408,15 @@ static int ripng_lladdr_check(struct interface *ifp, struct in6_addr *addr) } /* RIPng route garbage collect timer. */ -static void ripng_garbage_collect(struct thread *t) +static void ripng_garbage_collect(struct event *t) { struct ripng_info *rinfo; struct agg_node *rp; - rinfo = THREAD_ARG(t); + rinfo = EVENT_ARG(t); /* Off timeout timer. */ - THREAD_OFF(rinfo->t_timeout); + EVENT_OFF(rinfo->t_timeout); /* Get route_node pointer. */ rp = rinfo->rp; @@ -503,14 +503,14 @@ struct ripng_info *ripng_ecmp_replace(struct ripng *ripng, /* Re-use the first entry, and delete the others. */ for (ALL_LIST_ELEMENTS(list, node, nextnode, tmp_rinfo)) if (tmp_rinfo != rinfo) { - THREAD_OFF(tmp_rinfo->t_timeout); - THREAD_OFF(tmp_rinfo->t_garbage_collect); + EVENT_OFF(tmp_rinfo->t_timeout); + EVENT_OFF(tmp_rinfo->t_garbage_collect); list_delete_node(list, node); ripng_info_free(tmp_rinfo); } - THREAD_OFF(rinfo->t_timeout); - THREAD_OFF(rinfo->t_garbage_collect); + EVENT_OFF(rinfo->t_timeout); + EVENT_OFF(rinfo->t_garbage_collect); memcpy(rinfo, rinfo_new, sizeof(struct ripng_info)); if (ripng_route_rte(rinfo)) { @@ -542,7 +542,7 @@ struct ripng_info *ripng_ecmp_delete(struct ripng *ripng, struct agg_node *rp = rinfo->rp; struct list *list = (struct list *)rp->info; - THREAD_OFF(rinfo->t_timeout); + EVENT_OFF(rinfo->t_timeout); if (rinfo->metric != RIPNG_METRIC_INFINITY) ripng_aggregate_decrement(rp, rinfo); @@ -550,7 +550,7 @@ struct ripng_info *ripng_ecmp_delete(struct ripng *ripng, if (listcount(list) > 1) { /* Some other ECMP entries still exist. Just delete this entry. */ - THREAD_OFF(rinfo->t_garbage_collect); + EVENT_OFF(rinfo->t_garbage_collect); listnode_delete(list, rinfo); if (ripng_route_rte(rinfo) && CHECK_FLAG(rinfo->flags, RIPNG_RTF_FIB)) @@ -585,9 +585,9 @@ struct ripng_info *ripng_ecmp_delete(struct ripng *ripng, } /* Timeout RIPng routes. */ -static void ripng_timeout(struct thread *t) +static void ripng_timeout(struct event *t) { - struct ripng_info *rinfo = THREAD_ARG(t); + struct ripng_info *rinfo = EVENT_ARG(t); struct ripng *ripng = ripng_info_get_instance(rinfo); ripng_ecmp_delete(ripng, rinfo); @@ -596,9 +596,9 @@ static void ripng_timeout(struct thread *t) static void ripng_timeout_update(struct ripng *ripng, struct ripng_info *rinfo) { if (rinfo->metric != RIPNG_METRIC_INFINITY) { - THREAD_OFF(rinfo->t_timeout); - thread_add_timer(master, ripng_timeout, rinfo, - ripng->timeout_time, &rinfo->t_timeout); + EVENT_OFF(rinfo->t_timeout); + event_add_timer(master, ripng_timeout, rinfo, + ripng->timeout_time, &rinfo->t_timeout); } } @@ -877,18 +877,18 @@ static void ripng_route_process(struct rte *rte, struct sockaddr_in6 *from, * but * highly recommended". */ - if (!ripng->ecmp && !same && rinfo->metric == rte->metric - && rinfo->t_timeout - && (thread_timer_remain_second(rinfo->t_timeout) - < (ripng->timeout_time / 2))) { + if (!ripng->ecmp && !same && rinfo->metric == rte->metric && + rinfo->t_timeout && + (event_timer_remain_second(rinfo->t_timeout) < + (ripng->timeout_time / 2))) { ripng_ecmp_replace(ripng, &newinfo); } /* Next, compare the metrics. If the datagram is from the same router as the existing route, and the new metric is different than the old one; or, if the new metric is lower than the old one; do the following actions: */ - else if ((same && rinfo->metric != rte->metric) - || rte->metric < rinfo->metric) { + else if ((same && rinfo->metric != rte->metric) || + rte->metric < rinfo->metric) { if (listcount(list) == 1) { if (newinfo.metric != RIPNG_METRIC_INFINITY) ripng_ecmp_replace(ripng, &newinfo); @@ -1007,7 +1007,7 @@ void ripng_redistribute_delete(struct ripng *ripng, int type, int sub_type, RIPNG_TIMER_ON(rinfo->t_garbage_collect, ripng_garbage_collect, ripng->garbage_time); - THREAD_OFF(rinfo->t_timeout); + EVENT_OFF(rinfo->t_timeout); /* Aggregate count decrement. */ ripng_aggregate_decrement(rp, rinfo); @@ -1046,7 +1046,7 @@ void ripng_redistribute_withdraw(struct ripng *ripng, int type) RIPNG_TIMER_ON(rinfo->t_garbage_collect, ripng_garbage_collect, ripng->garbage_time); - THREAD_OFF(rinfo->t_timeout); + EVENT_OFF(rinfo->t_timeout); /* Aggregate count decrement. */ ripng_aggregate_decrement(rp, rinfo); @@ -1282,9 +1282,9 @@ static void ripng_request_process(struct ripng_packet *packet, int size, } /* First entry point of reading RIPng packet. */ -static void ripng_read(struct thread *thread) +static void ripng_read(struct event *thread) { - struct ripng *ripng = THREAD_ARG(thread); + struct ripng *ripng = EVENT_ARG(thread); int len; int sock; struct sockaddr_in6 from; @@ -1299,7 +1299,7 @@ static void ripng_read(struct thread *thread) /* Fetch thread data and set read pointer to empty for event managing. `sock' sould be same as ripng->sock. */ - sock = THREAD_FD(thread); + sock = EVENT_FD(thread); /* Add myself to the next event. */ ripng_event(ripng, RIPNG_READ, sock); @@ -1390,9 +1390,9 @@ static void ripng_clear_changed_flag(struct ripng *ripng) /* Regular update of RIPng route. Send all routing formation to RIPng enabled interface. */ -static void ripng_update(struct thread *t) +static void ripng_update(struct event *t) { - struct ripng *ripng = THREAD_ARG(t); + struct ripng *ripng = EVENT_ARG(t); struct interface *ifp; struct ripng_interface *ri; @@ -1430,7 +1430,7 @@ static void ripng_update(struct thread *t) /* Triggered updates may be suppressed if a regular update is due by the time the triggered update would be sent. */ - THREAD_OFF(ripng->t_triggered_interval); + EVENT_OFF(ripng->t_triggered_interval); ripng->trigger = 0; /* Reset flush event. */ @@ -1438,9 +1438,9 @@ static void ripng_update(struct thread *t) } /* Triggered update interval timer. */ -static void ripng_triggered_interval(struct thread *t) +static void ripng_triggered_interval(struct event *t) { - struct ripng *ripng = THREAD_ARG(t); + struct ripng *ripng = EVENT_ARG(t); if (ripng->trigger) { ripng->trigger = 0; @@ -1449,15 +1449,15 @@ static void ripng_triggered_interval(struct thread *t) } /* Execute triggered update. */ -void ripng_triggered_update(struct thread *t) +void ripng_triggered_update(struct event *t) { - struct ripng *ripng = THREAD_ARG(t); + struct ripng *ripng = EVENT_ARG(t); struct interface *ifp; struct ripng_interface *ri; int interval; /* Cancel interval timer. */ - THREAD_OFF(ripng->t_triggered_interval); + EVENT_OFF(ripng->t_triggered_interval); ripng->trigger = 0; /* Logging triggered update. */ @@ -1493,8 +1493,8 @@ void ripng_triggered_update(struct thread *t) update is triggered when the timer expires. */ interval = (frr_weak_random() % 5) + 1; - thread_add_timer(master, ripng_triggered_interval, ripng, interval, - &ripng->t_triggered_interval); + event_add_timer(master, ripng_triggered_interval, ripng, interval, + &ripng->t_triggered_interval); } /* Write routing table entry to the stream and return next index of @@ -1898,25 +1898,24 @@ void ripng_event(struct ripng *ripng, enum ripng_event event, int sock) switch (event) { case RIPNG_READ: - thread_add_read(master, ripng_read, ripng, sock, - &ripng->t_read); + event_add_read(master, ripng_read, ripng, sock, &ripng->t_read); break; case RIPNG_UPDATE_EVENT: - THREAD_OFF(ripng->t_update); + EVENT_OFF(ripng->t_update); /* Update timer jitter. */ jitter = ripng_update_jitter(ripng->update_time); - thread_add_timer(master, ripng_update, ripng, - sock ? 2 : ripng->update_time + jitter, - &ripng->t_update); + event_add_timer(master, ripng_update, ripng, + sock ? 2 : ripng->update_time + jitter, + &ripng->t_update); break; case RIPNG_TRIGGERED_UPDATE: if (ripng->t_triggered_interval) ripng->trigger = 1; else - thread_add_event(master, ripng_triggered_update, ripng, - 0, &ripng->t_triggered_update); + event_add_event(master, ripng_triggered_update, ripng, + 0, &ripng->t_triggered_update); break; case RIPNG_ZEBRA: case RIPNG_REQUEST_EVENT: @@ -1932,15 +1931,15 @@ static void ripng_vty_out_uptime(struct vty *vty, struct ripng_info *rinfo) struct tm tm; #define TIME_BUF 25 char timebuf[TIME_BUF]; - struct thread *thread; + struct event *thread; if ((thread = rinfo->t_timeout) != NULL) { - clock = thread_timer_remain_second(thread); + clock = event_timer_remain_second(thread); gmtime_r(&clock, &tm); strftime(timebuf, TIME_BUF, "%M:%S", &tm); vty_out(vty, "%5s", timebuf); } else if ((thread = rinfo->t_garbage_collect) != NULL) { - clock = thread_timer_remain_second(thread); + clock = event_timer_remain_second(thread); gmtime_r(&clock, &tm); strftime(timebuf, TIME_BUF, "%M:%S", &tm); vty_out(vty, "%5s", timebuf); @@ -2129,7 +2128,7 @@ DEFUN (show_ipv6_ripng_status, vty_out(vty, " Sending updates every %u seconds with +/-50%%,", ripng->update_time); vty_out(vty, " next due in %lu seconds\n", - thread_timer_remain_second(ripng->t_update)); + event_timer_remain_second(ripng->t_update)); vty_out(vty, " Timeout after %u seconds,", ripng->timeout_time); vty_out(vty, " garbage collect after %u seconds\n", ripng->garbage_time); @@ -2195,9 +2194,8 @@ void ripng_ecmp_disable(struct ripng *ripng) /* Drop all other entries, except the first one. */ for (ALL_LIST_ELEMENTS(list, node, nextnode, tmp_rinfo)) if (tmp_rinfo != rinfo) { - THREAD_OFF(tmp_rinfo->t_timeout); - THREAD_OFF( - tmp_rinfo->t_garbage_collect); + EVENT_OFF(tmp_rinfo->t_timeout); + EVENT_OFF(tmp_rinfo->t_garbage_collect); list_delete_node(list, node); ripng_info_free(tmp_rinfo); } @@ -2514,8 +2512,8 @@ static void ripng_instance_disable(struct ripng *ripng) ripng_zebra_ipv6_delete(ripng, rp); for (ALL_LIST_ELEMENTS_RO(list, listnode, rinfo)) { - THREAD_OFF(rinfo->t_timeout); - THREAD_OFF(rinfo->t_garbage_collect); + EVENT_OFF(rinfo->t_timeout); + EVENT_OFF(rinfo->t_garbage_collect); ripng_info_free(rinfo); } list_delete(&list); @@ -2534,12 +2532,12 @@ static void ripng_instance_disable(struct ripng *ripng) ripng_redistribute_disable(ripng); /* Cancel the RIPng timers */ - THREAD_OFF(ripng->t_update); - THREAD_OFF(ripng->t_triggered_update); - THREAD_OFF(ripng->t_triggered_interval); + EVENT_OFF(ripng->t_update); + EVENT_OFF(ripng->t_triggered_update); + EVENT_OFF(ripng->t_triggered_interval); /* Cancel the read thread */ - THREAD_OFF(ripng->t_read); + EVENT_OFF(ripng->t_read); /* Close the RIPng socket */ if (ripng->sock >= 0) { diff --git a/ripngd/ripngd.h b/ripngd/ripngd.h index 59b948b8f1..eefcb0ee69 100644 --- a/ripngd/ripngd.h +++ b/ripngd/ripngd.h @@ -121,13 +121,13 @@ struct ripng { struct list *offset_list_master; /* RIPng threads. */ - struct thread *t_read; - struct thread *t_update; + struct event *t_read; + struct event *t_update; /* Triggered update hack. */ int trigger; - struct thread *t_triggered_update; - struct thread *t_triggered_interval; + struct event *t_triggered_update; + struct event *t_triggered_interval; /* RIPng ECMP flag */ bool ecmp; @@ -200,8 +200,8 @@ struct ripng_info { uint8_t flags; /* Garbage collect timer. */ - struct thread *t_timeout; - struct thread *t_garbage_collect; + struct event *t_timeout; + struct event *t_garbage_collect; /* Route-map features - this variables can be changed. */ struct in6_addr nexthop_out; @@ -254,7 +254,7 @@ struct ripng_interface { uint8_t default_only; /* Wake up thread. */ - struct thread *t_wakeup; + struct event *t_wakeup; /* Passive interface. */ int passive; @@ -282,7 +282,7 @@ struct ripng_peer { int recv_badroutes; /* Timeout thread. */ - struct thread *t_timeout; + struct event *t_timeout; }; /* All RIPng events. */ @@ -295,7 +295,7 @@ enum ripng_event { }; /* RIPng timer on/off macro. */ -#define RIPNG_TIMER_ON(T,F,V) thread_add_timer (master, (F), rinfo, (V), &(T)) +#define RIPNG_TIMER_ON(T, F, V) event_add_timer(master, (F), rinfo, (V), &(T)) #define RIPNG_OFFSET_LIST_IN 0 #define RIPNG_OFFSET_LIST_OUT 1 @@ -316,7 +316,7 @@ struct ripng_offset_list { /* Extern variables. */ extern struct zebra_privs_t ripngd_privs; -extern struct thread_master *master; +extern struct event_loop *master; extern struct ripng_instance_head ripng_instances; /* Prototypes. */ @@ -338,7 +338,7 @@ extern void ripng_zebra_vrf_register(struct vrf *vrf); extern void ripng_zebra_vrf_deregister(struct vrf *vrf); extern void ripng_terminate(void); /* zclient_init() is done by ripng_zebra.c:zebra_init() */ -extern void zebra_init(struct thread_master *); +extern void zebra_init(struct event_loop *master); extern void ripng_zebra_stop(void); extern void ripng_redistribute_conf_update(struct ripng *ripng, int type); extern void ripng_redistribute_conf_delete(struct ripng *ripng, int type); diff --git a/sharpd/sharp_logpump.c b/sharpd/sharp_logpump.c index cadd818953..5474e80b11 100644 --- a/sharpd/sharp_logpump.c +++ b/sharpd/sharp_logpump.c @@ -11,7 +11,7 @@ #include "prefix.h" #include "nexthop.h" #include "log.h" -#include "thread.h" +#include "frrevent.h" #include "vrf.h" #include "zclient.h" #include "frr_pthread.h" @@ -28,9 +28,9 @@ static size_t lp_ctr, lp_expect; static struct rusage lp_rusage; static struct vty *lp_vty; -extern struct thread_master *master; +extern struct event_loop *master; -static void logpump_done(struct thread *thread) +static void logpump_done(struct event *thread) { double x; @@ -105,7 +105,7 @@ static void *logpump_run(void *arg) getrusage(RUSAGE_SELF, &lp_rusage); #endif - thread_add_timer_msec(master, logpump_done, NULL, 0, NULL); + event_add_timer_msec(master, logpump_done, NULL, 0, NULL); return NULL; } diff --git a/sharpd/sharp_main.c b/sharpd/sharp_main.c index 9d33fc89a7..fa85c2b448 100644 --- a/sharpd/sharp_main.c +++ b/sharpd/sharp_main.c @@ -8,7 +8,7 @@ #include #include "getopt.h" -#include "thread.h" +#include "frrevent.h" #include "prefix.h" #include "linklist.h" #include "if.h" @@ -55,7 +55,7 @@ struct zebra_privs_t sharp_privs = { struct option longopts[] = {{0}}; /* Master of threads. */ -struct thread_master *master; +struct event_loop *master; /* SIGHUP handler. */ static void sighup(void) diff --git a/sharpd/sharp_zebra.c b/sharpd/sharp_zebra.c index df06f5537e..17ad705969 100644 --- a/sharpd/sharp_zebra.c +++ b/sharpd/sharp_zebra.c @@ -6,7 +6,7 @@ */ #include -#include "thread.h" +#include "frrevent.h" #include "command.h" #include "network.h" #include "prefix.h" @@ -26,7 +26,7 @@ struct zclient *zclient = NULL; /* For registering threads. */ -extern struct thread_master *master; +extern struct event_loop *master; /* Privs info */ extern struct zebra_privs_t sharp_privs; diff --git a/staticd/static_bfd.c b/staticd/static_bfd.c index ccf7d206f2..78d8c05807 100644 --- a/staticd/static_bfd.c +++ b/staticd/static_bfd.c @@ -201,7 +201,7 @@ void static_next_hop_bfd_profile(struct static_nexthop *sn, const char *name) bfd_sess_install(sn->bsp); } -void static_bfd_initialize(struct zclient *zc, struct thread_master *tm) +void static_bfd_initialize(struct zclient *zc, struct event_loop *tm) { /* Initialize BFD integration library. */ bfd_protocol_integration_init(zc, tm); diff --git a/staticd/static_main.c b/staticd/static_main.c index d429162196..09f22318ff 100644 --- a/staticd/static_main.c +++ b/staticd/static_main.c @@ -8,7 +8,7 @@ #include #include "getopt.h" -#include "thread.h" +#include "frrevent.h" #include "command.h" #include "log.h" #include "memory.h" @@ -51,7 +51,7 @@ struct zebra_privs_t static_privs = { struct option longopts[] = { { 0 } }; /* Master of threads. */ -struct thread_master *master; +struct event_loop *master; uintptr_t mgmt_lib_hndl; diff --git a/staticd/static_routes.h b/staticd/static_routes.h index 4fd7a1342f..3be6fd6b14 100644 --- a/staticd/static_routes.h +++ b/staticd/static_routes.h @@ -252,7 +252,7 @@ extern void static_next_hop_bfd_profile(struct static_nexthop *sn, extern void static_next_hop_bfd_multi_hop(struct static_nexthop *sn, bool mhop); /** Call this function after zebra client initialization. */ -extern void static_bfd_initialize(struct zclient *zc, struct thread_master *tm); +extern void static_bfd_initialize(struct zclient *zc, struct event_loop *tm); extern void static_bfd_show(struct vty *vty, bool isjson); diff --git a/staticd/static_zebra.c b/staticd/static_zebra.c index f220b476fb..4f3ccde53d 100644 --- a/staticd/static_zebra.c +++ b/staticd/static_zebra.c @@ -6,7 +6,7 @@ */ #include -#include "thread.h" +#include "frrevent.h" #include "command.h" #include "network.h" #include "prefix.h" diff --git a/staticd/static_zebra.h b/staticd/static_zebra.h index 5f21d6c386..c4f4ebdcbc 100644 --- a/staticd/static_zebra.h +++ b/staticd/static_zebra.h @@ -11,7 +11,7 @@ extern "C" { #endif -extern struct thread_master *master; +extern struct event_loop *master; extern void static_zebra_nht_register(struct static_nexthop *nh, bool reg); diff --git a/tests/bgpd/test_aspath.c b/tests/bgpd/test_aspath.c index 926097f571..57aa2af9de 100644 --- a/tests/bgpd/test_aspath.c +++ b/tests/bgpd/test_aspath.c @@ -26,7 +26,7 @@ /* need these to link in libbgp */ struct zebra_privs_t bgpd_privs = {}; -struct thread_master *master = NULL; +struct event_loop *master = NULL; static int failed = 0; @@ -1405,7 +1405,7 @@ int main(void) { int i = 0; qobj_init(); - bgp_master_init(thread_master_create(NULL), BGP_SOCKET_SNDBUF_SIZE, + bgp_master_init(event_master_create(NULL), BGP_SOCKET_SNDBUF_SIZE, list_new()); master = bm->master; bgp_option_set(BGP_OPT_NO_LISTEN); diff --git a/tests/bgpd/test_capability.c b/tests/bgpd/test_capability.c index 8ef5748671..da17471fd1 100644 --- a/tests/bgpd/test_capability.c +++ b/tests/bgpd/test_capability.c @@ -30,7 +30,7 @@ /* need these to link in libbgp */ struct zebra_privs_t bgpd_privs = {}; -struct thread_master *master = NULL; +struct event_loop *master = NULL; static int failed = 0; static int tty = 0; @@ -925,7 +925,7 @@ int main(void) term_bgp_debug_as4 = -1UL; qobj_init(); - master = thread_master_create(NULL); + master = event_master_create(NULL); bgp_master_init(master, BGP_SOCKET_SNDBUF_SIZE, list_new()); vrf_init(NULL, NULL, NULL, NULL); bgp_option_set(BGP_OPT_NO_LISTEN); diff --git a/tests/bgpd/test_ecommunity.c b/tests/bgpd/test_ecommunity.c index bb360722c8..49322d3e2d 100644 --- a/tests/bgpd/test_ecommunity.c +++ b/tests/bgpd/test_ecommunity.c @@ -16,7 +16,7 @@ /* need these to link in libbgp */ struct zebra_privs_t bgpd_privs = {}; -struct thread_master *master = NULL; +struct event_loop *master = NULL; static int failed = 0; diff --git a/tests/bgpd/test_mp_attr.c b/tests/bgpd/test_mp_attr.c index b1f3314f1f..54596dbdfb 100644 --- a/tests/bgpd/test_mp_attr.c +++ b/tests/bgpd/test_mp_attr.c @@ -35,7 +35,7 @@ /* need these to link in libbgp */ struct zebra_privs_t bgpd_privs = {}; -struct thread_master *master = NULL; +struct event_loop *master = NULL; static int failed = 0; static int tty = 0; @@ -1070,7 +1070,7 @@ int main(void) qobj_init(); cmd_init(0); bgp_vty_init(); - master = thread_master_create("test mp attr"); + master = event_master_create("test mp attr"); bgp_master_init(master, BGP_SOCKET_SNDBUF_SIZE, list_new()); vrf_init(NULL, NULL, NULL, NULL); bgp_option_set(BGP_OPT_NO_LISTEN); diff --git a/tests/bgpd/test_mpath.c b/tests/bgpd/test_mpath.c index 3662805971..0124ad9b22 100644 --- a/tests/bgpd/test_mpath.c +++ b/tests/bgpd/test_mpath.c @@ -61,7 +61,7 @@ struct testcase_t__ { }; /* need these to link in libbgp */ -struct thread_master *master = NULL; +struct event_loop *master = NULL; extern struct zclient *zclient; struct zebra_privs_t bgpd_privs = { .user = NULL, @@ -378,7 +378,7 @@ int all_tests_count = array_size(all_tests); static int global_test_init(void) { qobj_init(); - master = thread_master_create(NULL); + master = event_master_create(NULL); zclient = zclient_new(master, &zclient_options_default, NULL, 0); bgp_master_init(master, BGP_SOCKET_SNDBUF_SIZE, list_new()); vrf_init(NULL, NULL, NULL, NULL); @@ -393,7 +393,7 @@ static int global_test_cleanup(void) { if (zclient != NULL) zclient_free(zclient); - thread_master_free(master); + event_master_free(master); return 0; } diff --git a/tests/bgpd/test_packet.c b/tests/bgpd/test_packet.c index aeebbd9a35..94c3feaa93 100644 --- a/tests/bgpd/test_packet.c +++ b/tests/bgpd/test_packet.c @@ -25,7 +25,7 @@ /* need these to link in libbgp */ struct zebra_privs_t bgpd_privs = {}; -struct thread_master *master = NULL; +struct event_loop *master = NULL; static struct bgp *bgp; static as_t asn = 100; @@ -41,11 +41,11 @@ int main(int argc, char *argv[]) { struct peer *peer; int i, j; - struct thread t; + struct event t; qobj_init(); bgp_attr_init(); - master = thread_master_create(NULL); + master = event_master_create(NULL); bgp_master_init(master, BGP_SOCKET_SNDBUF_SIZE, list_new()); vrf_init(NULL, NULL, NULL, NULL); bgp_option_set(BGP_OPT_NO_LISTEN); diff --git a/tests/bgpd/test_peer_attr.c b/tests/bgpd/test_peer_attr.c index dde38c8693..bc6eba9069 100644 --- a/tests/bgpd/test_peer_attr.c +++ b/tests/bgpd/test_peer_attr.c @@ -106,7 +106,7 @@ /* Required variables to link in libbgp */ struct zebra_privs_t bgpd_privs = {0}; -struct thread_master *master; +struct event_loop *master; enum test_state { TEST_SUCCESS, @@ -1363,7 +1363,7 @@ static void bgp_startup(void) zprivs_preinit(&bgpd_privs); zprivs_init(&bgpd_privs); - master = thread_master_create(NULL); + master = event_master_create(NULL); nb_init(master, NULL, 0, false); bgp_master_init(master, BGP_SOCKET_SNDBUF_SIZE, list_new()); bgp_option_set(BGP_OPT_NO_LISTEN); @@ -1412,7 +1412,7 @@ static void bgp_shutdown(void) nb_terminate(); yang_terminate(); zprivs_terminate(&bgpd_privs); - thread_master_free(master); + event_master_free(master); master = NULL; } diff --git a/tests/helpers/c/main.c b/tests/helpers/c/main.c index bb8acd2c44..cd2b5665e2 100644 --- a/tests/helpers/c/main.c +++ b/tests/helpers/c/main.c @@ -6,7 +6,7 @@ #include #include "getopt.h" -#include "thread.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "memory.h" @@ -14,7 +14,7 @@ extern void test_init(void); -struct thread_master *master; +struct event_loop *master; struct option longopts[] = {{"daemon", no_argument, NULL, 'd'}, {"config_file", required_argument, NULL, 'f'}, @@ -33,17 +33,17 @@ DEFUN (daemon_exit, } static int timer_count; -static void test_timer(struct thread *thread) +static void test_timer(struct event *thread) { - int *count = THREAD_ARG(thread); + int *count = EVENT_ARG(thread); printf("run %d of timer\n", (*count)++); - thread_add_timer(master, test_timer, count, 5, NULL); + event_add_timer(master, test_timer, count, 5, NULL); } static void test_timer_init(void) { - thread_add_timer(master, test_timer, &timer_count, 10, NULL); + event_add_timer(master, test_timer, &timer_count, 10, NULL); } static void test_vty_init(void) @@ -82,7 +82,7 @@ int main(int argc, char **argv) int vty_port = 4000; int daemon_mode = 0; char *progname; - struct thread thread; + struct event thread; char *config_file = NULL; /* Set umask before anything for security */ @@ -92,7 +92,7 @@ int main(int argc, char **argv) progname = ((p = strrchr(argv[0], '/')) ? ++p : argv[0]); /* master init. */ - master = thread_master_create(NULL); + master = event_master_create(NULL); while (1) { int opt; @@ -164,8 +164,8 @@ int main(int argc, char **argv) test_init(); /* Fetch next active thread. */ - while (thread_fetch(master, &thread)) - thread_call(&thread); + while (event_fetch(master, &thread)) + event_call(&thread); /* Not reached. */ exit(0); diff --git a/tests/isisd/test_common.c b/tests/isisd/test_common.c index 0f37752ce2..d0288f600d 100644 --- a/tests/isisd/test_common.c +++ b/tests/isisd/test_common.c @@ -12,7 +12,7 @@ #include "test_common.h" -struct thread_master *master; +struct event_loop *master; struct zebra_privs_t isisd_privs; int isis_sock_init(struct isis_circuit *circuit) diff --git a/tests/isisd/test_common.h b/tests/isisd/test_common.h index 9b83b30ba7..f0c5493c9d 100644 --- a/tests/isisd/test_common.h +++ b/tests/isisd/test_common.h @@ -65,7 +65,7 @@ extern int test_topology_load(const struct isis_topology *topology, struct lspdb_head lspdb[]); /* Global variables. */ -extern struct thread_master *master; +extern struct event_loop *master; extern struct zebra_privs_t isisd_privs; extern struct isis_topology test_topologies[]; diff --git a/tests/isisd/test_fuzz_isis_tlv.c b/tests/isisd/test_fuzz_isis_tlv.c index 8f0b92d0fc..627ccfee6f 100644 --- a/tests/isisd/test_fuzz_isis_tlv.c +++ b/tests/isisd/test_fuzz_isis_tlv.c @@ -9,7 +9,7 @@ #include "memory.h" #include "sbuf.h" #include "stream.h" -#include "thread.h" +#include "frrevent.h" #include "isisd/isis_circuit.h" #include "isisd/isis_tlvs.h" diff --git a/tests/isisd/test_isis_spf.c b/tests/isisd/test_isis_spf.c index 0cccf05678..85ddfea5b5 100644 --- a/tests/isisd/test_isis_spf.c +++ b/tests/isisd/test_isis_spf.c @@ -8,7 +8,7 @@ #include #include "getopt.h" -#include "thread.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "log.h" @@ -455,7 +455,7 @@ static void vty_do_exit(int isexit) cmd_terminate(); vty_terminate(); yang_terminate(); - thread_master_free(master); + event_master_free(master); log_memstats(stderr, "test-isis-spf"); if (!isexit) @@ -488,7 +488,7 @@ int main(int argc, char **argv) { char *p; char *progname; - struct thread thread; + struct event thread; bool debug = false; /* Set umask before anything for security */ @@ -521,7 +521,7 @@ int main(int argc, char **argv) } /* master init. */ - master = thread_master_create(NULL); + master = event_master_create(NULL); isis_master_init(master); /* Library inits. */ @@ -549,8 +549,8 @@ int main(int argc, char **argv) vty_stdio(vty_do_exit); /* Fetch next active thread. */ - while (thread_fetch(master, &thread)) - thread_call(&thread); + while (event_fetch(master, &thread)) + event_call(&thread); /* Not reached. */ exit(0); diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c index 29dad7d80f..e0981b991a 100644 --- a/tests/lib/cli/common_cli.c +++ b/tests/lib/cli/common_cli.c @@ -8,7 +8,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "memory.h" @@ -17,7 +17,7 @@ #include "common_cli.h" -struct thread_master *master; +struct event_loop *master; int dump_args(struct vty *vty, const char *descr, int argc, struct cmd_token *argv[]) @@ -39,7 +39,7 @@ static void vty_do_exit(int isexit) vty_terminate(); nb_terminate(); yang_terminate(); - thread_master_free(master); + event_master_free(master); log_memstats(stderr, "testcli"); if (!isexit) @@ -52,14 +52,14 @@ int test_log_prio = ZLOG_DISABLED; /* main routine. */ int main(int argc, char **argv) { - struct thread thread; + struct event thread; size_t yangcount; /* Set umask before anything for security */ umask(0027); /* master init. */ - master = thread_master_create(NULL); + master = event_master_create(NULL); zlog_aux_init("NONE: ", test_log_prio); @@ -81,8 +81,8 @@ int main(int argc, char **argv) vty_stdio(vty_do_exit); /* Fetch next active thread. */ - while (thread_fetch(master, &thread)) - thread_call(&thread); + while (event_fetch(master, &thread)) + event_call(&thread); /* Not reached. */ exit(0); diff --git a/tests/lib/cli/common_cli.h b/tests/lib/cli/common_cli.h index 7ef4d860bd..4a1de940df 100644 --- a/tests/lib/cli/common_cli.h +++ b/tests/lib/cli/common_cli.h @@ -22,7 +22,7 @@ extern void test_init(int argc, char **argv); /* functions provided by common cli * (includes main()) */ -extern struct thread_master *master; +extern struct event_loop *master; extern int test_log_prio; diff --git a/tests/lib/cli/test_commands.c b/tests/lib/cli/test_commands.c index 54db795757..ea84120fc1 100644 --- a/tests/lib/cli/test_commands.c +++ b/tests/lib/cli/test_commands.c @@ -30,7 +30,7 @@ extern vector cmdvec; extern struct cmd_node vty_node; extern void test_init_cmd(void); /* provided in test-commands-defun.c */ -struct thread_master *master; /* dummy for libfrr*/ +struct event_loop *master; /* dummy for libfrr*/ static vector test_cmds; static char test_buf[32768]; diff --git a/tests/lib/cxxcompat.c b/tests/lib/cxxcompat.c index 7aab88eeb9..8f54856186 100644 --- a/tests/lib/cxxcompat.c +++ b/tests/lib/cxxcompat.c @@ -78,7 +78,7 @@ #include "lib/stream.h" #include "lib/table.h" #include "lib/termtable.h" -#include "lib/thread.h" +#include "frrevent.h" #include "lib/typesafe.h" #include "lib/typerb.h" #include "lib/vector.h" diff --git a/tests/lib/fuzz_zlog.c b/tests/lib/fuzz_zlog.c index ad9677a718..d308f8eb2f 100644 --- a/tests/lib/fuzz_zlog.c +++ b/tests/lib/fuzz_zlog.c @@ -94,7 +94,7 @@ int main(int argc, char **argv) cfg->fd = fd; cmd_hostname_set("TEST"); - cfg->master = thread_master_create("TEST"); + cfg->master = event_master_create("TEST"); zlog_5424_apply_dst(cfg); diff --git a/tests/lib/northbound/test_oper_data.c b/tests/lib/northbound/test_oper_data.c index 3abda75f40..f82eddd3bf 100644 --- a/tests/lib/northbound/test_oper_data.c +++ b/tests/lib/northbound/test_oper_data.c @@ -6,7 +6,7 @@ #include -#include "thread.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "memory.h" @@ -14,7 +14,7 @@ #include "log.h" #include "northbound.h" -static struct thread_master *master; +static struct event_loop *master; struct troute { struct prefix_ipv4 prefix; @@ -351,7 +351,7 @@ static void vty_do_exit(int isexit) vty_terminate(); nb_terminate(); yang_terminate(); - thread_master_free(master); + event_master_free(master); log_memstats(stderr, "test-nb-oper-data"); if (!isexit) @@ -361,7 +361,7 @@ static void vty_do_exit(int isexit) /* main routine. */ int main(int argc, char **argv) { - struct thread thread; + struct event thread; unsigned int num_vrfs = 2; unsigned int num_interfaces = 4; unsigned int num_routes = 6; @@ -377,7 +377,7 @@ int main(int argc, char **argv) umask(0027); /* master init. */ - master = thread_master_create(NULL); + master = event_master_create(NULL); zlog_aux_init("NONE: ", ZLOG_DISABLED); @@ -395,8 +395,8 @@ int main(int argc, char **argv) vty_stdio(vty_do_exit); /* Fetch next active thread. */ - while (thread_fetch(master, &thread)) - thread_call(&thread); + while (event_fetch(master, &thread)) + event_call(&thread); /* Not reached. */ exit(0); diff --git a/tests/lib/test_assert.c b/tests/lib/test_assert.c index d68ee8a819..4440075b41 100644 --- a/tests/lib/test_assert.c +++ b/tests/lib/test_assert.c @@ -22,13 +22,13 @@ static void func_for_bt(int number) #include #include "lib/zlog.h" -#include "lib/thread.h" +#include "frrevent.h" #include "lib/sigevent.h" int main(int argc, char **argv) { int number = 10; - struct thread_master *master; + struct event_loop *master; zlog_aux_init("NONE: ", LOG_DEBUG); @@ -39,7 +39,7 @@ int main(int argc, char **argv) assertf(number > 1, "(B) the number was %d", number); /* set up SIGABRT handler */ - master = thread_master_create("test"); + master = event_master_create("test"); signal_init(master, 0, NULL); func_for_bt(number); diff --git a/tests/lib/test_buffer.c b/tests/lib/test_buffer.c index 9f501f4e35..bfb4600848 100644 --- a/tests/lib/test_buffer.c +++ b/tests/lib/test_buffer.c @@ -8,7 +8,7 @@ #include #include -struct thread_master *master; +struct event_loop *master; int main(int argc, char **argv) { diff --git a/tests/lib/test_checksum.c b/tests/lib/test_checksum.c index fcb79ee28d..329ae6087e 100644 --- a/tests/lib/test_checksum.c +++ b/tests/lib/test_checksum.c @@ -11,7 +11,7 @@ #include "network.h" #include "prng.h" -struct thread_master *master; +struct event_loop *master; struct acc_vals { int c0; diff --git a/tests/lib/test_grpc.cpp b/tests/lib/test_grpc.cpp index 282161c3df..fd30f04346 100644 --- a/tests/lib/test_grpc.cpp +++ b/tests/lib/test_grpc.cpp @@ -14,7 +14,7 @@ #include "libfrr.h" #include "routing_nb.h" #include "northbound_cli.h" -#include "thread.h" +#include "frrevent.h" #include "vrf.h" #include "vty.h" @@ -34,13 +34,13 @@ #include #include "grpc/frr-northbound.grpc.pb.h" -DEFINE_HOOK(frr_late_init, (struct thread_master * tm), (tm)); +DEFINE_HOOK(frr_late_init, (struct event_loop * tm), (tm)); DEFINE_KOOH(frr_fini, (), ()); struct vty *vty; bool mpls_enabled; -struct thread_master *master; +struct event_loop *master; struct zebra_privs_t static_privs = {0}; struct frrmod_runtime *grpc_module; char binpath[2 * MAXPATHLEN + 1]; @@ -66,7 +66,7 @@ static const struct frr_yang_module_info *const staticd_yang_modules[] = { &frr_staticd_info, &frr_vrf_info, }; -static void grpc_thread_stop(struct thread *thread); +static void grpc_thread_stop(struct event *thread); static void _err_print(const void *cookie, const char *errstr) { @@ -97,7 +97,7 @@ static void static_startup(void) static_debug_init(); - master = thread_master_create(NULL); + master = event_master_create(NULL); nb_init(master, staticd_yang_modules, array_size(staticd_yang_modules), false); @@ -139,7 +139,7 @@ static void static_shutdown(void) cmd_terminate(); nb_terminate(); yang_terminate(); - thread_master_free(master); + event_master_free(master); master = NULL; } @@ -479,14 +479,14 @@ void *grpc_client_test_start(void *arg) // Signal FRR event loop to stop test_debug("client: pthread: adding event to stop us"); - thread_add_event(master, grpc_thread_stop, NULL, 0, NULL); + event_add_event(master, grpc_thread_stop, NULL, 0, NULL); test_debug("client: pthread: DONE (returning)"); return NULL; } -static void grpc_thread_start(struct thread *thread) +static void grpc_thread_start(struct event *thread) { struct frr_pthread_attr client = { .start = grpc_client_test_start, @@ -498,7 +498,7 @@ static void grpc_thread_start(struct thread *thread) frr_pthread_wait_running(pth); } -static void grpc_thread_stop(struct thread *thread) +static void grpc_thread_stop(struct event *thread) { std::cout << __func__ << ": frr_pthread_stop_all" << std::endl; frr_pthread_stop_all(); @@ -542,12 +542,12 @@ int main(int argc, char **argv) static_startup(); - thread_add_event(master, grpc_thread_start, NULL, 0, NULL); + event_add_event(master, grpc_thread_start, NULL, 0, NULL); /* Event Loop */ - struct thread thread; - while (thread_fetch(master, &thread)) - thread_call(&thread); + struct event thread; + while (event_fetch(master, &thread)) + event_call(&thread); return 0; } diff --git a/tests/lib/test_heavy.c b/tests/lib/test_heavy.c index 2d54fe6c68..1e56940831 100644 --- a/tests/lib/test_heavy.c +++ b/tests/lib/test_heavy.c @@ -13,7 +13,7 @@ */ #include -#include "thread.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "memory.h" diff --git a/tests/lib/test_heavy_thread.c b/tests/lib/test_heavy_thread.c index afbd205451..4fb9ebfa3a 100644 --- a/tests/lib/test_heavy_thread.c +++ b/tests/lib/test_heavy_thread.c @@ -14,7 +14,7 @@ #include #include -#include "thread.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "memory.h" @@ -22,7 +22,7 @@ #include "tests.h" -extern struct thread_master *master; +extern struct event_loop *master; enum { ITERS_FIRST = 0, ITERS_ERR = 100, @@ -56,9 +56,9 @@ static void slow_func(struct vty *vty, const char *str, const int i) printf("%s did %d, x = %g\n", str, i, x); } -static void clear_something(struct thread *thread) +static void clear_something(struct event *thread) { - struct work_state *ws = THREAD_ARG(thread); + struct work_state *ws = EVENT_ARG(thread); /* this could be like iterating through 150k of route_table * or worse, iterating through a list of peers, to bgp_stop them with @@ -67,9 +67,9 @@ static void clear_something(struct thread *thread) while (ws->i < ITERS_MAX) { slow_func(ws->vty, ws->str, ws->i); ws->i++; - if (thread_should_yield(thread)) { - thread_add_timer_msec(master, clear_something, ws, 0, - NULL); + if (event_should_yield(thread)) { + event_add_timer_msec(master, clear_something, ws, 0, + NULL); return; } } @@ -102,7 +102,7 @@ DEFUN (clear_foo, ws->vty = vty; ws->i = ITERS_FIRST; - thread_add_timer_msec(master, clear_something, ws, 0, NULL); + event_add_timer_msec(master, clear_something, ws, 0, NULL); return CMD_SUCCESS; } diff --git a/tests/lib/test_heavy_wq.c b/tests/lib/test_heavy_wq.c index 9b2cfa5730..225573ae92 100644 --- a/tests/lib/test_heavy_wq.c +++ b/tests/lib/test_heavy_wq.c @@ -13,7 +13,7 @@ */ #include -#include "thread.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "memory.h" @@ -27,7 +27,7 @@ DEFINE_MGROUP(TEST_HEAVYWQ, "heavy-wq test"); DEFINE_MTYPE_STATIC(TEST_HEAVYWQ, WQ_NODE, "heavy_wq_node"); DEFINE_MTYPE_STATIC(TEST_HEAVYWQ, WQ_NODE_STR, "heavy_wq_node->str"); -extern struct thread_master *master; +extern struct event_loop *master; static struct work_queue *heavy_wq; struct heavy_wq_node { diff --git a/tests/lib/test_memory.c b/tests/lib/test_memory.c index e4423b0b5b..aba4c3589c 100644 --- a/tests/lib/test_memory.c +++ b/tests/lib/test_memory.c @@ -15,7 +15,7 @@ DEFINE_MTYPE_STATIC(TEST_MEMORY, TEST, "generic test mtype"); * CVS */ -struct thread_master *master; +struct event_loop *master; #if 0 /* set to 1 to use system alloc directly */ #undef XMALLOC diff --git a/tests/lib/test_nexthop_iter.c b/tests/lib/test_nexthop_iter.c index 2bb0b1233c..91380f1111 100644 --- a/tests/lib/test_nexthop_iter.c +++ b/tests/lib/test_nexthop_iter.c @@ -13,7 +13,7 @@ #include "zebra/rib.h" #include "prng.h" -struct thread_master *master; +struct event_loop *master; static int verbose; static void str_append(char **buf, const char *repr) diff --git a/tests/lib/test_privs.c b/tests/lib/test_privs.c index d7bc0b3153..e26754857b 100644 --- a/tests/lib/test_privs.c +++ b/tests/lib/test_privs.c @@ -50,7 +50,7 @@ Report bugs to %s\n", exit(status); } -struct thread_master *master; +struct event_loop *master; /* main routine. */ int main(int argc, char **argv) { diff --git a/tests/lib/test_resolver.c b/tests/lib/test_resolver.c index b4d8992b95..d72ff4f5a1 100644 --- a/tests/lib/test_resolver.c +++ b/tests/lib/test_resolver.c @@ -26,7 +26,7 @@ #include "tests/lib/cli/common_cli.h" -extern struct thread_master *master; +extern struct event_loop *master; static void resolver_result(struct resolver_query *resq, const char *errstr, int numaddrs, union sockunion *addr) diff --git a/tests/lib/test_segv.c b/tests/lib/test_segv.c index 8532da7c2d..af5f3aec63 100644 --- a/tests/lib/test_segv.c +++ b/tests/lib/test_segv.c @@ -17,7 +17,7 @@ struct frr_signal_t sigs[] = {}; -struct thread_master *master; +struct event_loop *master; void func1(int *arg); void func3(void); @@ -49,19 +49,19 @@ void func3(void) func2(6, buf); } -static void threadfunc(struct thread *thread) +static void threadfunc(struct event *thread) { func3(); } int main(void) { - master = thread_master_create(NULL); + master = event_master_create(NULL); signal_init(master, array_size(sigs), sigs); zlog_aux_init("NONE: ", LOG_DEBUG); - thread_execute(master, threadfunc, 0, 0); + event_execute(master, threadfunc, 0, 0); exit(0); } diff --git a/tests/lib/test_sig.c b/tests/lib/test_sig.c index 897e004b40..2bd7f30976 100644 --- a/tests/lib/test_sig.c +++ b/tests/lib/test_sig.c @@ -35,18 +35,18 @@ struct frr_signal_t sigs[] = {{ .handler = &sigusr2, }}; -struct thread_master *master; -struct thread t; +struct event_loop *master; +struct event t; int main(void) { - master = thread_master_create(NULL); + master = event_master_create(NULL); signal_init(master, array_size(sigs), sigs); zlog_aux_init("NONE: ", LOG_DEBUG); - while (thread_fetch(master, &t)) - thread_call(&t); + while (event_fetch(master, &t)) + event_call(&t); exit(0); } diff --git a/tests/lib/test_srcdest_table.c b/tests/lib/test_srcdest_table.c index c1235fe857..6d6c5156a7 100644 --- a/tests/lib/test_srcdest_table.c +++ b/tests/lib/test_srcdest_table.c @@ -24,7 +24,7 @@ #define s6_addr32 __u6_addr.__u6_addr32 #endif /*s6_addr32*/ -struct thread_master *master; +struct event_loop *master; /* This structure is copied from lib/srcdest_table.c to which it is * private as far as other parts of Quagga are concerned. diff --git a/tests/lib/test_stream.c b/tests/lib/test_stream.c index 015dc41db1..d38dfe0eb0 100644 --- a/tests/lib/test_stream.c +++ b/tests/lib/test_stream.c @@ -6,12 +6,12 @@ #include #include -#include +#include "frrevent.h" #include "printfrr.h" static unsigned long long ham = 0xdeadbeefdeadbeef; -struct thread_master *master; +struct event_loop *master; static void print_stream(struct stream *s) { diff --git a/tests/lib/test_table.c b/tests/lib/test_table.c index 41d7003956..51bfda2345 100644 --- a/tests/lib/test_table.c +++ b/tests/lib/test_table.c @@ -25,7 +25,7 @@ typedef struct test_node_t_ { char *prefix_str; } test_node_t; -struct thread_master *master; +struct event_loop *master; /* * add_node diff --git a/tests/lib/test_timer_correctness.c b/tests/lib/test_timer_correctness.c index 37eb4939a1..04c0516889 100644 --- a/tests/lib/test_timer_correctness.c +++ b/tests/lib/test_timer_correctness.c @@ -16,14 +16,14 @@ #include "memory.h" #include "prng.h" -#include "thread.h" +#include "frrevent.h" #define SCHEDULE_TIMERS 800 #define REMOVE_TIMERS 200 #define TIMESTR_LEN strlen("4294967296.999999") -struct thread_master *master; +struct event_loop *master; static size_t log_buf_len; static size_t log_buf_pos; @@ -35,7 +35,7 @@ static char *expected_buf; static struct prng *prng; -static struct thread **timers; +static struct event **timers; static int timers_pending; @@ -54,7 +54,7 @@ static void terminate_test(void) exit_code = 0; } - thread_master_free(master); + event_master_free(master); XFREE(MTYPE_TMP, log_buf); XFREE(MTYPE_TMP, expected_buf); prng_free(prng); @@ -63,7 +63,7 @@ static void terminate_test(void) exit(exit_code); } -static void timer_func(struct thread *thread) +static void timer_func(struct event *thread) { int rv; @@ -94,10 +94,10 @@ static int cmp_timeval(const void *a, const void *b) int main(int argc, char **argv) { int i, j; - struct thread t; + struct event t; struct timeval **alarms; - master = thread_master_create(NULL); + master = event_master_create(NULL); log_buf_len = SCHEDULE_TIMERS * (TIMESTR_LEN + 1) + 1; log_buf_pos = 0; @@ -119,8 +119,8 @@ int main(int argc, char **argv) /* Schedule timers to expire in 0..5 seconds */ interval_msec = prng_rand(prng) % 5000; arg = XMALLOC(MTYPE_TMP, TIMESTR_LEN + 1); - thread_add_timer_msec(master, timer_func, arg, interval_msec, - &timers[i]); + event_add_timer_msec(master, timer_func, arg, interval_msec, + &timers[i]); ret = snprintf(arg, TIMESTR_LEN + 1, "%lld.%06lld", (long long)timers[i]->u.sands.tv_sec, (long long)timers[i]->u.sands.tv_usec); @@ -137,7 +137,7 @@ int main(int argc, char **argv) continue; XFREE(MTYPE_TMP, timers[index]->arg); - thread_cancel(&timers[index]); + event_cancel(&timers[index]); timers_pending--; } @@ -166,8 +166,8 @@ int main(int argc, char **argv) } XFREE(MTYPE_TMP, alarms); - while (thread_fetch(master, &t)) - thread_call(&t); + while (event_fetch(master, &t)) + event_call(&t); return 0; } diff --git a/tests/lib/test_timer_performance.c b/tests/lib/test_timer_performance.c index 21976e8d31..3ace076b43 100644 --- a/tests/lib/test_timer_performance.c +++ b/tests/lib/test_timer_performance.c @@ -14,15 +14,15 @@ #include #include -#include "thread.h" +#include "frrevent.h" #include "prng.h" #define SCHEDULE_TIMERS 1000000 #define REMOVE_TIMERS 500000 -struct thread_master *master; +struct event_loop *master; -static void dummy_func(struct thread *thread) +static void dummy_func(struct event *thread) { } @@ -30,21 +30,21 @@ int main(int argc, char **argv) { struct prng *prng; int i; - struct thread **timers; + struct event **timers; struct timeval tv_start, tv_lap, tv_stop; unsigned long t_schedule, t_remove; - master = thread_master_create(NULL); + master = event_master_create(NULL); prng = prng_new(0); timers = calloc(SCHEDULE_TIMERS, sizeof(*timers)); /* create thread structures so they won't be allocated during the * time measurement */ for (i = 0; i < SCHEDULE_TIMERS; i++) { - thread_add_timer_msec(master, dummy_func, NULL, 0, &timers[i]); + event_add_timer_msec(master, dummy_func, NULL, 0, &timers[i]); } for (i = 0; i < SCHEDULE_TIMERS; i++) - thread_cancel(&timers[i]); + event_cancel(&timers[i]); monotime(&tv_start); @@ -52,8 +52,8 @@ int main(int argc, char **argv) long interval_msec; interval_msec = prng_rand(prng) % (100 * SCHEDULE_TIMERS); - thread_add_timer_msec(master, dummy_func, NULL, interval_msec, - &timers[i]); + event_add_timer_msec(master, dummy_func, NULL, interval_msec, + &timers[i]); } monotime(&tv_lap); @@ -62,7 +62,7 @@ int main(int argc, char **argv) int index; index = prng_rand(prng) % SCHEDULE_TIMERS; - thread_cancel(&timers[index]); + event_cancel(&timers[index]); } monotime(&tv_stop); @@ -80,7 +80,7 @@ int main(int argc, char **argv) fflush(stdout); free(timers); - thread_master_free(master); + event_master_free(master); prng_free(prng); return 0; } diff --git a/tests/lib/test_zmq.c b/tests/lib/test_zmq.c index 59a596e1c8..2cd9d47cb4 100644 --- a/tests/lib/test_zmq.c +++ b/tests/lib/test_zmq.c @@ -12,7 +12,7 @@ DEFINE_MTYPE_STATIC(LIB, TESTBUF, "zmq test buffer"); DEFINE_MTYPE_STATIC(LIB, ZMQMSG, "zmq message"); -static struct thread_master *master; +static struct event_loop *master; static void msg_buf_free(void *data, void *hint) { @@ -212,8 +212,8 @@ static void serverpartfn(void *arg, void *zmqsock, zmq_msg_t *msg, printf("server recv: %s\n", buf); fflush(stdout); - frrzmq_thread_add_write_msg(master, serverwritefn, NULL, msg_id, - zmqsock, &cb); + frrzmq_event_add_write_msg(master, serverwritefn, NULL, msg_id, zmqsock, + &cb); } static void serverfn(void *arg, void *zmqsock) @@ -242,8 +242,8 @@ static void serverfn(void *arg, void *zmqsock) frrzmq_thread_cancel(&cb, &cb->read); frrzmq_thread_cancel(&cb, &cb->write); - frrzmq_thread_add_read_part(master, serverpartfn, NULL, NULL, zmqsock, - &cb); + frrzmq_event_add_read_part(master, serverpartfn, NULL, NULL, zmqsock, + &cb); } static void sigchld(void) @@ -264,9 +264,9 @@ static void run_server(int syncfd) { void *zmqsock; char dummy = 0; - struct thread t; + struct event t; - master = thread_master_create(NULL); + master = event_master_create(NULL); signal_init(master, array_size(sigs), sigs); frrzmq_init(); @@ -276,15 +276,15 @@ static void run_server(int syncfd) exit(1); } - frrzmq_thread_add_read_msg(master, serverfn, NULL, NULL, zmqsock, &cb); + frrzmq_event_add_read_msg(master, serverfn, NULL, NULL, zmqsock, &cb); write(syncfd, &dummy, sizeof(dummy)); - while (thread_fetch(master, &t)) - thread_call(&t); + while (event_fetch(master, &t)) + event_call(&t); zmq_close(zmqsock); frrzmq_finish(); - thread_master_free(master); + event_master_free(master); log_memstats_stderr("test"); } diff --git a/tests/ospfd/common.c b/tests/ospfd/common.c index ef5e3ed177..e3941865ab 100644 --- a/tests/ospfd/common.c +++ b/tests/ospfd/common.c @@ -17,7 +17,7 @@ #include "common.h" -struct thread_master *master; +struct event_loop *master; struct zebra_privs_t ospfd_privs; diff --git a/tests/ospfd/common.h b/tests/ospfd/common.h index 6d3e63e359..18e412bd3c 100644 --- a/tests/ospfd/common.h +++ b/tests/ospfd/common.h @@ -30,7 +30,7 @@ extern int topology_load(struct vty *vty, struct ospf_topology *topology, struct ospf_test_node *root, struct ospf *ospf); /* Global variables. */ -extern struct thread_master *master; +extern struct event_loop *master; extern struct ospf_topology topo1; extern struct ospf_topology topo2; extern struct ospf_topology topo3; diff --git a/tests/ospfd/test_ospf_spf.c b/tests/ospfd/test_ospf_spf.c index b8a2aef69e..fc6b8e89ec 100644 --- a/tests/ospfd/test_ospf_spf.c +++ b/tests/ospfd/test_ospf_spf.c @@ -1,7 +1,7 @@ #include #include "getopt.h" -#include "thread.h" +#include "frrevent.h" #include #include "vty.h" #include "command.h" @@ -208,7 +208,7 @@ static void vty_do_exit(int isexit) cmd_terminate(); vty_terminate(); - thread_master_free(master); + event_master_free(master); if (!isexit) exit(0); @@ -240,7 +240,7 @@ int main(int argc, char **argv) { char *p; char *progname; - struct thread thread; + struct event thread; bool debug = false; /* Set umask before anything for security */ @@ -273,7 +273,7 @@ int main(int argc, char **argv) } /* master init. */ - master = thread_master_create(NULL); + master = event_master_create(NULL); /* Library inits. */ cmd_init(1); @@ -297,8 +297,8 @@ int main(int argc, char **argv) vty_stdio(vty_do_exit); /* Fetch next active thread. */ - while (thread_fetch(master, &thread)) - thread_call(&thread); + while (event_fetch(master, &thread)) + event_call(&thread); /* Not reached. */ exit(0); diff --git a/tools/frr-llvm-cg.c b/tools/frr-llvm-cg.c index 51e8fb7b7e..3a7222e421 100644 --- a/tools/frr-llvm-cg.c +++ b/tools/frr-llvm-cg.c @@ -271,12 +271,12 @@ static bool is_thread_sched(const char *name, size_t len) { #define thread_prefix "_" static const char *const names[] = { - thread_prefix "thread_add_read_write", - thread_prefix "thread_add_timer", - thread_prefix "thread_add_timer_msec", - thread_prefix "thread_add_timer_tv", - thread_prefix "thread_add_event", - thread_prefix "thread_execute", + thread_prefix "event_add_read_write", + thread_prefix "event_add_timer", + thread_prefix "event_add_timer_msec", + thread_prefix "event_add_timer_tv", + thread_prefix "event_add_event", + thread_prefix "event_execute", }; size_t i; diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c index 1d934f616b..7a779307d9 100644 --- a/vrrpd/vrrp.c +++ b/vrrpd/vrrp.c @@ -673,8 +673,8 @@ struct vrrp_vrouter *vrrp_lookup(const struct interface *ifp, uint8_t vrid) /* Forward decls */ static void vrrp_change_state(struct vrrp_router *r, int to); -static void vrrp_adver_timer_expire(struct thread *thread); -static void vrrp_master_down_timer_expire(struct thread *thread); +static void vrrp_adver_timer_expire(struct event *thread); +static void vrrp_master_down_timer_expire(struct event *thread); /* * Finds the first connected address of the appropriate family on a VRRP @@ -900,11 +900,11 @@ static int vrrp_recv_advertisement(struct vrrp_router *r, struct ipaddr *src, if (pkt->hdr.priority == 0) { vrrp_send_advertisement(r); - THREAD_OFF(r->t_adver_timer); - thread_add_timer_msec( - master, vrrp_adver_timer_expire, r, - r->vr->advertisement_interval * CS2MS, - &r->t_adver_timer); + EVENT_OFF(r->t_adver_timer); + event_add_timer_msec(master, vrrp_adver_timer_expire, r, + r->vr->advertisement_interval * + CS2MS, + &r->t_adver_timer); } else if (pkt->hdr.priority > r->priority || ((pkt->hdr.priority == r->priority) && addrcmp > 0)) { @@ -913,17 +913,17 @@ static int vrrp_recv_advertisement(struct vrrp_router *r, struct ipaddr *src, "Received advertisement from %s w/ priority %hhu; switching to Backup", r->vr->vrid, family2str(r->family), sipstr, pkt->hdr.priority); - THREAD_OFF(r->t_adver_timer); + EVENT_OFF(r->t_adver_timer); if (r->vr->version == 3) { r->master_adver_interval = htons(pkt->hdr.v3.adver_int); } vrrp_recalculate_timers(r); - THREAD_OFF(r->t_master_down_timer); - thread_add_timer_msec(master, - vrrp_master_down_timer_expire, r, - r->master_down_interval * CS2MS, - &r->t_master_down_timer); + EVENT_OFF(r->t_master_down_timer); + event_add_timer_msec(master, + vrrp_master_down_timer_expire, r, + r->master_down_interval * CS2MS, + &r->t_master_down_timer); vrrp_change_state(r, VRRP_STATE_BACKUP); } else { /* Discard advertisement */ @@ -936,8 +936,8 @@ static int vrrp_recv_advertisement(struct vrrp_router *r, struct ipaddr *src, break; case VRRP_STATE_BACKUP: if (pkt->hdr.priority == 0) { - THREAD_OFF(r->t_master_down_timer); - thread_add_timer_msec( + EVENT_OFF(r->t_master_down_timer); + event_add_timer_msec( master, vrrp_master_down_timer_expire, r, r->skew_time * CS2MS, &r->t_master_down_timer); } else if (!r->vr->preempt_mode @@ -947,11 +947,11 @@ static int vrrp_recv_advertisement(struct vrrp_router *r, struct ipaddr *src, ntohs(pkt->hdr.v3.adver_int); } vrrp_recalculate_timers(r); - THREAD_OFF(r->t_master_down_timer); - thread_add_timer_msec(master, - vrrp_master_down_timer_expire, r, - r->master_down_interval * CS2MS, - &r->t_master_down_timer); + EVENT_OFF(r->t_master_down_timer); + event_add_timer_msec(master, + vrrp_master_down_timer_expire, r, + r->master_down_interval * CS2MS, + &r->t_master_down_timer); } else if (r->vr->preempt_mode && pkt->hdr.priority < r->priority) { /* Discard advertisement */ @@ -976,9 +976,9 @@ static int vrrp_recv_advertisement(struct vrrp_router *r, struct ipaddr *src, /* * Read and process next IPvX datagram. */ -static void vrrp_read(struct thread *thread) +static void vrrp_read(struct event *thread) { - struct vrrp_router *r = THREAD_ARG(thread); + struct vrrp_router *r = EVENT_ARG(thread); struct vrrp_pkt *pkt; ssize_t pktsize; @@ -1039,7 +1039,7 @@ done: memset(r->ibuf, 0x00, sizeof(r->ibuf)); if (resched) - thread_add_read(master, vrrp_read, r, r->sock_rx, &r->t_read); + event_add_read(master, vrrp_read, r, r->sock_rx, &r->t_read); } /* @@ -1405,7 +1405,7 @@ static void vrrp_change_state_backup(struct vrrp_router *r) vrrp_zebra_radv_set(r, false); /* Disable Adver_Timer */ - THREAD_OFF(r->t_adver_timer); + EVENT_OFF(r->t_adver_timer); r->advert_pending = false; r->garp_pending = false; @@ -1473,9 +1473,9 @@ static void vrrp_change_state(struct vrrp_router *r, int to) /* * Called when Adver_Timer expires. */ -static void vrrp_adver_timer_expire(struct thread *thread) +static void vrrp_adver_timer_expire(struct event *thread) { - struct vrrp_router *r = THREAD_ARG(thread); + struct vrrp_router *r = EVENT_ARG(thread); DEBUGD(&vrrp_dbg_proto, VRRP_LOGPFX VRRP_LOGPFX_VRID VRRP_LOGPFX_FAM @@ -1487,9 +1487,9 @@ static void vrrp_adver_timer_expire(struct thread *thread) vrrp_send_advertisement(r); /* Reset the Adver_Timer to Advertisement_Interval */ - thread_add_timer_msec(master, vrrp_adver_timer_expire, r, - r->vr->advertisement_interval * CS2MS, - &r->t_adver_timer); + event_add_timer_msec(master, vrrp_adver_timer_expire, r, + r->vr->advertisement_interval * CS2MS, + &r->t_adver_timer); } else { zlog_err(VRRP_LOGPFX VRRP_LOGPFX_VRID VRRP_LOGPFX_FAM "Adver_Timer expired in state '%s'; this is a bug", @@ -1501,17 +1501,17 @@ static void vrrp_adver_timer_expire(struct thread *thread) /* * Called when Master_Down_Timer expires. */ -static void vrrp_master_down_timer_expire(struct thread *thread) +static void vrrp_master_down_timer_expire(struct event *thread) { - struct vrrp_router *r = THREAD_ARG(thread); + struct vrrp_router *r = EVENT_ARG(thread); zlog_info(VRRP_LOGPFX VRRP_LOGPFX_VRID VRRP_LOGPFX_FAM "Master_Down_Timer expired", r->vr->vrid, family2str(r->family)); - thread_add_timer_msec(master, vrrp_adver_timer_expire, r, - r->vr->advertisement_interval * CS2MS, - &r->t_adver_timer); + event_add_timer_msec(master, vrrp_adver_timer_expire, r, + r->vr->advertisement_interval * CS2MS, + &r->t_adver_timer); vrrp_change_state(r, VRRP_STATE_MASTER); } @@ -1561,7 +1561,7 @@ static int vrrp_startup(struct vrrp_router *r) } /* Schedule listener */ - thread_add_read(master, vrrp_read, r, r->sock_rx, &r->t_read); + event_add_read(master, vrrp_read, r, r->sock_rx, &r->t_read); /* Configure effective priority */ assert(listhead(r->addrs)); @@ -1583,16 +1583,16 @@ static int vrrp_startup(struct vrrp_router *r) } if (r->priority == VRRP_PRIO_MASTER) { - thread_add_timer_msec(master, vrrp_adver_timer_expire, r, - r->vr->advertisement_interval * CS2MS, - &r->t_adver_timer); + event_add_timer_msec(master, vrrp_adver_timer_expire, r, + r->vr->advertisement_interval * CS2MS, + &r->t_adver_timer); vrrp_change_state(r, VRRP_STATE_MASTER); } else { r->master_adver_interval = r->vr->advertisement_interval; vrrp_recalculate_timers(r); - thread_add_timer_msec(master, vrrp_master_down_timer_expire, r, - r->master_down_interval * CS2MS, - &r->t_master_down_timer); + event_add_timer_msec(master, vrrp_master_down_timer_expire, r, + r->master_down_interval * CS2MS, + &r->t_master_down_timer); vrrp_change_state(r, VRRP_STATE_BACKUP); } @@ -1632,10 +1632,10 @@ static int vrrp_shutdown(struct vrrp_router *r) } /* Cancel all timers */ - THREAD_OFF(r->t_adver_timer); - THREAD_OFF(r->t_master_down_timer); - THREAD_OFF(r->t_read); - THREAD_OFF(r->t_write); + EVENT_OFF(r->t_adver_timer); + EVENT_OFF(r->t_master_down_timer); + EVENT_OFF(r->t_read); + EVENT_OFF(r->t_write); /* Protodown macvlan */ if (r->mvl_ifp) diff --git a/vrrpd/vrrp.h b/vrrpd/vrrp.h index 9da9c8a518..0ac9b1f49c 100644 --- a/vrrpd/vrrp.h +++ b/vrrpd/vrrp.h @@ -18,7 +18,7 @@ #include "lib/northbound.h" #include "lib/privs.h" #include "lib/stream.h" -#include "lib/thread.h" +#include "lib/frrevent.h" #include "lib/vty.h" /* Global definitions */ @@ -65,7 +65,7 @@ struct vrrp_defaults { extern struct vrrp_defaults vd; /* threadmaster */ -extern struct thread_master *master; +extern struct event_loop *master; /* privileges */ extern struct zebra_privs_t vrrp_privs; @@ -193,10 +193,10 @@ struct vrrp_router { uint32_t trans_cnt; } stats; - struct thread *t_master_down_timer; - struct thread *t_adver_timer; - struct thread *t_read; - struct thread *t_write; + struct event *t_master_down_timer; + struct event *t_adver_timer; + struct event *t_read; + struct event *t_write; }; /* diff --git a/vrrpd/vrrp_main.c b/vrrpd/vrrp_main.c index d3d230d205..32ee4bb136 100644 --- a/vrrpd/vrrp_main.c +++ b/vrrpd/vrrp_main.c @@ -18,7 +18,7 @@ #include "lib/nexthop.h" #include "lib/privs.h" #include "lib/sigevent.h" -#include "lib/thread.h" +#include "lib/frrevent.h" #include "lib/vrf.h" #include "lib/vty.h" @@ -50,7 +50,7 @@ struct zebra_privs_t vrrp_privs = { struct option longopts[] = { {0} }; /* Master of threads. */ -struct thread_master *master; +struct event_loop *master; static struct frr_daemon_info vrrpd_di; diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 50970f26c9..0a164ec16d 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -57,7 +57,7 @@ struct vtysh_client { char path[MAXPATHLEN]; struct vtysh_client *next; - struct thread *log_reader; + struct event *log_reader; int log_fd; uint32_t lost_msgs; }; @@ -3728,9 +3728,9 @@ static void vtysh_log_print(struct vtysh_client *vclient, text + textpos); } -static void vtysh_log_read(struct thread *thread) +static void vtysh_log_read(struct event *thread) { - struct vtysh_client *vclient = THREAD_ARG(thread); + struct vtysh_client *vclient = EVENT_ARG(thread); struct { struct zlog_live_hdr hdr; char text[4096]; @@ -3738,8 +3738,8 @@ static void vtysh_log_read(struct thread *thread) const char *text; ssize_t ret; - thread_add_read(master, vtysh_log_read, vclient, vclient->log_fd, - &vclient->log_reader); + event_add_read(master, vtysh_log_read, vclient, vclient->log_fd, + &vclient->log_reader); ret = recv(vclient->log_fd, &buf, sizeof(buf), 0); @@ -3769,7 +3769,7 @@ static void vtysh_log_read(struct thread *thread) "log monitor connection closed unexpectedly"); buf.hdr.textlen = strlen(buf.text); - THREAD_OFF(vclient->log_reader); + EVENT_OFF(vclient->log_reader); close(vclient->log_fd); vclient->log_fd = -1; @@ -3835,9 +3835,9 @@ DEFPY (vtysh_terminal_monitor, if (fd != -1) { set_nonblocking(fd); vclient->log_fd = fd; - thread_add_read(master, vtysh_log_read, vclient, - vclient->log_fd, - &vclient->log_reader); + event_add_read(master, vtysh_log_read, vclient, + vclient->log_fd, + &vclient->log_reader); } if (ret != CMD_SUCCESS) { vty_out(vty, "%% failed to enable logs on %s\n", @@ -3891,7 +3891,7 @@ DEFPY (no_vtysh_terminal_monitor, * a close notification... */ if (vclient->log_fd != -1) { - THREAD_OFF(vclient->log_reader); + EVENT_OFF(vclient->log_reader); close(vclient->log_fd); vclient->log_fd = -1; diff --git a/vtysh/vtysh.h b/vtysh/vtysh.h index 2c202c3536..cb6357f5e6 100644 --- a/vtysh/vtysh.h +++ b/vtysh/vtysh.h @@ -9,9 +9,9 @@ #include "memory.h" DECLARE_MGROUP(MVTYSH); -struct thread_master; +struct event_loop; -extern struct thread_master *master; +extern struct event_loop *master; #define VTYSH_ZEBRA 0x00001 #define VTYSH_RIPD 0x00002 diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c index 25b667252e..c22889a4f6 100644 --- a/vtysh/vtysh_main.c +++ b/vtysh/vtysh_main.c @@ -64,7 +64,7 @@ int execute_flag = 0; int user_mode; /* Master of threads. */ -struct thread_master *master; +struct event_loop *master; /* Command logging */ FILE *logfile; @@ -214,33 +214,33 @@ struct option longopts[] = { bool vtysh_loop_exited; -static struct thread *vtysh_rl_read_thread; +static struct event *vtysh_rl_read_thread; -static void vtysh_rl_read(struct thread *thread) +static void vtysh_rl_read(struct event *thread) { - thread_add_read(master, vtysh_rl_read, NULL, STDIN_FILENO, - &vtysh_rl_read_thread); + event_add_read(master, vtysh_rl_read, NULL, STDIN_FILENO, + &vtysh_rl_read_thread); rl_callback_read_char(); } /* Read a string, and return a pointer to it. Returns NULL on EOF. */ static void vtysh_rl_run(void) { - struct thread thread; + struct event thread; - master = thread_master_create(NULL); + master = event_master_create(NULL); rl_callback_handler_install(vtysh_prompt(), vtysh_rl_callback); - thread_add_read(master, vtysh_rl_read, NULL, STDIN_FILENO, - &vtysh_rl_read_thread); + event_add_read(master, vtysh_rl_read, NULL, STDIN_FILENO, + &vtysh_rl_read_thread); - while (!vtysh_loop_exited && thread_fetch(master, &thread)) - thread_call(&thread); + while (!vtysh_loop_exited && event_fetch(master, &thread)) + event_call(&thread); if (!vtysh_loop_exited) rl_callback_handler_remove(); - thread_master_free(master); + event_master_free(master); } static void log_it(const char *line) diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c index 84f4d02a8a..89199da1af 100644 --- a/watchfrr/watchfrr.c +++ b/watchfrr/watchfrr.c @@ -6,7 +6,7 @@ */ #include -#include +#include "frrevent.h" #include #include #include @@ -53,7 +53,7 @@ DEFINE_MGROUP(WATCHFRR, "watchfrr"); DEFINE_MTYPE_STATIC(WATCHFRR, WATCHFRR_DAEMON, "watchfrr daemon entry"); /* Needs to be global, referenced somewhere inside libfrr. */ -struct thread_master *master; +struct event_loop *master; static bool watch_only = false; const char *pathspace; @@ -86,15 +86,15 @@ struct restart_info { pid_t pid; struct timeval time; long interval; - struct thread *t_kill; + struct event *t_kill; int kills; }; static struct global_state { enum restart_phase phase; - struct thread *t_phase_hanging; - struct thread *t_startup_timeout; - struct thread *t_operational; + struct event *t_phase_hanging; + struct event *t_startup_timeout; + struct event *t_operational; const char *vtydir; long period; long timeout; @@ -149,9 +149,9 @@ struct daemon { int fd; struct timeval echo_sent; unsigned int connect_tries; - struct thread *t_wakeup; - struct thread *t_read; - struct thread *t_write; + struct event *t_wakeup; + struct event *t_read; + struct event *t_write; struct daemon *next; struct restart_info restart; @@ -195,7 +195,7 @@ static const struct option longopts[] = { {NULL, 0, NULL, 0}}; static int try_connect(struct daemon *dmn); -static void wakeup_send_echo(struct thread *t_wakeup); +static void wakeup_send_echo(struct event *t_wakeup); static void try_restart(struct daemon *dmn); static void phase_check(void); static void restart_done(struct daemon *dmn); @@ -347,9 +347,9 @@ static struct timeval *time_elapsed(struct timeval *result, return result; } -static void restart_kill(struct thread *t_kill) +static void restart_kill(struct event *t_kill) { - struct restart_info *restart = THREAD_ARG(t_kill); + struct restart_info *restart = EVENT_ARG(t_kill); struct timeval delay; time_elapsed(&delay, &restart->time); @@ -358,8 +358,8 @@ static void restart_kill(struct thread *t_kill) zlog_err( "%s %s child process appears to still be reading configuration, delaying for another %lu time", restart->what, restart->name, gs.restart_timeout); - thread_add_timer(master, restart_kill, restart, - gs.restart_timeout, &restart->t_kill); + event_add_timer(master, restart_kill, restart, + gs.restart_timeout, &restart->t_kill); return; } @@ -369,8 +369,8 @@ static void restart_kill(struct thread *t_kill) (long)delay.tv_sec, (restart->kills ? SIGKILL : SIGTERM)); kill(-restart->pid, (restart->kills ? SIGKILL : SIGTERM)); restart->kills++; - thread_add_timer(master, restart_kill, restart, gs.restart_timeout, - &restart->t_kill); + event_add_timer(master, restart_kill, restart, gs.restart_timeout, + &restart->t_kill); } static struct restart_info *find_child(pid_t child) @@ -415,7 +415,7 @@ static void sigchild(void) what = restart->what; restart->pid = 0; gs.numpids--; - thread_cancel(&restart->t_kill); + event_cancel(&restart->t_kill); /* Update restart time to reflect the time the command * completed. */ @@ -505,8 +505,8 @@ static int run_job(struct restart_info *restart, const char *cmdtype, snprintf(cmd, sizeof(cmd), command, restart->name); #pragma GCC diagnostic pop if ((restart->pid = run_background(cmd)) > 0) { - thread_add_timer(master, restart_kill, restart, - gs.restart_timeout, &restart->t_kill); + event_add_timer(master, restart_kill, restart, + gs.restart_timeout, &restart->t_kill); restart->what = cmdtype; gs.numpids++; } else @@ -529,34 +529,34 @@ static int run_job(struct restart_info *restart, const char *cmdtype, #define SET_READ_HANDLER(DMN) \ do { \ (DMN)->t_read = NULL; \ - thread_add_read(master, handle_read, (DMN), (DMN)->fd, \ - &(DMN)->t_read); \ + event_add_read(master, handle_read, (DMN), (DMN)->fd, \ + &(DMN)->t_read); \ } while (0); #define SET_WAKEUP_DOWN(DMN) \ do { \ (DMN)->t_wakeup = NULL; \ - thread_add_timer_msec(master, wakeup_down, (DMN), \ - FUZZY(gs.period), &(DMN)->t_wakeup); \ + event_add_timer_msec(master, wakeup_down, (DMN), \ + FUZZY(gs.period), &(DMN)->t_wakeup); \ } while (0); #define SET_WAKEUP_UNRESPONSIVE(DMN) \ do { \ (DMN)->t_wakeup = NULL; \ - thread_add_timer_msec(master, wakeup_unresponsive, (DMN), \ - FUZZY(gs.period), &(DMN)->t_wakeup); \ + event_add_timer_msec(master, wakeup_unresponsive, (DMN), \ + FUZZY(gs.period), &(DMN)->t_wakeup); \ } while (0); #define SET_WAKEUP_ECHO(DMN) \ do { \ (DMN)->t_wakeup = NULL; \ - thread_add_timer_msec(master, wakeup_send_echo, (DMN), \ - FUZZY(gs.period), &(DMN)->t_wakeup); \ + event_add_timer_msec(master, wakeup_send_echo, (DMN), \ + FUZZY(gs.period), &(DMN)->t_wakeup); \ } while (0); -static void wakeup_down(struct thread *t_wakeup) +static void wakeup_down(struct event *t_wakeup) { - struct daemon *dmn = THREAD_ARG(t_wakeup); + struct daemon *dmn = EVENT_ARG(t_wakeup); dmn->t_wakeup = NULL; if (try_connect(dmn) < 0) @@ -565,9 +565,9 @@ static void wakeup_down(struct thread *t_wakeup) try_restart(dmn); } -static void wakeup_init(struct thread *t_wakeup) +static void wakeup_init(struct event *t_wakeup) { - struct daemon *dmn = THREAD_ARG(t_wakeup); + struct daemon *dmn = EVENT_ARG(t_wakeup); dmn->t_wakeup = NULL; if (try_connect(dmn) < 0) { @@ -587,13 +587,13 @@ static void restart_done(struct daemon *dmn) dmn->name, state_str[dmn->state]); return; } - THREAD_OFF(dmn->t_wakeup); + EVENT_OFF(dmn->t_wakeup); if (try_connect(dmn) < 0) SET_WAKEUP_DOWN(dmn); } -static void daemon_restarting_operational(struct thread *thread) +static void daemon_restarting_operational(struct event *thread) { systemd_send_status("FRR Operational"); } @@ -612,9 +612,9 @@ static void daemon_down(struct daemon *dmn, const char *why) close(dmn->fd); dmn->fd = -1; } - THREAD_OFF(dmn->t_read); - THREAD_OFF(dmn->t_write); - THREAD_OFF(dmn->t_wakeup); + EVENT_OFF(dmn->t_read); + EVENT_OFF(dmn->t_write); + EVENT_OFF(dmn->t_wakeup); if (try_connect(dmn) < 0) SET_WAKEUP_DOWN(dmn); @@ -622,9 +622,9 @@ static void daemon_down(struct daemon *dmn, const char *why) phase_check(); } -static void handle_read(struct thread *t_read) +static void handle_read(struct event *t_read) { - struct daemon *dmn = THREAD_ARG(t_read); + struct daemon *dmn = EVENT_ARG(t_read); static const char resp[sizeof(PING_TOKEN) + 4] = PING_TOKEN "\n"; char buf[sizeof(resp) + 100]; ssize_t rc; @@ -688,7 +688,7 @@ static void handle_read(struct thread *t_read) dmn->name, (long)delay.tv_sec, (long)delay.tv_usec); SET_READ_HANDLER(dmn); - thread_cancel(&dmn->t_wakeup); + event_cancel(&dmn->t_wakeup); SET_WAKEUP_ECHO(dmn); } @@ -740,19 +740,19 @@ static void daemon_up(struct daemon *dmn, const char *why) if (gs.numdown == 0) { daemon_send_ready(0); - THREAD_OFF(gs.t_operational); + EVENT_OFF(gs.t_operational); - thread_add_timer(master, daemon_restarting_operational, NULL, - gs.operational_timeout, &gs.t_operational); + event_add_timer(master, daemon_restarting_operational, NULL, + gs.operational_timeout, &gs.t_operational); } SET_WAKEUP_ECHO(dmn); phase_check(); } -static void check_connect(struct thread *t_write) +static void check_connect(struct event *t_write) { - struct daemon *dmn = THREAD_ARG(t_write); + struct daemon *dmn = EVENT_ARG(t_write); int sockerr; socklen_t reslen = sizeof(sockerr); @@ -778,9 +778,9 @@ static void check_connect(struct thread *t_write) daemon_up(dmn, "delayed connect succeeded"); } -static void wakeup_connect_hanging(struct thread *t_wakeup) +static void wakeup_connect_hanging(struct event *t_wakeup) { - struct daemon *dmn = THREAD_ARG(t_wakeup); + struct daemon *dmn = EVENT_ARG(t_wakeup); char why[100]; dmn->t_wakeup = NULL; @@ -848,10 +848,10 @@ static int try_connect(struct daemon *dmn) zlog_debug("%s: connection in progress", dmn->name); dmn->state = DAEMON_CONNECTING; dmn->fd = sock; - thread_add_write(master, check_connect, dmn, dmn->fd, - &dmn->t_write); - thread_add_timer(master, wakeup_connect_hanging, dmn, - gs.timeout, &dmn->t_wakeup); + event_add_write(master, check_connect, dmn, dmn->fd, + &dmn->t_write); + event_add_timer(master, wakeup_connect_hanging, dmn, gs.timeout, + &dmn->t_wakeup); SET_READ_HANDLER(dmn); return 0; } @@ -862,7 +862,7 @@ static int try_connect(struct daemon *dmn) return 1; } -static void phase_hanging(struct thread *t_hanging) +static void phase_hanging(struct event *t_hanging) { gs.t_phase_hanging = NULL; flog_err(EC_WATCHFRR_CONNECTION, @@ -874,10 +874,10 @@ static void phase_hanging(struct thread *t_hanging) static void set_phase(enum restart_phase new_phase) { gs.phase = new_phase; - thread_cancel(&gs.t_phase_hanging); + event_cancel(&gs.t_phase_hanging); - thread_add_timer(master, phase_hanging, NULL, PHASE_TIMEOUT, - &gs.t_phase_hanging); + event_add_timer(master, phase_hanging, NULL, PHASE_TIMEOUT, + &gs.t_phase_hanging); } static void phase_check(void) @@ -938,7 +938,7 @@ static void phase_check(void) gs.start_command, 1, 0); } gs.phase = PHASE_NONE; - THREAD_OFF(gs.t_phase_hanging); + EVENT_OFF(gs.t_phase_hanging); zlog_notice("Phased global restart has completed."); break; } @@ -985,9 +985,9 @@ static void try_restart(struct daemon *dmn) run_job(&gs.restart, "restart", gs.restart_command, 0, 1); } -static void wakeup_unresponsive(struct thread *t_wakeup) +static void wakeup_unresponsive(struct event *t_wakeup) { - struct daemon *dmn = THREAD_ARG(t_wakeup); + struct daemon *dmn = EVENT_ARG(t_wakeup); dmn->t_wakeup = NULL; if (dmn->state != DAEMON_UNRESPONSIVE) @@ -1000,9 +1000,9 @@ static void wakeup_unresponsive(struct thread *t_wakeup) } } -static void wakeup_no_answer(struct thread *t_wakeup) +static void wakeup_no_answer(struct event *t_wakeup) { - struct daemon *dmn = THREAD_ARG(t_wakeup); + struct daemon *dmn = EVENT_ARG(t_wakeup); dmn->t_wakeup = NULL; dmn->state = DAEMON_UNRESPONSIVE; @@ -1015,11 +1015,11 @@ static void wakeup_no_answer(struct thread *t_wakeup) try_restart(dmn); } -static void wakeup_send_echo(struct thread *t_wakeup) +static void wakeup_send_echo(struct event *t_wakeup) { static const char echocmd[] = "echo " PING_TOKEN; ssize_t rc; - struct daemon *dmn = THREAD_ARG(t_wakeup); + struct daemon *dmn = EVENT_ARG(t_wakeup); dmn->t_wakeup = NULL; if (((rc = write(dmn->fd, echocmd, sizeof(echocmd))) < 0) @@ -1031,8 +1031,8 @@ static void wakeup_send_echo(struct thread *t_wakeup) daemon_down(dmn, why); } else { gettimeofday(&dmn->echo_sent, NULL); - thread_add_timer(master, wakeup_no_answer, dmn, gs.timeout, - &dmn->t_wakeup); + event_add_timer(master, wakeup_no_answer, dmn, gs.timeout, + &dmn->t_wakeup); } } @@ -1118,7 +1118,7 @@ static char *translate_blanks(const char *cmd, const char *blankstr) return res; } -static void startup_timeout(struct thread *t_wakeup) +static void startup_timeout(struct event *t_wakeup) { daemon_send_ready(1); } @@ -1282,8 +1282,8 @@ static void watchfrr_init(int argc, char **argv) struct daemon *dmn, **add = &gs.daemons; char alldaemons[512] = "", *p = alldaemons; - thread_add_timer_msec(master, startup_timeout, NULL, STARTUP_TIMEOUT, - &gs.t_startup_timeout); + event_add_timer_msec(master, startup_timeout, NULL, STARTUP_TIMEOUT, + &gs.t_startup_timeout); for (i = optind; i < argc; i++) { dmn = XCALLOC(MTYPE_WATCHFRR_DAEMON, sizeof(*dmn)); @@ -1293,8 +1293,8 @@ static void watchfrr_init(int argc, char **argv) gs.numdaemons++; gs.numdown++; dmn->fd = -1; - thread_add_timer_msec(master, wakeup_init, dmn, 0, - &dmn->t_wakeup); + event_add_timer_msec(master, wakeup_init, dmn, 0, + &dmn->t_wakeup); dmn->restart.interval = gs.min_restart_interval; *add = dmn; add = &dmn->next; diff --git a/zebra/dpdk/zebra_dplane_dpdk.c b/zebra/dpdk/zebra_dplane_dpdk.c index 87245f47e8..b13daa3a97 100644 --- a/zebra/dpdk/zebra_dplane_dpdk.c +++ b/zebra/dpdk/zebra_dplane_dpdk.c @@ -694,7 +694,7 @@ static int zd_dpdk_finish(struct zebra_dplane_provider *prov, bool early) } -static int zd_dpdk_plugin_init(struct thread_master *tm) +static int zd_dpdk_plugin_init(struct event_loop *tm) { int ret; diff --git a/zebra/dplane_fpm_nl.c b/zebra/dplane_fpm_nl.c index 18aed7b376..b3bf1197be 100644 --- a/zebra/dplane_fpm_nl.c +++ b/zebra/dplane_fpm_nl.c @@ -83,22 +83,22 @@ struct fpm_nl_ctx { /* data plane events. */ struct zebra_dplane_provider *prov; struct frr_pthread *fthread; - struct thread *t_connect; - struct thread *t_read; - struct thread *t_write; - struct thread *t_event; - struct thread *t_nhg; - struct thread *t_dequeue; + struct event *t_connect; + struct event *t_read; + struct event *t_write; + struct event *t_event; + struct event *t_nhg; + struct event *t_dequeue; /* zebra events. */ - struct thread *t_lspreset; - struct thread *t_lspwalk; - struct thread *t_nhgreset; - struct thread *t_nhgwalk; - struct thread *t_ribreset; - struct thread *t_ribwalk; - struct thread *t_rmacreset; - struct thread *t_rmacwalk; + struct event *t_lspreset; + struct event *t_lspwalk; + struct event *t_nhgreset; + struct event *t_nhgwalk; + struct event *t_ribreset; + struct event *t_ribwalk; + struct event *t_rmacreset; + struct event *t_rmacwalk; /* Statistic counters. */ struct { @@ -156,26 +156,26 @@ enum fpm_nl_events { }; #define FPM_RECONNECT(fnc) \ - thread_add_event((fnc)->fthread->master, fpm_process_event, (fnc), \ - FNE_INTERNAL_RECONNECT, &(fnc)->t_event) + event_add_event((fnc)->fthread->master, fpm_process_event, (fnc), \ + FNE_INTERNAL_RECONNECT, &(fnc)->t_event) #define WALK_FINISH(fnc, ev) \ - thread_add_event((fnc)->fthread->master, fpm_process_event, (fnc), \ - (ev), NULL) + event_add_event((fnc)->fthread->master, fpm_process_event, (fnc), \ + (ev), NULL) /* * Prototypes. */ -static void fpm_process_event(struct thread *t); +static void fpm_process_event(struct event *t); static int fpm_nl_enqueue(struct fpm_nl_ctx *fnc, struct zebra_dplane_ctx *ctx); -static void fpm_lsp_send(struct thread *t); -static void fpm_lsp_reset(struct thread *t); -static void fpm_nhg_send(struct thread *t); -static void fpm_nhg_reset(struct thread *t); -static void fpm_rib_send(struct thread *t); -static void fpm_rib_reset(struct thread *t); -static void fpm_rmac_send(struct thread *t); -static void fpm_rmac_reset(struct thread *t); +static void fpm_lsp_send(struct event *t); +static void fpm_lsp_reset(struct event *t); +static void fpm_nhg_send(struct event *t); +static void fpm_nhg_reset(struct event *t); +static void fpm_rib_send(struct event *t); +static void fpm_rib_reset(struct event *t); +static void fpm_rmac_send(struct event *t); +static void fpm_rmac_reset(struct event *t); /* * CLI. @@ -231,8 +231,8 @@ DEFUN(fpm_set_address, fpm_set_address_cmd, memcpy(&sin6->sin6_addr, naddr, sizeof(sin6->sin6_addr)); ask_reconnect: - thread_add_event(gfnc->fthread->master, fpm_process_event, gfnc, - FNE_RECONNECT, &gfnc->t_event); + event_add_event(gfnc->fthread->master, fpm_process_event, gfnc, + FNE_RECONNECT, &gfnc->t_event); return CMD_SUCCESS; } @@ -246,8 +246,8 @@ DEFUN(no_fpm_set_address, no_fpm_set_address_cmd, "FPM remote listening server port\n" "Remote FPM server port\n") { - thread_add_event(gfnc->fthread->master, fpm_process_event, gfnc, - FNE_DISABLE, &gfnc->t_event); + event_add_event(gfnc->fthread->master, fpm_process_event, gfnc, + FNE_DISABLE, &gfnc->t_event); return CMD_SUCCESS; } @@ -260,8 +260,8 @@ DEFUN(fpm_use_nhg, fpm_use_nhg_cmd, if (gfnc->use_nhg) return CMD_SUCCESS; - thread_add_event(gfnc->fthread->master, fpm_process_event, gfnc, - FNE_TOGGLE_NHG, &gfnc->t_nhg); + event_add_event(gfnc->fthread->master, fpm_process_event, gfnc, + FNE_TOGGLE_NHG, &gfnc->t_nhg); return CMD_SUCCESS; } @@ -276,8 +276,8 @@ DEFUN(no_fpm_use_nhg, no_fpm_use_nhg_cmd, if (!gfnc->use_nhg) return CMD_SUCCESS; - thread_add_event(gfnc->fthread->master, fpm_process_event, gfnc, - FNE_TOGGLE_NHG, &gfnc->t_nhg); + event_add_event(gfnc->fthread->master, fpm_process_event, gfnc, + FNE_TOGGLE_NHG, &gfnc->t_nhg); return CMD_SUCCESS; } @@ -288,8 +288,8 @@ DEFUN(fpm_reset_counters, fpm_reset_counters_cmd, FPM_STR "FPM statistic counters\n") { - thread_add_event(gfnc->fthread->master, fpm_process_event, gfnc, - FNE_RESET_COUNTERS, &gfnc->t_event); + event_add_event(gfnc->fthread->master, fpm_process_event, gfnc, + FNE_RESET_COUNTERS, &gfnc->t_event); return CMD_SUCCESS; } @@ -409,19 +409,19 @@ static struct cmd_node fpm_node = { /* * FPM functions. */ -static void fpm_connect(struct thread *t); +static void fpm_connect(struct event *t); static void fpm_reconnect(struct fpm_nl_ctx *fnc) { /* Cancel all zebra threads first. */ - thread_cancel_async(zrouter.master, &fnc->t_lspreset, NULL); - thread_cancel_async(zrouter.master, &fnc->t_lspwalk, NULL); - thread_cancel_async(zrouter.master, &fnc->t_nhgreset, NULL); - thread_cancel_async(zrouter.master, &fnc->t_nhgwalk, NULL); - thread_cancel_async(zrouter.master, &fnc->t_ribreset, NULL); - thread_cancel_async(zrouter.master, &fnc->t_ribwalk, NULL); - thread_cancel_async(zrouter.master, &fnc->t_rmacreset, NULL); - thread_cancel_async(zrouter.master, &fnc->t_rmacwalk, NULL); + event_cancel_async(zrouter.master, &fnc->t_lspreset, NULL); + event_cancel_async(zrouter.master, &fnc->t_lspwalk, NULL); + event_cancel_async(zrouter.master, &fnc->t_nhgreset, NULL); + event_cancel_async(zrouter.master, &fnc->t_nhgwalk, NULL); + event_cancel_async(zrouter.master, &fnc->t_ribreset, NULL); + event_cancel_async(zrouter.master, &fnc->t_ribwalk, NULL); + event_cancel_async(zrouter.master, &fnc->t_rmacreset, NULL); + event_cancel_async(zrouter.master, &fnc->t_rmacwalk, NULL); /* * Grab the lock to empty the streams (data plane might try to @@ -437,20 +437,20 @@ static void fpm_reconnect(struct fpm_nl_ctx *fnc) stream_reset(fnc->ibuf); stream_reset(fnc->obuf); - THREAD_OFF(fnc->t_read); - THREAD_OFF(fnc->t_write); + EVENT_OFF(fnc->t_read); + EVENT_OFF(fnc->t_write); /* FPM is disabled, don't attempt to connect. */ if (fnc->disabled) return; - thread_add_timer(fnc->fthread->master, fpm_connect, fnc, 3, - &fnc->t_connect); + event_add_timer(fnc->fthread->master, fpm_connect, fnc, 3, + &fnc->t_connect); } -static void fpm_read(struct thread *t) +static void fpm_read(struct event *t) { - struct fpm_nl_ctx *fnc = THREAD_ARG(t); + struct fpm_nl_ctx *fnc = EVENT_ARG(t); fpm_msg_hdr_t fpm; ssize_t rv; char buf[65535]; @@ -482,8 +482,8 @@ static void fpm_read(struct thread *t) } /* Schedule the next read */ - thread_add_read(fnc->fthread->master, fpm_read, fnc, fnc->socket, - &fnc->t_read); + event_add_read(fnc->fthread->master, fpm_read, fnc, fnc->socket, + &fnc->t_read); /* We've got an interruption. */ if (rv == -2) @@ -610,9 +610,9 @@ static void fpm_read(struct thread *t) stream_reset(fnc->ibuf); } -static void fpm_write(struct thread *t) +static void fpm_write(struct event *t) { - struct fpm_nl_ctx *fnc = THREAD_ARG(t); + struct fpm_nl_ctx *fnc = EVENT_ARG(t); socklen_t statuslen; ssize_t bwritten; int rv, status; @@ -646,12 +646,12 @@ static void fpm_write(struct thread *t) * Starting with LSPs walk all FPM objects, marking them * as unsent and then replaying them. */ - thread_add_timer(zrouter.master, fpm_lsp_reset, fnc, 0, - &fnc->t_lspreset); + event_add_timer(zrouter.master, fpm_lsp_reset, fnc, 0, + &fnc->t_lspreset); /* Permit receiving messages now. */ - thread_add_read(fnc->fthread->master, fpm_read, fnc, - fnc->socket, &fnc->t_read); + event_add_read(fnc->fthread->master, fpm_read, fnc, fnc->socket, + &fnc->t_read); } frr_mutex_lock_autounlock(&fnc->obuf_mutex); @@ -708,15 +708,15 @@ static void fpm_write(struct thread *t) /* Stream is not empty yet, we must schedule more writes. */ if (STREAM_READABLE(fnc->obuf)) { stream_pulldown(fnc->obuf); - thread_add_write(fnc->fthread->master, fpm_write, fnc, - fnc->socket, &fnc->t_write); + event_add_write(fnc->fthread->master, fpm_write, fnc, + fnc->socket, &fnc->t_write); return; } } -static void fpm_connect(struct thread *t) +static void fpm_connect(struct event *t) { - struct fpm_nl_ctx *fnc = THREAD_ARG(t); + struct fpm_nl_ctx *fnc = EVENT_ARG(t); struct sockaddr_in *sin = (struct sockaddr_in *)&fnc->addr; struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&fnc->addr; socklen_t slen; @@ -727,8 +727,8 @@ static void fpm_connect(struct thread *t) if (sock == -1) { zlog_err("%s: fpm socket failed: %s", __func__, strerror(errno)); - thread_add_timer(fnc->fthread->master, fpm_connect, fnc, 3, - &fnc->t_connect); + event_add_timer(fnc->fthread->master, fpm_connect, fnc, 3, + &fnc->t_connect); return; } @@ -753,18 +753,18 @@ static void fpm_connect(struct thread *t) close(sock); zlog_warn("%s: fpm connection failed: %s", __func__, strerror(errno)); - thread_add_timer(fnc->fthread->master, fpm_connect, fnc, 3, - &fnc->t_connect); + event_add_timer(fnc->fthread->master, fpm_connect, fnc, 3, + &fnc->t_connect); return; } fnc->connecting = (errno == EINPROGRESS); fnc->socket = sock; if (!fnc->connecting) - thread_add_read(fnc->fthread->master, fpm_read, fnc, sock, - &fnc->t_read); - thread_add_write(fnc->fthread->master, fpm_write, fnc, sock, - &fnc->t_write); + event_add_read(fnc->fthread->master, fpm_read, fnc, sock, + &fnc->t_read); + event_add_write(fnc->fthread->master, fpm_write, fnc, sock, + &fnc->t_write); /* * Starting with LSPs walk all FPM objects, marking them @@ -773,8 +773,8 @@ static void fpm_connect(struct thread *t) * If we are not connected, then delay the objects reset/send. */ if (!fnc->connecting) - thread_add_timer(zrouter.master, fpm_lsp_reset, fnc, 0, - &fnc->t_lspreset); + event_add_timer(zrouter.master, fpm_lsp_reset, fnc, 0, + &fnc->t_lspreset); } /** @@ -983,8 +983,8 @@ static int fpm_nl_enqueue(struct fpm_nl_ctx *fnc, struct zebra_dplane_ctx *ctx) memory_order_relaxed); /* Tell the thread to start writing. */ - thread_add_write(fnc->fthread->master, fpm_write, fnc, fnc->socket, - &fnc->t_write); + event_add_write(fnc->fthread->master, fpm_write, fnc, fnc->socket, + &fnc->t_write); return 0; } @@ -1020,9 +1020,9 @@ static int fpm_lsp_send_cb(struct hash_bucket *bucket, void *arg) return HASHWALK_CONTINUE; } -static void fpm_lsp_send(struct thread *t) +static void fpm_lsp_send(struct event *t) { - struct fpm_nl_ctx *fnc = THREAD_ARG(t); + struct fpm_nl_ctx *fnc = EVENT_ARG(t); struct zebra_vrf *zvrf = vrf_info_lookup(VRF_DEFAULT); struct fpm_lsp_arg fla; @@ -1038,12 +1038,12 @@ static void fpm_lsp_send(struct thread *t) WALK_FINISH(fnc, FNE_LSP_FINISHED); /* Now move onto routes */ - thread_add_timer(zrouter.master, fpm_nhg_reset, fnc, 0, - &fnc->t_nhgreset); + event_add_timer(zrouter.master, fpm_nhg_reset, fnc, 0, + &fnc->t_nhgreset); } else { /* Didn't finish - reschedule LSP walk */ - thread_add_timer(zrouter.master, fpm_lsp_send, fnc, 0, - &fnc->t_lspwalk); + event_add_timer(zrouter.master, fpm_lsp_send, fnc, 0, + &fnc->t_lspwalk); } } @@ -1080,9 +1080,9 @@ static int fpm_nhg_send_cb(struct hash_bucket *bucket, void *arg) return HASHWALK_CONTINUE; } -static void fpm_nhg_send(struct thread *t) +static void fpm_nhg_send(struct event *t) { - struct fpm_nl_ctx *fnc = THREAD_ARG(t); + struct fpm_nl_ctx *fnc = EVENT_ARG(t); struct fpm_nhg_arg fna; fna.fnc = fnc; @@ -1099,19 +1099,19 @@ static void fpm_nhg_send(struct thread *t) /* We are done sending next hops, lets install the routes now. */ if (fna.complete) { WALK_FINISH(fnc, FNE_NHG_FINISHED); - thread_add_timer(zrouter.master, fpm_rib_reset, fnc, 0, - &fnc->t_ribreset); + event_add_timer(zrouter.master, fpm_rib_reset, fnc, 0, + &fnc->t_ribreset); } else /* Otherwise reschedule next hop group again. */ - thread_add_timer(zrouter.master, fpm_nhg_send, fnc, 0, - &fnc->t_nhgwalk); + event_add_timer(zrouter.master, fpm_nhg_send, fnc, 0, + &fnc->t_nhgwalk); } /** * Send all RIB installed routes to the connected data plane. */ -static void fpm_rib_send(struct thread *t) +static void fpm_rib_send(struct event *t) { - struct fpm_nl_ctx *fnc = THREAD_ARG(t); + struct fpm_nl_ctx *fnc = EVENT_ARG(t); rib_dest_t *dest; struct route_node *rn; struct route_table *rt; @@ -1141,8 +1141,8 @@ static void fpm_rib_send(struct thread *t) /* Free the temporary allocated context. */ dplane_ctx_fini(&ctx); - thread_add_timer(zrouter.master, fpm_rib_send, - fnc, 1, &fnc->t_ribwalk); + event_add_timer(zrouter.master, fpm_rib_send, + fnc, 1, &fnc->t_ribwalk); return; } @@ -1158,8 +1158,8 @@ static void fpm_rib_send(struct thread *t) WALK_FINISH(fnc, FNE_RIB_FINISHED); /* Schedule next event: RMAC reset. */ - thread_add_event(zrouter.master, fpm_rmac_reset, fnc, 0, - &fnc->t_rmacreset); + event_add_event(zrouter.master, fpm_rmac_reset, fnc, 0, + &fnc->t_rmacreset); } /* @@ -1199,8 +1199,8 @@ static void fpm_enqueue_rmac_table(struct hash_bucket *bucket, void *arg) zrmac->fwd_info.r_vtep_ip, sticky, 0 /*nhg*/, 0 /*update_flags*/); if (fpm_nl_enqueue(fra->fnc, fra->ctx) == -1) { - thread_add_timer(zrouter.master, fpm_rmac_send, - fra->fnc, 1, &fra->fnc->t_rmacwalk); + event_add_timer(zrouter.master, fpm_rmac_send, fra->fnc, 1, + &fra->fnc->t_rmacwalk); fra->complete = false; } } @@ -1214,11 +1214,11 @@ static void fpm_enqueue_l3vni_table(struct hash_bucket *bucket, void *arg) hash_iterate(zl3vni->rmac_table, fpm_enqueue_rmac_table, zl3vni); } -static void fpm_rmac_send(struct thread *t) +static void fpm_rmac_send(struct event *t) { struct fpm_rmac_arg fra; - fra.fnc = THREAD_ARG(t); + fra.fnc = EVENT_ARG(t); fra.ctx = dplane_ctx_alloc(); fra.complete = true; hash_iterate(zrouter.l3vni_table, fpm_enqueue_l3vni_table, &fra); @@ -1240,14 +1240,14 @@ static void fpm_nhg_reset_cb(struct hash_bucket *bucket, void *arg) UNSET_FLAG(nhe->flags, NEXTHOP_GROUP_FPM); } -static void fpm_nhg_reset(struct thread *t) +static void fpm_nhg_reset(struct event *t) { - struct fpm_nl_ctx *fnc = THREAD_ARG(t); + struct fpm_nl_ctx *fnc = EVENT_ARG(t); hash_iterate(zrouter.nhgs_id, fpm_nhg_reset_cb, NULL); /* Schedule next step: send next hop groups. */ - thread_add_event(zrouter.master, fpm_nhg_send, fnc, 0, &fnc->t_nhgwalk); + event_add_event(zrouter.master, fpm_nhg_send, fnc, 0, &fnc->t_nhgwalk); } /* @@ -1260,23 +1260,23 @@ static void fpm_lsp_reset_cb(struct hash_bucket *bucket, void *arg) UNSET_FLAG(lsp->flags, LSP_FLAG_FPM); } -static void fpm_lsp_reset(struct thread *t) +static void fpm_lsp_reset(struct event *t) { - struct fpm_nl_ctx *fnc = THREAD_ARG(t); + struct fpm_nl_ctx *fnc = EVENT_ARG(t); struct zebra_vrf *zvrf = vrf_info_lookup(VRF_DEFAULT); hash_iterate(zvrf->lsp_table, fpm_lsp_reset_cb, NULL); /* Schedule next step: send LSPs */ - thread_add_event(zrouter.master, fpm_lsp_send, fnc, 0, &fnc->t_lspwalk); + event_add_event(zrouter.master, fpm_lsp_send, fnc, 0, &fnc->t_lspwalk); } /** * Resets the RIB FPM flags so we send all routes again. */ -static void fpm_rib_reset(struct thread *t) +static void fpm_rib_reset(struct event *t) { - struct fpm_nl_ctx *fnc = THREAD_ARG(t); + struct fpm_nl_ctx *fnc = EVENT_ARG(t); rib_dest_t *dest; struct route_node *rn; struct route_table *rt; @@ -1295,7 +1295,7 @@ static void fpm_rib_reset(struct thread *t) } /* Schedule next step: send RIB routes. */ - thread_add_event(zrouter.master, fpm_rib_send, fnc, 0, &fnc->t_ribwalk); + event_add_event(zrouter.master, fpm_rib_send, fnc, 0, &fnc->t_ribwalk); } /* @@ -1315,20 +1315,20 @@ static void fpm_unset_l3vni_table(struct hash_bucket *bucket, void *arg) hash_iterate(zl3vni->rmac_table, fpm_unset_rmac_table, zl3vni); } -static void fpm_rmac_reset(struct thread *t) +static void fpm_rmac_reset(struct event *t) { - struct fpm_nl_ctx *fnc = THREAD_ARG(t); + struct fpm_nl_ctx *fnc = EVENT_ARG(t); hash_iterate(zrouter.l3vni_table, fpm_unset_l3vni_table, NULL); /* Schedule next event: send RMAC entries. */ - thread_add_event(zrouter.master, fpm_rmac_send, fnc, 0, - &fnc->t_rmacwalk); + event_add_event(zrouter.master, fpm_rmac_send, fnc, 0, + &fnc->t_rmacwalk); } -static void fpm_process_queue(struct thread *t) +static void fpm_process_queue(struct event *t) { - struct fpm_nl_ctx *fnc = THREAD_ARG(t); + struct fpm_nl_ctx *fnc = EVENT_ARG(t); struct zebra_dplane_ctx *ctx; bool no_bufs = false; uint64_t processed_contexts = 0; @@ -1371,8 +1371,8 @@ static void fpm_process_queue(struct thread *t) /* Re-schedule if we ran out of buffer space */ if (no_bufs) - thread_add_timer(fnc->fthread->master, fpm_process_queue, - fnc, 0, &fnc->t_dequeue); + event_add_timer(fnc->fthread->master, fpm_process_queue, fnc, 0, + &fnc->t_dequeue); /* * Let the dataplane thread know if there are items in the @@ -1387,10 +1387,10 @@ static void fpm_process_queue(struct thread *t) /** * Handles external (e.g. CLI, data plane or others) events. */ -static void fpm_process_event(struct thread *t) +static void fpm_process_event(struct event *t) { - struct fpm_nl_ctx *fnc = THREAD_ARG(t); - enum fpm_nl_events event = THREAD_VAL(t); + struct fpm_nl_ctx *fnc = EVENT_ARG(t); + enum fpm_nl_events event = EVENT_VAL(t); switch (event) { case FNE_DISABLE: @@ -1474,19 +1474,19 @@ static int fpm_nl_start(struct zebra_dplane_provider *prov) static int fpm_nl_finish_early(struct fpm_nl_ctx *fnc) { /* Disable all events and close socket. */ - THREAD_OFF(fnc->t_lspreset); - THREAD_OFF(fnc->t_lspwalk); - THREAD_OFF(fnc->t_nhgreset); - THREAD_OFF(fnc->t_nhgwalk); - THREAD_OFF(fnc->t_ribreset); - THREAD_OFF(fnc->t_ribwalk); - THREAD_OFF(fnc->t_rmacreset); - THREAD_OFF(fnc->t_rmacwalk); - THREAD_OFF(fnc->t_event); - THREAD_OFF(fnc->t_nhg); - thread_cancel_async(fnc->fthread->master, &fnc->t_read, NULL); - thread_cancel_async(fnc->fthread->master, &fnc->t_write, NULL); - thread_cancel_async(fnc->fthread->master, &fnc->t_connect, NULL); + EVENT_OFF(fnc->t_lspreset); + EVENT_OFF(fnc->t_lspwalk); + EVENT_OFF(fnc->t_nhgreset); + EVENT_OFF(fnc->t_nhgwalk); + EVENT_OFF(fnc->t_ribreset); + EVENT_OFF(fnc->t_ribwalk); + EVENT_OFF(fnc->t_rmacreset); + EVENT_OFF(fnc->t_rmacwalk); + EVENT_OFF(fnc->t_event); + EVENT_OFF(fnc->t_nhg); + event_cancel_async(fnc->fthread->master, &fnc->t_read, NULL); + event_cancel_async(fnc->fthread->master, &fnc->t_write, NULL); + event_cancel_async(fnc->fthread->master, &fnc->t_connect, NULL); if (fnc->socket != -1) { close(fnc->socket); @@ -1575,8 +1575,8 @@ static int fpm_nl_process(struct zebra_dplane_provider *prov) if (atomic_load_explicit(&fnc->counters.ctxqueue_len, memory_order_relaxed) > 0) - thread_add_timer(fnc->fthread->master, fpm_process_queue, - fnc, 0, &fnc->t_dequeue); + event_add_timer(fnc->fthread->master, fpm_process_queue, fnc, 0, + &fnc->t_dequeue); /* Ensure dataplane thread is rescheduled if we hit the work limit */ if (counter >= limit) @@ -1585,7 +1585,7 @@ static int fpm_nl_process(struct zebra_dplane_provider *prov) return 0; } -static int fpm_nl_new(struct thread_master *tm) +static int fpm_nl_new(struct event_loop *tm) { struct zebra_dplane_provider *prov = NULL; int rv; diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c index 21cad01374..3a325df06c 100644 --- a/zebra/if_netlink.c +++ b/zebra/if_netlink.c @@ -33,7 +33,7 @@ #include "table.h" #include "memory.h" #include "rib.h" -#include "thread.h" +#include "frrevent.h" #include "privs.h" #include "nexthop.h" #include "vrf.h" diff --git a/zebra/interface.c b/zebra/interface.c index 1ba5e972f8..03376afc09 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -51,9 +51,9 @@ DEFINE_MTYPE(ZEBRA, ZIF_DESC, "Intf desc"); static void if_down_del_nbr_connected(struct interface *ifp); -static void if_zebra_speed_update(struct thread *thread) +static void if_zebra_speed_update(struct event *thread) { - struct interface *ifp = THREAD_ARG(thread); + struct interface *ifp = EVENT_ARG(thread); struct zebra_if *zif = ifp->info; uint32_t new_speed; bool changed = false; @@ -96,9 +96,9 @@ static void if_zebra_speed_update(struct thread *thread) return; zif->speed_update_count++; - thread_add_timer(zrouter.master, if_zebra_speed_update, ifp, - SPEED_UPDATE_SLEEP_TIME, &zif->speed_update); - thread_ignore_late_timer(zif->speed_update); + event_add_timer(zrouter.master, if_zebra_speed_update, ifp, + SPEED_UPDATE_SLEEP_TIME, &zif->speed_update); + event_ignore_late_timer(zif->speed_update); } } @@ -161,9 +161,9 @@ static int if_zebra_new_hook(struct interface *ifp) * down upon startup. */ zebra_if->speed_update_count = 0; - thread_add_timer(zrouter.master, if_zebra_speed_update, ifp, 15, - &zebra_if->speed_update); - thread_ignore_late_timer(zebra_if->speed_update); + event_add_timer(zrouter.master, if_zebra_speed_update, ifp, 15, + &zebra_if->speed_update); + event_ignore_late_timer(zebra_if->speed_update); return 0; } @@ -223,7 +223,7 @@ static int if_zebra_delete_hook(struct interface *ifp) XFREE(MTYPE_ZIF_DESC, zebra_if->desc); - THREAD_OFF(zebra_if->speed_update); + EVENT_OFF(zebra_if->speed_update); XFREE(MTYPE_ZINFO, zebra_if); } @@ -1038,9 +1038,9 @@ void if_up(struct interface *ifp, bool install_connected) if (zif->flags & ZIF_FLAG_EVPN_MH_UPLINK) zebra_evpn_mh_uplink_oper_update(zif); - thread_add_timer(zrouter.master, if_zebra_speed_update, ifp, 0, - &zif->speed_update); - thread_ignore_late_timer(zif->speed_update); + event_add_timer(zrouter.master, if_zebra_speed_update, ifp, 0, + &zif->speed_update); + event_ignore_late_timer(zif->speed_update); } /* Interface goes down. We have to manage different behavior of based diff --git a/zebra/interface.h b/zebra/interface.h index c8ae906c91..4c6ebaa11d 100644 --- a/zebra/interface.h +++ b/zebra/interface.h @@ -199,7 +199,7 @@ struct zebra_if { struct interface *link; uint8_t speed_update_count; - struct thread *speed_update; + struct event *speed_update; /* * Does this interface have a v6 to v4 ll neighbor entry diff --git a/zebra/irdp.h b/zebra/irdp.h index 9b97bb93fa..4330734992 100644 --- a/zebra/irdp.h +++ b/zebra/irdp.h @@ -114,7 +114,7 @@ struct irdp_interface { #define IF_SHUTDOWN (1<<6) struct interface *ifp; - struct thread *t_advertise; + struct event *t_advertise; unsigned long irdp_sent; uint16_t Lifetime; @@ -129,10 +129,10 @@ struct Adv { extern void irdp_if_init(void); extern int irdp_sock_init(void); extern int irdp_config_write(struct vty *, struct interface *); -extern void irdp_send_thread(struct thread *t_advert); +extern void irdp_send_thread(struct event *t_advert); extern void irdp_advert_off(struct interface *ifp); extern void process_solicit(struct interface *ifp); -extern void irdp_read_raw(struct thread *r); +extern void irdp_read_raw(struct event *r); extern void send_packet(struct interface *ifp, struct stream *s, uint32_t dst, struct prefix *p, uint32_t ttl); diff --git a/zebra/irdp_interface.c b/zebra/irdp_interface.c index 0c9b6f3d39..253e6a8dd6 100644 --- a/zebra/irdp_interface.c +++ b/zebra/irdp_interface.c @@ -24,7 +24,7 @@ #include "connected.h" #include "log.h" #include "zclient.h" -#include "thread.h" +#include "frrevent.h" #include "lib_errors.h" #include "zebra/interface.h" #include "zebra/rtadv.h" @@ -272,8 +272,8 @@ static void irdp_if_start(struct interface *ifp, int multicast, timer); irdp->t_advertise = NULL; - thread_add_timer(zrouter.master, irdp_send_thread, ifp, timer, - &irdp->t_advertise); + event_add_timer(zrouter.master, irdp_send_thread, ifp, timer, + &irdp->t_advertise); } static void irdp_if_stop(struct interface *ifp) diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c index ddcad92bdc..6548790e9a 100644 --- a/zebra/irdp_main.c +++ b/zebra/irdp_main.c @@ -32,7 +32,7 @@ #include "connected.h" #include "log.h" #include "zclient.h" -#include "thread.h" +#include "frrevent.h" #include "privs.h" #include "libfrr.h" #include "lib_errors.h" @@ -56,7 +56,7 @@ extern struct zebra_privs_t zserv_privs; -struct thread *t_irdp_raw; +struct event *t_irdp_raw; /* Timer interval of irdp. */ int irdp_timer_interval = IRDP_DEFAULT_INTERVAL; @@ -97,7 +97,7 @@ int irdp_sock_init(void) return ret; }; - thread_add_read(zrouter.master, irdp_read_raw, NULL, sock, &t_irdp_raw); + event_add_read(zrouter.master, irdp_read_raw, NULL, sock, &t_irdp_raw); return sock; } @@ -190,10 +190,10 @@ static void irdp_advertisement(struct interface *ifp, struct prefix *p) stream_free(s); } -void irdp_send_thread(struct thread *t_advert) +void irdp_send_thread(struct event *t_advert) { uint32_t timer, tmp; - struct interface *ifp = THREAD_ARG(t_advert); + struct interface *ifp = EVENT_ARG(t_advert); struct zebra_if *zi = ifp->info; struct irdp_interface *irdp = zi->irdp; struct prefix *p; @@ -229,8 +229,8 @@ void irdp_send_thread(struct thread *t_advert) timer); irdp->t_advertise = NULL; - thread_add_timer(zrouter.master, irdp_send_thread, ifp, timer, - &irdp->t_advertise); + event_add_timer(zrouter.master, irdp_send_thread, ifp, timer, + &irdp->t_advertise); } void irdp_advert_off(struct interface *ifp) @@ -245,7 +245,7 @@ void irdp_advert_off(struct interface *ifp) if (!irdp) return; - THREAD_OFF(irdp->t_advertise); + EVENT_OFF(irdp->t_advertise); if (ifp->connected) for (ALL_LIST_ELEMENTS(ifp->connected, node, nnode, ifc)) { @@ -280,13 +280,13 @@ void process_solicit(struct interface *ifp) return; irdp->flags |= IF_SOLICIT; - THREAD_OFF(irdp->t_advertise); + EVENT_OFF(irdp->t_advertise); timer = (frr_weak_random() % MAX_RESPONSE_DELAY) + 1; irdp->t_advertise = NULL; - thread_add_timer(zrouter.master, irdp_send_thread, ifp, timer, - &irdp->t_advertise); + event_add_timer(zrouter.master, irdp_send_thread, ifp, timer, + &irdp->t_advertise); } static int irdp_finish(void) @@ -316,7 +316,7 @@ static int irdp_finish(void) return 0; } -static int irdp_init(struct thread_master *master) +static int irdp_init(struct event_loop *master) { irdp_if_init(); diff --git a/zebra/irdp_packet.c b/zebra/irdp_packet.c index 4f4f3772dc..2dfc027f1d 100644 --- a/zebra/irdp_packet.c +++ b/zebra/irdp_packet.c @@ -34,7 +34,7 @@ #include "sockunion.h" #include "sockunion.h" #include "stream.h" -#include "thread.h" +#include "frrevent.h" #include "vty.h" #include "zclient.h" #include "lib_errors.h" @@ -52,7 +52,7 @@ int irdp_sock = -1; -extern struct thread *t_irdp_raw; +extern struct event *t_irdp_raw; static void parse_irdp_packet(char *p, int len, struct interface *ifp) { @@ -209,7 +209,7 @@ static int irdp_recvmsg(int sock, uint8_t *buf, int size, int *ifindex) return ret; } -void irdp_read_raw(struct thread *r) +void irdp_read_raw(struct event *r) { struct interface *ifp; struct zebra_if *zi; @@ -217,9 +217,9 @@ void irdp_read_raw(struct thread *r) char buf[IRDP_RX_BUF]; int ret, ifindex = 0; - int irdp_sock = THREAD_FD(r); - thread_add_read(zrouter.master, irdp_read_raw, NULL, irdp_sock, - &t_irdp_raw); + int irdp_sock = EVENT_FD(r); + event_add_read(zrouter.master, irdp_read_raw, NULL, irdp_sock, + &t_irdp_raw); ret = irdp_recvmsg(irdp_sock, (uint8_t *)buf, IRDP_RX_BUF, &ifindex); diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c index a980b56b33..78b1dfe276 100644 --- a/zebra/kernel_netlink.c +++ b/zebra/kernel_netlink.c @@ -15,7 +15,7 @@ #include "table.h" #include "memory.h" #include "rib.h" -#include "thread.h" +#include "frrevent.h" #include "privs.h" #include "nexthop.h" #include "vrf.h" @@ -156,7 +156,7 @@ static const struct message rttype_str[] = {{RTN_UNSPEC, "none"}, {RTN_XRESOLVE, "resolver"}, {0}}; -extern struct thread_master *master; +extern struct event_loop *master; extern struct zebra_privs_t zserv_privs; @@ -482,9 +482,9 @@ static int dplane_netlink_information_fetch(struct nlmsghdr *h, ns_id_t ns_id, return 0; } -static void kernel_read(struct thread *thread) +static void kernel_read(struct event *thread) { - struct zebra_ns *zns = (struct zebra_ns *)THREAD_ARG(thread); + struct zebra_ns *zns = (struct zebra_ns *)EVENT_ARG(thread); struct zebra_dplane_info dp_info; /* Capture key info from ns struct */ @@ -493,8 +493,8 @@ static void kernel_read(struct thread *thread) netlink_parse_info(netlink_information_fetch, &zns->netlink, &dp_info, 5, false); - thread_add_read(zrouter.master, kernel_read, zns, zns->netlink.sock, - &zns->t_netlink); + event_add_read(zrouter.master, kernel_read, zns, zns->netlink.sock, + &zns->t_netlink); } /* @@ -1939,8 +1939,8 @@ void kernel_init(struct zebra_ns *zns) zns->t_netlink = NULL; - thread_add_read(zrouter.master, kernel_read, zns, - zns->netlink.sock, &zns->t_netlink); + event_add_read(zrouter.master, kernel_read, zns, zns->netlink.sock, + &zns->t_netlink); rt_netlink_init(); } @@ -1959,7 +1959,7 @@ static void kernel_nlsock_fini(struct nlsock *nls) void kernel_terminate(struct zebra_ns *zns, bool complete) { - THREAD_OFF(zns->t_netlink); + EVENT_OFF(zns->t_netlink); kernel_nlsock_fini(&zns->netlink); diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c index 915fd087fe..b8dc92b2e9 100644 --- a/zebra/kernel_socket.c +++ b/zebra/kernel_socket.c @@ -1255,7 +1255,7 @@ int rtm_write(int message, union sockunion *dest, union sockunion *mask, } -#include "thread.h" +#include "frrevent.h" #include "zebra/zserv.h" /* For debug purpose. */ @@ -1281,7 +1281,7 @@ static void rtmsg_debug(struct rt_msghdr *rtm) #endif /* RTAX_MAX */ /* Kernel routing table and interface updates via routing socket. */ -static void kernel_read(struct thread *thread) +static void kernel_read(struct event *thread) { int sock; int nbytes; @@ -1326,7 +1326,7 @@ static void kernel_read(struct thread *thread) } buf; /* Fetch routing socket. */ - sock = THREAD_FD(thread); + sock = EVENT_FD(thread); nbytes = read(sock, &buf, sizeof(buf)); @@ -1338,8 +1338,8 @@ static void kernel_read(struct thread *thread) * shortage and is not harmful for consistency of * reading the routing socket. Ignore it. */ - thread_add_read(zrouter.master, kernel_read, NULL, sock, - NULL); + event_add_read(zrouter.master, kernel_read, NULL, sock, + NULL); return; #else flog_err(EC_ZEBRA_RECVMSG_OVERRUN, @@ -1362,7 +1362,7 @@ static void kernel_read(struct thread *thread) if (nbytes == 0) return; - thread_add_read(zrouter.master, kernel_read, NULL, sock, NULL); + event_add_read(zrouter.master, kernel_read, NULL, sock, NULL); if (IS_ZEBRA_DEBUG_KERNEL) rtmsg_debug(&buf.r.rtm); @@ -1465,7 +1465,7 @@ static void routing_socket(struct zebra_ns *zns) } /* kernel_read needs rewrite. */ - thread_add_read(zrouter.master, kernel_read, NULL, routing_sock, NULL); + event_add_read(zrouter.master, kernel_read, NULL, routing_sock, NULL); } /* Exported interface function. This function simply calls diff --git a/zebra/label_manager.h b/zebra/label_manager.h index c0bd8e369f..cfbb4bd169 100644 --- a/zebra/label_manager.h +++ b/zebra/label_manager.h @@ -14,7 +14,7 @@ #include #include "lib/linklist.h" -#include "lib/thread.h" +#include "frrevent.h" #include "lib/hook.h" #include "zebra/zserv.h" diff --git a/zebra/main.c b/zebra/main.c index c40a03551d..ba43ae910b 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -8,7 +8,7 @@ #include #include "getopt.h" #include "command.h" -#include "thread.h" +#include "frrevent.h" #include "filter.h" #include "memory.h" #include "prefix.h" @@ -52,7 +52,7 @@ pid_t pid; /* Pacify zclient.o in libfrr, which expects this variable. */ -struct thread_master *master; +struct event_loop *master; /* Route retain mode flag. */ int retain_mode = 0; @@ -203,7 +203,7 @@ static void sigint(void) * Final shutdown step for the zebra main thread. This is run after all * async update processing has completed. */ -void zebra_finalize(struct thread *dummy) +void zebra_finalize(struct event *dummy) { zlog_info("Zebra final shutdown"); @@ -435,8 +435,8 @@ int main(int argc, char **argv) * we have to have route_read() called before. */ zrouter.startup_time = monotime(NULL); - thread_add_timer(zrouter.master, rib_sweep_route, NULL, - graceful_restart, &zrouter.sweeper); + event_add_timer(zrouter.master, rib_sweep_route, NULL, graceful_restart, + &zrouter.sweeper); /* Needed for BSD routing socket. */ pid = getpid(); diff --git a/zebra/rib.h b/zebra/rib.h index 70968d3900..0e897881e4 100644 --- a/zebra/rib.h +++ b/zebra/rib.h @@ -402,7 +402,7 @@ extern struct route_entry *rib_lookup_ipv4(struct prefix_ipv4 *p, extern void rib_update(enum rib_update_event event); extern void rib_update_table(struct route_table *table, enum rib_update_event event, int rtype); -extern void rib_sweep_route(struct thread *t); +extern void rib_sweep_route(struct event *t); extern void rib_sweep_table(struct route_table *table); extern void rib_close_table(struct route_table *table); extern void rib_init(void); diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index e4ddbd95d7..de01ced411 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -38,7 +38,7 @@ #include "table.h" #include "memory.h" #include "rib.h" -#include "thread.h" +#include "frrevent.h" #include "privs.h" #include "nexthop.h" #include "vrf.h" diff --git a/zebra/rtadv.c b/zebra/rtadv.c index 1e0769fb6d..9af41cbc39 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -9,7 +9,7 @@ #include "memory.h" #include "sockopt.h" -#include "thread.h" +#include "frrevent.h" #include "if.h" #include "stream.h" #include "log.h" @@ -475,9 +475,9 @@ no_more_opts: zif->ra_sent++; } -static void rtadv_timer(struct thread *thread) +static void rtadv_timer(struct event *thread) { - struct zebra_vrf *zvrf = THREAD_ARG(thread); + struct zebra_vrf *zvrf = EVENT_ARG(thread); struct vrf *vrf; struct interface *ifp; struct zebra_if *zif; @@ -817,7 +817,7 @@ static void rtadv_process_packet(uint8_t *buf, unsigned int len, return; } -static void rtadv_read(struct thread *thread) +static void rtadv_read(struct event *thread) { int sock; int len; @@ -825,9 +825,9 @@ static void rtadv_read(struct thread *thread) struct sockaddr_in6 from; ifindex_t ifindex = 0; int hoplimit = -1; - struct zebra_vrf *zvrf = THREAD_ARG(thread); + struct zebra_vrf *zvrf = EVENT_ARG(thread); - sock = THREAD_FD(thread); + sock = EVENT_FD(thread); zvrf->rtadv.ra_read = NULL; /* Register myself. */ @@ -2800,26 +2800,26 @@ static void rtadv_event(struct zebra_vrf *zvrf, enum rtadv_event event, int val) switch (event) { case RTADV_START: - thread_add_read(zrouter.master, rtadv_read, zvrf, rtadv->sock, - &rtadv->ra_read); - thread_add_event(zrouter.master, rtadv_timer, zvrf, 0, - &rtadv->ra_timer); + event_add_read(zrouter.master, rtadv_read, zvrf, rtadv->sock, + &rtadv->ra_read); + event_add_event(zrouter.master, rtadv_timer, zvrf, 0, + &rtadv->ra_timer); break; case RTADV_STOP: - THREAD_OFF(rtadv->ra_timer); - THREAD_OFF(rtadv->ra_read); + EVENT_OFF(rtadv->ra_timer); + EVENT_OFF(rtadv->ra_read); break; case RTADV_TIMER: - thread_add_timer(zrouter.master, rtadv_timer, zvrf, val, - &rtadv->ra_timer); + event_add_timer(zrouter.master, rtadv_timer, zvrf, val, + &rtadv->ra_timer); break; case RTADV_TIMER_MSEC: - thread_add_timer_msec(zrouter.master, rtadv_timer, zvrf, val, - &rtadv->ra_timer); + event_add_timer_msec(zrouter.master, rtadv_timer, zvrf, val, + &rtadv->ra_timer); break; case RTADV_READ: - thread_add_read(zrouter.master, rtadv_read, zvrf, rtadv->sock, - &rtadv->ra_read); + event_add_read(zrouter.master, rtadv_read, zvrf, rtadv->sock, + &rtadv->ra_read); break; default: break; diff --git a/zebra/rtadv.h b/zebra/rtadv.h index 2338efe0bd..1ec376a106 100644 --- a/zebra/rtadv.h +++ b/zebra/rtadv.h @@ -30,8 +30,8 @@ struct rtadv { struct adv_if_list_head adv_if; struct adv_if_list_head adv_msec_if; - struct thread *ra_read; - struct thread *ra_timer; + struct event *ra_read; + struct event *ra_timer; }; PREDECL_RBTREE_UNIQ(rtadv_prefixes); diff --git a/zebra/sample_plugin.c b/zebra/sample_plugin.c index 0ccf736f24..b5f7b88375 100644 --- a/zebra/sample_plugin.c +++ b/zebra/sample_plugin.c @@ -76,7 +76,7 @@ static int sample_process(struct zebra_dplane_provider *prov) * Init entry point called during zebra startup. This is registered during * module init. */ -static int init_sample_plugin(struct thread_master *tm) +static int init_sample_plugin(struct event_loop *tm) { int ret; diff --git a/zebra/table_manager.h b/zebra/table_manager.h index deed4fa30b..f8e99a357d 100644 --- a/zebra/table_manager.h +++ b/zebra/table_manager.h @@ -9,7 +9,7 @@ #include #include "lib/linklist.h" -#include "lib/thread.h" +#include "frrevent.h" #include "lib/ns.h" #include "zebra/zserv.h" diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c index af1dd6b5fd..fb1ebc6827 100644 --- a/zebra/zebra_dplane.c +++ b/zebra/zebra_dplane.c @@ -476,10 +476,10 @@ struct dplane_zns_info { struct zebra_dplane_info info; /* Request data from the OS */ - struct thread *t_request; + struct event *t_request; /* Read event */ - struct thread *t_read; + struct event *t_read; /* List linkage */ struct zns_info_list_item link; @@ -582,13 +582,13 @@ static struct zebra_dplane_globals { struct frr_pthread *dg_pthread; /* Event-delivery context 'master' for the dplane */ - struct thread_master *dg_master; + struct event_loop *dg_master; /* Event/'thread' pointer for queued updates */ - struct thread *dg_t_update; + struct event *dg_t_update; /* Event pointer for pending shutdown check loop */ - struct thread *dg_t_shutdown_check; + struct event *dg_t_shutdown_check; } zdplane_info; @@ -609,7 +609,7 @@ DECLARE_DLIST(zns_info_list, struct dplane_zns_info, link); #define DPLANE_PROV_UNLOCK(p) pthread_mutex_unlock(&((p)->dp_mutex)) /* Prototypes */ -static void dplane_thread_loop(struct thread *event); +static void dplane_thread_loop(struct event *event); static enum zebra_dplane_result lsp_update_internal(struct zebra_lsp *lsp, enum dplane_op_e op); static enum zebra_dplane_result pw_update_internal(struct zebra_pw *pw, @@ -633,7 +633,7 @@ neigh_update_internal(enum dplane_op_e op, const struct interface *ifp, */ /* Obtain thread_master for dataplane thread */ -struct thread_master *dplane_get_thread_master(void) +struct event_loop *dplane_get_thread_master(void) { return zdplane_info.dg_master; } @@ -5773,28 +5773,28 @@ bool dplane_provider_is_threaded(const struct zebra_dplane_provider *prov) * Callback when an OS (netlink) incoming event read is ready. This runs * in the dplane pthread. */ -static void dplane_incoming_read(struct thread *event) +static void dplane_incoming_read(struct event *event) { - struct dplane_zns_info *zi = THREAD_ARG(event); + struct dplane_zns_info *zi = EVENT_ARG(event); kernel_dplane_read(&zi->info); /* Re-start read task */ - thread_add_read(zdplane_info.dg_master, dplane_incoming_read, zi, - zi->info.sock, &zi->t_read); + event_add_read(zdplane_info.dg_master, dplane_incoming_read, zi, + zi->info.sock, &zi->t_read); } /* * Callback in the dataplane pthread that requests info from the OS and * initiates netlink reads. */ -static void dplane_incoming_request(struct thread *event) +static void dplane_incoming_request(struct event *event) { - struct dplane_zns_info *zi = THREAD_ARG(event); + struct dplane_zns_info *zi = EVENT_ARG(event); /* Start read task */ - thread_add_read(zdplane_info.dg_master, dplane_incoming_read, zi, - zi->info.sock, &zi->t_read); + event_add_read(zdplane_info.dg_master, dplane_incoming_read, zi, + zi->info.sock, &zi->t_read); /* Send requests */ netlink_request_netconf(zi->info.sock); @@ -5812,9 +5812,8 @@ static void dplane_kernel_info_request(struct dplane_zns_info *zi) * pthread is running, we'll initiate this later on. */ if (zdplane_info.dg_master) - thread_add_event(zdplane_info.dg_master, - dplane_incoming_request, zi, 0, - &zi->t_request); + event_add_event(zdplane_info.dg_master, dplane_incoming_request, + zi, 0, &zi->t_request); } #endif /* HAVE_NETLINK */ @@ -5875,11 +5874,11 @@ void zebra_dplane_ns_enable(struct zebra_ns *zns, bool enabled) /* Stop any outstanding tasks */ if (zdplane_info.dg_master) { - thread_cancel_async(zdplane_info.dg_master, - &zi->t_request, NULL); + event_cancel_async(zdplane_info.dg_master, + &zi->t_request, NULL); - thread_cancel_async(zdplane_info.dg_master, &zi->t_read, - NULL); + event_cancel_async(zdplane_info.dg_master, &zi->t_read, + NULL); } XFREE(MTYPE_DP_NS, zi); @@ -5898,9 +5897,8 @@ int dplane_provider_work_ready(void) * available. */ if (zdplane_info.dg_run) { - thread_add_event(zdplane_info.dg_master, - dplane_thread_loop, NULL, 0, - &zdplane_info.dg_t_update); + event_add_event(zdplane_info.dg_master, dplane_thread_loop, + NULL, 0, &zdplane_info.dg_t_update); } return AOK; @@ -6597,7 +6595,7 @@ static bool dplane_work_pending(void) * final zebra shutdown. * This runs in the dplane pthread context. */ -static void dplane_check_shutdown_status(struct thread *event) +static void dplane_check_shutdown_status(struct event *event) { struct dplane_zns_info *zi; @@ -6609,8 +6607,8 @@ static void dplane_check_shutdown_status(struct thread *event) zns_info_list_del(&zdplane_info.dg_zns_list, zi); if (zdplane_info.dg_master) { - THREAD_OFF(zi->t_read); - THREAD_OFF(zi->t_request); + EVENT_OFF(zi->t_read); + EVENT_OFF(zi->t_request); } XFREE(MTYPE_DP_NS, zi); @@ -6618,10 +6616,9 @@ static void dplane_check_shutdown_status(struct thread *event) if (dplane_work_pending()) { /* Reschedule dplane check on a short timer */ - thread_add_timer_msec(zdplane_info.dg_master, - dplane_check_shutdown_status, - NULL, 100, - &zdplane_info.dg_t_shutdown_check); + event_add_timer_msec(zdplane_info.dg_master, + dplane_check_shutdown_status, NULL, 100, + &zdplane_info.dg_t_shutdown_check); /* TODO - give up and stop waiting after a short time? */ @@ -6629,7 +6626,7 @@ static void dplane_check_shutdown_status(struct thread *event) /* We appear to be done - schedule a final callback event * for the zebra main pthread. */ - thread_add_event(zrouter.master, zebra_finalize, NULL, 0, NULL); + event_add_event(zrouter.master, zebra_finalize, NULL, 0, NULL); } } @@ -6648,9 +6645,8 @@ void zebra_dplane_finish(void) if (IS_ZEBRA_DEBUG_DPLANE) zlog_debug("Zebra dataplane fini called"); - thread_add_event(zdplane_info.dg_master, - dplane_check_shutdown_status, NULL, 0, - &zdplane_info.dg_t_shutdown_check); + event_add_event(zdplane_info.dg_master, dplane_check_shutdown_status, + NULL, 0, &zdplane_info.dg_t_shutdown_check); } /* @@ -6664,7 +6660,7 @@ void zebra_dplane_finish(void) * pthread can look for other pending work - such as i/o work on behalf of * providers. */ -static void dplane_thread_loop(struct thread *event) +static void dplane_thread_loop(struct event *event) { struct dplane_ctx_list_head work_list; struct dplane_ctx_list_head error_list; @@ -6858,8 +6854,8 @@ void zebra_dplane_shutdown(void) zdplane_info.dg_run = false; if (zdplane_info.dg_t_update) - thread_cancel_async(zdplane_info.dg_t_update->master, - &zdplane_info.dg_t_update, NULL); + event_cancel_async(zdplane_info.dg_t_update->master, + &zdplane_info.dg_t_update, NULL); frr_pthread_stop(zdplane_info.dg_pthread, NULL); @@ -6929,14 +6925,14 @@ void zebra_dplane_start(void) zdplane_info.dg_run = true; /* Enqueue an initial event for the dataplane pthread */ - thread_add_event(zdplane_info.dg_master, dplane_thread_loop, NULL, 0, - &zdplane_info.dg_t_update); + event_add_event(zdplane_info.dg_master, dplane_thread_loop, NULL, 0, + &zdplane_info.dg_t_update); /* Enqueue requests and reads if necessary */ frr_each (zns_info_list, &zdplane_info.dg_zns_list, zi) { #if defined(HAVE_NETLINK) - thread_add_read(zdplane_info.dg_master, dplane_incoming_read, - zi, zi->info.sock, &zi->t_read); + event_add_read(zdplane_info.dg_master, dplane_incoming_read, zi, + zi->info.sock, &zi->t_read); dplane_kernel_info_request(zi); #endif } diff --git a/zebra/zebra_dplane.h b/zebra/zebra_dplane.h index 3a4f3c2174..6716c0ffb6 100644 --- a/zebra/zebra_dplane.h +++ b/zebra/zebra_dplane.h @@ -1006,7 +1006,7 @@ void dplane_provider_lock(struct zebra_dplane_provider *prov); void dplane_provider_unlock(struct zebra_dplane_provider *prov); /* Obtain thread_master for dataplane thread */ -struct thread_master *dplane_get_thread_master(void); +struct event_loop *dplane_get_thread_master(void); /* Providers should (generally) limit number of updates per work cycle */ int dplane_provider_get_work_limit(const struct zebra_dplane_provider *prov); diff --git a/zebra/zebra_evpn_mac.c b/zebra/zebra_evpn_mac.c index a2d310a10b..c7252e48bc 100644 --- a/zebra/zebra_evpn_mac.c +++ b/zebra/zebra_evpn_mac.c @@ -378,7 +378,7 @@ static char *zebra_evpn_zebra_mac_flag_dump(struct zebra_mac *mac, char *buf, return buf; } -static void zebra_evpn_dad_mac_auto_recovery_exp(struct thread *t) +static void zebra_evpn_dad_mac_auto_recovery_exp(struct event *t) { struct zebra_vrf *zvrf = NULL; struct zebra_mac *mac = NULL; @@ -386,7 +386,7 @@ static void zebra_evpn_dad_mac_auto_recovery_exp(struct thread *t) struct listnode *node = NULL; struct zebra_neigh *nbr = NULL; - mac = THREAD_ARG(t); + mac = EVENT_ARG(t); /* since this is asynchronous we need sanity checks*/ zvrf = vrf_info_lookup(mac->zevpn->vrf_id); @@ -575,7 +575,7 @@ static void zebra_evpn_dup_addr_detect_for_mac(struct zebra_vrf *zvrf, } /* Start auto recovery timer for this MAC */ - THREAD_OFF(mac->dad_mac_auto_recovery_timer); + EVENT_OFF(mac->dad_mac_auto_recovery_timer); if (zvrf->dad_freeze && zvrf->dad_freeze_time) { if (IS_ZEBRA_DEBUG_VXLAN) { char mac_buf[MAC_BUF_SIZE]; @@ -588,10 +588,10 @@ static void zebra_evpn_dup_addr_detect_for_mac(struct zebra_vrf *zvrf, zvrf->dad_freeze_time); } - thread_add_timer(zrouter.master, - zebra_evpn_dad_mac_auto_recovery_exp, - mac, zvrf->dad_freeze_time, - &mac->dad_mac_auto_recovery_timer); + event_add_timer(zrouter.master, + zebra_evpn_dad_mac_auto_recovery_exp, + mac, zvrf->dad_freeze_time, + &mac->dad_mac_auto_recovery_timer); } /* In case of local update, do not inform to client (BGPd), @@ -615,7 +615,7 @@ void zebra_evpn_print_mac(struct zebra_mac *mac, void *ctxt, json_object *json) struct zebra_vrf *zvrf; struct timeval detect_start_time = {0, 0}; char timebuf[MONOTIME_STRLEN]; - char thread_buf[THREAD_TIMER_STRLEN]; + char thread_buf[EVENT_TIMER_STRLEN]; time_t uptime; char up_str[MONOTIME_STRLEN]; @@ -692,9 +692,9 @@ void zebra_evpn_print_mac(struct zebra_mac *mac, void *ctxt, json_object *json) if (mac->hold_timer) json_object_string_add( json_mac, "peerActiveHold", - thread_timer_to_hhmmss(thread_buf, - sizeof(thread_buf), - mac->hold_timer)); + event_timer_to_hhmmss(thread_buf, + sizeof(thread_buf), + mac->hold_timer)); if (mac->es) json_object_string_add(json_mac, "esi", mac->es->esi_str); @@ -784,9 +784,9 @@ void zebra_evpn_print_mac(struct zebra_mac *mac, void *ctxt, json_object *json) vty_out(vty, " peer-active"); if (mac->hold_timer) vty_out(vty, " (ht: %s)", - thread_timer_to_hhmmss(thread_buf, - sizeof(thread_buf), - mac->hold_timer)); + event_timer_to_hhmmss(thread_buf, + sizeof(thread_buf), + mac->hold_timer)); vty_out(vty, "\n"); vty_out(vty, " Local Seq: %u Remote Seq: %u\n", mac->loc_seq, mac->rem_seq); @@ -1152,7 +1152,7 @@ int zebra_evpn_mac_del(struct zebra_evpn *zevpn, struct zebra_mac *mac) zebra_evpn_mac_stop_hold_timer(mac); /* Cancel auto recovery */ - THREAD_OFF(mac->dad_mac_auto_recovery_timer); + EVENT_OFF(mac->dad_mac_auto_recovery_timer); /* If the MAC is freed before the neigh we will end up * with a stale pointer against the neigh. @@ -1500,7 +1500,7 @@ void zebra_evpn_mac_send_add_del_to_client(struct zebra_mac *mac, * external neighmgr daemon to probe existing hosts to independently * establish their presence on the ES. */ -static void zebra_evpn_mac_hold_exp_cb(struct thread *t) +static void zebra_evpn_mac_hold_exp_cb(struct event *t) { struct zebra_mac *mac; bool old_bgp_ready; @@ -1508,7 +1508,7 @@ static void zebra_evpn_mac_hold_exp_cb(struct thread *t) bool old_static; bool new_static; - mac = THREAD_ARG(t); + mac = EVENT_ARG(t); /* the purpose of the hold timer is to age out the peer-active * flag */ @@ -1561,8 +1561,8 @@ static inline void zebra_evpn_mac_start_hold_timer(struct zebra_mac *mac) zebra_evpn_zebra_mac_flag_dump(mac, mac_buf, sizeof(mac_buf))); } - thread_add_timer(zrouter.master, zebra_evpn_mac_hold_exp_cb, mac, - zmh_info->mac_hold_time, &mac->hold_timer); + event_add_timer(zrouter.master, zebra_evpn_mac_hold_exp_cb, mac, + zmh_info->mac_hold_time, &mac->hold_timer); } void zebra_evpn_mac_stop_hold_timer(struct zebra_mac *mac) @@ -1581,7 +1581,7 @@ void zebra_evpn_mac_stop_hold_timer(struct zebra_mac *mac) sizeof(mac_buf))); } - THREAD_OFF(mac->hold_timer); + EVENT_OFF(mac->hold_timer); } void zebra_evpn_sync_mac_del(struct zebra_mac *mac) diff --git a/zebra/zebra_evpn_mac.h b/zebra/zebra_evpn_mac.h index befb1c398d..ba612f7696 100644 --- a/zebra/zebra_evpn_mac.h +++ b/zebra/zebra_evpn_mac.h @@ -114,14 +114,14 @@ struct zebra_mac { /* Duplicate mac detection */ uint32_t dad_count; - struct thread *dad_mac_auto_recovery_timer; + struct event *dad_mac_auto_recovery_timer; struct timeval detect_start_time; time_t dad_dup_detect_time; /* used for ageing out the PEER_ACTIVE flag */ - struct thread *hold_timer; + struct event *hold_timer; /* number of neigh entries (using this mac) that have * ZEBRA_MAC_ES_PEER_ACTIVE or ZEBRA_NEIGH_ES_PEER_PROXY diff --git a/zebra/zebra_evpn_mh.c b/zebra/zebra_evpn_mh.c index 334dde3b10..bf488ca316 100644 --- a/zebra/zebra_evpn_mh.c +++ b/zebra/zebra_evpn_mh.c @@ -2201,11 +2201,11 @@ static void zebra_evpn_mh_advertise_svi_mac(void) zebra_evpn_acc_vl_adv_svi_mac_all(); } -static void zebra_evpn_es_df_delay_exp_cb(struct thread *t) +static void zebra_evpn_es_df_delay_exp_cb(struct event *t) { struct zebra_evpn_es *es; - es = THREAD_ARG(t); + es = EVENT_ARG(t); if (IS_ZEBRA_DEBUG_EVPN_MH_ES) zlog_debug("es %s df-delay expired", es->esi_str); @@ -2269,9 +2269,9 @@ static void zebra_evpn_es_local_info_set(struct zebra_evpn_es *es, /* Start the DF delay timer on the local ES */ if (!es->df_delay_timer) - thread_add_timer(zrouter.master, zebra_evpn_es_df_delay_exp_cb, - es, ZEBRA_EVPN_MH_DF_DELAY_TIME, - &es->df_delay_timer); + event_add_timer(zrouter.master, zebra_evpn_es_df_delay_exp_cb, + es, ZEBRA_EVPN_MH_DF_DELAY_TIME, + &es->df_delay_timer); /* See if the local VTEP can function as DF on the ES */ if (!zebra_evpn_es_run_df_election(es, __func__)) { @@ -2314,7 +2314,7 @@ static void zebra_evpn_es_local_info_clear(struct zebra_evpn_es **esp) es->flags &= ~(ZEBRA_EVPNES_LOCAL | ZEBRA_EVPNES_READY_FOR_BGP); - THREAD_OFF(es->df_delay_timer); + EVENT_OFF(es->df_delay_timer); /* clear EVPN protodown flags on the access port */ zebra_evpn_mh_clear_protodown_es(es); @@ -3139,7 +3139,7 @@ static void zebra_evpn_es_show_entry_detail(struct vty *vty, char alg_buf[EVPN_DF_ALG_STR_LEN]; struct zebra_evpn_es_vtep *es_vtep; struct listnode *node; - char thread_buf[THREAD_TIMER_STRLEN]; + char thread_buf[EVENT_TIMER_STRLEN]; if (json) { json_object *json_vteps; @@ -3181,9 +3181,9 @@ static void zebra_evpn_es_show_entry_detail(struct vty *vty, if (es->df_delay_timer) json_object_string_add( json, "dfDelayTimer", - thread_timer_to_hhmmss(thread_buf, - sizeof(thread_buf), - es->df_delay_timer)); + event_timer_to_hhmmss(thread_buf, + sizeof(thread_buf), + es->df_delay_timer)); json_object_int_add(json, "nexthopGroup", es->nhg_id); if (listcount(es->es_vtep_list)) { json_vteps = json_object_new_array(); @@ -3226,9 +3226,9 @@ static void zebra_evpn_es_show_entry_detail(struct vty *vty, : "df"); if (es->df_delay_timer) vty_out(vty, " DF delay: %s\n", - thread_timer_to_hhmmss(thread_buf, - sizeof(thread_buf), - es->df_delay_timer)); + event_timer_to_hhmmss(thread_buf, + sizeof(thread_buf), + es->df_delay_timer)); vty_out(vty, " DF preference: %u\n", es->df_pref); vty_out(vty, " Nexthop group: %u\n", es->nhg_id); vty_out(vty, " VTEPs:\n"); @@ -3522,15 +3522,15 @@ DEFPY(zebra_evpn_mh_uplink, zebra_evpn_mh_uplink_cmd, "[no] evpn mh uplink", void zebra_evpn_mh_json(json_object *json) { json_object *json_array; - char thread_buf[THREAD_TIMER_STRLEN]; + char thread_buf[EVENT_TIMER_STRLEN]; json_object_int_add(json, "macHoldtime", zmh_info->mac_hold_time); json_object_int_add(json, "neighHoldtime", zmh_info->neigh_hold_time); json_object_int_add(json, "startupDelay", zmh_info->startup_delay_time); json_object_string_add( json, "startupDelayTimer", - thread_timer_to_hhmmss(thread_buf, sizeof(thread_buf), - zmh_info->startup_delay_timer)); + event_timer_to_hhmmss(thread_buf, sizeof(thread_buf), + zmh_info->startup_delay_timer)); json_object_int_add(json, "uplinkConfigCount", zmh_info->uplink_cfg_cnt); json_object_int_add(json, "uplinkActiveCount", @@ -3555,15 +3555,15 @@ void zebra_evpn_mh_json(json_object *json) void zebra_evpn_mh_print(struct vty *vty) { char pd_buf[ZEBRA_PROTODOWN_RC_STR_LEN]; - char thread_buf[THREAD_TIMER_STRLEN]; + char thread_buf[EVENT_TIMER_STRLEN]; vty_out(vty, "EVPN MH:\n"); vty_out(vty, " mac-holdtime: %ds, neigh-holdtime: %ds\n", zmh_info->mac_hold_time, zmh_info->neigh_hold_time); vty_out(vty, " startup-delay: %ds, start-delay-timer: %s\n", zmh_info->startup_delay_time, - thread_timer_to_hhmmss(thread_buf, sizeof(thread_buf), - zmh_info->startup_delay_timer)); + event_timer_to_hhmmss(thread_buf, sizeof(thread_buf), + zmh_info->startup_delay_timer)); vty_out(vty, " uplink-cfg-cnt: %u, uplink-active-cnt: %u\n", zmh_info->uplink_cfg_cnt, zmh_info->uplink_oper_up_cnt); if (zmh_info->protodown_rc) @@ -3917,7 +3917,7 @@ void zebra_evpn_mh_uplink_oper_update(struct zebra_if *zif) new_protodown); } -static void zebra_evpn_mh_startup_delay_exp_cb(struct thread *t) +static void zebra_evpn_mh_startup_delay_exp_cb(struct event *t) { if (IS_ZEBRA_DEBUG_EVPN_MH_ES) zlog_debug("startup-delay expired"); @@ -3931,7 +3931,7 @@ static void zebra_evpn_mh_startup_delay_timer_start(const char *rc) if (zmh_info->startup_delay_timer) { if (IS_ZEBRA_DEBUG_EVPN_MH_ES) zlog_debug("startup-delay timer cancelled"); - THREAD_OFF(zmh_info->startup_delay_timer); + EVENT_OFF(zmh_info->startup_delay_timer); } if (zmh_info->startup_delay_time) { @@ -3939,10 +3939,10 @@ static void zebra_evpn_mh_startup_delay_timer_start(const char *rc) zlog_debug( "startup-delay timer started for %d sec on %s", zmh_info->startup_delay_time, rc); - thread_add_timer(zrouter.master, - zebra_evpn_mh_startup_delay_exp_cb, NULL, - zmh_info->startup_delay_time, - &zmh_info->startup_delay_timer); + event_add_timer(zrouter.master, + zebra_evpn_mh_startup_delay_exp_cb, NULL, + zmh_info->startup_delay_time, + &zmh_info->startup_delay_timer); zebra_evpn_mh_update_protodown( ZEBRA_PROTODOWN_EVPN_STARTUP_DELAY, true /* set */); } else { diff --git a/zebra/zebra_evpn_mh.h b/zebra/zebra_evpn_mh.h index 89a917628d..6dda30a57f 100644 --- a/zebra/zebra_evpn_mh.h +++ b/zebra/zebra_evpn_mh.h @@ -87,7 +87,7 @@ struct zebra_evpn_es { * imported before running the DF election. */ #define ZEBRA_EVPN_MH_DF_DELAY_TIME 3 /* seconds */ - struct thread *df_delay_timer; + struct event *df_delay_timer; }; RB_HEAD(zebra_es_rb_head, zebra_evpn_es); RB_PROTOTYPE(zebra_es_rb_head, zebra_evpn_es, rb_node, zebra_es_rb_cmp); @@ -248,7 +248,7 @@ struct zebra_evpn_mh_info { */ int startup_delay_time; /* seconds */ #define ZEBRA_EVPN_MH_STARTUP_DELAY_DEF (3 * 60) - struct thread *startup_delay_timer; + struct event *startup_delay_timer; /* Number of configured uplinks */ uint32_t uplink_cfg_cnt; diff --git a/zebra/zebra_evpn_neigh.c b/zebra/zebra_evpn_neigh.c index acd60aa08f..74141e4f34 100644 --- a/zebra/zebra_evpn_neigh.c +++ b/zebra/zebra_evpn_neigh.c @@ -397,7 +397,7 @@ void zebra_evpn_sync_neigh_static_chg(struct zebra_neigh *n, bool old_n_static, * external neighmgr daemon to probe existing hosts to independently * establish their presence on the ES. */ -static void zebra_evpn_neigh_hold_exp_cb(struct thread *t) +static void zebra_evpn_neigh_hold_exp_cb(struct event *t) { struct zebra_neigh *n; bool old_bgp_ready; @@ -405,7 +405,7 @@ static void zebra_evpn_neigh_hold_exp_cb(struct thread *t) bool old_n_static; bool new_n_static; - n = THREAD_ARG(t); + n = EVENT_ARG(t); /* the purpose of the hold timer is to age out the peer-active * flag */ @@ -444,8 +444,8 @@ static inline void zebra_evpn_neigh_start_hold_timer(struct zebra_neigh *n) if (IS_ZEBRA_DEBUG_EVPN_MH_NEIGH) zlog_debug("sync-neigh vni %u ip %pIA mac %pEA 0x%x hold start", n->zevpn->vni, &n->ip, &n->emac, n->flags); - thread_add_timer(zrouter.master, zebra_evpn_neigh_hold_exp_cb, n, - zmh_info->neigh_hold_time, &n->hold_timer); + event_add_timer(zrouter.master, zebra_evpn_neigh_hold_exp_cb, n, + zmh_info->neigh_hold_time, &n->hold_timer); } static void zebra_evpn_local_neigh_deref_mac(struct zebra_neigh *n, @@ -576,7 +576,7 @@ int zebra_evpn_neigh_del(struct zebra_evpn *zevpn, struct zebra_neigh *n) listnode_delete(n->mac->neigh_list, n); /* Cancel auto recovery */ - THREAD_OFF(n->dad_ip_auto_recovery_timer); + EVENT_OFF(n->dad_ip_auto_recovery_timer); /* Cancel proxy hold timer */ zebra_evpn_neigh_stop_hold_timer(n); @@ -1080,13 +1080,13 @@ static int zebra_evpn_ip_inherit_dad_from_mac(struct zebra_vrf *zvrf, return 0; } -static void zebra_evpn_dad_ip_auto_recovery_exp(struct thread *t) +static void zebra_evpn_dad_ip_auto_recovery_exp(struct event *t) { struct zebra_vrf *zvrf = NULL; struct zebra_neigh *nbr = NULL; struct zebra_evpn *zevpn = NULL; - nbr = THREAD_ARG(t); + nbr = EVENT_ARG(t); /* since this is asynchronous we need sanity checks*/ zvrf = vrf_info_lookup(nbr->zevpn->vrf_id); @@ -1223,7 +1223,7 @@ static void zebra_evpn_dup_addr_detect_for_neigh( nbr->dad_dup_detect_time = monotime(NULL); /* Start auto recovery timer for this IP */ - THREAD_OFF(nbr->dad_ip_auto_recovery_timer); + EVENT_OFF(nbr->dad_ip_auto_recovery_timer); if (zvrf->dad_freeze && zvrf->dad_freeze_time) { if (IS_ZEBRA_DEBUG_VXLAN) zlog_debug( @@ -1231,10 +1231,10 @@ static void zebra_evpn_dup_addr_detect_for_neigh( __func__, &nbr->emac, &nbr->ip, nbr->flags, zvrf->dad_freeze_time); - thread_add_timer(zrouter.master, - zebra_evpn_dad_ip_auto_recovery_exp, - nbr, zvrf->dad_freeze_time, - &nbr->dad_ip_auto_recovery_timer); + event_add_timer(zrouter.master, + zebra_evpn_dad_ip_auto_recovery_exp, + nbr, zvrf->dad_freeze_time, + &nbr->dad_ip_auto_recovery_timer); } if (zvrf->dad_freeze) *is_dup_detect = true; @@ -1680,7 +1680,7 @@ void zebra_evpn_clear_dup_neigh_hash(struct hash_bucket *bucket, void *ctxt) nbr->detect_start_time.tv_sec = 0; nbr->detect_start_time.tv_usec = 0; nbr->dad_dup_detect_time = 0; - THREAD_OFF(nbr->dad_ip_auto_recovery_timer); + EVENT_OFF(nbr->dad_ip_auto_recovery_timer); if (CHECK_FLAG(nbr->flags, ZEBRA_NEIGH_LOCAL)) { zebra_evpn_neigh_send_add_to_client(zevpn->vni, &nbr->ip, @@ -1706,7 +1706,7 @@ void zebra_evpn_print_neigh(struct zebra_neigh *n, void *ctxt, struct zebra_vrf *zvrf = NULL; struct timeval detect_start_time = {0, 0}; char timebuf[MONOTIME_STRLEN]; - char thread_buf[THREAD_TIMER_STRLEN]; + char thread_buf[EVENT_TIMER_STRLEN]; time_t uptime; char up_str[MONOTIME_STRLEN]; @@ -1746,9 +1746,9 @@ void zebra_evpn_print_neigh(struct zebra_neigh *n, void *ctxt, } if (n->hold_timer) { vty_out(vty, " (ht: %s)", - thread_timer_to_hhmmss(thread_buf, - sizeof(thread_buf), - n->hold_timer)); + event_timer_to_hhmmss(thread_buf, + sizeof(thread_buf), + n->hold_timer)); sync_info = true; } if (!sync_info) @@ -1769,9 +1769,9 @@ void zebra_evpn_print_neigh(struct zebra_neigh *n, void *ctxt, if (n->hold_timer) json_object_string_add( json, "peerActiveHold", - thread_timer_to_hhmmss(thread_buf, - sizeof(thread_buf), - n->hold_timer)); + event_timer_to_hhmmss(thread_buf, + sizeof(thread_buf), + n->hold_timer)); } if (CHECK_FLAG(n->flags, ZEBRA_NEIGH_REMOTE)) { if (n->mac->es) { diff --git a/zebra/zebra_evpn_neigh.h b/zebra/zebra_evpn_neigh.h index 18ef8546de..c82b3673b1 100644 --- a/zebra/zebra_evpn_neigh.h +++ b/zebra/zebra_evpn_neigh.h @@ -92,7 +92,7 @@ struct zebra_neigh { /* Duplicate ip detection */ uint32_t dad_count; - struct thread *dad_ip_auto_recovery_timer; + struct event *dad_ip_auto_recovery_timer; struct timeval detect_start_time; @@ -101,7 +101,7 @@ struct zebra_neigh { time_t uptime; /* used for ageing out the PEER_ACTIVE flag */ - struct thread *hold_timer; + struct event *hold_timer; }; /* @@ -158,7 +158,7 @@ static inline void zebra_evpn_neigh_stop_hold_timer(struct zebra_neigh *n) if (IS_ZEBRA_DEBUG_EVPN_MH_NEIGH) zlog_debug("sync-neigh vni %u ip %pIA mac %pEA 0x%x hold stop", n->zevpn->vni, &n->ip, &n->emac, n->flags); - THREAD_OFF(n->hold_timer); + EVENT_OFF(n->hold_timer); } void zebra_evpn_sync_neigh_static_chg(struct zebra_neigh *n, bool old_n_static, diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c index 15765b5e18..e379a5868c 100644 --- a/zebra/zebra_fpm.c +++ b/zebra/zebra_fpm.c @@ -11,7 +11,7 @@ #include "log.h" #include "libfrr.h" #include "stream.h" -#include "thread.h" +#include "frrevent.h" #include "network.h" #include "command.h" #include "lib/version.h" @@ -156,7 +156,7 @@ struct zfpm_glob { */ enum zfpm_msg_format message_format; - struct thread_master *master; + struct event_loop *master; enum zfpm_state state; @@ -204,15 +204,15 @@ struct zfpm_glob { /* * Threads for I/O. */ - struct thread *t_connect; - struct thread *t_write; - struct thread *t_read; + struct event *t_connect; + struct event *t_write; + struct event *t_read; /* * Thread to clean up after the TCP connection to the FPM goes down * and the state that belongs to it. */ - struct thread *t_conn_down; + struct event *t_conn_down; struct { struct zfpm_rnodes_iter iter; @@ -222,7 +222,7 @@ struct zfpm_glob { * Thread to take actions once the TCP conn to the FPM comes up, and * the state that belongs to it. */ - struct thread *t_conn_up; + struct event *t_conn_up; struct { struct zfpm_rnodes_iter iter; @@ -251,7 +251,7 @@ struct zfpm_glob { /* * Stats interval timer. */ - struct thread *t_stats; + struct event *t_stats; /* * If non-zero, the last time when statistics were cleared. @@ -269,8 +269,8 @@ static struct zfpm_glob *zfpm_g = &zfpm_glob_space; static int zfpm_trigger_update(struct route_node *rn, const char *reason); -static void zfpm_read_cb(struct thread *thread); -static void zfpm_write_cb(struct thread *thread); +static void zfpm_read_cb(struct event *thread); +static void zfpm_write_cb(struct event *thread); static void zfpm_set_state(enum zfpm_state state, const char *reason); static void zfpm_start_connect_timer(const char *reason); @@ -283,9 +283,9 @@ union g_addr ipv4ll_gateway; /* * zfpm_thread_should_yield */ -static inline int zfpm_thread_should_yield(struct thread *t) +static inline int zfpm_thread_should_yield(struct event *t) { - return thread_should_yield(t); + return event_should_yield(t); } /* @@ -460,8 +460,8 @@ static inline void zfpm_read_on(void) assert(!zfpm_g->t_read); assert(zfpm_g->sock >= 0); - thread_add_read(zfpm_g->master, zfpm_read_cb, 0, zfpm_g->sock, - &zfpm_g->t_read); + event_add_read(zfpm_g->master, zfpm_read_cb, 0, zfpm_g->sock, + &zfpm_g->t_read); } /* @@ -472,8 +472,8 @@ static inline void zfpm_write_on(void) assert(!zfpm_g->t_write); assert(zfpm_g->sock >= 0); - thread_add_write(zfpm_g->master, zfpm_write_cb, 0, zfpm_g->sock, - &zfpm_g->t_write); + event_add_write(zfpm_g->master, zfpm_write_cb, 0, zfpm_g->sock, + &zfpm_g->t_write); } /* @@ -481,7 +481,7 @@ static inline void zfpm_write_on(void) */ static inline void zfpm_read_off(void) { - THREAD_OFF(zfpm_g->t_read); + EVENT_OFF(zfpm_g->t_read); } /* @@ -489,12 +489,12 @@ static inline void zfpm_read_off(void) */ static inline void zfpm_write_off(void) { - THREAD_OFF(zfpm_g->t_write); + EVENT_OFF(zfpm_g->t_write); } static inline void zfpm_connect_off(void) { - THREAD_OFF(zfpm_g->t_connect); + EVENT_OFF(zfpm_g->t_connect); } /* @@ -503,7 +503,7 @@ static inline void zfpm_connect_off(void) * Callback for actions to be taken when the connection to the FPM * comes up. */ -static void zfpm_conn_up_thread_cb(struct thread *thread) +static void zfpm_conn_up_thread_cb(struct event *thread) { struct route_node *rnode; struct zfpm_rnodes_iter *iter; @@ -542,8 +542,8 @@ static void zfpm_conn_up_thread_cb(struct thread *thread) zfpm_g->stats.t_conn_up_yields++; zfpm_rnodes_iter_pause(iter); - thread_add_timer_msec(zfpm_g->master, zfpm_conn_up_thread_cb, - NULL, 0, &zfpm_g->t_conn_up); + event_add_timer_msec(zfpm_g->master, zfpm_conn_up_thread_cb, + NULL, 0, &zfpm_g->t_conn_up); return; } @@ -568,15 +568,15 @@ static void zfpm_connection_up(const char *detail) /* * Start thread to push existing routes to the FPM. */ - THREAD_OFF(zfpm_g->t_conn_up); + EVENT_OFF(zfpm_g->t_conn_up); zfpm_rnodes_iter_init(&zfpm_g->t_conn_up_state.iter); zfpm_g->fpm_mac_dump_done = false; zfpm_debug("Starting conn_up thread"); - thread_add_timer_msec(zfpm_g->master, zfpm_conn_up_thread_cb, NULL, 0, - &zfpm_g->t_conn_up); + event_add_timer_msec(zfpm_g->master, zfpm_conn_up_thread_cb, NULL, 0, + &zfpm_g->t_conn_up); zfpm_g->stats.t_conn_up_starts++; } @@ -619,7 +619,7 @@ static void zfpm_connect_check(void) * Callback that is invoked to clean up state after the TCP connection * to the FPM goes down. */ -static void zfpm_conn_down_thread_cb(struct thread *thread) +static void zfpm_conn_down_thread_cb(struct event *thread) { struct route_node *rnode; struct zfpm_rnodes_iter *iter; @@ -668,8 +668,8 @@ static void zfpm_conn_down_thread_cb(struct thread *thread) zfpm_g->stats.t_conn_down_yields++; zfpm_rnodes_iter_pause(iter); zfpm_g->t_conn_down = NULL; - thread_add_timer_msec(zfpm_g->master, zfpm_conn_down_thread_cb, - NULL, 0, &zfpm_g->t_conn_down); + event_add_timer_msec(zfpm_g->master, zfpm_conn_down_thread_cb, + NULL, 0, &zfpm_g->t_conn_down); return; } @@ -713,8 +713,8 @@ static void zfpm_connection_down(const char *detail) assert(!zfpm_g->t_conn_down); zfpm_rnodes_iter_init(&zfpm_g->t_conn_down_state.iter); zfpm_g->t_conn_down = NULL; - thread_add_timer_msec(zfpm_g->master, zfpm_conn_down_thread_cb, NULL, 0, - &zfpm_g->t_conn_down); + event_add_timer_msec(zfpm_g->master, zfpm_conn_down_thread_cb, NULL, 0, + &zfpm_g->t_conn_down); zfpm_g->stats.t_conn_down_starts++; zfpm_set_state(ZFPM_STATE_IDLE, detail); @@ -723,7 +723,7 @@ static void zfpm_connection_down(const char *detail) /* * zfpm_read_cb */ -static void zfpm_read_cb(struct thread *thread) +static void zfpm_read_cb(struct event *thread) { size_t already; struct stream *ibuf; @@ -1152,7 +1152,7 @@ static void zfpm_build_updates(void) /* * zfpm_write_cb */ -static void zfpm_write_cb(struct thread *thread) +static void zfpm_write_cb(struct event *thread) { struct stream *s; int num_writes; @@ -1234,7 +1234,7 @@ static void zfpm_write_cb(struct thread *thread) /* * zfpm_connect_cb */ -static void zfpm_connect_cb(struct thread *t) +static void zfpm_connect_cb(struct event *t) { int sock, ret; struct sockaddr_in serv; @@ -1388,8 +1388,8 @@ static void zfpm_start_connect_timer(const char *reason) delay_secs = zfpm_calc_connect_delay(); zfpm_debug("scheduling connect in %ld seconds", delay_secs); - thread_add_timer(zfpm_g->master, zfpm_connect_cb, 0, delay_secs, - &zfpm_g->t_connect); + event_add_timer(zfpm_g->master, zfpm_connect_cb, 0, delay_secs, + &zfpm_g->t_connect); zfpm_set_state(ZFPM_STATE_ACTIVE, reason); } @@ -1664,7 +1664,7 @@ static void zfpm_iterate_rmac_table(struct hash_bucket *bucket, void *args) /* * struct zfpm_statsimer_cb */ -static void zfpm_stats_timer_cb(struct thread *t) +static void zfpm_stats_timer_cb(struct event *t) { zfpm_g->t_stats = NULL; @@ -1697,7 +1697,7 @@ static void zfpm_stop_stats_timer(void) return; zfpm_debug("Stopping existing stats timer"); - THREAD_OFF(zfpm_g->t_stats); + EVENT_OFF(zfpm_g->t_stats); } /* @@ -1707,8 +1707,8 @@ void zfpm_start_stats_timer(void) { assert(!zfpm_g->t_stats); - thread_add_timer(zfpm_g->master, zfpm_stats_timer_cb, 0, - ZFPM_STATS_IVL_SECS, &zfpm_g->t_stats); + event_add_timer(zfpm_g->master, zfpm_stats_timer_cb, 0, + ZFPM_STATS_IVL_SECS, &zfpm_g->t_stats); } /* @@ -1978,7 +1978,7 @@ static struct cmd_node zebra_node = { * * Returns true on success. */ -static int zfpm_init(struct thread_master *master) +static int zfpm_init(struct event_loop *master) { int enable = 1; uint16_t port = 0; diff --git a/zebra/zebra_gr.c b/zebra/zebra_gr.c index 3724ea0901..96d598f7c4 100644 --- a/zebra/zebra_gr.c +++ b/zebra/zebra_gr.c @@ -13,7 +13,7 @@ #include "lib/prefix.h" #include "lib/command.h" #include "lib/if.h" -#include "lib/thread.h" +#include "frrevent.h" #include "lib/stream.h" #include "lib/memory.h" #include "lib/table.h" @@ -39,7 +39,7 @@ DEFINE_MTYPE_STATIC(ZEBRA, ZEBRA_GR, "GR"); * Forward declaration. */ static struct zserv *zebra_gr_find_stale_client(struct zserv *client); -static void zebra_gr_route_stale_delete_timer_expiry(struct thread *thread); +static void zebra_gr_route_stale_delete_timer_expiry(struct event *thread); static int32_t zebra_gr_delete_stale_routes(struct client_gr_info *info); static void zebra_gr_process_client_stale_routes(struct zserv *client, vrf_id_t vrf_id); @@ -80,13 +80,13 @@ void zebra_gr_stale_client_cleanup(struct list *client_list) /* Cancel the stale timer */ if (info->t_stale_removal != NULL) { - THREAD_OFF(info->t_stale_removal); + EVENT_OFF(info->t_stale_removal); info->t_stale_removal = NULL; /* Process the stale routes */ - thread_execute( - zrouter.master, - zebra_gr_route_stale_delete_timer_expiry, - info, 1); + event_execute( + zrouter.master, + zebra_gr_route_stale_delete_timer_expiry, + info, 1); } } } @@ -115,7 +115,7 @@ static void zebra_gr_client_info_delte(struct zserv *client, TAILQ_REMOVE(&(client->gr_info_queue), info, gr_info); - THREAD_OFF(info->t_stale_removal); + EVENT_OFF(info->t_stale_removal); XFREE(MTYPE_ZEBRA_GR, info->current_prefix); @@ -159,7 +159,7 @@ int32_t zebra_gr_client_disconnect(struct zserv *client) && (info->t_stale_removal == NULL)) { struct vrf *vrf = vrf_lookup_by_id(info->vrf_id); - thread_add_timer( + event_add_timer( zrouter.master, zebra_gr_route_stale_delete_timer_expiry, info, info->stale_removal_time, @@ -461,9 +461,9 @@ void zread_client_capabilities(ZAPI_HANDLER_ARGS) * Delete all the stale routes that have not been refreshed * post restart. */ -static void zebra_gr_route_stale_delete_timer_expiry(struct thread *thread) +static void zebra_gr_route_stale_delete_timer_expiry(struct event *thread) { - struct client_gr_info *info = THREAD_ARG(thread); + struct client_gr_info *info = EVENT_ARG(thread); int32_t cnt = 0; struct zserv *client; struct vrf *vrf = vrf_lookup_by_id(info->vrf_id); @@ -482,10 +482,10 @@ static void zebra_gr_route_stale_delete_timer_expiry(struct thread *thread) __func__, zebra_route_string(client->proto), VRF_LOGNAME(vrf), info->vrf_id, cnt); - thread_add_timer(zrouter.master, - zebra_gr_route_stale_delete_timer_expiry, info, - ZEBRA_DEFAULT_STALE_UPDATE_DELAY, - &info->t_stale_removal); + event_add_timer(zrouter.master, + zebra_gr_route_stale_delete_timer_expiry, info, + ZEBRA_DEFAULT_STALE_UPDATE_DELAY, + &info->t_stale_removal); } else { /* No routes to delete for the VRF */ LOG_GR("%s: Client %s vrf %s(%u) all stale routes processed", @@ -692,9 +692,9 @@ static void zebra_gr_process_client_stale_routes(struct zserv *client, LOG_GR("%s: Client %s canceled stale delete timer vrf %s(%d)", __func__, zebra_route_string(client->proto), VRF_LOGNAME(vrf), info->vrf_id); - THREAD_OFF(info->t_stale_removal); - thread_execute(zrouter.master, - zebra_gr_route_stale_delete_timer_expiry, info, - 0); + EVENT_OFF(info->t_stale_removal); + event_execute(zrouter.master, + zebra_gr_route_stale_delete_timer_expiry, info, + 0); } } diff --git a/zebra/zebra_mlag.c b/zebra/zebra_mlag.c index b4a0c575a2..6713dbc967 100644 --- a/zebra/zebra_mlag.c +++ b/zebra/zebra_mlag.c @@ -36,8 +36,8 @@ uint8_t mlag_rd_buffer[ZEBRA_MLAG_BUF_LIMIT]; static bool test_mlag_in_progress; static int zebra_mlag_signal_write_thread(void); -static void zebra_mlag_terminate_pthread(struct thread *event); -static void zebra_mlag_post_data_from_main_thread(struct thread *thread); +static void zebra_mlag_terminate_pthread(struct event *event); +static void zebra_mlag_post_data_from_main_thread(struct event *thread); static void zebra_mlag_publish_process_state(struct zserv *client, zebra_message_types_t msg_type); @@ -114,8 +114,8 @@ void zebra_mlag_process_mlag_data(uint8_t *data, uint32_t len) * additional four bytes are for message type */ stream_putl_at(s, 0, msg_type); - thread_add_event(zrouter.master, zebra_mlag_post_data_from_main_thread, - s, 0, NULL); + event_add_event(zrouter.master, zebra_mlag_post_data_from_main_thread, + s, 0, NULL); } /**********************End of MLAG Interaction********************************/ @@ -132,7 +132,7 @@ void zebra_mlag_process_mlag_data(uint8_t *data, uint32_t len) * This thread reads the clients data from the Global queue and encodes with * protobuf and pass on to the MLAG socket. */ -static void zebra_mlag_client_msg_handler(struct thread *event) +static void zebra_mlag_client_msg_handler(struct event *event) { struct stream *s; uint32_t wr_count = 0; @@ -173,9 +173,9 @@ static void zebra_mlag_client_msg_handler(struct thread *event) * main thread. */ if (msg_type == MLAG_DEREGISTER) { - thread_add_event(zrouter.master, - zebra_mlag_terminate_pthread, - NULL, 0, NULL); + event_add_event(zrouter.master, + zebra_mlag_terminate_pthread, + NULL, 0, NULL); } } @@ -237,9 +237,9 @@ static int zebra_mlag_signal_write_thread(void) * during Zebra Init/after MLAG thread is destroyed. * so it is safe to use without any locking */ - thread_add_event(zrouter.mlag_info.th_master, - zebra_mlag_client_msg_handler, NULL, 0, - &zrouter.mlag_info.t_write); + event_add_event(zrouter.mlag_info.th_master, + zebra_mlag_client_msg_handler, NULL, 0, + &zrouter.mlag_info.t_write); return 0; } @@ -279,8 +279,8 @@ static void zebra_mlag_publish_process_state(struct zserv *client, s = stream_new(ZEBRA_HEADER_SIZE + ZEBRA_MLAG_METADATA_LEN); stream_putl(s, ZEBRA_MLAG_MSG_BCAST); zclient_create_header(s, msg_type, VRF_DEFAULT); - thread_add_event(zrouter.master, zebra_mlag_post_data_from_main_thread, - s, 0, NULL); + event_add_event(zrouter.master, zebra_mlag_post_data_from_main_thread, + s, 0, NULL); } /**************************End of Multi-entrant Apis**************************/ @@ -292,9 +292,9 @@ static void zebra_mlag_publish_process_state(struct zserv *client, * main thread, because for that access was needed for clients list. * so instead of forcing the locks, messages will be posted from main thread. */ -static void zebra_mlag_post_data_from_main_thread(struct thread *thread) +static void zebra_mlag_post_data_from_main_thread(struct event *thread) { - struct stream *s = THREAD_ARG(thread); + struct stream *s = EVENT_ARG(thread); struct stream *zebra_s = NULL; struct listnode *node; struct zserv *client; @@ -376,7 +376,7 @@ static void zebra_mlag_spawn_pthread(void) * all clients are un-registered for MLAG Updates, terminate the * MLAG write thread */ -static void zebra_mlag_terminate_pthread(struct thread *event) +static void zebra_mlag_terminate_pthread(struct event *event) { if (IS_ZEBRA_DEBUG_MLAG) zlog_debug("Zebra MLAG write thread terminate called"); diff --git a/zebra/zebra_mlag_private.c b/zebra/zebra_mlag_private.c index 334eb6dc46..f348c50755 100644 --- a/zebra/zebra_mlag_private.c +++ b/zebra/zebra_mlag_private.c @@ -12,7 +12,7 @@ #include "hook.h" #include "module.h" -#include "thread.h" +#include "frrevent.h" #include "frr_pthread.h" #include "libfrr.h" #include "lib/version.h" @@ -32,11 +32,11 @@ * */ -static struct thread_master *zmlag_master; +static struct event_loop *zmlag_master; static int mlag_socket; -static void zebra_mlag_connect(struct thread *thread); -static void zebra_mlag_read(struct thread *thread); +static void zebra_mlag_connect(struct event *thread); +static void zebra_mlag_read(struct event *thread); /* * Write the data to MLAGD @@ -55,11 +55,11 @@ static int zebra_mlag_private_write_data(uint8_t *data, uint32_t len) static void zebra_mlag_sched_read(void) { - thread_add_read(zmlag_master, zebra_mlag_read, NULL, mlag_socket, - &zrouter.mlag_info.t_read); + event_add_read(zmlag_master, zebra_mlag_read, NULL, mlag_socket, + &zrouter.mlag_info.t_read); } -static void zebra_mlag_read(struct thread *thread) +static void zebra_mlag_read(struct event *thread) { static uint32_t mlag_rd_buf_offset; uint32_t *msglen; @@ -151,7 +151,7 @@ static void zebra_mlag_read(struct thread *thread) zebra_mlag_sched_read(); } -static void zebra_mlag_connect(struct thread *thread) +static void zebra_mlag_connect(struct event *thread) { struct sockaddr_un svr = {0}; @@ -173,8 +173,8 @@ static void zebra_mlag_connect(struct thread *thread) svr.sun_path); close(mlag_socket); zrouter.mlag_info.timer_running = true; - thread_add_timer(zmlag_master, zebra_mlag_connect, NULL, 10, - &zrouter.mlag_info.t_read); + event_add_timer(zmlag_master, zebra_mlag_connect, NULL, 10, + &zrouter.mlag_info.t_read); return; } @@ -184,8 +184,8 @@ static void zebra_mlag_connect(struct thread *thread) zlog_debug("%s: Connection with MLAG is established ", __func__); - thread_add_read(zmlag_master, zebra_mlag_read, NULL, mlag_socket, - &zrouter.mlag_info.t_read); + event_add_read(zmlag_master, zebra_mlag_read, NULL, mlag_socket, + &zrouter.mlag_info.t_read); /* * Connection is established with MLAGD, post to clients */ @@ -197,8 +197,8 @@ static void zebra_mlag_connect(struct thread *thread) */ static int zebra_mlag_private_monitor_state(void) { - thread_add_event(zmlag_master, zebra_mlag_connect, NULL, 0, - &zrouter.mlag_info.t_read); + event_add_event(zmlag_master, zebra_mlag_connect, NULL, 0, + &zrouter.mlag_info.t_read); return 0; } @@ -225,8 +225,8 @@ static int zebra_mlag_private_open_channel(void) /* * Connect only if any clients are showing interest */ - thread_add_event(zmlag_master, zebra_mlag_connect, NULL, 0, - &zrouter.mlag_info.t_read); + event_add_event(zmlag_master, zebra_mlag_connect, NULL, 0, + &zrouter.mlag_info.t_read); } return 0; } diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c index 4aaf6f25af..3fbf201086 100644 --- a/zebra/zebra_mpls.c +++ b/zebra/zebra_mpls.c @@ -13,7 +13,7 @@ #include "log.h" #include "sockunion.h" #include "linklist.h" -#include "thread.h" +#include "frrevent.h" #include "workqueue.h" #include "prefix.h" #include "routemap.h" diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c index 28f3c03abe..4260d29c43 100644 --- a/zebra/zebra_netns_notify.c +++ b/zebra/zebra_netns_notify.c @@ -17,7 +17,7 @@ #include #include -#include "thread.h" +#include "frrevent.h" #include "ns.h" #include "command.h" #include "memory.h" @@ -41,18 +41,18 @@ #define ZEBRA_NS_POLLING_MAX_RETRIES 200 DEFINE_MTYPE_STATIC(ZEBRA, NETNS_MISC, "ZebraNetNSInfo"); -static struct thread *zebra_netns_notify_current; +static struct event *zebra_netns_notify_current; struct zebra_netns_info { const char *netnspath; unsigned int retries; }; -static void zebra_ns_ready_read(struct thread *t); +static void zebra_ns_ready_read(struct event *t); static void zebra_ns_notify_create_context_from_entry_name(const char *name); static int zebra_ns_continue_read(struct zebra_netns_info *zns_info, int stop_retry); -static void zebra_ns_notify_read(struct thread *t); +static void zebra_ns_notify_read(struct event *t); static struct vrf *vrf_handler_create(struct vty *vty, const char *vrfname) { @@ -133,9 +133,9 @@ static int zebra_ns_continue_read(struct zebra_netns_info *zns_info, XFREE(MTYPE_NETNS_MISC, zns_info); return 0; } - thread_add_timer_msec(zrouter.master, zebra_ns_ready_read, - (void *)zns_info, ZEBRA_NS_POLLING_INTERVAL_MSEC, - NULL); + event_add_timer_msec(zrouter.master, zebra_ns_ready_read, + (void *)zns_info, ZEBRA_NS_POLLING_INTERVAL_MSEC, + NULL); return 0; } @@ -229,9 +229,9 @@ static bool zebra_ns_notify_is_default_netns(const char *name) return false; } -static void zebra_ns_ready_read(struct thread *t) +static void zebra_ns_ready_read(struct event *t) { - struct zebra_netns_info *zns_info = THREAD_ARG(t); + struct zebra_netns_info *zns_info = EVENT_ARG(t); const char *netnspath; int err, stop_retry = 0; @@ -280,16 +280,16 @@ static void zebra_ns_ready_read(struct thread *t) zebra_ns_continue_read(zns_info, 1); } -static void zebra_ns_notify_read(struct thread *t) +static void zebra_ns_notify_read(struct event *t) { - int fd_monitor = THREAD_FD(t); + int fd_monitor = EVENT_FD(t); struct inotify_event *event; char buf[BUFSIZ]; ssize_t len; char event_name[NAME_MAX + 1]; - thread_add_read(zrouter.master, zebra_ns_notify_read, NULL, fd_monitor, - &zebra_netns_notify_current); + event_add_read(zrouter.master, zebra_ns_notify_read, NULL, fd_monitor, + &zebra_netns_notify_current); len = read(fd_monitor, buf, sizeof(buf)); if (len < 0) { flog_err_sys(EC_ZEBRA_NS_NOTIFY_READ, @@ -361,8 +361,8 @@ static void zebra_ns_notify_read(struct thread *t) sizeof(struct zebra_netns_info)); netnsinfo->retries = ZEBRA_NS_POLLING_MAX_RETRIES; netnsinfo->netnspath = netnspath; - thread_add_timer_msec(zrouter.master, zebra_ns_ready_read, - (void *)netnsinfo, 0, NULL); + event_add_timer_msec(zrouter.master, zebra_ns_ready_read, + (void *)netnsinfo, 0, NULL); } } @@ -427,8 +427,8 @@ void zebra_ns_notify_init(void) "NS notify watch: failed to add watch (%s)", safe_strerror(errno)); } - thread_add_read(zrouter.master, zebra_ns_notify_read, NULL, fd_monitor, - &zebra_netns_notify_current); + event_add_read(zrouter.master, zebra_ns_notify_read, NULL, fd_monitor, + &zebra_netns_notify_current); } void zebra_ns_notify_close(void) @@ -442,7 +442,7 @@ void zebra_ns_notify_close(void) fd = zebra_netns_notify_current->u.fd; if (zebra_netns_notify_current->master != NULL) - THREAD_OFF(zebra_netns_notify_current); + EVENT_OFF(zebra_netns_notify_current); /* auto-removal of notify items */ if (fd > 0) diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c index 654cf50d49..8616b14050 100644 --- a/zebra/zebra_nhg.c +++ b/zebra/zebra_nhg.c @@ -1619,7 +1619,7 @@ void zebra_nhg_free(struct nhg_hash_entry *nhe) nhe->nhg.nexthop); } - THREAD_OFF(nhe->timer); + EVENT_OFF(nhe->timer); zebra_nhg_free_members(nhe); @@ -1644,7 +1644,7 @@ void zebra_nhg_hash_free(void *p) nhe->nhg.nexthop); } - THREAD_OFF(nhe->timer); + EVENT_OFF(nhe->timer); nexthops_free(nhe->nhg.nexthop); @@ -1683,9 +1683,9 @@ void zebra_nhg_hash_free_zero_id(struct hash_bucket *b, void *arg) } } -static void zebra_nhg_timer(struct thread *thread) +static void zebra_nhg_timer(struct event *thread) { - struct nhg_hash_entry *nhe = THREAD_ARG(thread); + struct nhg_hash_entry *nhe = EVENT_ARG(thread); if (IS_ZEBRA_DEBUG_NHG_DETAIL) zlog_debug("Nexthop Timer for nhe: %pNG", nhe); @@ -1707,8 +1707,8 @@ void zebra_nhg_decrement_ref(struct nhg_hash_entry *nhe) !CHECK_FLAG(nhe->flags, NEXTHOP_GROUP_KEEP_AROUND)) { nhe->refcnt = 1; SET_FLAG(nhe->flags, NEXTHOP_GROUP_KEEP_AROUND); - thread_add_timer(zrouter.master, zebra_nhg_timer, nhe, - zrouter.nhg_keep, &nhe->timer); + event_add_timer(zrouter.master, zebra_nhg_timer, nhe, + zrouter.nhg_keep, &nhe->timer); return; } @@ -1727,8 +1727,8 @@ void zebra_nhg_increment_ref(struct nhg_hash_entry *nhe) nhe->refcnt++; - if (thread_is_scheduled(nhe->timer)) { - THREAD_OFF(nhe->timer); + if (event_is_scheduled(nhe->timer)) { + EVENT_OFF(nhe->timer); nhe->refcnt--; UNSET_FLAG(nhe->flags, NEXTHOP_GROUP_KEEP_AROUND); } @@ -3507,7 +3507,7 @@ struct nhg_hash_entry *zebra_nhg_proto_add(uint32_t id, int type, /* Dont call the dec API, we dont want to uninstall the ID */ old->refcnt = 0; - THREAD_OFF(old->timer); + EVENT_OFF(old->timer); zebra_nhg_free(old); old = NULL; } diff --git a/zebra/zebra_nhg.h b/zebra/zebra_nhg.h index 5830952d5a..b178007b4e 100644 --- a/zebra/zebra_nhg.h +++ b/zebra/zebra_nhg.h @@ -89,7 +89,7 @@ struct nhg_hash_entry { */ struct nhg_connected_tree_head nhg_depends, nhg_dependents; - struct thread *timer; + struct event *timer; /* * Is this nexthop group valid, ie all nexthops are fully resolved. diff --git a/zebra/zebra_ns.h b/zebra/zebra_ns.h index 5e8764854e..e759d522fa 100644 --- a/zebra/zebra_ns.h +++ b/zebra/zebra_ns.h @@ -46,7 +46,7 @@ struct zebra_ns { */ struct nlsock netlink_dplane_out; struct nlsock netlink_dplane_in; - struct thread *t_netlink; + struct event *t_netlink; #endif struct route_table *if_table; 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 */ diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c index a8f4953d5a..a1fee840df 100644 --- a/zebra/zebra_ptm.c +++ b/zebra/zebra_ptm.c @@ -84,7 +84,7 @@ static ptm_lib_handle_t *ptm_hdl; struct zebra_ptm_cb ptm_cb; static int zebra_ptm_socket_init(void); -void zebra_ptm_sock_read(struct thread *thread); +void zebra_ptm_sock_read(struct event *thread); static void zebra_ptm_install_commands(void); static int zebra_ptm_handle_msg_cb(void *arg, void *in_ctxt); void zebra_bfd_peer_replay_req(void); @@ -141,9 +141,9 @@ void zebra_ptm_finish(void) free(ptm_cb.in_data); /* Cancel events. */ - THREAD_OFF(ptm_cb.t_read); - THREAD_OFF(ptm_cb.t_write); - THREAD_OFF(ptm_cb.t_timer); + EVENT_OFF(ptm_cb.t_read); + EVENT_OFF(ptm_cb.t_write); + EVENT_OFF(ptm_cb.t_timer); if (ptm_cb.wb) buffer_free(ptm_cb.wb); @@ -152,7 +152,7 @@ void zebra_ptm_finish(void) close(ptm_cb.ptm_sock); } -static void zebra_ptm_flush_messages(struct thread *thread) +static void zebra_ptm_flush_messages(struct event *thread) { ptm_cb.t_write = NULL; @@ -169,13 +169,13 @@ static void zebra_ptm_flush_messages(struct thread *thread) ptm_cb.ptm_sock = -1; zebra_ptm_reset_status(0); ptm_cb.t_timer = NULL; - thread_add_timer(zrouter.master, zebra_ptm_connect, NULL, - ptm_cb.reconnect_time, &ptm_cb.t_timer); + event_add_timer(zrouter.master, zebra_ptm_connect, NULL, + ptm_cb.reconnect_time, &ptm_cb.t_timer); return; case BUFFER_PENDING: ptm_cb.t_write = NULL; - thread_add_write(zrouter.master, zebra_ptm_flush_messages, NULL, - ptm_cb.ptm_sock, &ptm_cb.t_write); + event_add_write(zrouter.master, zebra_ptm_flush_messages, NULL, + ptm_cb.ptm_sock, &ptm_cb.t_write); break; case BUFFER_EMPTY: break; @@ -193,22 +193,22 @@ static int zebra_ptm_send_message(char *data, int size) ptm_cb.ptm_sock = -1; zebra_ptm_reset_status(0); ptm_cb.t_timer = NULL; - thread_add_timer(zrouter.master, zebra_ptm_connect, NULL, - ptm_cb.reconnect_time, &ptm_cb.t_timer); + event_add_timer(zrouter.master, zebra_ptm_connect, NULL, + ptm_cb.reconnect_time, &ptm_cb.t_timer); return -1; case BUFFER_EMPTY: - THREAD_OFF(ptm_cb.t_write); + EVENT_OFF(ptm_cb.t_write); break; case BUFFER_PENDING: - thread_add_write(zrouter.master, zebra_ptm_flush_messages, NULL, - ptm_cb.ptm_sock, &ptm_cb.t_write); + event_add_write(zrouter.master, zebra_ptm_flush_messages, NULL, + ptm_cb.ptm_sock, &ptm_cb.t_write); break; } return 0; } -void zebra_ptm_connect(struct thread *t) +void zebra_ptm_connect(struct event *t) { int init = 0; @@ -220,8 +220,8 @@ void zebra_ptm_connect(struct thread *t) if (ptm_cb.ptm_sock != -1) { if (init) { ptm_cb.t_read = NULL; - thread_add_read(zrouter.master, zebra_ptm_sock_read, - NULL, ptm_cb.ptm_sock, &ptm_cb.t_read); + event_add_read(zrouter.master, zebra_ptm_sock_read, + NULL, ptm_cb.ptm_sock, &ptm_cb.t_read); zebra_bfd_peer_replay_req(); } zebra_ptm_send_status_req(); @@ -232,8 +232,8 @@ void zebra_ptm_connect(struct thread *t) ptm_cb.reconnect_time = ZEBRA_PTM_RECONNECT_TIME_MAX; ptm_cb.t_timer = NULL; - thread_add_timer(zrouter.master, zebra_ptm_connect, NULL, - ptm_cb.reconnect_time, &ptm_cb.t_timer); + event_add_timer(zrouter.master, zebra_ptm_connect, NULL, + ptm_cb.reconnect_time, &ptm_cb.t_timer); } else if (ptm_cb.reconnect_time >= ZEBRA_PTM_RECONNECT_TIME_MAX) { ptm_cb.reconnect_time = ZEBRA_PTM_RECONNECT_TIME_INITIAL; } @@ -629,13 +629,13 @@ static int zebra_ptm_handle_msg_cb(void *arg, void *in_ctxt) } } -void zebra_ptm_sock_read(struct thread *thread) +void zebra_ptm_sock_read(struct event *thread) { int sock; int rc; errno = 0; - sock = THREAD_FD(thread); + sock = EVENT_FD(thread); if (sock == -1) return; @@ -656,15 +656,14 @@ void zebra_ptm_sock_read(struct thread *thread) ptm_cb.ptm_sock = -1; zebra_ptm_reset_status(0); ptm_cb.t_timer = NULL; - thread_add_timer(zrouter.master, zebra_ptm_connect, NULL, - ptm_cb.reconnect_time, - &ptm_cb.t_timer); + event_add_timer(zrouter.master, zebra_ptm_connect, NULL, + ptm_cb.reconnect_time, &ptm_cb.t_timer); return; } ptm_cb.t_read = NULL; - thread_add_read(zrouter.master, zebra_ptm_sock_read, NULL, - ptm_cb.ptm_sock, &ptm_cb.t_read); + event_add_read(zrouter.master, zebra_ptm_sock_read, NULL, + ptm_cb.ptm_sock, &ptm_cb.t_read); } /* BFD peer/dst register/update */ @@ -698,8 +697,8 @@ void zebra_ptm_bfd_dst_register(ZAPI_HANDLER_ARGS) if (ptm_cb.ptm_sock == -1) { ptm_cb.t_timer = NULL; - thread_add_timer(zrouter.master, zebra_ptm_connect, NULL, - ptm_cb.reconnect_time, &ptm_cb.t_timer); + event_add_timer(zrouter.master, zebra_ptm_connect, NULL, + ptm_cb.reconnect_time, &ptm_cb.t_timer); return; } @@ -857,8 +856,8 @@ void zebra_ptm_bfd_dst_deregister(ZAPI_HANDLER_ARGS) if (ptm_cb.ptm_sock == -1) { ptm_cb.t_timer = NULL; - thread_add_timer(zrouter.master, zebra_ptm_connect, NULL, - ptm_cb.reconnect_time, &ptm_cb.t_timer); + event_add_timer(zrouter.master, zebra_ptm_connect, NULL, + ptm_cb.reconnect_time, &ptm_cb.t_timer); return; } @@ -985,8 +984,8 @@ void zebra_ptm_bfd_client_register(ZAPI_HANDLER_ARGS) if (ptm_cb.ptm_sock == -1) { ptm_cb.t_timer = NULL; - thread_add_timer(zrouter.master, zebra_ptm_connect, NULL, - ptm_cb.reconnect_time, &ptm_cb.t_timer); + event_add_timer(zrouter.master, zebra_ptm_connect, NULL, + ptm_cb.reconnect_time, &ptm_cb.t_timer); return; } @@ -1044,8 +1043,8 @@ int zebra_ptm_bfd_client_deregister(struct zserv *client) if (ptm_cb.ptm_sock == -1) { ptm_cb.t_timer = NULL; - thread_add_timer(zrouter.master, zebra_ptm_connect, NULL, - ptm_cb.reconnect_time, &ptm_cb.t_timer); + event_add_timer(zrouter.master, zebra_ptm_connect, NULL, + ptm_cb.reconnect_time, &ptm_cb.t_timer); return 0; } diff --git a/zebra/zebra_ptm.h b/zebra/zebra_ptm.h index 9cea96555b..1b2f7a02d4 100644 --- a/zebra/zebra_ptm.h +++ b/zebra/zebra_ptm.h @@ -26,9 +26,9 @@ struct zebra_ptm_cb { struct buffer *wb; /* Buffer of data waiting to be written to ptm. */ - struct thread *t_read; /* Thread for read */ - struct thread *t_write; /* Thread for write */ - struct thread *t_timer; /* Thread for timer */ + struct event *t_read; /* Thread for read */ + struct event *t_write; /* Thread for write */ + struct event *t_timer; /* Thread for timer */ char *out_data; char *in_data; @@ -57,7 +57,7 @@ struct zebra_ptm_cb { void zebra_ptm_init(void); void zebra_ptm_finish(void); -void zebra_ptm_connect(struct thread *t); +void zebra_ptm_connect(struct event *t); void zebra_ptm_write(struct vty *vty); int zebra_ptm_get_enable_state(void); diff --git a/zebra/zebra_pw.c b/zebra/zebra_pw.c index dc56ba3c30..a02d7e8807 100644 --- a/zebra/zebra_pw.c +++ b/zebra/zebra_pw.c @@ -7,7 +7,7 @@ #include "log.h" #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "command.h" #include "vrf.h" #include "lib/json.h" @@ -33,7 +33,7 @@ DEFINE_HOOK(pw_uninstall, (struct zebra_pw * pw), (pw)); static int zebra_pw_enabled(struct zebra_pw *); static void zebra_pw_install(struct zebra_pw *); static void zebra_pw_uninstall(struct zebra_pw *); -static void zebra_pw_install_retry(struct thread *thread); +static void zebra_pw_install_retry(struct event *thread); static int zebra_pw_check_reachability(const struct zebra_pw *); static void zebra_pw_update_status(struct zebra_pw *, int); @@ -89,7 +89,7 @@ void zebra_pw_del(struct zebra_vrf *zvrf, struct zebra_pw *pw) dplane_pw_uninstall(pw); } - THREAD_OFF(pw->install_retry_timer); + EVENT_OFF(pw->install_retry_timer); /* unlink and release memory */ RB_REMOVE(zebra_pw_head, &zvrf->pseudowires, pw); @@ -207,16 +207,16 @@ void zebra_pw_install_failure(struct zebra_pw *pw, int pwstatus) pw->vrf_id, pw->ifname, PW_INSTALL_RETRY_INTERVAL); /* schedule to retry later */ - THREAD_OFF(pw->install_retry_timer); - thread_add_timer(zrouter.master, zebra_pw_install_retry, pw, - PW_INSTALL_RETRY_INTERVAL, &pw->install_retry_timer); + EVENT_OFF(pw->install_retry_timer); + event_add_timer(zrouter.master, zebra_pw_install_retry, pw, + PW_INSTALL_RETRY_INTERVAL, &pw->install_retry_timer); zebra_pw_update_status(pw, pwstatus); } -static void zebra_pw_install_retry(struct thread *thread) +static void zebra_pw_install_retry(struct event *thread) { - struct zebra_pw *pw = THREAD_ARG(thread); + struct zebra_pw *pw = EVENT_ARG(thread); zebra_pw_install(pw); } diff --git a/zebra/zebra_pw.h b/zebra/zebra_pw.h index d939cc07ea..fd94d5e5ed 100644 --- a/zebra/zebra_pw.h +++ b/zebra/zebra_pw.h @@ -38,7 +38,7 @@ struct zebra_pw { uint8_t protocol; struct zserv *client; struct rnh *rnh; - struct thread *install_retry_timer; + struct event *install_retry_timer; QOBJ_FIELDS; }; DECLARE_QOBJ_TYPE(zebra_pw); diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index 6c499b77d7..5a86b7d0a5 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -18,7 +18,7 @@ #include "sockunion.h" #include "srcdest_table.h" #include "table.h" -#include "thread.h" +#include "frrevent.h" #include "vrf.h" #include "workqueue.h" #include "nexthop_group_private.h" @@ -56,7 +56,7 @@ DEFINE_MTYPE_STATIC(ZEBRA, WQ_WRAPPER, "WQ wrapper"); * Event, list, and mutex for delivery of dataplane results */ static pthread_mutex_t dplane_mutex; -static struct thread *t_dplane; +static struct event *t_dplane; static struct dplane_ctx_list_head rib_dplane_q; DEFINE_HOOK(rib_update, (struct route_node * rn, const char *reason), @@ -4393,11 +4393,11 @@ static void rib_update_ctx_fini(struct rib_update_ctx **ctx) XFREE(MTYPE_RIB_UPDATE_CTX, *ctx); } -static void rib_update_handler(struct thread *thread) +static void rib_update_handler(struct event *thread) { struct rib_update_ctx *ctx; - ctx = THREAD_ARG(thread); + ctx = EVENT_ARG(thread); rib_update_handle_vrf_all(ctx->event, ZEBRA_ROUTE_ALL); @@ -4408,20 +4408,20 @@ static void rib_update_handler(struct thread *thread) * Thread list to ensure we don't schedule a ton of events * if interfaces are flapping for instance. */ -static struct thread *t_rib_update_threads[RIB_UPDATE_MAX]; +static struct event *t_rib_update_threads[RIB_UPDATE_MAX]; /* Schedule a RIB update event for all vrfs */ void rib_update(enum rib_update_event event) { struct rib_update_ctx *ctx; - if (thread_is_scheduled(t_rib_update_threads[event])) + if (event_is_scheduled(t_rib_update_threads[event])) return; ctx = rib_update_ctx_init(0, event); - thread_add_event(zrouter.master, rib_update_handler, ctx, 0, - &t_rib_update_threads[event]); + event_add_event(zrouter.master, rib_update_handler, ctx, 0, + &t_rib_update_threads[event]); if (IS_ZEBRA_DEBUG_EVENT) zlog_debug("%s: Scheduled VRF (ALL), event %s", __func__, @@ -4494,7 +4494,7 @@ void rib_sweep_table(struct route_table *table) } /* Sweep all RIB tables. */ -void rib_sweep_route(struct thread *t) +void rib_sweep_route(struct event *t) { struct vrf *vrf; struct zebra_vrf *zvrf; @@ -4606,7 +4606,7 @@ static void handle_pw_result(struct zebra_dplane_ctx *ctx) * Handle results from the dataplane system. Dequeue update context * structs, dispatch to appropriate internal handlers. */ -static void rib_process_dplane_results(struct thread *thread) +static void rib_process_dplane_results(struct event *thread) { struct zebra_dplane_ctx *ctx; struct dplane_ctx_list_head ctxlist; @@ -4793,8 +4793,8 @@ static int rib_dplane_results(struct dplane_ctx_list_head *ctxlist) } /* Ensure event is signalled to zebra main pthread */ - thread_add_event(zrouter.master, rib_process_dplane_results, NULL, 0, - &t_dplane); + event_add_event(zrouter.master, rib_process_dplane_results, NULL, 0, + &t_dplane); return 0; } diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c index 2666dc232f..abb10e21cc 100644 --- a/zebra/zebra_rnh.c +++ b/zebra/zebra_rnh.c @@ -13,7 +13,7 @@ #include "log.h" #include "sockunion.h" #include "linklist.h" -#include "thread.h" +#include "frrevent.h" #include "workqueue.h" #include "prefix.h" #include "routemap.h" diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c index c5bccd05a6..d9a7ee465a 100644 --- a/zebra/zebra_routemap.c +++ b/zebra/zebra_routemap.c @@ -28,7 +28,7 @@ #include "zebra/zebra_routemap_clippy.c" static uint32_t zebra_rmap_update_timer = ZEBRA_RMAP_DEFAULT_UPDATE_TIMER; -static struct thread *zebra_t_rmap_update = NULL; +static struct event *zebra_t_rmap_update = NULL; char *zebra_import_table_routemap[AFI_MAX][ZEBRA_KERNEL_TABLE_MAX]; struct nh_rmap_obj { @@ -1722,7 +1722,7 @@ static void zebra_route_map_process_update_cb(char *rmap_name) zebra_nht_rm_update(rmap_name); } -static void zebra_route_map_update_timer(struct thread *thread) +static void zebra_route_map_update_timer(struct event *thread) { if (IS_ZEBRA_DEBUG_EVENT) zlog_debug("Event driven route-map update triggered"); @@ -1747,7 +1747,7 @@ static void zebra_route_map_set_delay_timer(uint32_t value) if (!value && zebra_t_rmap_update) { /* Event driven route map updates is being disabled */ /* But there's a pending timer. Fire it off now */ - THREAD_OFF(zebra_t_rmap_update); + EVENT_OFF(zebra_t_rmap_update); zebra_route_map_update_timer(NULL); } } @@ -1757,7 +1757,7 @@ void zebra_routemap_finish(void) /* Set zebra_rmap_update_timer to 0 so that it wont schedule again */ zebra_rmap_update_timer = 0; /* Thread off if any scheduled already */ - THREAD_OFF(zebra_t_rmap_update); + EVENT_OFF(zebra_t_rmap_update); route_map_finish(); } @@ -1874,10 +1874,10 @@ static void zebra_route_map_mark_update(const char *rmap_name) { /* rmap_update_timer of 0 means don't do route updates */ if (zebra_rmap_update_timer) - THREAD_OFF(zebra_t_rmap_update); + EVENT_OFF(zebra_t_rmap_update); - thread_add_timer(zrouter.master, zebra_route_map_update_timer, - NULL, zebra_rmap_update_timer, &zebra_t_rmap_update); + event_add_timer(zrouter.master, zebra_route_map_update_timer, NULL, + zebra_rmap_update_timer, &zebra_t_rmap_update); } static void zebra_route_map_add(const char *rmap_name) diff --git a/zebra/zebra_router.c b/zebra/zebra_router.c index 787442f5c8..a477287913 100644 --- a/zebra/zebra_router.c +++ b/zebra/zebra_router.c @@ -218,7 +218,7 @@ void zebra_router_terminate(void) { struct zebra_router_table *zrt, *tmp; - THREAD_OFF(zrouter.sweeper); + EVENT_OFF(zrouter.sweeper); RB_FOREACH_SAFE (zrt, zebra_router_table_head, &zrouter.tables, tmp) zebra_router_free_table(zrt); diff --git a/zebra/zebra_router.h b/zebra/zebra_router.h index 3112fcab46..d81c7df589 100644 --- a/zebra/zebra_router.h +++ b/zebra/zebra_router.h @@ -110,7 +110,7 @@ struct zebra_mlag_info { struct frr_pthread *zebra_pth_mlag; /* MLAG Thread context 'master' */ - struct thread_master *th_master; + struct event_loop *th_master; /* * Event for Initial MLAG Connection setup & Data Read @@ -118,16 +118,16 @@ struct zebra_mlag_info { * so no issues. * */ - struct thread *t_read; + struct event *t_read; /* Event for MLAG write */ - struct thread *t_write; + struct event *t_write; }; struct zebra_router { atomic_bool in_shutdown; /* Thread master */ - struct thread_master *master; + struct event_loop *master; /* Lists of clients who have connected to us */ struct list *client_list; @@ -194,7 +194,7 @@ struct zebra_router { * Time for when we sweep the rib from old routes */ time_t startup_time; - struct thread *sweeper; + struct event *sweeper; /* * The hash of nexthop groups associated with this router diff --git a/zebra/zebra_snmp.c b/zebra/zebra_snmp.c index c8b652f54a..e06733cb8c 100644 --- a/zebra/zebra_snmp.c +++ b/zebra/zebra_snmp.c @@ -536,7 +536,7 @@ static uint8_t *ipCidrTable(struct variable *v, oid objid[], size_t *objid_len, return NULL; } -static int zebra_snmp_init(struct thread_master *tm) +static int zebra_snmp_init(struct event_loop *tm) { smux_init(tm); REGISTER_MIB("mibII/ipforward", zebra_variables, variable, ipfw_oid); diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index 6d61430029..56e7226424 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -1179,12 +1179,12 @@ static void show_nexthop_group_out(struct vty *vty, struct nhg_hash_entry *nhe, json_object_string_add(json, "type", zebra_route_string(nhe->type)); json_object_int_add(json, "refCount", nhe->refcnt); - if (thread_is_scheduled(nhe->timer)) + if (event_is_scheduled(nhe->timer)) json_object_string_add( json, "timeToDeletion", - thread_timer_to_hhmmss(time_left, - sizeof(time_left), - nhe->timer)); + event_timer_to_hhmmss(time_left, + sizeof(time_left), + nhe->timer)); json_object_string_add(json, "uptime", up_str); json_object_string_add(json, "vrf", vrf_id_to_name(nhe->vrf_id)); @@ -1193,11 +1193,11 @@ static void show_nexthop_group_out(struct vty *vty, struct nhg_hash_entry *nhe, vty_out(vty, "ID: %u (%s)\n", nhe->id, zebra_route_string(nhe->type)); vty_out(vty, " RefCnt: %u", nhe->refcnt); - if (thread_is_scheduled(nhe->timer)) + if (event_is_scheduled(nhe->timer)) vty_out(vty, " Time to Deletion: %s", - thread_timer_to_hhmmss(time_left, - sizeof(time_left), - nhe->timer)); + event_timer_to_hhmmss(time_left, + sizeof(time_left), + nhe->timer)); vty_out(vty, "\n"); vty_out(vty, " Uptime: %s\n", up_str); diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c index 153a5b8d8f..c370ad9169 100644 --- a/zebra/zebra_vxlan.c +++ b/zebra/zebra_vxlan.c @@ -3449,7 +3449,7 @@ int zebra_vxlan_clear_dup_detect_vni_mac(struct zebra_vrf *zvrf, vni_t vni, mac->detect_start_time.tv_sec = 0; mac->detect_start_time.tv_usec = 0; mac->dad_dup_detect_time = 0; - THREAD_OFF(mac->dad_mac_auto_recovery_timer); + EVENT_OFF(mac->dad_mac_auto_recovery_timer); /* warn-only action return */ if (!zvrf->dad_freeze) @@ -3531,7 +3531,7 @@ int zebra_vxlan_clear_dup_detect_vni_ip(struct zebra_vrf *zvrf, vni_t vni, nbr->detect_start_time.tv_sec = 0; nbr->detect_start_time.tv_usec = 0; nbr->dad_dup_detect_time = 0; - THREAD_OFF(nbr->dad_ip_auto_recovery_timer); + EVENT_OFF(nbr->dad_ip_auto_recovery_timer); if (!!CHECK_FLAG(nbr->flags, ZEBRA_NEIGH_LOCAL)) { zebra_evpn_neigh_send_add_to_client(zevpn->vni, ip, &nbr->emac, @@ -3566,7 +3566,7 @@ static void zevpn_clear_dup_mac_hash(struct hash_bucket *bucket, void *ctxt) mac->detect_start_time.tv_sec = 0; mac->detect_start_time.tv_usec = 0; mac->dad_dup_detect_time = 0; - THREAD_OFF(mac->dad_mac_auto_recovery_timer); + EVENT_OFF(mac->dad_mac_auto_recovery_timer); /* Remove all IPs as duplicate associcated with this MAC */ for (ALL_LIST_ELEMENTS_RO(mac->neigh_list, node, nbr)) { diff --git a/zebra/zserv.c b/zebra/zserv.c index e064c27ad1..70707866ee 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -34,7 +34,7 @@ #include "lib/sockopt.h" /* for setsockopt_so_recvbuf, setsockopt... */ #include "lib/sockunion.h" /* for sockopt_reuseaddr, sockopt_reuseport */ #include "lib/stream.h" /* for STREAM_SIZE, stream (ptr only), ... */ -#include "lib/thread.h" /* for thread (ptr only), THREAD_ARG, ... */ +#include "frrevent.h" /* for thread (ptr only), EVENT_ARG, ... */ #include "lib/vrf.h" /* for vrf_info_lookup, VRF_DEFAULT */ #include "lib/vty.h" /* for vty_out, vty (ptr only) */ #include "lib/zclient.h" /* for zmsghdr, ZEBRA_HEADER_SIZE, ZEBRA... */ @@ -100,7 +100,7 @@ enum zserv_event { /* * Zebra server event driver for all client threads. * - * This is essentially a wrapper around thread_add_event() that centralizes + * This is essentially a wrapper around event_add_event() that centralizes * those scheduling calls into one place. * * All calls to this function schedule an event on the pthread running the @@ -118,7 +118,7 @@ static void zserv_client_event(struct zserv *client, /* * Zebra server event driver for the main thread. * - * This is essentially a wrapper around thread_add_event() that centralizes + * This is essentially a wrapper around event_add_event() that centralizes * those scheduling calls into one place. * * All calls to this function schedule an event on Zebra's main pthread. @@ -188,8 +188,8 @@ static void zserv_client_fail(struct zserv *client) atomic_store_explicit(&client->pthread->running, false, memory_order_relaxed); - THREAD_OFF(client->t_read); - THREAD_OFF(client->t_write); + EVENT_OFF(client->t_read); + EVENT_OFF(client->t_write); zserv_event(client, ZSERV_HANDLE_CLIENT_FAIL); } @@ -213,9 +213,9 @@ static void zserv_client_fail(struct zserv *client) * allows us to expose information about input and output queues to the user in * terms of number of packets rather than size of data. */ -static void zserv_write(struct thread *thread) +static void zserv_write(struct event *thread) { - struct zserv *client = THREAD_ARG(thread); + struct zserv *client = EVENT_ARG(thread); struct stream *msg; uint32_t wcmd = 0; struct stream_fifo *cache; @@ -306,9 +306,9 @@ zwrite_fail: * * Any failure in any of these actions is handled by terminating the client. */ -static void zserv_read(struct thread *thread) +static void zserv_read(struct event *thread) { - struct zserv *client = THREAD_ARG(thread); + struct zserv *client = EVENT_ARG(thread); int sock; size_t already; struct stream_fifo *cache; @@ -321,7 +321,7 @@ static void zserv_read(struct thread *thread) memory_order_relaxed); cache = stream_fifo_new(); p2p = p2p_orig; - sock = THREAD_FD(thread); + sock = EVENT_FD(thread); while (p2p) { ssize_t nb; @@ -462,12 +462,12 @@ static void zserv_client_event(struct zserv *client, { switch (event) { case ZSERV_CLIENT_READ: - thread_add_read(client->pthread->master, zserv_read, client, - client->sock, &client->t_read); + event_add_read(client->pthread->master, zserv_read, client, + client->sock, &client->t_read); break; case ZSERV_CLIENT_WRITE: - thread_add_write(client->pthread->master, zserv_write, client, - client->sock, &client->t_write); + event_add_write(client->pthread->master, zserv_write, client, + client->sock, &client->t_write); break; } } @@ -491,9 +491,9 @@ static void zserv_client_event(struct zserv *client, * rely on the read thread to handle queuing this task enough times to process * everything on the input queue. */ -static void zserv_process_messages(struct thread *thread) +static void zserv_process_messages(struct event *thread) { - struct zserv *client = THREAD_ARG(thread); + struct zserv *client = EVENT_ARG(thread); struct stream *msg; struct stream_fifo *cache = stream_fifo_new(); uint32_t p2p = zrouter.packets_to_process; @@ -570,7 +570,7 @@ DEFINE_KOOH(zserv_client_close, (struct zserv *client), (client)); * - Free associated resources * - Free client structure * - * This does *not* take any action on the struct thread * fields. These are + * This does *not* take any action on the struct event * fields. These are * managed by the owning pthread and any tasks associated with them must have * been stopped prior to invoking this function. */ @@ -670,9 +670,9 @@ void zserv_close_client(struct zserv *client) zlog_debug("Closing client '%s'", zebra_route_string(client->proto)); - thread_cancel_event(zrouter.master, client); - THREAD_OFF(client->t_cleanup); - THREAD_OFF(client->t_process); + event_cancel_event(zrouter.master, client); + EVENT_OFF(client->t_cleanup); + EVENT_OFF(client->t_process); /* destroy pthread */ frr_pthread_destroy(client->pthread); @@ -709,9 +709,9 @@ void zserv_close_client(struct zserv *client) * already have been closed and the thread will most likely have died, but its * resources still need to be cleaned up. */ -static void zserv_handle_client_fail(struct thread *thread) +static void zserv_handle_client_fail(struct event *thread) { - struct zserv *client = THREAD_ARG(thread); + struct zserv *client = EVENT_ARG(thread); zserv_close_client(client); } @@ -831,9 +831,9 @@ void zserv_release_client(struct zserv *client) * main pthread. */ if (client->is_closed) - thread_add_event(zrouter.master, - zserv_handle_client_fail, - client, 0, &client->t_cleanup); + event_add_event(zrouter.master, + zserv_handle_client_fail, + client, 0, &client->t_cleanup); } } @@ -846,14 +846,14 @@ void zserv_release_client(struct zserv *client) /* * Accept socket connection. */ -static void zserv_accept(struct thread *thread) +static void zserv_accept(struct event *thread) { int accept_sock; int client_sock; struct sockaddr_in client; socklen_t len; - accept_sock = THREAD_FD(thread); + accept_sock = EVENT_FD(thread); /* Reregister myself. */ zserv_event(NULL, ZSERV_ACCEPT); @@ -953,16 +953,15 @@ void zserv_event(struct zserv *client, enum zserv_event event) { switch (event) { case ZSERV_ACCEPT: - thread_add_read(zrouter.master, zserv_accept, NULL, zsock, - NULL); + event_add_read(zrouter.master, zserv_accept, NULL, zsock, NULL); break; case ZSERV_PROCESS_MESSAGES: - thread_add_event(zrouter.master, zserv_process_messages, client, - 0, &client->t_process); + event_add_event(zrouter.master, zserv_process_messages, client, + 0, &client->t_process); break; case ZSERV_HANDLE_CLIENT_FAIL: - thread_add_event(zrouter.master, zserv_handle_client_fail, - client, 0, &client->t_cleanup); + event_add_event(zrouter.master, zserv_handle_client_fail, + client, 0, &client->t_cleanup); } } @@ -1149,7 +1148,7 @@ static void zebra_show_stale_client_detail(struct vty *vty, if (info->t_stale_removal) { vty_out(vty, "Stale delete timer: %ld sec\n", - thread_timer_remain_second( + event_timer_remain_second( info->t_stale_removal)); } } diff --git a/zebra/zserv.h b/zebra/zserv.h index 1226cd7115..aa58a3a299 100644 --- a/zebra/zserv.h +++ b/zebra/zserv.h @@ -19,7 +19,7 @@ #include "lib/vrf.h" /* for vrf_bitmap_t */ #include "lib/zclient.h" /* for redist_proto */ #include "lib/stream.h" /* for stream, stream_fifo */ -#include "lib/thread.h" /* for thread, thread_master */ +#include "frrevent.h" /* for thread, thread_master */ #include "lib/linklist.h" /* for list */ #include "lib/workqueue.h" /* for work_queue */ #include "lib/hook.h" /* for DECLARE_HOOK, DECLARE_KOOH */ @@ -70,7 +70,7 @@ struct client_gr_info { /* Book keeping */ struct prefix *current_prefix; void *stale_client_ptr; - struct thread *t_stale_removal; + struct event *t_stale_removal; TAILQ_ENTRY(client_gr_info) gr_info; }; @@ -105,14 +105,14 @@ struct zserv { struct buffer *wb; /* Threads for read/write. */ - struct thread *t_read; - struct thread *t_write; + struct event *t_read; + struct event *t_write; /* Event for message processing, for the main pthread */ - struct thread *t_process; + struct event *t_process; /* Event for the main pthread */ - struct thread *t_cleanup; + struct event *t_cleanup; /* This client's redistribute flag. */ struct redist_proto mi_redist[AFI_MAX][ZEBRA_ROUTE_MAX]; @@ -378,7 +378,7 @@ void zserv_log_message(const char *errmsg, struct stream *msg, struct zmsghdr *hdr); /* TODO */ -__attribute__((__noreturn__)) void zebra_finalize(struct thread *event); +__attribute__((__noreturn__)) void zebra_finalize(struct event *event); /* * Graceful restart functions.