Skip to content

Commit 41695c7

Browse files
donaldsharpdonaldsharp
authored
Merge pull request #18739 from mjstapp/remove_cancel_macro
*: Remove deprecated EVENT_OFF macro
2 parents d0b2ca2 + 870487f commit 41695c7

File tree

162 files changed

+821
-830
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+821
-830
lines changed

‎bfdd/bfd.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2434,13 +2434,13 @@ static int bfd_vrf_disable(struct vrf *vrf)
24342434
zlog_debug("VRF disable %s id %d", vrf->name, vrf->vrf_id);
24352435

24362436
/* Disable read/write poll triggering. */
2437-
EVENT_OFF(bvrf->bg_ev[0]);
2438-
EVENT_OFF(bvrf->bg_ev[1]);
2439-
EVENT_OFF(bvrf->bg_ev[2]);
2440-
EVENT_OFF(bvrf->bg_ev[3]);
2441-
EVENT_OFF(bvrf->bg_ev[4]);
2442-
EVENT_OFF(bvrf->bg_ev[5]);
2443-
EVENT_OFF(bvrf->bg_ev[6]);
2437+
event_cancel(&bvrf->bg_ev[0]);
2438+
event_cancel(&bvrf->bg_ev[1]);
2439+
event_cancel(&bvrf->bg_ev[2]);
2440+
event_cancel(&bvrf->bg_ev[3]);
2441+
event_cancel(&bvrf->bg_ev[4]);
2442+
event_cancel(&bvrf->bg_ev[5]);
2443+
event_cancel(&bvrf->bg_ev[6]);
24442444

24452445
/* Close all descriptors. */
24462446
socket_close(&bvrf->bg_echo);

‎bfdd/bfd_packet.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -738,31 +738,31 @@ ssize_t bfd_recv_ipv6(int sd, uint8_t *msgbuf, size_t msgbuflen, uint8_t *ttl,
738738
static void bfd_sd_reschedule(struct bfd_vrf_global *bvrf, int sd)
739739
{
740740
if (sd == bvrf->bg_shop) {
741-
EVENT_OFF(bvrf->bg_ev[0]);
741+
event_cancel(&bvrf->bg_ev[0]);
742742
event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop,
743743
&bvrf->bg_ev[0]);
744744
} else if (sd == bvrf->bg_mhop) {
745-
EVENT_OFF(bvrf->bg_ev[1]);
745+
event_cancel(&bvrf->bg_ev[1]);
746746
event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop,
747747
&bvrf->bg_ev[1]);
748748
} else if (sd == bvrf->bg_shop6) {
749-
EVENT_OFF(bvrf->bg_ev[2]);
749+
event_cancel(&bvrf->bg_ev[2]);
750750
event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop6,
751751
&bvrf->bg_ev[2]);
752752
} else if (sd == bvrf->bg_mhop6) {
753-
EVENT_OFF(bvrf->bg_ev[3]);
753+
event_cancel(&bvrf->bg_ev[3]);
754754
event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop6,
755755
&bvrf->bg_ev[3]);
756756
} else if (sd == bvrf->bg_echo) {
757-
EVENT_OFF(bvrf->bg_ev[4]);
757+
event_cancel(&bvrf->bg_ev[4]);
758758
event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echo,
759759
&bvrf->bg_ev[4]);
760760
} else if (sd == bvrf->bg_echov6) {
761-
EVENT_OFF(bvrf->bg_ev[5]);
761+
event_cancel(&bvrf->bg_ev[5]);
762762
event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echov6,
763763
&bvrf->bg_ev[5]);
764764
} else if (sd == bvrf->bg_initv6) {
765-
EVENT_OFF(bvrf->bg_ev[6]);
765+
event_cancel(&bvrf->bg_ev[6]);
766766
event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_initv6, &bvrf->bg_ev[6]);
767767
}
768768
}

‎bfdd/dplane.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ static ssize_t bfd_dplane_flush(struct bfd_dplane_ctx *bdc)
307307
stream_pulldown(bdc->outbuf);
308308

309309
/* Disable write ready events. */
310-
EVENT_OFF(bdc->outbufev);
310+
event_cancel(&bdc->outbufev);
311311

312312
return total;
313313
}
@@ -677,16 +677,16 @@ static void bfd_dplane_ctx_free(struct bfd_dplane_ctx *bdc)
677677
/* Client mode has special treatment. */
678678
if (bdc->client) {
679679
/* Disable connection event if any. */
680-
EVENT_OFF(bdc->connectev);
680+
event_cancel(&bdc->connectev);
681681

682682
/* Normal treatment on shutdown. */
683683
if (bglobal.bg_shutdown)
684684
goto free_resources;
685685

686686
/* Attempt reconnection. */
687687
socket_close(&bdc->sock);
688-
EVENT_OFF(bdc->inbufev);
689-
EVENT_OFF(bdc->outbufev);
688+
event_cancel(&bdc->inbufev);
689+
event_cancel(&bdc->outbufev);
690690
event_add_timer(master, bfd_dplane_client_connect, bdc, 3,
691691
&bdc->connectev);
692692
return;
@@ -704,8 +704,8 @@ static void bfd_dplane_ctx_free(struct bfd_dplane_ctx *bdc)
704704
socket_close(&bdc->sock);
705705
stream_free(bdc->inbuf);
706706
stream_free(bdc->outbuf);
707-
EVENT_OFF(bdc->inbufev);
708-
EVENT_OFF(bdc->outbufev);
707+
event_cancel(&bdc->inbufev);
708+
event_cancel(&bdc->outbufev);
709709
XFREE(MTYPE_BFDD_DPLANE_CTX, bdc);
710710
}
711711

@@ -957,8 +957,8 @@ static void bfd_dplane_client_connect(struct event *t)
957957
return;
958958

959959
reschedule_connect:
960-
EVENT_OFF(bdc->inbufev);
961-
EVENT_OFF(bdc->outbufev);
960+
event_cancel(&bdc->inbufev);
961+
event_cancel(&bdc->outbufev);
962962
socket_close(&sock);
963963
event_add_timer(master, bfd_dplane_client_connect, bdc, 3,
964964
&bdc->connectev);
@@ -1005,7 +1005,7 @@ static int bfd_dplane_finish_late(void)
10051005
bfd_dplane_ctx_free(bdc);
10061006

10071007
/* Cancel accept thread and close socket. */
1008-
EVENT_OFF(bglobal.bg_dplane_sockev);
1008+
event_cancel(&bglobal.bg_dplane_sockev);
10091009
close(bglobal.bg_dplane_sock);
10101010

10111011
return 0;

‎bfdd/event.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,40 +166,40 @@ void bfd_echo_xmttimer_update(struct bfd_session *bs, uint64_t jitter)
166166

167167
void bfd_recvtimer_delete(struct bfd_session *bs)
168168
{
169-
EVENT_OFF(bs->recvtimer_ev);
169+
event_cancel(&bs->recvtimer_ev);
170170
}
171171

172172
void bfd_echo_recvtimer_delete(struct bfd_session *bs)
173173
{
174-
EVENT_OFF(bs->echo_recvtimer_ev);
174+
event_cancel(&bs->echo_recvtimer_ev);
175175
}
176176

177177
void bfd_xmttimer_delete(struct bfd_session *bs)
178178
{
179-
EVENT_OFF(bs->xmttimer_ev);
179+
event_cancel(&bs->xmttimer_ev);
180180
}
181181

182182
void bfd_echo_xmttimer_delete(struct bfd_session *bs)
183183
{
184-
EVENT_OFF(bs->echo_xmttimer_ev);
184+
event_cancel(&bs->echo_xmttimer_ev);
185185
}
186186

187187
void sbfd_init_recvtimer_delete(struct bfd_session *bs)
188188
{
189-
EVENT_OFF(bs->recvtimer_ev);
189+
event_cancel(&bs->recvtimer_ev);
190190
}
191191

192192
void sbfd_echo_recvtimer_delete(struct bfd_session *bs)
193193
{
194-
EVENT_OFF(bs->echo_recvtimer_ev);
194+
event_cancel(&bs->echo_recvtimer_ev);
195195
}
196196

197197
void sbfd_init_xmttimer_delete(struct bfd_session *bs)
198198
{
199-
EVENT_OFF(bs->xmttimer_ev);
199+
event_cancel(&bs->xmttimer_ev);
200200
}
201201

202202
void sbfd_echo_xmttimer_delete(struct bfd_session *bs)
203203
{
204-
EVENT_OFF(bs->echo_xmttimer_ev);
204+
event_cancel(&bs->echo_xmttimer_ev);
205205
}

‎bgpd/bgp_bmp.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2138,7 +2138,7 @@ static void bmp_close(struct bmp *bmp)
21382138
struct bmp_queue_entry *bqe;
21392139
struct bmp_mirrorq *bmq;
21402140

2141-
EVENT_OFF(bmp->t_read);
2141+
event_cancel(&bmp->t_read);
21422142

21432143
if (bmp->active)
21442144
bmp_active_disconnected(bmp->active);
@@ -2153,7 +2153,7 @@ static void bmp_close(struct bmp *bmp)
21532153
if (!bqe->refcount)
21542154
XFREE(MTYPE_BMP_QUEUE, bqe);
21552155

2156-
EVENT_OFF(bmp->t_read);
2156+
event_cancel(&bmp->t_read);
21572157
pullwr_del(bmp->pullwr);
21582158
close(bmp->socket);
21592159
}
@@ -2373,7 +2373,7 @@ static void bmp_targets_put(struct bmp_targets *bt)
23732373
struct bmp_active *ba;
23742374
struct bmp_imported_bgp *bib;
23752375

2376-
EVENT_OFF(bt->t_stats);
2376+
event_cancel(&bt->t_stats);
23772377

23782378
frr_each_safe (bmp_actives, &bt->actives, ba)
23792379
bmp_active_put(ba);
@@ -2529,7 +2529,7 @@ static void bmp_listener_start(struct bmp_listener *bl)
25292529

25302530
static void bmp_listener_stop(struct bmp_listener *bl)
25312531
{
2532-
EVENT_OFF(bl->t_accept);
2532+
event_cancel(&bl->t_accept);
25332533

25342534
if (bl->sock != -1)
25352535
close(bl->sock);
@@ -2568,9 +2568,9 @@ static struct bmp_active *bmp_active_get(struct bmp_targets *bt,
25682568

25692569
static void bmp_active_put(struct bmp_active *ba)
25702570
{
2571-
EVENT_OFF(ba->t_timer);
2572-
EVENT_OFF(ba->t_read);
2573-
EVENT_OFF(ba->t_write);
2571+
event_cancel(&ba->t_timer);
2572+
event_cancel(&ba->t_read);
2573+
event_cancel(&ba->t_write);
25742574

25752575
bmp_actives_del(&ba->targets->actives, ba);
25762576

@@ -2711,9 +2711,9 @@ static void bmp_active_thread(struct event *t)
27112711

27122712
/* all 3 end up here, though only timer or read+write are active
27132713
* at a time */
2714-
EVENT_OFF(ba->t_timer);
2715-
EVENT_OFF(ba->t_read);
2716-
EVENT_OFF(ba->t_write);
2714+
event_cancel(&ba->t_timer);
2715+
event_cancel(&ba->t_read);
2716+
event_cancel(&ba->t_write);
27172717

27182718
ba->last_err = NULL;
27192719

@@ -2767,9 +2767,9 @@ static void bmp_active_disconnected(struct bmp_active *ba)
27672767

27682768
static void bmp_active_setup(struct bmp_active *ba)
27692769
{
2770-
EVENT_OFF(ba->t_timer);
2771-
EVENT_OFF(ba->t_read);
2772-
EVENT_OFF(ba->t_write);
2770+
event_cancel(&ba->t_timer);
2771+
event_cancel(&ba->t_read);
2772+
event_cancel(&ba->t_write);
27732773

27742774
if (ba->bmp)
27752775
return;
@@ -3050,7 +3050,7 @@ DEFPY(bmp_stats_cfg,
30503050
{
30513051
VTY_DECLVAR_CONTEXT_SUB(bmp_targets, bt);
30523052

3053-
EVENT_OFF(bt->t_stats);
3053+
event_cancel(&bt->t_stats);
30543054
if (no)
30553055
bt->stat_msec = 0;
30563056
else if (interval_str)

‎bgpd/bgp_conditional_adv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ void bgp_conditional_adv_disable(struct peer *peer, afi_t afi, safi_t safi)
354354
}
355355

356356
/* Last filter removed. So cancel conditional routes polling thread. */
357-
EVENT_OFF(bgp->t_condition_check);
357+
event_cancel(&bgp->t_condition_check);
358358
}
359359

360360
static void peer_advertise_map_filter_update(struct peer *peer, afi_t afi,

‎bgpd/bgp_damp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ void bgp_damp_info_clean(struct bgp *bgp, struct bgp_damp_config *bdc,
519519
XFREE(MTYPE_BGP_DAMP_ARRAY, bdc->reuse_list);
520520
bdc->reuse_list_size = 0;
521521

522-
EVENT_OFF(bdc->t_reuse);
522+
event_cancel(&bdc->t_reuse);
523523
}
524524

525525
/* Disable route flap dampening for a bgp instance.
@@ -540,7 +540,7 @@ int bgp_damp_disable(struct bgp *bgp, afi_t afi, safi_t safi)
540540
return 0;
541541

542542
/* Cancel reuse event. */
543-
EVENT_OFF(bdc->t_reuse);
543+
event_cancel(&bdc->t_reuse);
544544

545545
/* Clean BGP dampening information. */
546546
bgp_damp_info_clean(bgp, bdc, afi, safi);

‎bgpd/bgp_dump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ static int bgp_dump_unset(struct bgp_dump *bgp_dump)
698698
}
699699

700700
/* Removing interval event. */
701-
EVENT_OFF(bgp_dump->t_interval);
701+
event_cancel(&bgp_dump->t_interval);
702702

703703
bgp_dump->interval = 0;
704704

‎bgpd/bgp_evpn_mh.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5014,7 +5014,7 @@ void bgp_evpn_mh_finish(void)
50145014
bgp_evpn_es_local_info_clear(es, true);
50155015
}
50165016
if (bgp_mh_info->t_cons_check)
5017-
EVENT_OFF(bgp_mh_info->t_cons_check);
5017+
event_cancel(&bgp_mh_info->t_cons_check);
50185018
list_delete(&bgp_mh_info->local_es_list);
50195019
list_delete(&bgp_mh_info->pend_es_list);
50205020
list_delete(&bgp_mh_info->ead_es_export_rtl);

0 commit comments

Comments
 (0)