*: 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>

diff --git a/babeld/babel_main.c b/babeld/babel_main.c
index 574a35887a8a067d240265e1d71e4bb717965cce..b6126d5b7d19e403ae005515bce8c3bd8de31558 100644 (file)
--- 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 bbbb9676eb22e1a7f90d97bc3f92ddee86a6d29a..4fe5bcfea68ca2dd6879494d6c776573ad02ae63 100644 (file)
--- 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 92e9466a1ffa616ad195b9f1a20297007113be95..d8539812e097faf7643c7b57ccf718f02933491d 100644 (file)
--- 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 429abc17907a5bbbb94fb31724c0a42434f949b3..9686b08a983ee883eee1f11be1012ea6bda318e8 100644 (file)
--- 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 8923c193373ad79ad6c7bf24bba24f3f08a4d8e0..a51bcb1a1a6fae5012ceccf2cb88c50d0fefacaf 100644 (file)
--- 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 0dfb3a106874b2e6a0b0d124a67fb4c2184600ed..73dbf4ab2b4ec8f0446b37c5bc78007154cd39a0 100644 (file)
--- 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 419587ae18817d1fc9d9ed9a65d80b8ae8d41e5f..a6d0e74dc0df87ae65ca639a4c11c739125d9082 100644 (file)
--- 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 d59e1925ebe795c27d6dc93e39a9f829ebd4e28e..c78e740ec9671a56aea4f68ecc23d6591d8b2730 100644 (file)
--- 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 9118be3a7fba69c267352e9740b4511deebf6e3d..a289d3d67a0f6f605e49f3889ccfac4ad5b175d8 100644 (file)
--- 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 56f01ab2314eb52242004ab89472e8167530ca98..650adc1c9a1c4c59add95cc7dc87d17bdaea486f 100644 (file)
--- 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 c13e0b0daf2e41c5819b07734d7dcadd500ac82f..0f3faeb29759f303bcc8a9943b07423ff35c5046 100644 (file)
--- 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 63dab9070a24cf27d3b490f1334470e8d6c36a28..074059c1461d4ce965474944f81ba66548788b3e 100644 (file)
--- 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 52320031c7bbe63b32bb9cdd72b401b3f88792c6..20fec6d77be648f0ae6835d03e83a2f8955d4661 100644 (file)
--- 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 f5fe9e0fdb18eced5f5b26360a0f0cde90ede487..78da7a42b52c2c7a1f9fd4353242729c93f2e0a3 100644 (file)
--- 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 2ccc5e2c335360596bfeaf32656cb2bf0b6fbd46..c4b832ee595eff58da20f20c75310bd1ce52ffc9 100644 (file)
--- 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 436e9441215e4ddfe3b14e99bed5cff4934260cc..a294ebcc63062a5c956e248786adbe1ea7a8d94c 100644 (file)
--- 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 457f7be7eb85d0f95623e4618cf8b11aa2cd24a2..e028fa3dc84c9c7e9ba8a415743e2e11302d4dc2 100644 (file)
--- 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 6d3ca8abafa7b9caffc1d8ca89d312cfadfd6d72..1c76828a2f2063c085a7c5f590bc52048f57afae 100644 (file)
--- 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 7296f63f7d95daf70a0dc1dcc2d1d63d72b2820c..07bec23b296235d83368aebc1b9f85517605aa30 100644 (file)
--- 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 8e094466448216a2fba7676719159908f0898d2a..c6e3131e02fa1ae6023f1ac6efa89af3802d01fc 100644 (file)
--- 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 f2b420724cb2893cf124e6a1e3f078bb5ef1d481..ce9442c1e0205f717f43761de979d04544caf001 100644 (file)
--- 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 1c586ad56f5a0030ebb18c76a194e72d7612f02f..123d33bd1430caa6900632a91a063210a4fa7a2b 100644 (file)
--- 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 e2952ab3c80bf634a6a3fd3e6e81dfa830c7afc2..712b5d4af87725ee33fef8e6d722cf9583dab040 100644 (file)
--- 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 69eda0dd9b04d1ae905fabef6c9ec8057eaab010..72dca9f702925c57022fe41a0d9786ac806a86fc 100644 (file)
--- 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 e2fc9f68ba04a37e9d34a3357223c976a00bceb9..e4bc0176d17453761ad0ea448f350d98acb25999 100644 (file)
--- 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 279a7cce6076199da4d5032c29723eabbd9744b3..e04d5ae245ca544fdbb9e0d4112e563d056baa13 100644 (file)
--- 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 342d01866ef2b7b6e17a4dfcc95ffdaafff15c91..4bbbced806822bb52f19c211683ab5d1c3e0ea24 100644 (file)
--- 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 f3b1b948c482aa11995c68ffc5746506cf57c2db..3b17c99d6ddd49f466f510bdb8450b57a24af9c5 100644 (file)
--- 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 ae46efef2c13ea282e6141f7cc3a70bcceb6e122..cbed52068f856c15a7ece4fc90495a7fa9c1acf9 100644 (file)
--- 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 73d7930b49f0e9bc7b8805651eb7d232a254de9f..e6da79fafb86f000052e6afb2a98f9f7a5294a2b 100644 (file)
--- 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 7e021e8f7a8a521c06a06cfbb5349652ed6c5257..dd06afe7e26aaff2f43eac9c11a1a9dde3b537d2 100644 (file)
--- 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 957e0432ef38134613e9b32d35b2cd91d8fb0e6e..f715de08578c64c750aacc73511d25b8d1573980 100644 (file)
--- 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 647b96aa0eeaeb69ea04a3c1095af15b78655980..0feac8e738740b50f97d8bb7d4eca7edfa031798 100644 (file)
--- 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 8afc34369a40167ff9c80be91cc83557cf1790a2..2ebabd0efa46a5ea8728aa45c2cd665e96173eda 100644 (file)
--- 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 b56380f0e8216e5a7837cb00c5e9b4b4d1ae8294..eceef6b8a7939302809e32bc951ef67af27f1106 100644 (file)
--- 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 cdfc99fce0e23919f857da6ae861ae2c632583a3..6d8061e57232e3943d594f8c21cbffa56547c268 100644 (file)
--- 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 d8cc4a45ed6e6948afe2b27729c85e51f8be888b..662c750e9639c9d5f64140739166b05745e7ad67 100644 (file)
--- 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 e983f46cc8ce71e4e67fd6ec4353689eb68af677..2381977dbaefc6ca82975481fbb0317be48da7ab 100644 (file)
--- 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 0ccc9810a74d1525c61101c8071b98ab30895214..6d7443b7914ea6fb32f48b1e3d57f787942bb2b5 100644 (file)
--- 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 667fb02ce162befba509bf6f60aa9b6edb8195c1..25209c3bb3bb9dadecf05f1ada40735ad49199e5 100644 (file)
--- 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 4e5580480b3526dea6d53b1553afbc937997e48e..ef567fe4ef63b1d428bc04620f4729c0c5491b6f 100644 (file)
--- 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 8c3e75228cfb0268f69e83a82ce107f7620686d4..963d229bc1050312f7e3ddc4d9ad4b2d2e7de0a9 100644 (file)
--- 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 7e21eb79a0415ecb6561b9a6bc8eb83a57d51e21..0e206cded65336f32c40d35e3cfaf1bb40d717b9 100644 (file)
--- 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 07d1fd75d6b655dc8735b8e2e19ed37429102542..aae89e832b0aeae409925596628a489afb4076e3 100644 (file)
--- 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 f4ddf1da32312785b1c29cdf620338111b3a408c..71486a1f6f85a23955a61cf13821394b512dc04e 100644 (file)
--- 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 aaea1df778b48a52d3d37131c45f2530ec1fe4ee..6c8c1ef58de51746188d60bf0f29b68ed33d69e3 100644 (file)
--- 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 efa72e3a099a8bbfa8a623a511fd685f144e9552..492ef3e713789cc5be091ca607833933187ab762 100644 (file)
--- 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 fb39c6efdf895475b93334ce9fb44f96a0d97846..2237a611e8bd036ffa72432c3ab30ba982f297d7 100644 (file)
--- 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 c4dba8bc31f53cc81281da51bdf3f7599155909d..88510e75afb56e131e2d4d977f16a329bb412d0a 100644 (file)
--- 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 70365adad47fcf3919d50617d7fee6e9d2f7afb5..94c2bcab71f91ec0575790f37d5c91d08624e8ce 100644 (file)
--- 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 58241b5f17cf99a87039b42ccfbd7f904a0b2b3d..c7dd96bfff3d12293cf202d4c422125bcdd0d1a4 100644 (file)
--- 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 c7c958292960d6b1297fabec1b4648c5f71c16cc..1871078cc165734824784f9b484099a0e73796da 100644 (file)
--- 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 8d62390743a38f35b2bda65eed527f3977a5c858..124dcdd86d5b2abf068e01aa1b15b0058f331962 100644 (file)
--- 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 2b460e10cfbb456519263851eaf6e3915f3c191d..9e278d47f81e75c383723b09be5866c4f5feb3c0 100644 (file)
--- 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 3bc18827363a3e3097da6f5ff29593b0ffa0a8d1..3b921608092699f9b44876c155767417ce084d29 100644 (file)
--- 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 469f332be620bacb3bab90be043a906d15468224..446e52201998c3068aae4bce3c2078c4c225b728 100644 (file)
--- 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 708a2747fb68b9a92ee35ebf68cbc27e1b1c7fec..8a2a2ab971edd084dd1bf4f36f03d67a478bb727 100644 (file)
--- 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 59596e1af5d57dab8b1537d3b4cbcc1ac81c7924..53676ffe366002b96b26533077fed253291ffbb5 100644 (file)
--- 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 32540b0faaa5c1faa5b5b4a9183fbbabd9bb1287..d569f6bd5be66e67685b5d5bcb03ee4954884863 100644 (file)
--- 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 65d1206c1c6a66f702946ff7b1c96c0fdeb7b601..2f4e4e0bd6c5b2014c859681166aa7b09a890eb5 100644 (file)
--- 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 a5d5679c02f0e927dd5bb28d359f693fb7727539..dd442840d045912f25ef27d6149b5b7c3ad22448 100644 (file)
--- 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 57f59721239ee7934943b40cb41d7872381e28fb..3b653194bf3d7a3b029a62049aeaaaa030e0cd25 100644 (file)
--- 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 6d2a1f1599cefc0e115c0e8394788578c2d7ca06..9be133c7880d75b92d9507064b1d96c5eaa9770b 100644 (file)
--- 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 f63b0000642fa9cc7df60fcff250e7cc17137763..bfe3758cd898d77e18aad50b3d08eb6a658616ab 100644 (file)
--- 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 9d859c222be859ca46b39586350a1996af8e28f5..45d763fd698150d9e7bec924534fabe5f17254b6 100644 (file)
--- 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 8a279558aa719d60ec3ec4796cc26dfea68004cd..8cd8f57c4704c6d97f11d75f79a8ea853a5e7e3e 100644 (file)
--- 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 20a48a03f5eba8749ea9a6a21b7743055c6d6d46..d216d100e1128cc2bff5636ac38ee4c04fc5db4c 100644 (file)
--- 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 9de3ea4a523da9b3d4d9edefe0b8346f44f6dede..1fec5beafc7a6f3393ae25b23f555e6a20d94032 100644 (file)
--- 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"

diff --git a/lib/bfd.c b/lib/bfd.c
index 9dbeaab0d8f82cdfee352a9d7d332ab628f46bf4..cc6d09a60f5a199ea77b9c42b7d5a08d9b490b19 100644 (file)
--- a/lib/bfd.c
+++ b/lib/bfd.c
@@ -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 be766f7cd170c015fd05d07c2d41cab57d325f30..97ea200ff4b8c2ee6b9359036bafb2a3c200383b 100644 (file)
--- 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 f95e98a7feb0f64c703a313036f3d7139ac018c6..9d3378b9bfbeadc337be7e7bd877fca97048c3b1 100644 (file)
--- 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/event.h b/lib/event.h
deleted file mode 100644 (file)
index 1079499..0000000
--- a/lib/event.h
+++ /dev/null
@@ -1,295 +0,0 @@
-// 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 <zebra.h>
-#include <pthread.h>
-#include <poll.h>
-#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 *); /* 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 *);
-       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/frr_pthread.h b/lib/frr_pthread.h
index 36d0bdae80e107b288500434def85a8866b6bf91..f91044dfaef2c9e6e0de168e56ab22b5e844492f 100644 (file)
--- 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 0b17e781e53b1c5787bfba527ddbc1a349790364..b28dd7f1bbc51b0aafe31c130d3d69cb87038aa8 100644 (file)
--- 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 44f209b250b220758ce58775387c962d069763c4..73da3770f4b90717898df1724e3154d22104e56f 100644 (file)
--- 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/frrevent.h b/lib/frrevent.h
new file mode 100644 (file)
index 0000000..b05885a
--- /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 <zebra.h>
+#include <pthread.h>
+#include <poll.h>
+#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 *); /* 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 *);
+       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/ldp_sync.c b/lib/ldp_sync.c
index b0608c391ad2b18907c69ca9b6c9271d1f573432..d55819dfaffa6d112fb6b257528069c675d697b9 100644 (file)
--- 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 a60580e1d6161d7a1ab5e221f0c90848545fec51..c05bc01e4ff22637a01c48e30332eb2aaeafae32 100644 (file)
--- 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 4d25f55804f48ca5171054efd15b8ae2e9ee21d8..05c958fa42cdc603f7c182afa0669d11aef4209f 100644 (file)
--- 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 2269a72ac0afc8486115b689c2391ae603c6ee7d..aa3371f03c4643edb46adf7c5cdbdd79a2d24007 100644 (file)
--- 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 e7564f2688aebf70600ed79ece3e90460c388ca4..3f55f82024f4685fedd6065612b5f99b873e2a52 100644 (file)
--- 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 90dab8da76303171314de11d9ff8110031f93ac2..e2dd2d476a8fbad45129334053365ddbdc75a308 100644 (file)
--- 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 59703363bad0fbdc3fe8a7e2cd01eed636c175d4..1723a87e4e75bba6a471c9704065b7b9b7519478 100644 (file)
--- 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 5ce80fb5fbbbdd3b625f2357c353a4edd0016e85..6c33351cef0439b6b20318391f6468a49c5a6e4f 100644 (file)
--- 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 a589389c3b477f2424557d32a60f9fc0e39ba326..ef2e01c04ede27f2f40522cccc64d0c1142fe8c5 100644 (file)
--- 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 6ebdcbf9cb4424e8aa5dec5b13bacf8d3ece3583..b9630e7547133f4d479070b1c1c8c429e79eeaed 100644 (file)
--- 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 d5915040be9b0d02f5fecaffff28b7848d628222..99bf356eb3e648c5a3a7e68c4806051041e2aa5a 100644 (file)
--- 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 aba4e16c0635407bc4cb5a77f3caa1526a2a261b..87e8ecdc4ae6ba62c66f508e74d719988de10d40 100644 (file)
--- 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 34753e1fd59a078e015003b1fe694b8a7aedb449..0b07f594c1c4cdaca1f30bbb2e0f51d5e68c4bbd 100644 (file)
--- 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 366bf6fea32858acede326c083bc4516bc02f895..cec4d2a1bf1e76ca18cf325641c5c03c3db051b5 100644 (file)
--- 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 ab9c94445a93d508c91d7a715f1d3b02708b985a..1053d8f69524103e5c28f876df3ecb19896468d4 100644 (file)
--- 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 9f2f4033fcd56e47492cad03862557312331a468..469fac2446f53396e0c0baa3094fe65796a4c727 100644 (file)
--- 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 bd364ad6684d36c4d297c915c8f82ccca4dffe41..56a53a6e781b447faede882ce266621040ebcc29 100644 (file)
--- 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"
 

diff --git a/lib/vty.c b/lib/vty.c
index 7ab82b1552c2f06d792902509c05ef1e910d0c14..d0a667778812c22822528d2ad30f318c7bec3b47 100644 (file)
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -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"

diff --git a/lib/vty.h b/lib/vty.h
index 438bcfc9270fc008fd47964d5c64091b685fdc2d..66d3355329d7982fdb4ce9445b7ee268f41c50cd 100644 (file)
--- a/lib/vty.h
+++ b/lib/vty.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 d9362bac47e1d5511a13e3f5baa9e1e42b019e1e..e17995c64a3ea01ce25dc6d2fb5ba19e60e3decf 100644 (file)
--- 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 3b677e008500bd42e681ef2785c9d2fa63567c8f..fa5d585360cc3ceb87baeafb046d23563fd959c5 100644 (file)
--- 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 d708a711a445b994e3dec889f70324f535a48687..95093a56f5d9e9aaa022762c14ed256372441555 100644 (file)
--- 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 618325d09d8e4815fb85b06357dac26c04361a0d..309a955fa90a52ad27d4236ab2ee746f3b923eb8 100644 (file)
--- 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 984ab5d1f528eb9c3a03632f65f10ad2fdf3ba0f..c15bdece299e5621f14a4c71d57e101d3d007522 100644 (file)
--- 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 c85b3549b68b9732dc2dda297764719be29e9286..e0ab2cab80ee763c27c1930094bd5c7b02ee5a6b 100644 (file)
--- 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 600a5f564b74d65cc3c31d552fc572ded6c20c83..59b536215923500745d98f49a1c28bce41a314b3 100644 (file)
--- 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 845d454d1594bf88dd1b0f14c8676631e98ad709..2e22f8e247a7f3b28d90cc4cffc6007366bb0dcd 100644 (file)
--- 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 f41c0afc545ece53dfa7fc350d4580cf8f09b8a2..1a11e0d98ba70d84f7d16e075c726a84700bbb16 100644 (file)
--- 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 59bb62d280dd38b364d12265107e081d51ed00ed..ba318581d572d721117be31a6b24987bac0e2176 100644 (file)
--- 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 7a0c3ba493c53a2aa4d49448133d2a2fd73061eb..7c84fde3675b8a80e16b63c102644874854e3a89 100644 (file)
--- 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 f34020bc6adb601c33120dda1353e3c8e2db598a..593498ca134783e51e0810f321066f1eb55b6b53 100644 (file)
--- 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 71f27ac21839de4d547b6c2490a0c33d4dccfdaf..fdc1a31f25197e1c0d3c1a7d798986337d9153a7 100644 (file)
--- 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 063e7bbf8fa51a05774f09b02456e76531e26dc8..b2af0da4291d9714a183bb4eb25137267751c216 100644 (file)
--- 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 3366a64b4fe27eecc1de70fed5ca7e02c8c7d11a..9d0b30cfeea2363068b1e745ff26dcca3ddf342f 100644 (file)
--- 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 f41a7d31478da56ed5660d4eef35ceed1e25341f..ffb6cf7506436839025b2ff9e60c729c0170fcc6 100644 (file)
--- 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 5a141022d4e749fedfdedb419ee7c3835dc6a856..04dad2aea627701ad330294c412d82ee16e07722 100644 (file)
--- 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 65e9af854ee5f901fdc18305c49f5be579cfcefa..2c3201438b839d599877560ce505d16d2ebe3c2b 100644 (file)
--- 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 c72f3a86f8d05da175d7421f4112a2b6f2ceded4..2f76362603ce0fd5e6a7faba99b88384b52dc0fe 100644 (file)
--- 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 407de01c5397f667ad5ff7d147e6845c4a6576f5..f4202a4a29e730f2045f0ea2a76c5296fe9e2ad8 100644 (file)
--- 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 0a4d3e957a9f7ed7c5b4b506bdd794e5222996f0..69c711bf06e0439d86174c3cb4aebbf421815b44 100644 (file)
--- 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 57b5fafa91476aa0c8d7fade0b99ad606510ccca..713dd820751c6749b8acd981518a52ddbea63816 100644 (file)
--- 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 1f3c4be4d84d42bb767cdd2579041bf397cda9c8..6379f9d992c59ebb7aa9e767b0ce1c095187d61d 100644 (file)
--- 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 9e482e75120465d0f31647d11315969ebe08a885..a81d5222d6e4873e6ec09d765da79cc960cd2d4a 100644 (file)
--- 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 617a4a2354fbd9a9633a722a310cad997511fcb3..e7148d66ba9a84f4b3fe4a65fb31b3f1f3b236a5 100644 (file)
--- 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 a8c12f8a5485c2cc021ddb6f85c0df4a4ab58a5f..301fccecd77b8f5a904c6b9fe66299a9e260f0c9 100644 (file)
--- 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 708aaec8943018ad47427f194033a6ac5393e4d7..2b806afe06f1cc6815007ffce352a312c78cdcf4 100644 (file)
--- 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 599ee76a4e38b7620938b8970d7e2efe21e66e09..fdb93475d487bc727db206b42133607af88fd360 100644 (file)
--- 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 69ac2f3b6d66fe98a1dfaba7dfa99ff12519c5af..14b02dac7969e54e727fecc295605c7469fe82ee 100644 (file)
--- 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 00d3a853081911aede8f978546068b547dd2729c..42e4074522b12ab557c838597f6c9680966d2ea7 100644 (file)
--- 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 7ff0a09328d707e648e597cff877c86349c5fd80..e7a10eba4152bf578d42ba3fcb8af1fc5c06d307 100644 (file)
--- 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 885595511623c4d94068e13f9778c181989a124c..3cc0d5e96386ab61867c3a3c8f445c403a3a2c50 100644 (file)
--- 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 e8c7740a047763ebcf14cacd753916a67565ae22..c2aa3abeedc667476a9f056076a58473d306cebb 100644 (file)
--- 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 3700511fa244559df3ddae8731a3217b410e055a..214007d041e788b051037f6828d8c784ef8b9e14 100644 (file)
--- 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 89758b9462b8c4cd7cc26f73f9e05418cd449eb1..980a365265a05a2b3bce1f38df5791185043a6d3 100644 (file)
--- 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 a29c4222777d1030777c5e32c23507b802c4733a..a1193001faea9613a3c9c20875deee2622904984 100644 (file)
--- 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 8e5a982302962648b4ec6f37868f1572bc377d8a..24ff08561d7bdb1249676be5ebe841677b0cc849 100644 (file)
--- 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 3cb65961d1202d56f957422f5f62e85327914787..e14586c5ee031048f7f989240a6942b97cd4c4a6 100644 (file)
--- 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 922696f8bdde29bce1d6f19473ec15b0e6b6122f..213ee8c1fd166464a6d29cbe1070d8828593c7be 100644 (file)
--- 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 7be3c1d2a846bae21cfe31126443def0018c9227..1aacc341aa336c80f9db165b9cd871280177313e 100644 (file)
--- 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 a7e2f7319a182458094b37168420f00a55255716..7befcc1086fbc51cd50f82e2b4be60e67176e8df 100644 (file)
--- 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 ea2388a3a88f3840eb29da2cec72c81b2e9c1a84..80390af505cdc4f9dc2df3eb5af587091bebca03 100644 (file)
--- 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 3146656d6a4afd836c1d4907ac023c3ba36a39df..7d4c7c06b81e40f2c252426cd261a9c8a3d2ef41 100644 (file)
--- 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 22d67c406bbe1b4d524c81eef17d1086039985f9..dbe6dd97d0d350e3db18187e00c64ffaabbd2189 100644 (file)
--- 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 28f368e37f804a2518648b4585c3d0b3239047bf..75b58035a3d5607f45cb5d46b5718fdcf73c47e0 100644 (file)
--- 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 99bc4249fa2a86af02b7d268e8bdcd5648c59437..f3fe504a07e64e6d2935f8a4b652025be3cf5480 100644 (file)
--- 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 33b351d82e46679a8d3183c5c55bdb3e1ebe0b10..b97b6802b2feb7b459e17e477bc99965b054e2cf 100644 (file)
--- 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 b4bf6cf3d07df66b0da90b3cee9610bd42dca54f..59112b2cd2b79e88e92663669567dd936f8fb68c 100644 (file)
--- 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 78d5bb25bdb9ad763e4a00c389c2b3878b8cc5dd..dcecffa6a56909f6c8beaa35a63dd9b8d3a0a9ce 100644 (file)
--- 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 352fa83eca7b44aa7c8fd6f7b3ba554277be5de4..9f795ea91850329e442cf44a7979d07864315a78 100644 (file)
--- 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 0ea21e540fd034435c97862af2367e1ae1123b70..b97e87faa0924f9602b1afdebab815ec6e93a11a 100644 (file)
--- 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 2e206258a4ef31e28685a575f1d9f9e05df8e5b8..850e8520444eb32fca85723b7d27593ee6d62000 100644 (file)
--- 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 6bfba6cee8028cd003dfa68f69f0dcd9a8449340..1f476a7e3d63651114c282af7e60d369643c4e24 100644 (file)
--- 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 c490695ac7a87b4a9b17888407bdae4c4f615ef2..c238f051dfeb754d2963fceface4e9f58aab6927 100644 (file)
--- 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 ba74e67a32ef77d6e1f89292318e2424db843424..d3f30ce1ee81c93ec10ad522afbb39dc44a3b4ff 100644 (file)
--- 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 5eac6166af3ba683584e8c9e8a1e7112a099001e..bcbe02879575e67071f9c276e96875f7e60bea9a 100644 (file)
--- 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 ee57e975aa55b80af3c26c629e89a2390a41ceed..6f66ee10a1ebbd722ffe31ef32a274b02ed73c43 100644 (file)
--- 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 a0cc9b0bd5d641b7ae6f5dfe8edbe7bdec3793a0..5f7d49e0bbc4afc1efd714fd2ef54ea91d7a88f3 100644 (file)
--- 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 2503f39a3c6af892d3cfd85775e9b69818ddb1a9..0179f9ee0bea7ee41ffc55cec96870e786b1c27d 100644 (file)
--- 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 c6e862011bde0de877ae862088196448c02ee04e..274d5bc9af7b74b67c340bc8d36e80ba12c3b4ce 100644 (file)
--- 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 8eca038a90dc1db38b1904d682ff9e0212b98a13..467cb0504d9590adf8a964ebee3cec5bb7ab8f7c 100644 (file)
--- 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 2c4bd17d91342f53ec336beda244b4e997282fda..dc9dd34303644c96085220d26fd6e475abe311a7 100644 (file)
--- 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 024bb532a3c302992f00f928c482edc264bb3ea9..8c0afd8527e45ff811c341c2d7e3adbc0a47287a 100644 (file)
--- 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 92fb38f5484e3b06e6d93741734dc23092ecc2c4..3e02d3c33e1dcfa5179bdd769fa7b34a2bf9ced3 100644 (file)
--- 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 2cdad9368cf65038f45a9b31325c5fd1e31c6c87..112ddfedb7c4440820f1f0d50017fe9ac48bc9a5 100644 (file)
--- 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 a837187da4eafa8a9c2f504c09f33619165ef973..c333162f2b4f23f3e4f83668d9f30f545431b307 100644 (file)
--- 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 0e63b56f57bd2fba60e3ae92138db43cab5ee478..da7ee89f2fef1a4d50a6873365a8f72bf7161d08 100644 (file)
--- 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 8d9206bfa24842004248318a2ef925361b5f3da2..dad26383e95ef638c2f75a248c3f03c22cafb932 100644 (file)
--- 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 c2a9298f37e81aff9f6305ab998f672258fb04ef..c4708d3f08fe11b5cfbfc489abf1686cb6bb5483 100644 (file)
--- 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 1519af4eef096c6538a0376bfba1aba6178a4d7f..16cea3b4cd2d7fd3b99534df403c98d54679a268 100644 (file)
--- 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 c2c785fb6bc20b2c6f582795ed1a96845ed7be50..097c9f29644025bb7fadf72add07aa6ae48b5388 100644 (file)
--- 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 7d3b084f397f2a358e2b546b4ad6c8e3696aad9f..1d84a9941b8a083913a7a163627e0c4684f454f8 100644 (file)
--- 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 15c33790193ffbda206ba0143ca1591fe0d3414e..bc6b84ff2c93a9903acd550b4f3185544e00ec66 100644 (file)
--- 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 0a782455caec5138105def0435cfc17dd73c3497..7db0a7676b2ec84e2b666d5585c2840903b27e54 100644 (file)
--- 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 6c169a7e73c57e17bae15e1565843cc77286f97e..b1b6958fe16681dd1e7e74abaee259db960dba74 100644 (file)
--- 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 0ec7aa77f91839ad1198f4a0d8a66da27a93ead6..a414736cccf1bc552fbb0362e01770d13fdd69be 100644 (file)
--- 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 57b31348974debe401c03eaf77386bfbd7adebe1..fe8d5e934aca19b802fc8fa8672bdbf09b523231 100644 (file)
--- 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 ffd2d4283c1cdb27f87ac41ebb5ab89bb4375d5d..4a272a4802b708e2b5309be0300748c16d9d4900 100644 (file)
--- 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 be8b4c4000920877b087f3f0da0a13556fd25c15..b5d9df6f2ac85dc0ed14dadaca10b296378b9751 100644 (file)
--- 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 7b10d91144990ee90e2881f33c0acf1505f2133d..205945e5aee4dfe3c29119e608b9a1d4ff586064 100644 (file)
--- 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 47f2bc8b7fe22f746806adb07daf45164cbddbcd..6c0e07396a6cd240054bd3b6714de20b5a0c1076 100644 (file)
--- 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 283fdfc1951285b719cc5960d15684cdc32cb50c..8fa7b7cf96c6469559701733a271c1d44455d9b3 100644 (file)
--- 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 0a994809b7b27355cfae8472a2dd6f4c86f3d800..05a72269d664c67be28b2ba2c05bc82d5104c97b 100644 (file)
--- 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 db850255045d0c7bbcdeb125c1b61a369bbe14f3..0b92f174b1ff1301424972f6dbae25c0b5d09229 100644 (file)
--- 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 fbe877ca7604799ceee58a47fe2e8f6d0c0f6c83..a6e4ad776bf132ea44e66937c8bd819b1f62ea88 100644 (file)
--- 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 0f5a145578984b684b86ffb23bc5ba2123023b3b..9410ef380ecc723de5beafb65a415fe2ee67d175 100644 (file)
--- 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 5e07ca48f970d9daefd46872b018a1685d54709f..ae4d93b4f5853f82835077737dcb02a877bb0fab 100644 (file)
--- 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 516e280b0d52ae0854ff9a96e92539c9085f3df3..1d9d53e47a03b3227af04be2b67f5884c0b5d129 100644 (file)
--- 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 bedd393759b6d30eeef6fc5d509f96b30ea0df91..1d392efdde9bfe3079091551cd767f7ea08cdffa 100644 (file)
--- 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 c03f2a4dfe3213af8762c125afbbc1e5930be1c9..901b548a42a152cfbfa7c178b1cdbc18cc147e05 100644 (file)
--- 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 18456ac48c7b8c712bfc858e048760eb4fe261d3..79e8871f6a5f5dc35e0a3beceafcc987987b558c 100644 (file)
--- 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 8a86507176ef79e880fced8b6514b01b73c24f8f..5474e80b116a4b79f4640aedffd5445cf5b6e17d 100644 (file)
--- 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 80979ec9ae531b24b66d4fde8f12080f5e34344b..fa85c2b44839ec8469c241fa0dafe2d4734154ab 100644 (file)
--- 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 189d61db24fdff2424f57d1d25906b851b4c732e..17ad70596968e02ff845e0dd55aa3cf97f238f72 100644 (file)
--- 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 d6ef91fea4f32c418de35995c87623c50a3e1672..09f22318ffc2d2556db18b8c1f485c0559be56e7 100644 (file)
--- 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 6c59f04ee620b30ad9285b1a04b693a9f1c6560f..4f3ccde53dab83c0b2e699df178ad5bbdc1f9f4d 100644 (file)
--- 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 5eb841448a1d59582194e4f55143919a8bc0c1d0..cd2b5665e2e1ee7b459897647f48e9ac7087f6bf 100644 (file)
--- 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 2443f3866f9f0070ef45230373fd9879004aa818..627ccfee6fa37be57d2c8c7c26789d294ecf1d07 100644 (file)
--- 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 b14ef290781c49b2704ad560b80b4cb7b6a10968..85ddfea5b52d9cf40f6d53eb6d71b86241388df1 100644 (file)
--- 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 a02b2e460d2c5a83cc1c6c37c411d78e13e81975..e0981b991acb99f5381022dcfdc195bb5c1b289a 100644 (file)
--- 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 85dcea9e80378c66ee6173d9aa9fe485eaafebfe..8f548561863f66e7d73d00763808806dfe7051ea 100644 (file)
--- 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 d88b37fb4471e67d0dac8908f2316e94b7e4d8d9..f82eddd3bf1b976386e1757fadd8946992837c50 100644 (file)
--- 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 3535743597853b899c887a6ec5c15392e76cb486..4440075b41fe5aa47cb7c1d14f09c1dd412c4c08 100644 (file)
--- 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 65633c471bea135fb35cd7ec1dcc129016feae40..fd30f04346063797f3d8b5cd3e63ec0294ea781b 100644 (file)
--- 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 7bce1584ec80cd37387c8ee1c995b5ec4a29df5d..1e56940831b07e017b10d355189636fc0b8ce80b 100644 (file)
--- 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 48e95a8dd4766f6161b03994a7f9d245d88dc1d0..4fb9ebfa3a4b5a871d8b4bf6730c3b1817e7fa36 100644 (file)
--- 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 f43bd77a613c32213c084a881911bb8402b6c636..225573ae92f6d16acfd8d2cbb020569818cc77f7 100644 (file)
--- 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 489f56c13235f08ee91b35a8b4c66749ddb895bb..d38dfe0eb0377ce813c9236d51de845c9b75d6b5 100644 (file)
--- 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 deaff9d4858364c435171a02f74dd204ea0988e4..04c05168890d3877f6bfd7a11f687d9ba8dac751 100644 (file)
--- 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 2dcbb8c596100375128423b0abd863030ea27691..3ace076b4327c9de82f07ab6bcc8680b74f01294 100644 (file)
--- 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 7d1d7ae262c78e07ac0fac182da13417f7d07186..fc6b8e89ec6e8d5fa4f7661a8bc6ad42c4931a33 100644 (file)
--- 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 fdbd35f06dedaa0c47adeea4c6649b586be0efcb..0ac9b1f49c1a0ec9fb95bf136dd26263ecc43833 100644 (file)
--- 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 5d4bffe03fb52198885e637f3dc284b17705adf6..32ee4bb136a59c2eccad6478992f5746a7323888 100644 (file)
--- 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 c6eac46ae1520e5daa160b7ca62776c96ba26ad1..89199da1af79a94ce77e60372f2b0475a0161f95 100644 (file)
--- 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 8fb5b28c3d9f146835b13b561f82f6b4e6a6b2ed..3a325df06c45bfd5a7d7126c405ae6eb5e148f1e 100644 (file)
--- 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 ca46a4bf8a01678b869358f288acd07508d78729..253e6a8dd617f89bb5b081bcc2392bf3f4814bc9 100644 (file)
--- 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 19b749b5621f104e226187f43f096c8e102f3d00..6548790e9a80bef8ce39bac973ef645aa104307a 100644 (file)
--- 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 0ccc0af41e9f653519cf0a115bfaf2a62b4adf3c..2dfc027f1ddbf882c94e9dd8523b7cc3006e7264 100644 (file)
--- 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 04d30577c44a58ccddb07b3b368ed9ed4253013a..78b1dfe27633039f3c515d01883d42abb49f587b 100644 (file)
--- 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 e8041dce082ed17c20db3107ab2f7606490e8875..b8dc92b2e93e16a107dc529aa244f3a247ebddd9 100644 (file)
--- 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 e2f5d19019d3aaf2e48fea6441f7fe9d18a676fe..cfbb4bd16987174fba29acf9292dcb937bb701b4 100644 (file)
--- 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 391633c35f1ae290579ca7e9a46b8b5b09c4679b..ba43ae910b175538e51aa9caffdafc975c5343c2 100644 (file)
--- 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 e92fb19151560eb3cbe7bb1331d817c5daa99f5c..de01ced411ef9a05844010fe36b89156c9e97d24 100644 (file)
--- 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 f205ab01e98a6f52913f4fe528f97da5a160032a..9af41cbc393ab824a115158dc94fffd0bb099647 100644 (file)
--- 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 eb460c291f42b6f0ef320f38600df53f8c6b3735..f8e99a357dbac43e8d18ff6609dfb9f865251c7e 100644 (file)
--- 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 5b4e493e48e3a45e15fb7034e6338f075ab78095..e379a5868c6d9b1873596c175d0321250201f52c 100644 (file)
--- 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 3106b82c498fcd17b09986722db1cdb6fc808edb..96d598f7c424b33bd3b5e995bdf01aa5d40c968e 100644 (file)
--- 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 d85097f2a4843b701381f67d7a9e4ba1b42ea7d1..f348c50755c121e03148a6a3fc902d84ee54841c 100644 (file)
--- 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 dfb4875ffcdb16072fe46128667cf65da2fc91fe..3fbf201086d11f0048707618b5304a76cea697fb 100644 (file)
--- 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 5ccff635feb7d20b8f8ce573447adbc593f9e31d..4260d29c43a58ed05d360f36953e8d5cc649ae35 100644 (file)
--- 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 d5f56d417bc4e5a834b3a8da652d0a63fed48a2c..a02d7e8807365f6f66c609f5c8b094bee1e83862 100644 (file)
--- 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 014b5126b5b3f82b9ab5558f66e220ef464fe1c0..5a86b7d0a55127e7d60b81d9f7e135d03b0ad25d 100644 (file)
--- 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 61a4559e04fb0612fb6b210f4dbfca6e95519a83..abb10e21cc5bef9cb81b7e57639723ce52ee535f 100644 (file)
--- 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 87cce37baa9a274e6a10f4ffc7cfad9561275fc6..70707866ee286092a81865de8881c8e1527ea4fc 100644 (file)
--- 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 fc1fd0ec93f63f924759cf5f6bce1d9d14739494..aa58a3a29948c5942c78416caa833314c3712098 100644 (file)
--- 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 */