proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 12:25:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: Convert thread_cancel to THREAD_OFF

Browse Source 
Just convert all uses of thread_cancel to THREAD_OFF

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2022-06-03 12:47:04 -04:00
parent b8551584ee
commit 146bcb9b92
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zebra/irdp_main.c
View File

@ -260,7 +260,7 @@ void irdp_advert_off(struct interface *ifp)
if (!irdp) if (!irdp)
return; return;
thread_cancel(&irdp->t_advertise); THREAD_OFF(irdp->t_advertise);
if (ifp->connected) if (ifp->connected)
for (ALL_LIST_ELEMENTS(ifp->connected, node, nnode, ifc)) { for (ALL_LIST_ELEMENTS(ifp->connected, node, nnode, ifc)) {
@ -295,7 +295,7 @@ void process_solicit(struct interface *ifp)
return; return;
irdp->flags |= IF_SOLICIT; irdp->flags |= IF_SOLICIT;
thread_cancel(&irdp->t_advertise); THREAD_OFF(irdp->t_advertise);
timer = (frr_weak_random() % MAX_RESPONSE_DELAY) + 1; timer = (frr_weak_random() % MAX_RESPONSE_DELAY) + 1;

2
zebra/kernel_netlink.c
View File

@ -1902,7 +1902,7 @@ static void kernel_nlsock_fini(struct nlsock *nls)
void kernel_terminate(struct zebra_ns *zns, bool complete) void kernel_terminate(struct zebra_ns *zns, bool complete)
{ {
thread_cancel(&zns->t_netlink); THREAD_OFF(zns->t_netlink);
kernel_nlsock_fini(&zns->netlink); kernel_nlsock_fini(&zns->netlink);

4
zebra/zebra_dplane.c
View File

@ -6043,8 +6043,8 @@ static void dplane_check_shutdown_status(struct thread *event)
zns_info_list_del(&zdplane_info.dg_zns_list, zi); zns_info_list_del(&zdplane_info.dg_zns_list, zi);
if (zdplane_info.dg_master) { if (zdplane_info.dg_master) {
thread_cancel(&zi->t_read); THREAD_OFF(zi->t_read);
thread_cancel(&zi->t_request); THREAD_OFF(zi->t_request);
} }
XFREE(MTYPE_DP_NS, zi); XFREE(MTYPE_DP_NS, zi);

10
zebra/zebra_fpm.c
View File

@ -496,7 +496,7 @@ static inline void zfpm_write_on(void)
*/ */
static inline void zfpm_read_off(void) static inline void zfpm_read_off(void)
{ {
thread_cancel(&zfpm_g->t_read); THREAD_OFF(zfpm_g->t_read);
} }
/* /*
@ -504,12 +504,12 @@ static inline void zfpm_read_off(void)
*/ */
static inline void zfpm_write_off(void) static inline void zfpm_write_off(void)
{ {
thread_cancel(&zfpm_g->t_write); THREAD_OFF(zfpm_g->t_write);
} }
static inline void zfpm_connect_off(void) static inline void zfpm_connect_off(void)
{ {
thread_cancel(&zfpm_g->t_connect); THREAD_OFF(zfpm_g->t_connect);
} }
/* /*
@ -583,7 +583,7 @@ static void zfpm_connection_up(const char *detail)
/* /*
* Start thread to push existing routes to the FPM. * Start thread to push existing routes to the FPM.
*/ */
thread_cancel(&zfpm_g->t_conn_up); THREAD_OFF(zfpm_g->t_conn_up);
zfpm_rnodes_iter_init(&zfpm_g->t_conn_up_state.iter); zfpm_rnodes_iter_init(&zfpm_g->t_conn_up_state.iter);
zfpm_g->fpm_mac_dump_done = false; zfpm_g->fpm_mac_dump_done = false;
@ -1687,7 +1687,7 @@ static void zfpm_stop_stats_timer(void)
return; return;
zfpm_debug("Stopping existing stats timer"); zfpm_debug("Stopping existing stats timer");
thread_cancel(&zfpm_g->t_stats); THREAD_OFF(zfpm_g->t_stats);
} }
/* /*

2
zebra/zebra_netns_notify.c
View File

@ -413,7 +413,7 @@ void zebra_ns_notify_close(void)
fd = zebra_netns_notify_current->u.fd; fd = zebra_netns_notify_current->u.fd;
if (zebra_netns_notify_current->master != NULL) if (zebra_netns_notify_current->master != NULL)
thread_cancel(&zebra_netns_notify_current); THREAD_OFF(zebra_netns_notify_current);
/* auto-removal of notify items */ /* auto-removal of notify items */
if (fd > 0) if (fd > 0)

8
zebra/zebra_ptm.c
View File

@ -157,9 +157,9 @@ void zebra_ptm_finish(void)
free(ptm_cb.in_data); free(ptm_cb.in_data);
/* Cancel events. */ /* Cancel events. */
thread_cancel(&ptm_cb.t_read); THREAD_OFF(ptm_cb.t_read);
thread_cancel(&ptm_cb.t_write); THREAD_OFF(ptm_cb.t_write);
thread_cancel(&ptm_cb.t_timer); THREAD_OFF(ptm_cb.t_timer);
if (ptm_cb.wb) if (ptm_cb.wb)
buffer_free(ptm_cb.wb); buffer_free(ptm_cb.wb);
@ -213,7 +213,7 @@ static int zebra_ptm_send_message(char *data, int size)
ptm_cb.reconnect_time, &ptm_cb.t_timer); ptm_cb.reconnect_time, &ptm_cb.t_timer);
return -1; return -1;
case BUFFER_EMPTY: case BUFFER_EMPTY:
thread_cancel(&ptm_cb.t_write); THREAD_OFF(ptm_cb.t_write);
break; break;
case BUFFER_PENDING: case BUFFER_PENDING:
thread_add_write(zrouter.master, zebra_ptm_flush_messages, NULL, thread_add_write(zrouter.master, zebra_ptm_flush_messages, NULL,

4
zebra/zebra_pw.c
View File

@ -102,7 +102,7 @@ void zebra_pw_del(struct zebra_vrf *zvrf, struct zebra_pw *pw)
hook_call(pw_uninstall, pw); hook_call(pw_uninstall, pw);
dplane_pw_uninstall(pw); dplane_pw_uninstall(pw);
} else if (pw->install_retry_timer) } else if (pw->install_retry_timer)
thread_cancel(&pw->install_retry_timer); THREAD_OFF(pw->install_retry_timer);
/* unlink and release memory */ /* unlink and release memory */
RB_REMOVE(zebra_pw_head, &zvrf->pseudowires, pw); RB_REMOVE(zebra_pw_head, &zvrf->pseudowires, pw);
@ -219,7 +219,7 @@ void zebra_pw_install_failure(struct zebra_pw *pw, int pwstatus)
pw->vrf_id, pw->ifname, PW_INSTALL_RETRY_INTERVAL); pw->vrf_id, pw->ifname, PW_INSTALL_RETRY_INTERVAL);
/* schedule to retry later */ /* schedule to retry later */
thread_cancel(&pw->install_retry_timer); THREAD_OFF(pw->install_retry_timer);
thread_add_timer(zrouter.master, zebra_pw_install_retry, pw, thread_add_timer(zrouter.master, zebra_pw_install_retry, pw,
PW_INSTALL_RETRY_INTERVAL, &pw->install_retry_timer); PW_INSTALL_RETRY_INTERVAL, &pw->install_retry_timer);