diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2023-03-07 14:22:48 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2023-03-24 08:32:17 -0400 |
| commit | 24a58196ddcff2215d382d8a677c2dcdc898e03c (patch) | |
| tree | 96e008127cbe222d07aefc8b31d2176f64a1e21a | |
| parent | cd9d0537411d0a74cd19ae36f6d3716c8ccbb4c1 (diff) | |
*: Convert event.h to frrevent.h
We should probably prevent any type of namespace collision
with something else.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
229 files changed, 232 insertions, 232 deletions
diff --git a/babeld/babel_main.c b/babeld/babel_main.c index 574a35887a..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 "event.h" +#include "frrevent.h" #include "privs.h" #include "sigevent.h" #include "lib/version.h" diff --git a/babeld/kernel.c b/babeld/kernel.c index bbbb9676eb..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 "event.h" +#include "frrevent.h" #include "nexthop.h" #include "util.h" diff --git a/bfdd/dplane.c b/bfdd/dplane.c index 92e9466a1f..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/event.h" +#include "lib/frrevent.h" #include "bfd.h" #include "bfddp_packet.h" diff --git a/bgpd/bgp_advertise.c b/bgpd/bgp_advertise.c index 429abc1790..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 "event.h" +#include "frrevent.h" #include "queue.h" #include "filter.h" diff --git a/bgpd/bgp_bfd.c b/bgpd/bgp_bfd.c index 8923c19337..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 "event.h" +#include "frrevent.h" #include "buffer.h" #include "stream.h" #include "vrf.h" diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c index 0dfb3a1068..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 "event.h" +#include "frrevent.h" #include "linklist.h" #include "queue.h" #include "pullwr.h" diff --git a/bgpd/bgp_damp.c b/bgpd/bgp_damp.c index 419587ae18..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 "event.h" +#include "frrevent.h" #include "queue.h" #include "filter.h" diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c index d59e1925eb..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 "event.h" +#include "frrevent.h" #include "linklist.h" #include "queue.h" #include "memory.h" diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c index 9118be3a7f..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 "event.h" +#include "frrevent.h" #include "log.h" #include "stream.h" #include "ringbuf.h" diff --git a/bgpd/bgp_io.c b/bgpd/bgp_io.c index 56f01ab231..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 "event.h" // for EVENT_OFF, EVENT_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 diff --git a/bgpd/bgp_label.c b/bgpd/bgp_label.c index c13e0b0daf..0f3faeb297 100644 --- a/bgpd/bgp_label.c +++ b/bgpd/bgp_label.c @@ -6,7 +6,7 @@ #include <zebra.h> #include "command.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "zclient.h" #include "stream.h" diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index 63dab9070a..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 "event.h" +#include "frrevent.h" #include <lib/version.h> #include "memory.h" #include "prefix.h" diff --git a/bgpd/bgp_mplsvpn_snmp.c b/bgpd/bgp_mplsvpn_snmp.c index 52320031c7..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 "event.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 f5fe9e0fdb..78da7a42b5 100644 --- a/bgpd/bgp_network.c +++ b/bgpd/bgp_network.c @@ -5,7 +5,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "sockunion.h" #include "sockopt.h" #include "memory.h" diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c index 2ccc5e2c33..c4b832ee59 100644 --- a/bgpd/bgp_nexthop.c +++ b/bgpd/bgp_nexthop.c @@ -6,7 +6,7 @@ #include <zebra.h> #include "command.h" -#include "event.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 436e944121..a294ebcc63 100644 --- a/bgpd/bgp_nht.c +++ b/bgpd/bgp_nht.c @@ -6,7 +6,7 @@ #include <zebra.h> #include "command.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "zclient.h" #include "stream.h" diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c index 457f7be7eb..e028fa3dc8 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 "event.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 6d3ca8abaf..1c76828a2f 100644 --- a/bgpd/bgp_packet.c +++ b/bgpd/bgp_packet.c @@ -8,7 +8,7 @@ #include <zebra.h> #include <sys/time.h> -#include "event.h" +#include "frrevent.h" #include "stream.h" #include "network.h" #include "prefix.h" diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 7296f63f7d..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 "event.h" +#include "frrevent.h" #include "workqueue.h" #include "queue.h" #include "memory.h" diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c index 8e09446644..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 "event.h" +#include "frrevent.h" #include "filter.h" #include "bgpd/bgpd.h" #include "bgpd/bgp_table.h" diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c index f2b420724c..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 "event.h" +#include "frrevent.h" #include "smux.h" #include "filter.h" #include "hook.h" diff --git a/bgpd/bgp_snmp_bgp4.c b/bgpd/bgp_snmp_bgp4.c index 1c586ad56f..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 "event.h" +#include "frrevent.h" #include "smux.h" #include "filter.h" #include "hook.h" diff --git a/bgpd/bgp_snmp_bgp4v2.c b/bgpd/bgp_snmp_bgp4v2.c index e2952ab3c8..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 "event.h" +#include "frrevent.h" #include "smux.h" #include "filter.h" #include "hook.h" diff --git a/bgpd/bgp_updgrp.c b/bgpd/bgp_updgrp.c index 69eda0dd9b..72dca9f702 100644 --- a/bgpd/bgp_updgrp.c +++ b/bgpd/bgp_updgrp.c @@ -12,7 +12,7 @@ #include <zebra.h> #include "prefix.h" -#include "event.h" +#include "frrevent.h" #include "buffer.h" #include "stream.h" #include "command.h" diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c index e2fc9f68ba..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 "event.h" +#include "frrevent.h" #include "queue.h" #include "routemap.h" #include "filter.h" diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c index 279a7cce60..e04d5ae245 100644 --- a/bgpd/bgp_updgrp_packet.c +++ b/bgpd/bgp_updgrp_packet.c @@ -12,7 +12,7 @@ #include <zebra.h> #include "prefix.h" -#include "event.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 342d01866e..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 "event.h" +#include "frrevent.h" #include "log.h" #include "memory.h" #include "lib_vty.h" diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index f3b1b948c4..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 "event.h" +#include "frrevent.h" #include "queue.h" #include "memory.h" #include "lib/json.h" diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index ae46efef2c..cbed52068f 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -6,7 +6,7 @@ #include <zebra.h> #include "prefix.h" -#include "event.h" +#include "frrevent.h" #include "buffer.h" #include "stream.h" #include "ringbuf.h" diff --git a/bgpd/rfapi/rfapi_import.c b/bgpd/rfapi/rfapi_import.c index 73d7930b49..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 "event.h" +#include "frrevent.h" #include "lib/stream.h" #include "lib/lib_errors.h" diff --git a/bgpd/rfapi/rfapi_import.h b/bgpd/rfapi/rfapi_import.h index 7e021e8f7a..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 "event.h" +#include "frrevent.h" /* * These are per-rt-import-list diff --git a/bgpd/rfapi/vnc_export_table.h b/bgpd/rfapi/vnc_export_table.h index 957e0432ef..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 "event.h" +#include "frrevent.h" #include "lib/vty.h" #include "bgpd/bgpd.h" diff --git a/doc/developer/modules.rst b/doc/developer/modules.rst index 647b96aa0e..0feac8e738 100644 --- a/doc/developer/modules.rst +++ b/doc/developer/modules.rst @@ -56,7 +56,7 @@ Basic boilerplate: #include "hook.h" #include "module.h" #include "libfrr.h" - #include "event.h" + #include "frrevent.h" static int module_late_init(struct event_loop *master) { diff --git a/eigrpd/eigrp_dump.c b/eigrpd/eigrp_dump.c index 8afc34369a..2ebabd0efa 100644 --- a/eigrpd/eigrp_dump.c +++ b/eigrpd/eigrp_dump.c @@ -13,7 +13,7 @@ #include <zebra.h> #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "command.h" #include "stream.h" diff --git a/eigrpd/eigrp_filter.c b/eigrpd/eigrp_filter.c index b56380f0e8..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 "event.h" +#include "frrevent.h" #include "memory.h" #include "log.h" #include "stream.h" diff --git a/eigrpd/eigrp_fsm.c b/eigrpd/eigrp_fsm.c index cdfc99fce0..6d8061e572 100644 --- a/eigrpd/eigrp_fsm.c +++ b/eigrpd/eigrp_fsm.c @@ -54,7 +54,7 @@ #include <zebra.h> -#include "event.h" +#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 d8cc4a45ed..662c750e96 100644 --- a/eigrpd/eigrp_hello.c +++ b/eigrpd/eigrp_hello.c @@ -16,7 +16,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_interface.c b/eigrpd/eigrp_interface.c index e983f46cc8..2381977dba 100644 --- a/eigrpd/eigrp_interface.c +++ b/eigrpd/eigrp_interface.c @@ -16,7 +16,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "prefix.h" #include "if.h" diff --git a/eigrpd/eigrp_main.c b/eigrpd/eigrp_main.c index 0ccc9810a7..6d7443b791 100644 --- a/eigrpd/eigrp_main.c +++ b/eigrpd/eigrp_main.c @@ -17,7 +17,7 @@ #include <lib/version.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "linklist.h" #include "if.h" diff --git a/eigrpd/eigrp_neighbor.c b/eigrpd/eigrp_neighbor.c index 667fb02ce1..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 "event.h" +#include "frrevent.h" #include "stream.h" #include "table.h" #include "log.h" diff --git a/eigrpd/eigrp_network.c b/eigrpd/eigrp_network.c index 4e5580480b..ef567fe4ef 100644 --- a/eigrpd/eigrp_network.c +++ b/eigrpd/eigrp_network.c @@ -12,7 +12,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "prefix.h" #include "if.h" diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c index 8c3e75228c..963d229bc1 100644 --- a/eigrpd/eigrp_packet.c +++ b/eigrpd/eigrp_packet.c @@ -12,7 +12,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "vty.h" diff --git a/eigrpd/eigrp_query.c b/eigrpd/eigrp_query.c index 7e21eb79a0..0e206cded6 100644 --- a/eigrpd/eigrp_query.c +++ b/eigrpd/eigrp_query.c @@ -12,7 +12,7 @@ #include <zebra.h> -#include "event.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 07d1fd75d6..aae89e832b 100644 --- a/eigrpd/eigrp_reply.c +++ b/eigrpd/eigrp_reply.c @@ -16,7 +16,7 @@ #include <zebra.h> -#include "event.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 f4ddf1da32..71486a1f6f 100644 --- a/eigrpd/eigrp_siaquery.c +++ b/eigrpd/eigrp_siaquery.c @@ -12,7 +12,7 @@ #include <zebra.h> -#include "event.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 aaea1df778..6c8c1ef58d 100644 --- a/eigrpd/eigrp_siareply.c +++ b/eigrpd/eigrp_siareply.c @@ -11,7 +11,7 @@ */ #include <zebra.h> -#include "event.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 efa72e3a09..492ef3e713 100644 --- a/eigrpd/eigrp_snmp.c +++ b/eigrpd/eigrp_snmp.c @@ -16,7 +16,7 @@ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_update.c b/eigrpd/eigrp_update.c index fb39c6efdf..2237a611e8 100644 --- a/eigrpd/eigrp_update.c +++ b/eigrpd/eigrp_update.c @@ -16,7 +16,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_vty.c b/eigrpd/eigrp_vty.c index c4dba8bc31..88510e75af 100644 --- a/eigrpd/eigrp_vty.c +++ b/eigrpd/eigrp_vty.c @@ -17,7 +17,7 @@ #include <zebra.h> #include "memory.h" -#include "event.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 70365adad4..94c2bcab71 100644 --- a/eigrpd/eigrp_zebra.c +++ b/eigrpd/eigrp_zebra.c @@ -12,7 +12,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "command.h" #include "network.h" #include "prefix.h" diff --git a/eigrpd/eigrpd.c b/eigrpd/eigrpd.c index 58241b5f17..c7dd96bfff 100644 --- a/eigrpd/eigrpd.c +++ b/eigrpd/eigrpd.c @@ -12,7 +12,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "linklist.h" diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c index c7c9582929..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 "event.h" +#include "frrevent.h" #include "if.h" #include "stream.h" #include "bfd.h" diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index 8d62390743..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 "event.h" +#include "frrevent.h" #include "vty.h" #include "hash.h" #include "prefix.h" diff --git a/isisd/isis_csm.c b/isisd/isis_csm.c index 2b460e10cf..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 "event.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 3bc1882736..3b92160809 100644 --- a/isisd/isis_dr.c +++ b/isisd/isis_dr.c @@ -13,7 +13,7 @@ #include "log.h" #include "hash.h" -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "stream.h" diff --git a/isisd/isis_dynhn.c b/isisd/isis_dynhn.c index 469f332be6..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 "event.h" +#include "frrevent.h" #include "isisd/isis_constants.h" #include "isisd/isis_common.h" diff --git a/isisd/isis_events.c b/isisd/isis_events.c index 708a2747fb..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 "event.h" +#include "frrevent.h" #include "hash.h" #include "prefix.h" #include "stream.h" diff --git a/isisd/isis_ldp_sync.c b/isisd/isis_ldp_sync.c index 59596e1af5..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 "event.h" +#include "frrevent.h" #include "prefix.h" #include "table.h" #include "vty.h" diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c index 32540b0faa..d569f6bd5b 100644 --- a/isisd/isis_lsp.c +++ b/isisd/isis_lsp.c @@ -12,7 +12,7 @@ #include <zebra.h> #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "stream.h" #include "memory.h" diff --git a/isisd/isis_main.c b/isisd/isis_main.c index 65d1206c1c..2f4e4e0bd6 100644 --- a/isisd/isis_main.c +++ b/isisd/isis_main.c @@ -10,7 +10,7 @@ #include <zebra.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "log.h" #include <lib/version.h> #include "command.h" diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c index a5d5679c02..dd442840d0 100644 --- a/isisd/isis_pdu.c +++ b/isisd/isis_pdu.c @@ -11,7 +11,7 @@ #include <zebra.h> #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "log.h" #include "stream.h" diff --git a/isisd/isis_route.c b/isisd/isis_route.c index 57f5972123..3b653194bf 100644 --- a/isisd/isis_route.c +++ b/isisd/isis_route.c @@ -11,7 +11,7 @@ #include <zebra.h> -#include "event.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 6d2a1f1599..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 "event.h" +#include "frrevent.h" #include "vty.h" #include "isis_constants.h" diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c index f63b000064..bfe3758cd8 100644 --- a/isisd/isis_spf.c +++ b/isisd/isis_spf.c @@ -11,7 +11,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "log.h" diff --git a/isisd/isis_te.c b/isisd/isis_te.c index 9d859c222b..45d763fd69 100644 --- a/isisd/isis_te.c +++ b/isisd/isis_te.c @@ -13,7 +13,7 @@ #include <math.h> #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "stream.h" #include "memory.h" diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c index 8a279558aa..8cd8f57c47 100644 --- a/isisd/isis_zebra.c +++ b/isisd/isis_zebra.c @@ -10,7 +10,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "command.h" #include "memory.h" #include "log.h" diff --git a/isisd/isisd.c b/isisd/isisd.c index 20a48a03f5..d216d100e1 100644 --- a/isisd/isisd.c +++ b/isisd/isisd.c @@ -9,7 +9,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "log.h" diff --git a/ldpd/ldpd.h b/ldpd/ldpd.h index 9de3ea4a52..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 "event.h" +#include "frrevent.h" #include "qobj.h" #include "prefix.h" #include "filter.h" @@ -10,7 +10,7 @@ #include "command.h" #include "memory.h" #include "prefix.h" -#include "event.h" +#include "frrevent.h" #include "stream.h" #include "vrf.h" #include "zclient.h" diff --git a/lib/command.c b/lib/command.c index be766f7cd1..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 "event.h" +#include "frrevent.h" #include "vector.h" #include "linklist.h" #include "vty.h" diff --git a/lib/event.c b/lib/event.c index f95e98a7fe..9d3378b9bf 100644 --- a/lib/event.c +++ b/lib/event.c @@ -8,7 +8,7 @@ #include <zebra.h> #include <sys/resource.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "frrcu.h" #include "log.h" diff --git a/lib/frr_pthread.h b/lib/frr_pthread.h index 36d0bdae80..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 "event.h" +#include "frrevent.h" #ifdef __cplusplus extern "C" { diff --git a/lib/frr_zmq.c b/lib/frr_zmq.c index 0b17e781e5..b28dd7f1bb 100644 --- a/lib/frr_zmq.c +++ b/lib/frr_zmq.c @@ -15,7 +15,7 @@ #include <zebra.h> #include <zmq.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "frr_zmq.h" #include "log.h" diff --git a/lib/frr_zmq.h b/lib/frr_zmq.h index 44f209b250..73da3770f4 100644 --- a/lib/frr_zmq.h +++ b/lib/frr_zmq.h @@ -7,7 +7,7 @@ #ifndef _FRRZMQ_H #define _FRRZMQ_H -#include "event.h" +#include "frrevent.h" #include <zmq.h> #ifdef __cplusplus diff --git a/lib/event.h b/lib/frrevent.h index 107949900a..b05885a985 100644 --- a/lib/event.h +++ b/lib/frrevent.h @@ -33,7 +33,7 @@ struct rusage_t { #endif struct timeval real; }; -#define RUSAGE_T struct rusage_t +#define RUSAGE_T struct rusage_t #define GETRUSAGE(X) event_getrusage(X) @@ -118,10 +118,10 @@ struct event { 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 */ + 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 */ + pthread_mutex_t mtx; /* mutex for thread.c functions */ bool ignore_timer_late; }; diff --git a/lib/ldp_sync.c b/lib/ldp_sync.c index b0608c391a..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 "event.h" +#include "frrevent.h" #include "stream.h" #include "zclient.h" #include "table.h" diff --git a/lib/libfrr.h b/lib/libfrr.h index a60580e1d6..c05bc01e4f 100644 --- a/lib/libfrr.h +++ b/lib/libfrr.h @@ -11,7 +11,7 @@ #include "typesafe.h" #include "sigevent.h" #include "privs.h" -#include "event.h" +#include "frrevent.h" #include "log.h" #include "getopt.h" #include "module.h" diff --git a/lib/libfrr_trace.h b/lib/libfrr_trace.h index 4d25f55804..05c958fa42 100644 --- a/lib/libfrr_trace.h +++ b/lib/libfrr_trace.h @@ -21,7 +21,7 @@ #include <lttng/tracepoint.h> #include "hash.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "table.h" diff --git a/lib/mgmt_fe_client.h b/lib/mgmt_fe_client.h index 2269a72ac0..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 "event.h" +#include "frrevent.h" #include "mgmtd/mgmt_defines.h" /*************************************************************** diff --git a/lib/mgmt_msg.c b/lib/mgmt_msg.c index e7564f2688..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 "event.h" +#include "frrevent.h" #include "mgmt_msg.h" diff --git a/lib/mgmt_msg.h b/lib/mgmt_msg.h index 90dab8da76..e2dd2d476a 100644 --- a/lib/mgmt_msg.h +++ b/lib/mgmt_msg.h @@ -8,7 +8,7 @@ #define _MGMT_MSG_H #include "stream.h" -#include "event.h" +#include "frrevent.h" #define MGMT_MSG_MARKER (0x4D724B21u) /* ASCII - "MrK!"*/ diff --git a/lib/northbound.h b/lib/northbound.h index 59703363ba..1723a87e4e 100644 --- a/lib/northbound.h +++ b/lib/northbound.h @@ -7,7 +7,7 @@ #ifndef _FRR_NORTHBOUND_H_ #define _FRR_NORTHBOUND_H_ -#include "event.h" +#include "frrevent.h" #include "hook.h" #include "linklist.h" #include "openbsd-tree.h" diff --git a/lib/northbound_grpc.cpp b/lib/northbound_grpc.cpp index 5ce80fb5fb..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 "event.h" +#include "frrevent.h" #include "command.h" #include "lib_errors.h" #include "northbound.h" diff --git a/lib/pullwr.h b/lib/pullwr.h index a589389c3b..ef2e01c04e 100644 --- a/lib/pullwr.h +++ b/lib/pullwr.h @@ -10,7 +10,7 @@ #include <stdbool.h> #include <stdint.h> -#include "event.h" +#include "frrevent.h" #include "stream.h" #ifdef __cplusplus diff --git a/lib/qobj.c b/lib/qobj.c index 6ebdcbf9cb..b9630e7547 100644 --- a/lib/qobj.c +++ b/lib/qobj.c @@ -7,7 +7,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "hash.h" #include "log.h" diff --git a/lib/resolver.c b/lib/resolver.c index d5915040be..99bf356eb3 100644 --- a/lib/resolver.c +++ b/lib/resolver.c @@ -12,7 +12,7 @@ #include "typesafe.h" #include "jhash.h" -#include "event.h" +#include "frrevent.h" #include "lib_errors.h" #include "resolver.h" #include "command.h" diff --git a/lib/resolver.h b/lib/resolver.h index aba4e16c06..87e8ecdc4a 100644 --- a/lib/resolver.h +++ b/lib/resolver.h @@ -6,7 +6,7 @@ #ifndef _FRR_RESOLVER_H #define _FRR_RESOLVER_H -#include "event.h" +#include "frrevent.h" #include "sockunion.h" #ifdef __cplusplus diff --git a/lib/sigevent.h b/lib/sigevent.h index 34753e1fd5..0b07f594c1 100644 --- a/lib/sigevent.h +++ b/lib/sigevent.h @@ -8,7 +8,7 @@ #ifndef _FRR_SIGNAL_H #define _FRR_SIGNAL_H -#include <event.h> +#include <frrevent.h> #ifdef __cplusplus extern "C" { diff --git a/lib/smux.h b/lib/smux.h index 366bf6fea3..cec4d2a1bf 100644 --- a/lib/smux.h +++ b/lib/smux.h @@ -9,7 +9,7 @@ #include <net-snmp/agent/net-snmp-agent-includes.h> #include <net-snmp/agent/snmp_vars.h> -#include "event.h" +#include "frrevent.h" #include "hook.h" #ifdef __cplusplus diff --git a/lib/spf_backoff.c b/lib/spf_backoff.c index ab9c94445a..1053d8f695 100644 --- a/lib/spf_backoff.c +++ b/lib/spf_backoff.c @@ -17,7 +17,7 @@ #include "command.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "vty.h" DEFINE_MTYPE_STATIC(LIB, SPF_BACKOFF, "SPF backoff"); diff --git a/lib/subdir.am b/lib/subdir.am index 9f2f4033fc..469fac2446 100644 --- a/lib/subdir.am +++ b/lib/subdir.am @@ -288,7 +288,7 @@ pkginclude_HEADERS += \ lib/systemd.h \ lib/table.h \ lib/termtable.h \ - lib/event.h \ + lib/frrevent.h \ lib/trace.h \ lib/typerb.h \ lib/typesafe.h \ diff --git a/lib/systemd.c b/lib/systemd.c index bd364ad668..56a53a6e78 100644 --- a/lib/systemd.c +++ b/lib/systemd.c @@ -7,7 +7,7 @@ #include <zebra.h> #include <sys/un.h> -#include "event.h" +#include "frrevent.h" #include "systemd.h" #include "lib_errors.h" @@ -22,7 +22,7 @@ #include <stdio.h> #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "buffer.h" #include "command.h" #include "sockunion.h" @@ -18,7 +18,7 @@ #include <regex.h> #endif /* HAVE_LIBPCRE2_POSIX */ -#include "event.h" +#include "frrevent.h" #include "log.h" #include "sockunion.h" #include "qobj.h" diff --git a/lib/wheel.c b/lib/wheel.c index d9362bac47..e17995c64a 100644 --- a/lib/wheel.c +++ b/lib/wheel.c @@ -6,7 +6,7 @@ */ #include "zebra.h" #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "wheel.h" #include "log.h" diff --git a/lib/workqueue.c b/lib/workqueue.c index 3b677e0085..fa5d585360 100644 --- a/lib/workqueue.c +++ b/lib/workqueue.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "workqueue.h" #include "linklist.h" diff --git a/lib/zclient.c b/lib/zclient.c index d708a711a4..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 "event.h" +#include "frrevent.h" #include "zclient.h" #include "memory.h" #include "table.h" diff --git a/lib/zlog.c b/lib/zlog.c index 618325d09d..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 "event.h" +#include "frrevent.h" DEFINE_MTYPE_STATIC(LIB, LOG_MESSAGE, "log message"); DEFINE_MTYPE_STATIC(LIB, LOG_TLSBUF, "log thread-local buffer"); diff --git a/lib/zlog_5424.c b/lib/zlog_5424.c index 984ab5d1f5..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 "event.h" +#include "frrevent.h" #include "lib/version.h" #include "lib/lib_errors.h" diff --git a/mgmtd/mgmt_be_adapter.c b/mgmtd/mgmt_be_adapter.c index c85b3549b6..e0ab2cab80 100644 --- a/mgmtd/mgmt_be_adapter.c +++ b/mgmtd/mgmt_be_adapter.c @@ -7,7 +7,7 @@ */ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "sockopt.h" #include "network.h" #include "libfrr.h" diff --git a/mgmtd/mgmt_history.c b/mgmtd/mgmt_history.c index 600a5f564b..59b5362159 100644 --- a/mgmtd/mgmt_history.c +++ b/mgmtd/mgmt_history.c @@ -7,7 +7,7 @@ #include <zebra.h> #include "md5.h" -#include "event.h" +#include "frrevent.h" #include "xref.h" #include "mgmt_fe_client.h" diff --git a/nhrpd/netlink_arp.c b/nhrpd/netlink_arp.c index 845d454d15..2e22f8e247 100644 --- a/nhrpd/netlink_arp.c +++ b/nhrpd/netlink_arp.c @@ -14,7 +14,7 @@ #include <linux/neighbour.h> #include <linux/netfilter/nfnetlink_log.h> -#include "event.h" +#include "frrevent.h" #include "stream.h" #include "prefix.h" #include "nhrpd.h" diff --git a/nhrpd/nhrp_cache.c b/nhrpd/nhrp_cache.c index f41c0afc54..1a11e0d98b 100644 --- a/nhrpd/nhrp_cache.c +++ b/nhrpd/nhrp_cache.c @@ -5,7 +5,7 @@ #include "zebra.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "hash.h" #include "nhrpd.h" diff --git a/nhrpd/nhrp_event.c b/nhrpd/nhrp_event.c index 59bb62d280..ba318581d5 100644 --- a/nhrpd/nhrp_event.c +++ b/nhrpd/nhrp_event.c @@ -11,7 +11,7 @@ #include <sys/socket.h> #include <sys/un.h> -#include "event.h" +#include "frrevent.h" #include "zbuf.h" #include "log.h" #include "nhrpd.h" diff --git a/nhrpd/nhrp_interface.c b/nhrpd/nhrp_interface.c index 7a0c3ba493..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 "event.h" +#include "frrevent.h" #include "nhrpd.h" #include "os.h" diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c index f34020bc6a..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 "event.h" +#include "frrevent.h" #include "sigevent.h" #include "lib/version.h" #include "log.h" diff --git a/nhrpd/nhrp_multicast.c b/nhrpd/nhrp_multicast.c index 71f27ac218..fdc1a31f25 100644 --- a/nhrpd/nhrp_multicast.c +++ b/nhrpd/nhrp_multicast.c @@ -18,7 +18,7 @@ #include <sys/types.h> #include <sys/socket.h> -#include "event.h" +#include "frrevent.h" #include "nhrpd.h" #include "netlink.h" #include "znl.h" diff --git a/nhrpd/nhrp_nhs.c b/nhrpd/nhrp_nhs.c index 063e7bbf8f..b2af0da429 100644 --- a/nhrpd/nhrp_nhs.c +++ b/nhrpd/nhrp_nhs.c @@ -6,7 +6,7 @@ #include "zebra.h" #include "zbuf.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "nhrpd.h" #include "nhrp_protocol.h" diff --git a/nhrpd/nhrp_packet.c b/nhrpd/nhrp_packet.c index 3366a64b4f..9d0b30cfee 100644 --- a/nhrpd/nhrp_packet.c +++ b/nhrpd/nhrp_packet.c @@ -10,7 +10,7 @@ #include <netinet/if_ether.h> #include "nhrpd.h" #include "zbuf.h" -#include "event.h" +#include "frrevent.h" #include "hash.h" #include "nhrp_protocol.h" diff --git a/nhrpd/nhrp_peer.c b/nhrpd/nhrp_peer.c index f41a7d3147..ffb6cf7506 100644 --- a/nhrpd/nhrp_peer.c +++ b/nhrpd/nhrp_peer.c @@ -11,7 +11,7 @@ #include "zebra.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "hash.h" #include "network.h" diff --git a/nhrpd/nhrp_shortcut.c b/nhrpd/nhrp_shortcut.c index 5a141022d4..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 "event.h" +#include "frrevent.h" #include "log.h" #include "nhrp_protocol.h" diff --git a/nhrpd/nhrp_vc.c b/nhrpd/nhrp_vc.c index 65e9af854e..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 "event.h" +#include "frrevent.h" #include "jhash.h" #include "nhrpd.h" diff --git a/nhrpd/vici.c b/nhrpd/vici.c index c72f3a86f8..2f76362603 100644 --- a/nhrpd/vici.c +++ b/nhrpd/vici.c @@ -11,7 +11,7 @@ #include <sys/socket.h> #include <sys/un.h> -#include "event.h" +#include "frrevent.h" #include "zbuf.h" #include "log.h" #include "lib_errors.h" diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c index 407de01c53..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 "event.h" +#include "frrevent.h" #include "plist.h" #include "filter.h" diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c index 0a4d3e957a..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 "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "if.h" diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c index 57b5fafa91..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 "event.h" +#include "frrevent.h" #include "linklist.h" #include "lib/northbound_cli.h" diff --git a/ospf6d/ospf6_bfd.c b/ospf6d/ospf6_bfd.c index 1f3c4be4d8..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 "event.h" +#include "frrevent.h" #include "buffer.h" #include "stream.h" #include "zclient.h" diff --git a/ospf6d/ospf6_flood.c b/ospf6d/ospf6_flood.c index 9e482e7512..a81d5222d6 100644 --- a/ospf6d/ospf6_flood.c +++ b/ospf6d/ospf6_flood.c @@ -6,7 +6,7 @@ #include <zebra.h> #include "log.h" -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "command.h" diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index 617a4a2354..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 "event.h" +#include "frrevent.h" #include "prefix.h" #include "plist.h" #include "zclient.h" diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c index a8c12f8a54..301fccecd7 100644 --- a/ospf6d/ospf6_intra.c +++ b/ospf6d/ospf6_intra.c @@ -7,7 +7,7 @@ #include "log.h" #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "if.h" #include "prefix.h" diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c index 708aaec894..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 "event.h" +#include "frrevent.h" #include "checksum.h" #include "frrstr.h" diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c index 599ee76a4e..fdb93475d4 100644 --- a/ospf6d/ospf6_main.c +++ b/ospf6d/ospf6_main.c @@ -9,7 +9,7 @@ #include <stdlib.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "log.h" #include "command.h" #include "vty.h" diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c index 69ac2f3b6d..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 "event.h" +#include "frrevent.h" #include "linklist.h" #include "lib_errors.h" #include "checksum.h" diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c index 00d3a85308..42e4074522 100644 --- a/ospf6d/ospf6_neighbor.c +++ b/ospf6d/ospf6_neighbor.c @@ -7,7 +7,7 @@ #include "log.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "command.h" diff --git a/ospf6d/ospf6_nssa.c b/ospf6d/ospf6_nssa.c index 7ff0a09328..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 "event.h" +#include "frrevent.h" #include "plist.h" #include "filter.h" diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c index 8855955116..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 "event.h" +#include "frrevent.h" #include "lib_errors.h" #include "ospf6_lsa.h" diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index e8c7740a04..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 "event.h" +#include "frrevent.h" #include "command.h" #include "defaults.h" #include "lib/json.h" diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c index 3700511fa2..214007d041 100644 --- a/ospf6d/ospf6d.c +++ b/ospf6d/ospf6d.c @@ -5,7 +5,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "command.h" diff --git a/ospf6d/ospf6d.h b/ospf6d/ospf6d.h index 89758b9462..980a365265 100644 --- a/ospf6d/ospf6d.h +++ b/ospf6d/ospf6d.h @@ -7,7 +7,7 @@ #define OSPF6D_H #include "libospf.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" DECLARE_MGROUP(OSPF6D); diff --git a/ospfclient/ospf_apiclient.c b/ospfclient/ospf_apiclient.c index a29c422277..a1193001fa 100644 --- a/ospfclient/ospf_apiclient.c +++ b/ospfclient/ospf_apiclient.c @@ -8,7 +8,7 @@ #include <lib/version.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "linklist.h" #include "if.h" diff --git a/ospfclient/ospfclient.c b/ospfclient/ospfclient.c index 8e5a982302..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 "event.h" +#include "frrevent.h" #include "log.h" /* Local portnumber for async channel. Note that OSPF API library will also diff --git a/ospfd/ospf_abr.c b/ospfd/ospf_abr.c index 3cb65961d1..e14586c5ee 100644 --- a/ospfd/ospf_abr.c +++ b/ospfd/ospf_abr.c @@ -7,7 +7,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/ospfd/ospf_api.c b/ospfd/ospf_api.c index 922696f8bd..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 "event.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 7be3c1d2a8..1aacc341aa 100644 --- a/ospfd/ospf_apiserver.c +++ b/ospfd/ospf_apiserver.c @@ -18,7 +18,7 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "event.h" +#include "frrevent.h" #include "hash.h" #include "sockunion.h" /* for inet_aton() */ #include "buffer.h" diff --git a/ospfd/ospf_asbr.c b/ospfd/ospf_asbr.c index a7e2f7319a..7befcc1086 100644 --- a/ospfd/ospf_asbr.c +++ b/ospfd/ospf_asbr.c @@ -6,7 +6,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/ospfd/ospf_ase.c b/ospfd/ospf_ase.c index ea2388a3a8..80390af505 100644 --- a/ospfd/ospf_ase.c +++ b/ospfd/ospf_ase.c @@ -6,7 +6,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "hash.h" #include "linklist.h" diff --git a/ospfd/ospf_bfd.c b/ospfd/ospf_bfd.c index 3146656d6a..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 "event.h" +#include "frrevent.h" #include "buffer.h" #include "stream.h" #include "zclient.h" diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c index 22d67c406b..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 "event.h" +#include "frrevent.h" #include "prefix.h" #include "command.h" #include "stream.h" diff --git a/ospfd/ospf_ext.c b/ospfd/ospf_ext.c index 28f368e37f..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 "event.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 99bc4249fa..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 "event.h" +#include "frrevent.h" #include "memory.h" #include "log.h" #include "zclient.h" diff --git a/ospfd/ospf_gr_helper.c b/ospfd/ospf_gr_helper.c index 33b351d82e..b97b6802b2 100644 --- a/ospfd/ospf_gr_helper.c +++ b/ospfd/ospf_gr_helper.c @@ -8,7 +8,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/ospfd/ospf_ia.c b/ospfd/ospf_ia.c index b4bf6cf3d0..59112b2cd2 100644 --- a/ospfd/ospf_ia.c +++ b/ospfd/ospf_ia.c @@ -7,7 +7,7 @@ #include <zebra.h> -#include "event.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 78d5bb25bd..dcecffa6a5 100644 --- a/ospfd/ospf_interface.c +++ b/ospfd/ospf_interface.c @@ -6,7 +6,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "prefix.h" #include "if.h" diff --git a/ospfd/ospf_ism.c b/ospfd/ospf_ism.c index 352fa83eca..9f795ea918 100644 --- a/ospfd/ospf_ism.c +++ b/ospfd/ospf_ism.c @@ -7,7 +7,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "linklist.h" #include "prefix.h" #include "if.h" diff --git a/ospfd/ospf_ldp_sync.c b/ospfd/ospf_ldp_sync.c index 0ea21e540f..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 "event.h" +#include "frrevent.h" #include "prefix.h" #include "table.h" #include "vty.h" diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c index 2e206258a4..850e852044 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 "event.h" +#include "frrevent.h" #include "hash.h" #include "sockunion.h" /* for inet_aton() */ #include "checksum.h" diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c index 6bfba6cee8..1f476a7e3d 100644 --- a/ospfd/ospf_main.c +++ b/ospfd/ospf_main.c @@ -9,7 +9,7 @@ #include <lib/version.h> #include "bfd.h" #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "linklist.h" #include "if.h" diff --git a/ospfd/ospf_neighbor.c b/ospfd/ospf_neighbor.c index c490695ac7..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 "event.h" +#include "frrevent.h" #include "stream.h" #include "table.h" #include "log.h" diff --git a/ospfd/ospf_network.c b/ospfd/ospf_network.c index ba74e67a32..d3f30ce1ee 100644 --- a/ospfd/ospf_network.c +++ b/ospfd/ospf_network.c @@ -6,7 +6,7 @@ #include <zebra.h> -#include "event.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 5eac6166af..bcbe028795 100644 --- a/ospfd/ospf_nsm.c +++ b/ospfd/ospf_nsm.c @@ -7,7 +7,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "hash.h" #include "linklist.h" diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c index ee57e975aa..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 "event.h" +#include "frrevent.h" #include "hash.h" #include "sockunion.h" /* for inet_aton() */ #include "printfrr.h" diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index a0cc9b0bd5..5f7d49e0bb 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -7,7 +7,7 @@ #include <zebra.h> #include "monotime.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c index 2503f39a3c..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 "event.h" +#include "frrevent.h" #include "hash.h" #include "sockunion.h" /* for inet_aton() */ #include "mpls.h" diff --git a/ospfd/ospf_spf.c b/ospfd/ospf_spf.c index c6e862011b..274d5bc9af 100644 --- a/ospfd/ospf_spf.c +++ b/ospfd/ospf_spf.c @@ -6,7 +6,7 @@ #include <zebra.h> #include "monotime.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "hash.h" #include "linklist.h" diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c index 8eca038a90..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 "event.h" +#include "frrevent.h" #include "vty.h" #include "zclient.h" #include "sbuf.h" diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c index 2c4bd17d91..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 "event.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 024bb532a3..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 "event.h" +#include "frrevent.h" #include "prefix.h" #include "table.h" #include "vty.h" diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index 92fb38f548..3e02d3c33e 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -6,7 +6,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "command.h" #include "network.h" #include "prefix.h" diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c index 2cdad9368c..112ddfedb7 100644 --- a/ospfd/ospfd.c +++ b/ospfd/ospfd.c @@ -5,7 +5,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "linklist.h" diff --git a/pathd/path_main.c b/pathd/path_main.c index a837187da4..c333162f2b 100644 --- a/pathd/path_main.c +++ b/pathd/path_main.c @@ -6,7 +6,7 @@ #include <lib/version.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "command.h" #include "log.h" #include "memory.h" diff --git a/pathd/path_pcep_config.c b/pathd/path_pcep_config.c index 0e63b56f57..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 "event.h" +#include "frrevent.h" #define MAX_XPATH 256 #define MAX_FLOAT_LEN 22 diff --git a/pathd/path_zebra.c b/pathd/path_zebra.c index 8d9206bfa2..dad26383e9 100644 --- a/pathd/path_zebra.c +++ b/pathd/path_zebra.c @@ -5,7 +5,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "log.h" #include "lib_errors.h" #include "if.h" diff --git a/pbrd/pbr_main.c b/pbrd/pbr_main.c index c2a9298f37..c4708d3f08 100644 --- a/pbrd/pbr_main.c +++ b/pbrd/pbr_main.c @@ -8,7 +8,7 @@ #include <lib/version.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "linklist.h" #include "if.h" diff --git a/pbrd/pbr_map.c b/pbrd/pbr_map.c index 1519af4eef..16cea3b4cd 100644 --- a/pbrd/pbr_map.c +++ b/pbrd/pbr_map.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include "event.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 c2c785fb6b..097c9f2964 100644 --- a/pbrd/pbr_zebra.c +++ b/pbrd/pbr_zebra.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "command.h" #include "network.h" #include "prefix.h" diff --git a/pimd/pim6_mld.c b/pimd/pim6_mld.c index 7d3b084f39..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/event.h" +#include "lib/frrevent.h" #include "termtable.h" #include "pimd/pim6_mld.h" diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index 15c3379019..bc6b84ff2c 100644 --- a/pimd/pim_ifchannel.c +++ b/pimd/pim_ifchannel.c @@ -7,7 +7,7 @@ #include <zebra.h> #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "if.h" #include "vrf.h" diff --git a/pimd/pim_main.c b/pimd/pim_main.c index 0a782455ca..7db0a7676b 100644 --- a/pimd/pim_main.c +++ b/pimd/pim_main.c @@ -11,7 +11,7 @@ #include "lib/version.h" #include <getopt.h> #include "command.h" -#include "event.h" +#include "frrevent.h" #include <signal.h> #include "memory.h" diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c index 6c169a7e73..b1b6958fe1 100644 --- a/pimd/pim_msdp.c +++ b/pimd/pim_msdp.c @@ -12,7 +12,7 @@ #include <lib/prefix.h> #include <lib/sockunion.h> #include <lib/stream.h> -#include <event.h> +#include <frrevent.h> #include <lib/vty.h> #include <lib/plist.h> #include <lib/lib_errors.h> diff --git a/pimd/pim_msdp_packet.c b/pimd/pim_msdp_packet.c index 0ec7aa77f9..a414736ccc 100644 --- a/pimd/pim_msdp_packet.c +++ b/pimd/pim_msdp_packet.c @@ -8,7 +8,7 @@ #include <lib/log.h> #include <lib/network.h> #include <lib/stream.h> -#include "event.h" +#include "frrevent.h" #include <lib/vty.h> #include <lib/lib_errors.h> diff --git a/pimd/pim_msdp_socket.c b/pimd/pim_msdp_socket.c index 57b3134897..fe8d5e934a 100644 --- a/pimd/pim_msdp_socket.c +++ b/pimd/pim_msdp_socket.c @@ -9,7 +9,7 @@ #include <lib/log.h> #include <lib/network.h> #include <lib/sockunion.h> -#include "event.h" +#include "frrevent.h" #include <lib/vty.h> #include <lib/if.h> #include <lib/vrf.h> diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c index ffd2d4283c..4a272a4802 100644 --- a/pimd/pim_pim.c +++ b/pimd/pim_pim.c @@ -7,7 +7,7 @@ #include <zebra.h> #include "log.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "if.h" #include "network.h" diff --git a/pimd/pim_register.c b/pimd/pim_register.c index be8b4c4000..b5d9df6f2a 100644 --- a/pimd/pim_register.c +++ b/pimd/pim_register.c @@ -9,7 +9,7 @@ #include "log.h" #include "if.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "vty.h" #include "plist.h" diff --git a/pimd/pim_time.c b/pimd/pim_time.c index 7b10d91144..205945e5ae 100644 --- a/pimd/pim_time.c +++ b/pimd/pim_time.c @@ -11,7 +11,7 @@ #include <time.h> #include "log.h" -#include "event.h" +#include "frrevent.h" #include "lib_errors.h" #include "pim_time.h" diff --git a/pimd/pim_time.h b/pimd/pim_time.h index 47f2bc8b7f..6c0e07396a 100644 --- a/pimd/pim_time.h +++ b/pimd/pim_time.h @@ -10,7 +10,7 @@ #include <stdint.h> #include <zebra.h> -#include "event.h" +#include "frrevent.h" int64_t pim_time_monotonic_sec(void); int64_t pim_time_monotonic_dsec(void); diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index 283fdfc195..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 "event.h" +#include "frrevent.h" #include "linklist.h" #include "vty.h" #include "plist.h" diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c index 0a994809b7..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 "event.h" +#include "frrevent.h" #include "prefix.h" #include "vty.h" #include "lib_errors.h" diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index db85025504..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 "event.h" +#include "frrevent.h" #include "zclient.h" #include "filter.h" #include "sockopt.h" diff --git a/ripd/rip_main.c b/ripd/rip_main.c index fbe877ca76..a6e4ad776b 100644 --- a/ripd/rip_main.c +++ b/ripd/rip_main.c @@ -7,7 +7,7 @@ #include <lib/version.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "command.h" #include "memory.h" #include "prefix.h" diff --git a/ripd/rip_peer.c b/ripd/rip_peer.c index 0f5a145578..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 "event.h" +#include "frrevent.h" #include "memory.h" #include "ripd/ripd.h" diff --git a/ripd/ripd.c b/ripd/ripd.c index 5e07ca48f9..ae4d93b4f5 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -11,7 +11,7 @@ #include "command.h" #include "prefix.h" #include "table.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "log.h" #include "stream.h" diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c index 516e280b0d..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 "event.h" +#include "frrevent.h" #include "privs.h" #include "vrf.h" #include "lib_errors.h" diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c index bedd393759..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 "event.h" +#include "frrevent.h" #include "log.h" #include "prefix.h" #include "if.h" diff --git a/ripngd/ripng_peer.c b/ripngd/ripng_peer.c index c03f2a4dfe..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 "event.h" +#include "frrevent.h" #include "memory.h" #include "ripngd/ripngd.h" diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c index 18456ac48c..79e8871f6a 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -8,7 +8,7 @@ #include "prefix.h" #include "filter.h" #include "log.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "if.h" #include "stream.h" diff --git a/sharpd/sharp_logpump.c b/sharpd/sharp_logpump.c index 8a86507176..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 "event.h" +#include "frrevent.h" #include "vrf.h" #include "zclient.h" #include "frr_pthread.h" diff --git a/sharpd/sharp_main.c b/sharpd/sharp_main.c index 80979ec9ae..fa85c2b448 100644 --- a/sharpd/sharp_main.c +++ b/sharpd/sharp_main.c @@ -8,7 +8,7 @@ #include <lib/version.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "prefix.h" #include "linklist.h" #include "if.h" diff --git a/sharpd/sharp_zebra.c b/sharpd/sharp_zebra.c index 189d61db24..17ad705969 100644 --- a/sharpd/sharp_zebra.c +++ b/sharpd/sharp_zebra.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "command.h" #include "network.h" #include "prefix.h" diff --git a/staticd/static_main.c b/staticd/static_main.c index d6ef91fea4..09f22318ff 100644 --- a/staticd/static_main.c +++ b/staticd/static_main.c @@ -8,7 +8,7 @@ #include <lib/version.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "command.h" #include "log.h" #include "memory.h" diff --git a/staticd/static_zebra.c b/staticd/static_zebra.c index 6c59f04ee6..4f3ccde53d 100644 --- a/staticd/static_zebra.c +++ b/staticd/static_zebra.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "command.h" #include "network.h" #include "prefix.h" diff --git a/tests/helpers/c/main.c b/tests/helpers/c/main.c index 5eb841448a..cd2b5665e2 100644 --- a/tests/helpers/c/main.c +++ b/tests/helpers/c/main.c @@ -6,7 +6,7 @@ #include <lib/version.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "memory.h" diff --git a/tests/isisd/test_fuzz_isis_tlv.c b/tests/isisd/test_fuzz_isis_tlv.c index 2443f3866f..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 "event.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 b14ef29078..85ddfea5b5 100644 --- a/tests/isisd/test_isis_spf.c +++ b/tests/isisd/test_isis_spf.c @@ -8,7 +8,7 @@ #include <lib/version.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "log.h" diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c index a02b2e460d..e0981b991a 100644 --- a/tests/lib/cli/common_cli.c +++ b/tests/lib/cli/common_cli.c @@ -8,7 +8,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "memory.h" diff --git a/tests/lib/cxxcompat.c b/tests/lib/cxxcompat.c index 85dcea9e80..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 "event.h" +#include "frrevent.h" #include "lib/typesafe.h" #include "lib/typerb.h" #include "lib/vector.h" diff --git a/tests/lib/northbound/test_oper_data.c b/tests/lib/northbound/test_oper_data.c index d88b37fb44..f82eddd3bf 100644 --- a/tests/lib/northbound/test_oper_data.c +++ b/tests/lib/northbound/test_oper_data.c @@ -6,7 +6,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "memory.h" diff --git a/tests/lib/test_assert.c b/tests/lib/test_assert.c index 3535743597..4440075b41 100644 --- a/tests/lib/test_assert.c +++ b/tests/lib/test_assert.c @@ -22,7 +22,7 @@ static void func_for_bt(int number) #include <zebra.h> #include "lib/zlog.h" -#include "event.h" +#include "frrevent.h" #include "lib/sigevent.h" int main(int argc, char **argv) diff --git a/tests/lib/test_grpc.cpp b/tests/lib/test_grpc.cpp index 65633c471b..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 "event.h" +#include "frrevent.h" #include "vrf.h" #include "vty.h" diff --git a/tests/lib/test_heavy.c b/tests/lib/test_heavy.c index 7bce1584ec..1e56940831 100644 --- a/tests/lib/test_heavy.c +++ b/tests/lib/test_heavy.c @@ -13,7 +13,7 @@ */ #include <zebra.h> -#include "event.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 48e95a8dd4..4fb9ebfa3a 100644 --- a/tests/lib/test_heavy_thread.c +++ b/tests/lib/test_heavy_thread.c @@ -14,7 +14,7 @@ #include <zebra.h> #include <math.h> -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "memory.h" diff --git a/tests/lib/test_heavy_wq.c b/tests/lib/test_heavy_wq.c index f43bd77a61..225573ae92 100644 --- a/tests/lib/test_heavy_wq.c +++ b/tests/lib/test_heavy_wq.c @@ -13,7 +13,7 @@ */ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "memory.h" diff --git a/tests/lib/test_stream.c b/tests/lib/test_stream.c index 489f56c132..d38dfe0eb0 100644 --- a/tests/lib/test_stream.c +++ b/tests/lib/test_stream.c @@ -6,7 +6,7 @@ #include <zebra.h> #include <stream.h> -#include "event.h" +#include "frrevent.h" #include "printfrr.h" diff --git a/tests/lib/test_timer_correctness.c b/tests/lib/test_timer_correctness.c index deaff9d485..04c0516889 100644 --- a/tests/lib/test_timer_correctness.c +++ b/tests/lib/test_timer_correctness.c @@ -16,7 +16,7 @@ #include "memory.h" #include "prng.h" -#include "event.h" +#include "frrevent.h" #define SCHEDULE_TIMERS 800 #define REMOVE_TIMERS 200 diff --git a/tests/lib/test_timer_performance.c b/tests/lib/test_timer_performance.c index 2dcbb8c596..3ace076b43 100644 --- a/tests/lib/test_timer_performance.c +++ b/tests/lib/test_timer_performance.c @@ -14,7 +14,7 @@ #include <stdio.h> #include <unistd.h> -#include "event.h" +#include "frrevent.h" #include "prng.h" #define SCHEDULE_TIMERS 1000000 diff --git a/tests/ospfd/test_ospf_spf.c b/tests/ospfd/test_ospf_spf.c index 7d1d7ae262..fc6b8e89ec 100644 --- a/tests/ospfd/test_ospf_spf.c +++ b/tests/ospfd/test_ospf_spf.c @@ -1,7 +1,7 @@ #include <zebra.h> #include "getopt.h" -#include "event.h" +#include "frrevent.h" #include <lib/version.h> #include "vty.h" #include "command.h" diff --git a/vrrpd/vrrp.h b/vrrpd/vrrp.h index fdbd35f06d..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/event.h" +#include "lib/frrevent.h" #include "lib/vty.h" /* Global definitions */ diff --git a/vrrpd/vrrp_main.c b/vrrpd/vrrp_main.c index 5d4bffe03f..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/event.h" +#include "lib/frrevent.h" #include "lib/vrf.h" #include "lib/vty.h" diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c index c6eac46ae1..89199da1af 100644 --- a/watchfrr/watchfrr.c +++ b/watchfrr/watchfrr.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include <log.h> #include <network.h> #include <sigevent.h> diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c index 8fb5b28c3d..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 "event.h" +#include "frrevent.h" #include "privs.h" #include "nexthop.h" #include "vrf.h" diff --git a/zebra/irdp_interface.c b/zebra/irdp_interface.c index ca46a4bf8a..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 "event.h" +#include "frrevent.h" #include "lib_errors.h" #include "zebra/interface.h" #include "zebra/rtadv.h" diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c index 19b749b562..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 "event.h" +#include "frrevent.h" #include "privs.h" #include "libfrr.h" #include "lib_errors.h" diff --git a/zebra/irdp_packet.c b/zebra/irdp_packet.c index 0ccc0af41e..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 "event.h" +#include "frrevent.h" #include "vty.h" #include "zclient.h" #include "lib_errors.h" diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c index 04d30577c4..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 "event.h" +#include "frrevent.h" #include "privs.h" #include "nexthop.h" #include "vrf.h" diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c index e8041dce08..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 "event.h" +#include "frrevent.h" #include "zebra/zserv.h" /* For debug purpose. */ diff --git a/zebra/label_manager.h b/zebra/label_manager.h index e2f5d19019..cfbb4bd169 100644 --- a/zebra/label_manager.h +++ b/zebra/label_manager.h @@ -14,7 +14,7 @@ #include <stdint.h> #include "lib/linklist.h" -#include "event.h" +#include "frrevent.h" #include "lib/hook.h" #include "zebra/zserv.h" diff --git a/zebra/main.c b/zebra/main.c index 391633c35f..ba43ae910b 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -8,7 +8,7 @@ #include <lib/version.h> #include "getopt.h" #include "command.h" -#include "event.h" +#include "frrevent.h" #include "filter.h" #include "memory.h" #include "prefix.h" diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index e92fb19151..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 "event.h" +#include "frrevent.h" #include "privs.h" #include "nexthop.h" #include "vrf.h" diff --git a/zebra/rtadv.c b/zebra/rtadv.c index f205ab01e9..9af41cbc39 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -9,7 +9,7 @@ #include "memory.h" #include "sockopt.h" -#include "event.h" +#include "frrevent.h" #include "if.h" #include "stream.h" #include "log.h" diff --git a/zebra/table_manager.h b/zebra/table_manager.h index eb460c291f..f8e99a357d 100644 --- a/zebra/table_manager.h +++ b/zebra/table_manager.h @@ -9,7 +9,7 @@ #include <stdint.h> #include "lib/linklist.h" -#include "event.h" +#include "frrevent.h" #include "lib/ns.h" #include "zebra/zserv.h" diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c index 5b4e493e48..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 "event.h" +#include "frrevent.h" #include "network.h" #include "command.h" #include "lib/version.h" diff --git a/zebra/zebra_gr.c b/zebra/zebra_gr.c index 3106b82c49..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 "event.h" +#include "frrevent.h" #include "lib/stream.h" #include "lib/memory.h" #include "lib/table.h" diff --git a/zebra/zebra_mlag_private.c b/zebra/zebra_mlag_private.c index d85097f2a4..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 "event.h" +#include "frrevent.h" #include "frr_pthread.h" #include "libfrr.h" #include "lib/version.h" diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c index dfb4875ffc..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 "event.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 5ccff635fe..4260d29c43 100644 --- a/zebra/zebra_netns_notify.c +++ b/zebra/zebra_netns_notify.c @@ -17,7 +17,7 @@ #include <sys/inotify.h> #include <sys/stat.h> -#include "event.h" +#include "frrevent.h" #include "ns.h" #include "command.h" #include "memory.h" diff --git a/zebra/zebra_pw.c b/zebra/zebra_pw.c index d5f56d417b..a02d7e8807 100644 --- a/zebra/zebra_pw.c +++ b/zebra/zebra_pw.c @@ -7,7 +7,7 @@ #include "log.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "command.h" #include "vrf.h" #include "lib/json.h" diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index 014b5126b5..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 "event.h" +#include "frrevent.h" #include "vrf.h" #include "workqueue.h" #include "nexthop_group_private.h" diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c index 61a4559e04..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 "event.h" +#include "frrevent.h" #include "workqueue.h" #include "prefix.h" #include "routemap.h" diff --git a/zebra/zserv.c b/zebra/zserv.c index 87cce37baa..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 "event.h" /* for thread (ptr only), EVENT_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... */ diff --git a/zebra/zserv.h b/zebra/zserv.h index fc1fd0ec93..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 "event.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 */ |