diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2022-02-28 16:40:31 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2023-03-24 13:32:16 +0100 |
| commit | cb37cb336a2cca77bfbaf6b0cfab12e847e45623 (patch) | |
| tree | def5299d18d1d91fa9e28108c139ca6146e866ed | |
| parent | Merge pull request #13065 from rgirada/ospf_abr_summary (diff) | |
| download | frr-cb37cb336a2cca77bfbaf6b0cfab12e847e45623.tar.xz frr-cb37cb336a2cca77bfbaf6b0cfab12e847e45623.zip | |
*: Rename thread.[ch] to event.[ch]
This is a first in a series of commits, whose goal is to rename
the thread system in FRR to an event system. There is a continual
problem where people are confusing `struct thread` with a true
pthread. In reality, our entire thread.c is an event system.
In this commit rename the thread.[ch] files to event.[ch].
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
232 files changed, 235 insertions, 236 deletions
diff --git a/babeld/babel_main.c b/babeld/babel_main.c index 0869c120a..de0c8230f 100644 --- a/babeld/babel_main.c +++ b/babeld/babel_main.c @@ -8,7 +8,7 @@ Copyright 2011 by Matthieu Boutier and Juliusz Chroboczek #include "getopt.h" #include "if.h" #include "log.h" -#include "thread.h" +#include "event.h" #include "privs.h" #include "sigevent.h" #include "lib/version.h" diff --git a/babeld/kernel.c b/babeld/kernel.c index f89fe268d..bbbb9676e 100644 --- a/babeld/kernel.c +++ b/babeld/kernel.c @@ -29,7 +29,7 @@ Copyright 2011, 2012 by Matthieu Boutier and Juliusz Chroboczek #include "command.h" #include "vty.h" #include "memory.h" -#include "thread.h" +#include "event.h" #include "nexthop.h" #include "util.h" diff --git a/bfdd/dplane.c b/bfdd/dplane.c index 99bd1886f..7d160e868 100644 --- a/bfdd/dplane.c +++ b/bfdd/dplane.c @@ -26,7 +26,7 @@ #include "lib/network.h" #include "lib/printfrr.h" #include "lib/stream.h" -#include "lib/thread.h" +#include "lib/event.h" #include "bfd.h" #include "bfddp_packet.h" diff --git a/bgpd/bgp_advertise.c b/bgpd/bgp_advertise.c index 3469d129e..429abc179 100644 --- a/bgpd/bgp_advertise.c +++ b/bgpd/bgp_advertise.c @@ -9,7 +9,7 @@ #include "memory.h" #include "prefix.h" #include "hash.h" -#include "thread.h" +#include "event.h" #include "queue.h" #include "filter.h" diff --git a/bgpd/bgp_bfd.c b/bgpd/bgp_bfd.c index 4a81b69ce..bdbaf6226 100644 --- a/bgpd/bgp_bfd.c +++ b/bgpd/bgp_bfd.c @@ -11,7 +11,7 @@ #include "linklist.h" #include "memory.h" #include "prefix.h" -#include "thread.h" +#include "event.h" #include "buffer.h" #include "stream.h" #include "vrf.h" diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c index 40a27cad7..6ade0fc38 100644 --- a/bgpd/bgp_bmp.c +++ b/bgpd/bgp_bmp.c @@ -11,7 +11,7 @@ #include "sockunion.h" #include "command.h" #include "prefix.h" -#include "thread.h" +#include "event.h" #include "linklist.h" #include "queue.h" #include "pullwr.h" diff --git a/bgpd/bgp_damp.c b/bgpd/bgp_damp.c index 54bbf9b9c..ba16a33fb 100644 --- a/bgpd/bgp_damp.c +++ b/bgpd/bgp_damp.c @@ -10,7 +10,7 @@ #include "memory.h" #include "command.h" #include "log.h" -#include "thread.h" +#include "event.h" #include "queue.h" #include "filter.h" diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c index 794dd7b8b..6aad4ff2a 100644 --- a/bgpd/bgp_dump.c +++ b/bgpd/bgp_dump.c @@ -10,7 +10,7 @@ #include "sockunion.h" #include "command.h" #include "prefix.h" -#include "thread.h" +#include "event.h" #include "linklist.h" #include "queue.h" #include "memory.h" diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c index aa9a6a860..dc6ce6b8e 100644 --- a/bgpd/bgp_fsm.c +++ b/bgpd/bgp_fsm.c @@ -9,7 +9,7 @@ #include "linklist.h" #include "prefix.h" #include "sockunion.h" -#include "thread.h" +#include "event.h" #include "log.h" #include "stream.h" #include "ringbuf.h" diff --git a/bgpd/bgp_io.c b/bgpd/bgp_io.c index 530b77987..5dae39d40 100644 --- a/bgpd/bgp_io.c +++ b/bgpd/bgp_io.c @@ -17,7 +17,7 @@ #include "network.h" // for ERRNO_IO_RETRY #include "stream.h" // for stream_get_endp, stream_getw_from, str... #include "ringbuf.h" // for ringbuf_remain, ringbuf_peek, ringbuf_... -#include "thread.h" // for THREAD_OFF, THREAD_ARG, thread... +#include "event.h" // for THREAD_OFF, THREAD_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 414dafebd..c13e0b0da 100644 --- a/bgpd/bgp_label.c +++ b/bgpd/bgp_label.c @@ -6,7 +6,7 @@ #include <zebra.h> #include "command.h" -#include "thread.h" +#include "event.h" #include "prefix.h" #include "zclient.h" #include "stream.h" diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index 85e490437..63dab9070 100644 --- a/bgpd/bgp_main.c +++ b/bgpd/bgp_main.c @@ -9,7 +9,7 @@ #include "vector.h" #include "command.h" #include "getopt.h" -#include "thread.h" +#include "event.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 8453133df..52320031c 100644 --- a/bgpd/bgp_mplsvpn_snmp.c +++ b/bgpd/bgp_mplsvpn_snmp.c @@ -12,7 +12,7 @@ #include "log.h" #include "prefix.h" #include "command.h" -#include "thread.h" +#include "event.h" #include "smux.h" #include "filter.h" #include "hook.h" diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c index 6f035358f..8fcb5b017 100644 --- a/bgpd/bgp_network.c +++ b/bgpd/bgp_network.c @@ -5,7 +5,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "sockunion.h" #include "sockopt.h" #include "memory.h" diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c index f1f6b031a..2ccc5e2c3 100644 --- a/bgpd/bgp_nexthop.c +++ b/bgpd/bgp_nexthop.c @@ -6,7 +6,7 @@ #include <zebra.h> #include "command.h" -#include "thread.h" +#include "event.h" #include "prefix.h" #include "lib/json.h" #include "zclient.h" diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c index 473c95071..cb9de84cc 100644 --- a/bgpd/bgp_nht.c +++ b/bgpd/bgp_nht.c @@ -6,7 +6,7 @@ #include <zebra.h> #include "command.h" -#include "thread.h" +#include "event.h" #include "prefix.h" #include "zclient.h" #include "stream.h" diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c index 032767820..457f7be7e 100644 --- a/bgpd/bgp_open.c +++ b/bgpd/bgp_open.c @@ -8,7 +8,7 @@ #include "linklist.h" #include "prefix.h" #include "stream.h" -#include "thread.h" +#include "event.h" #include "log.h" #include "command.h" #include "memory.h" diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c index 93672d29f..97b26ea62 100644 --- a/bgpd/bgp_packet.c +++ b/bgpd/bgp_packet.c @@ -8,7 +8,7 @@ #include <zebra.h> #include <sys/time.h> -#include "thread.h" +#include "event.h" #include "stream.h" #include "network.h" #include "prefix.h" diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 14ce4e6bc..efa367a56 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -20,7 +20,7 @@ #include "buffer.h" #include "sockunion.h" #include "plist.h" -#include "thread.h" +#include "event.h" #include "workqueue.h" #include "queue.h" #include "memory.h" diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c index 32ca909fe..2aceca8bd 100644 --- a/bgpd/bgp_rpki.c +++ b/bgpd/bgp_rpki.c @@ -23,7 +23,7 @@ #include "command.h" #include "linklist.h" #include "memory.h" -#include "thread.h" +#include "event.h" #include "filter.h" #include "bgpd/bgpd.h" #include "bgpd/bgp_table.h" @@ -36,7 +36,6 @@ #include "northbound_cli.h" #include "lib/network.h" -#include "lib/thread.h" #include "rtrlib/rtrlib.h" #include "hook.h" #include "libfrr.h" diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c index 5aa5e1428..7408b7765 100644 --- a/bgpd/bgp_snmp.c +++ b/bgpd/bgp_snmp.c @@ -12,7 +12,7 @@ #include "log.h" #include "prefix.h" #include "command.h" -#include "thread.h" +#include "event.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 186c9e284..3bf3c61bf 100644 --- a/bgpd/bgp_snmp_bgp4.c +++ b/bgpd/bgp_snmp_bgp4.c @@ -12,7 +12,7 @@ #include "log.h" #include "prefix.h" #include "command.h" -#include "thread.h" +#include "event.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 9c2599d5f..61615be2c 100644 --- a/bgpd/bgp_snmp_bgp4v2.c +++ b/bgpd/bgp_snmp_bgp4v2.c @@ -13,7 +13,7 @@ #include "log.h" #include "prefix.h" #include "command.h" -#include "thread.h" +#include "event.h" #include "smux.h" #include "filter.h" #include "hook.h" diff --git a/bgpd/bgp_updgrp.c b/bgpd/bgp_updgrp.c index 204b8092e..68bfb4c13 100644 --- a/bgpd/bgp_updgrp.c +++ b/bgpd/bgp_updgrp.c @@ -12,7 +12,7 @@ #include <zebra.h> #include "prefix.h" -#include "thread.h" +#include "event.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 d8e0e7875..181d57813 100644 --- a/bgpd/bgp_updgrp_adv.c +++ b/bgpd/bgp_updgrp_adv.c @@ -17,7 +17,7 @@ #include "memory.h" #include "prefix.h" #include "hash.h" -#include "thread.h" +#include "event.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 5106dcf35..279a7cce6 100644 --- a/bgpd/bgp_updgrp_packet.c +++ b/bgpd/bgp_updgrp_packet.c @@ -12,7 +12,7 @@ #include <zebra.h> #include "prefix.h" -#include "thread.h" +#include "event.h" #include "buffer.h" #include "stream.h" #include "command.h" diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 93b412240..3bc64c349 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -16,7 +16,7 @@ #include "buffer.h" #include "linklist.h" #include "stream.h" -#include "thread.h" +#include "event.h" #include "log.h" #include "memory.h" #include "lib_vty.h" diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index da598993d..d4c98a2c7 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -13,7 +13,7 @@ #include "sockunion.h" #include "zclient.h" #include "routemap.h" -#include "thread.h" +#include "event.h" #include "queue.h" #include "memory.h" #include "lib/json.h" diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 96c6a111c..c7cd80b98 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -6,7 +6,7 @@ #include <zebra.h> #include "prefix.h" -#include "thread.h" +#include "event.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 25a440304..5fb2c5046 100644 --- a/bgpd/rfapi/rfapi_import.c +++ b/bgpd/rfapi/rfapi_import.c @@ -15,7 +15,7 @@ #include "lib/memory.h" #include "lib/log.h" #include "lib/skiplist.h" -#include "lib/thread.h" +#include "event.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 3bec225f6..7e021e8f7 100644 --- a/bgpd/rfapi/rfapi_import.h +++ b/bgpd/rfapi/rfapi_import.h @@ -13,7 +13,7 @@ #ifndef QUAGGA_HGP_RFAPI_IMPORT_H #define QUAGGA_HGP_RFAPI_IMPORT_H -#include "lib/thread.h" +#include "event.h" /* * These are per-rt-import-list diff --git a/bgpd/rfapi/vnc_export_table.h b/bgpd/rfapi/vnc_export_table.h index 42c04f0c7..5716570cb 100644 --- a/bgpd/rfapi/vnc_export_table.h +++ b/bgpd/rfapi/vnc_export_table.h @@ -9,7 +9,7 @@ #define _QUAGGA_VNC_VNC_EXPORT_TABLE_H_ #include "lib/table.h" -#include "lib/thread.h" +#include "event.h" #include "lib/vty.h" #include "bgpd/bgpd.h" diff --git a/doc/developer/modules.rst b/doc/developer/modules.rst index e95f8a1b4..89d2f81f1 100644 --- a/doc/developer/modules.rst +++ b/doc/developer/modules.rst @@ -56,7 +56,7 @@ Basic boilerplate: #include "hook.h" #include "module.h" #include "libfrr.h" - #include "thread.h" + #include "event.h" static int module_late_init(struct thread_master *master) { diff --git a/doc/developer/process-architecture.rst b/doc/developer/process-architecture.rst index 37bd620f2..4f6cfcc7c 100644 --- a/doc/developer/process-architecture.rst +++ b/doc/developer/process-architecture.rst @@ -57,7 +57,7 @@ execute. At initialization, a daemon will typically create one fetch each task and execute it. These tasks have various types corresponding to their general action. The types -are given by integer macros in :file:`thread.h` and are: +are given by integer macros in :file:`event.h` and are: ``THREAD_READ`` Task which waits for a file descriptor to become ready for reading and then @@ -144,7 +144,7 @@ macros wrap underlying functions in :file:`thread.c` to provide additional information added at compile time, such as the line number the task was scheduled from, that can be accessed at runtime for debugging, logging and informational purposes. Each task type has its own specific scheduling function -that follow the naming convention ``thread_add_<type>``; see :file:`thread.h` +that follow the naming convention ``thread_add_<type>``; see :file:`event.h` for details. There are some gotchas to keep in mind: diff --git a/eigrpd/eigrp_dump.c b/eigrpd/eigrp_dump.c index 489b3bd1c..b7c7e0070 100644 --- a/eigrpd/eigrp_dump.c +++ b/eigrpd/eigrp_dump.c @@ -13,7 +13,7 @@ #include <zebra.h> #include "linklist.h" -#include "thread.h" +#include "event.h" #include "prefix.h" #include "command.h" #include "stream.h" diff --git a/eigrpd/eigrp_filter.c b/eigrpd/eigrp_filter.c index 09ae6be6d..534b4fef5 100644 --- a/eigrpd/eigrp_filter.c +++ b/eigrpd/eigrp_filter.c @@ -21,7 +21,7 @@ #include "command.h" #include "prefix.h" #include "table.h" -#include "thread.h" +#include "event.h" #include "memory.h" #include "log.h" #include "stream.h" diff --git a/eigrpd/eigrp_fsm.c b/eigrpd/eigrp_fsm.c index d065af0cb..cdfc99fce 100644 --- a/eigrpd/eigrp_fsm.c +++ b/eigrpd/eigrp_fsm.c @@ -53,8 +53,8 @@ */ #include <zebra.h> -#include <thread.h> +#include "event.h" #include "prefix.h" #include "table.h" #include "memory.h" diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c index f62f54b68..55f0a3269 100644 --- a/eigrpd/eigrp_hello.c +++ b/eigrpd/eigrp_hello.c @@ -16,7 +16,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_interface.c b/eigrpd/eigrp_interface.c index 8d98dcf5a..eeb2bd4d0 100644 --- a/eigrpd/eigrp_interface.c +++ b/eigrpd/eigrp_interface.c @@ -16,7 +16,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "linklist.h" #include "prefix.h" #include "if.h" diff --git a/eigrpd/eigrp_main.c b/eigrpd/eigrp_main.c index 3c1e5da34..5cd1353a9 100644 --- a/eigrpd/eigrp_main.c +++ b/eigrpd/eigrp_main.c @@ -17,7 +17,7 @@ #include <lib/version.h> #include "getopt.h" -#include "thread.h" +#include "event.h" #include "prefix.h" #include "linklist.h" #include "if.h" diff --git a/eigrpd/eigrp_neighbor.c b/eigrpd/eigrp_neighbor.c index 9288b0f1c..f427067b3 100644 --- a/eigrpd/eigrp_neighbor.c +++ b/eigrpd/eigrp_neighbor.c @@ -20,7 +20,7 @@ #include "prefix.h" #include "memory.h" #include "command.h" -#include "thread.h" +#include "event.h" #include "stream.h" #include "table.h" #include "log.h" diff --git a/eigrpd/eigrp_network.c b/eigrpd/eigrp_network.c index 68edd0898..4e5580480 100644 --- a/eigrpd/eigrp_network.c +++ b/eigrpd/eigrp_network.c @@ -12,7 +12,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "linklist.h" #include "prefix.h" #include "if.h" diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c index e00d62fb0..02fb3d23b 100644 --- a/eigrpd/eigrp_packet.c +++ b/eigrpd/eigrp_packet.c @@ -12,7 +12,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "memory.h" #include "linklist.h" #include "vty.h" diff --git a/eigrpd/eigrp_query.c b/eigrpd/eigrp_query.c index 56498ed67..7e21eb79a 100644 --- a/eigrpd/eigrp_query.c +++ b/eigrpd/eigrp_query.c @@ -12,7 +12,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_reply.c b/eigrpd/eigrp_reply.c index a1413fe9c..07d1fd75d 100644 --- a/eigrpd/eigrp_reply.c +++ b/eigrpd/eigrp_reply.c @@ -16,7 +16,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_siaquery.c b/eigrpd/eigrp_siaquery.c index 1c2ec3731..f4ddf1da3 100644 --- a/eigrpd/eigrp_siaquery.c +++ b/eigrpd/eigrp_siaquery.c @@ -12,7 +12,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_siareply.c b/eigrpd/eigrp_siareply.c index 37cca6737..aaea1df77 100644 --- a/eigrpd/eigrp_siareply.c +++ b/eigrpd/eigrp_siareply.c @@ -11,7 +11,7 @@ */ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_snmp.c b/eigrpd/eigrp_snmp.c index f159415cc..efa72e3a0 100644 --- a/eigrpd/eigrp_snmp.c +++ b/eigrpd/eigrp_snmp.c @@ -16,7 +16,7 @@ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> -#include "thread.h" +#include "event.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_update.c b/eigrpd/eigrp_update.c index 49acf3069..6d4b3eb8e 100644 --- a/eigrpd/eigrp_update.c +++ b/eigrpd/eigrp_update.c @@ -16,7 +16,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/eigrpd/eigrp_vty.c b/eigrpd/eigrp_vty.c index 33f728ec4..c4dba8bc3 100644 --- a/eigrpd/eigrp_vty.c +++ b/eigrpd/eigrp_vty.c @@ -17,7 +17,7 @@ #include <zebra.h> #include "memory.h" -#include "thread.h" +#include "event.h" #include "prefix.h" #include "table.h" #include "vty.h" diff --git a/eigrpd/eigrp_zebra.c b/eigrpd/eigrp_zebra.c index 179c2d0f2..0ae8c3b45 100644 --- a/eigrpd/eigrp_zebra.c +++ b/eigrpd/eigrp_zebra.c @@ -12,7 +12,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "command.h" #include "network.h" #include "prefix.h" diff --git a/eigrpd/eigrpd.c b/eigrpd/eigrpd.c index a382862e3..9db0531b5 100644 --- a/eigrpd/eigrpd.c +++ b/eigrpd/eigrpd.c @@ -12,7 +12,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "vty.h" #include "command.h" #include "linklist.h" diff --git a/gdb/lib.txt b/gdb/lib.txt index b44c23798..5d22321b6 100644 --- a/gdb/lib.txt +++ b/gdb/lib.txt @@ -157,7 +157,7 @@ document walk_route_table Walk through a routing table (or subset thereof) and dump all the non-null (struct route_node *)->info pointers. -Argument: A lib/thread.h::(struct route_node *) pointing to the route_node +Argument: A lib/hread.h::(struct route_node *) pointing to the route_node under which all data should be dumped end diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c index cb2cf8f61..16def982b 100644 --- a/isisd/isis_adjacency.c +++ b/isisd/isis_adjacency.c @@ -15,7 +15,7 @@ #include "hash.h" #include "vty.h" #include "linklist.h" -#include "thread.h" +#include "event.h" #include "if.h" #include "stream.h" #include "bfd.h" diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index 1ee7f4451..8593aee8b 100644 --- a/isisd/isis_circuit.c +++ b/isisd/isis_circuit.c @@ -19,7 +19,7 @@ #include "if.h" #include "linklist.h" #include "command.h" -#include "thread.h" +#include "event.h" #include "vty.h" #include "hash.h" #include "prefix.h" diff --git a/isisd/isis_csm.c b/isisd/isis_csm.c index 95bbc077a..2b460e10c 100644 --- a/isisd/isis_csm.c +++ b/isisd/isis_csm.c @@ -14,7 +14,7 @@ #include "if.h" #include "linklist.h" #include "command.h" -#include "thread.h" +#include "event.h" #include "hash.h" #include "prefix.h" #include "stream.h" diff --git a/isisd/isis_dr.c b/isisd/isis_dr.c index b1a421581..5b236a66d 100644 --- a/isisd/isis_dr.c +++ b/isisd/isis_dr.c @@ -13,7 +13,7 @@ #include "log.h" #include "hash.h" -#include "thread.h" +#include "event.h" #include "linklist.h" #include "vty.h" #include "stream.h" diff --git a/isisd/isis_dynhn.c b/isisd/isis_dynhn.c index ef21de327..667a90c2c 100644 --- a/isisd/isis_dynhn.c +++ b/isisd/isis_dynhn.c @@ -16,7 +16,7 @@ #include "stream.h" #include "command.h" #include "if.h" -#include "thread.h" +#include "event.h" #include "isisd/isis_constants.h" #include "isisd/isis_common.h" diff --git a/isisd/isis_events.c b/isisd/isis_events.c index d7b396911..87b6061b5 100644 --- a/isisd/isis_events.c +++ b/isisd/isis_events.c @@ -13,7 +13,7 @@ #include "if.h" #include "linklist.h" #include "command.h" -#include "thread.h" +#include "event.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 817e2a201..497906aae 100644 --- a/isisd/isis_ldp_sync.c +++ b/isisd/isis_ldp_sync.c @@ -9,7 +9,7 @@ #include "monotime.h" #include "memory.h" -#include "thread.h" +#include "event.h" #include "prefix.h" #include "table.h" #include "vty.h" diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c index 4a332d0ae..59cedec70 100644 --- a/isisd/isis_lsp.c +++ b/isisd/isis_lsp.c @@ -12,7 +12,7 @@ #include <zebra.h> #include "linklist.h" -#include "thread.h" +#include "event.h" #include "vty.h" #include "stream.h" #include "memory.h" diff --git a/isisd/isis_main.c b/isisd/isis_main.c index 25ea18749..99a18fc31 100644 --- a/isisd/isis_main.c +++ b/isisd/isis_main.c @@ -10,7 +10,7 @@ #include <zebra.h> #include "getopt.h" -#include "thread.h" +#include "event.h" #include "log.h" #include <lib/version.h> #include "command.h" diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c index f659f3abc..ec1b8d268 100644 --- a/isisd/isis_pdu.c +++ b/isisd/isis_pdu.c @@ -11,7 +11,7 @@ #include <zebra.h> #include "memory.h" -#include "thread.h" +#include "event.h" #include "linklist.h" #include "log.h" #include "stream.h" diff --git a/isisd/isis_route.c b/isisd/isis_route.c index 711d5cbed..57f597212 100644 --- a/isisd/isis_route.c +++ b/isisd/isis_route.c @@ -11,7 +11,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "linklist.h" #include "vty.h" #include "log.h" diff --git a/isisd/isis_routemap.c b/isisd/isis_routemap.c index 632b4ff95..6d2a1f159 100644 --- a/isisd/isis_routemap.c +++ b/isisd/isis_routemap.c @@ -18,7 +18,7 @@ #include "plist.h" #include "routemap.h" #include "table.h" -#include "thread.h" +#include "event.h" #include "vty.h" #include "isis_constants.h" diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c index 9229f0a77..90f5ff69a 100644 --- a/isisd/isis_spf.c +++ b/isisd/isis_spf.c @@ -11,7 +11,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "linklist.h" #include "vty.h" #include "log.h" diff --git a/isisd/isis_te.c b/isisd/isis_te.c index 3659f4e07..9d859c222 100644 --- a/isisd/isis_te.c +++ b/isisd/isis_te.c @@ -13,7 +13,7 @@ #include <math.h> #include "linklist.h" -#include "thread.h" +#include "event.h" #include "vty.h" #include "stream.h" #include "memory.h" diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c index 7e85576c7..c344f1634 100644 --- a/isisd/isis_zebra.c +++ b/isisd/isis_zebra.c @@ -10,7 +10,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "command.h" #include "memory.h" #include "log.h" diff --git a/isisd/isisd.c b/isisd/isisd.c index 586785b05..ee402dad9 100644 --- a/isisd/isisd.c +++ b/isisd/isisd.c @@ -9,7 +9,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "vty.h" #include "command.h" #include "log.h" diff --git a/ldpd/ldpd.h b/ldpd/ldpd.h index dc993e3d7..cbf916553 100644 --- a/ldpd/ldpd.h +++ b/ldpd/ldpd.h @@ -14,7 +14,7 @@ #include "queue.h" #include "openbsd-tree.h" #include "imsg.h" -#include "thread.h" +#include "event.h" #include "qobj.h" #include "prefix.h" #include "filter.h" @@ -10,7 +10,7 @@ #include "command.h" #include "memory.h" #include "prefix.h" -#include "thread.h" +#include "event.h" #include "stream.h" #include "vrf.h" #include "zclient.h" diff --git a/lib/command.c b/lib/command.c index 196d73d46..e2de6f322 100644 --- a/lib/command.c +++ b/lib/command.c @@ -17,7 +17,7 @@ #include "memory.h" #include "log.h" #include "log_vty.h" -#include "thread.h" +#include "event.h" #include "vector.h" #include "linklist.h" #include "vty.h" diff --git a/lib/thread.c b/lib/event.c index 87ad3d882..b0f901ab0 100644 --- a/lib/thread.c +++ b/lib/event.c @@ -8,7 +8,7 @@ #include <zebra.h> #include <sys/resource.h> -#include "thread.h" +#include "event.h" #include "memory.h" #include "frrcu.h" #include "log.h" @@ -87,7 +87,7 @@ unsigned long cputime_threshold = CONSUMED_TIME_CHECK; unsigned long walltime_threshold = CONSUMED_TIME_CHECK; /* CLI start ---------------------------------------------------------------- */ -#include "lib/thread_clippy.c" +#include "lib/event_clippy.c" static unsigned int cpu_record_hash_key(const struct cpu_thread_history *a) { diff --git a/lib/thread.h b/lib/event.h index 128d11b6e..128d11b6e 100644 --- a/lib/thread.h +++ b/lib/event.h diff --git a/lib/frr_pthread.h b/lib/frr_pthread.h index b1d08717f..c14ba7792 100644 --- a/lib/frr_pthread.h +++ b/lib/frr_pthread.h @@ -11,7 +11,7 @@ #include "frratomic.h" #include "memory.h" #include "frrcu.h" -#include "thread.h" +#include "event.h" #ifdef __cplusplus extern "C" { diff --git a/lib/frr_zmq.c b/lib/frr_zmq.c index 2673d5760..525e49942 100644 --- a/lib/frr_zmq.c +++ b/lib/frr_zmq.c @@ -15,7 +15,7 @@ #include <zebra.h> #include <zmq.h> -#include "thread.h" +#include "event.h" #include "memory.h" #include "frr_zmq.h" #include "log.h" diff --git a/lib/frr_zmq.h b/lib/frr_zmq.h index f12291d60..bfc1e93b1 100644 --- a/lib/frr_zmq.h +++ b/lib/frr_zmq.h @@ -7,7 +7,7 @@ #ifndef _FRRZMQ_H #define _FRRZMQ_H -#include "thread.h" +#include "event.h" #include <zmq.h> #ifdef __cplusplus diff --git a/lib/ldp_sync.c b/lib/ldp_sync.c index b01cf8728..3ecbfcabf 100644 --- a/lib/ldp_sync.c +++ b/lib/ldp_sync.c @@ -10,7 +10,7 @@ #include "memory.h" #include "prefix.h" #include "log.h" -#include "thread.h" +#include "event.h" #include "stream.h" #include "zclient.h" #include "table.h" diff --git a/lib/libfrr.h b/lib/libfrr.h index 97e9b93c1..365734650 100644 --- a/lib/libfrr.h +++ b/lib/libfrr.h @@ -11,7 +11,7 @@ #include "typesafe.h" #include "sigevent.h" #include "privs.h" -#include "thread.h" +#include "event.h" #include "log.h" #include "getopt.h" #include "module.h" diff --git a/lib/libfrr_trace.h b/lib/libfrr_trace.h index 92c469706..d13cdc20b 100644 --- a/lib/libfrr_trace.h +++ b/lib/libfrr_trace.h @@ -21,7 +21,7 @@ #include <lttng/tracepoint.h> #include "hash.h" -#include "thread.h" +#include "event.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 ac29b8f27..10712964b 100644 --- a/lib/mgmt_fe_client.h +++ b/lib/mgmt_fe_client.h @@ -13,7 +13,7 @@ extern "C" { #endif #include "mgmt_pb.h" -#include "thread.h" +#include "event.h" #include "mgmtd/mgmt_defines.h" /*************************************************************** diff --git a/lib/mgmt_msg.c b/lib/mgmt_msg.c index 2fab03bc5..e7564f268 100644 --- a/lib/mgmt_msg.c +++ b/lib/mgmt_msg.c @@ -10,7 +10,7 @@ #include "network.h" #include "sockopt.h" #include "stream.h" -#include "thread.h" +#include "event.h" #include "mgmt_msg.h" diff --git a/lib/mgmt_msg.h b/lib/mgmt_msg.h index 854875170..90dab8da7 100644 --- a/lib/mgmt_msg.h +++ b/lib/mgmt_msg.h @@ -8,7 +8,7 @@ #define _MGMT_MSG_H #include "stream.h" -#include "thread.h" +#include "event.h" #define MGMT_MSG_MARKER (0x4D724B21u) /* ASCII - "MrK!"*/ diff --git a/lib/northbound.h b/lib/northbound.h index 4b5028c87..6820a59cc 100644 --- a/lib/northbound.h +++ b/lib/northbound.h @@ -7,7 +7,7 @@ #ifndef _FRR_NORTHBOUND_H_ #define _FRR_NORTHBOUND_H_ -#include "thread.h" +#include "event.h" #include "hook.h" #include "linklist.h" #include "openbsd-tree.h" diff --git a/lib/northbound_grpc.cpp b/lib/northbound_grpc.cpp index 274a0ca45..d68e22368 100644 --- a/lib/northbound_grpc.cpp +++ b/lib/northbound_grpc.cpp @@ -12,7 +12,7 @@ #include "log.h" #include "libfrr.h" #include "lib/version.h" -#include "lib/thread.h" +#include "event.h" #include "command.h" #include "lib_errors.h" #include "northbound.h" diff --git a/lib/pullwr.h b/lib/pullwr.h index 77ecf855b..8a028b909 100644 --- a/lib/pullwr.h +++ b/lib/pullwr.h @@ -10,7 +10,7 @@ #include <stdbool.h> #include <stdint.h> -#include "thread.h" +#include "event.h" #include "stream.h" #ifdef __cplusplus diff --git a/lib/qobj.c b/lib/qobj.c index 09b156ba3..6ebdcbf9c 100644 --- a/lib/qobj.c +++ b/lib/qobj.c @@ -7,7 +7,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "memory.h" #include "hash.h" #include "log.h" diff --git a/lib/resolver.c b/lib/resolver.c index 2918576c0..ffc84e5fe 100644 --- a/lib/resolver.c +++ b/lib/resolver.c @@ -12,7 +12,7 @@ #include "typesafe.h" #include "jhash.h" -#include "thread.h" +#include "event.h" #include "lib_errors.h" #include "resolver.h" #include "command.h" diff --git a/lib/resolver.h b/lib/resolver.h index d3f38f742..764e3e72a 100644 --- a/lib/resolver.h +++ b/lib/resolver.h @@ -6,7 +6,7 @@ #ifndef _FRR_RESOLVER_H #define _FRR_RESOLVER_H -#include "thread.h" +#include "event.h" #include "sockunion.h" #ifdef __cplusplus diff --git a/lib/sigevent.h b/lib/sigevent.h index e58b9a70c..69b3f54aa 100644 --- a/lib/sigevent.h +++ b/lib/sigevent.h @@ -8,7 +8,7 @@ #ifndef _FRR_SIGNAL_H #define _FRR_SIGNAL_H -#include <thread.h> +#include <event.h> #ifdef __cplusplus extern "C" { diff --git a/lib/smux.h b/lib/smux.h index 28a303cf7..dd1689f73 100644 --- a/lib/smux.h +++ b/lib/smux.h @@ -9,7 +9,7 @@ #include <net-snmp/agent/net-snmp-agent-includes.h> #include <net-snmp/agent/snmp_vars.h> -#include "thread.h" +#include "event.h" #include "hook.h" #ifdef __cplusplus diff --git a/lib/spf_backoff.c b/lib/spf_backoff.c index 1e80b5ec2..36b059a99 100644 --- a/lib/spf_backoff.c +++ b/lib/spf_backoff.c @@ -17,7 +17,7 @@ #include "command.h" #include "memory.h" -#include "thread.h" +#include "event.h" #include "vty.h" DEFINE_MTYPE_STATIC(LIB, SPF_BACKOFF, "SPF backoff"); diff --git a/lib/subdir.am b/lib/subdir.am index d456629bb..9f2f4033f 100644 --- a/lib/subdir.am +++ b/lib/subdir.am @@ -108,7 +108,7 @@ lib_libfrr_la_SOURCES = \ lib/systemd.c \ lib/table.c \ lib/termtable.c \ - lib/thread.c \ + lib/event.c \ lib/typerb.c \ lib/typesafe.c \ lib/vector.c \ @@ -181,7 +181,7 @@ clippy_scan += \ lib/plist.c \ lib/routemap.c \ lib/routemap_cli.c \ - lib/thread.c \ + lib/event.c \ lib/vty.c \ lib/zlog_5424_cli.c \ # end @@ -288,7 +288,7 @@ pkginclude_HEADERS += \ lib/systemd.h \ lib/table.h \ lib/termtable.h \ - lib/thread.h \ + lib/event.h \ lib/trace.h \ lib/typerb.h \ lib/typesafe.h \ diff --git a/lib/systemd.c b/lib/systemd.c index 0106e88b9..458bea514 100644 --- a/lib/systemd.c +++ b/lib/systemd.c @@ -7,7 +7,7 @@ #include <zebra.h> #include <sys/un.h> -#include "thread.h" +#include "event.h" #include "systemd.h" #include "lib_errors.h" @@ -22,7 +22,7 @@ #include <stdio.h> #include "linklist.h" -#include "thread.h" +#include "event.h" #include "buffer.h" #include "command.h" #include "sockunion.h" @@ -18,7 +18,7 @@ #include <regex.h> #endif /* HAVE_LIBPCRE2_POSIX */ -#include "thread.h" +#include "event.h" #include "log.h" #include "sockunion.h" #include "qobj.h" diff --git a/lib/wheel.c b/lib/wheel.c index 4aca23481..bd12105a3 100644 --- a/lib/wheel.c +++ b/lib/wheel.c @@ -6,7 +6,7 @@ */ #include "zebra.h" #include "linklist.h" -#include "thread.h" +#include "event.h" #include "memory.h" #include "wheel.h" #include "log.h" diff --git a/lib/workqueue.c b/lib/workqueue.c index 5477aadd6..e1ab4c48d 100644 --- a/lib/workqueue.c +++ b/lib/workqueue.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "memory.h" #include "workqueue.h" #include "linklist.h" diff --git a/lib/zclient.c b/lib/zclient.c index 0e49d6552..2cd80cc58 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -14,7 +14,7 @@ #include "vrf_int.h" #include "if.h" #include "log.h" -#include "thread.h" +#include "event.h" #include "zclient.h" #include "memory.h" #include "table.h" diff --git a/lib/zlog.c b/lib/zlog.c index e05720fd9..d379ff8d3 100644 --- a/lib/zlog.c +++ b/lib/zlog.c @@ -48,7 +48,7 @@ #include "frrcu.h" #include "zlog.h" #include "libfrr_trace.h" -#include "thread.h" +#include "event.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 5264dda0f..23cad0034 100644 --- a/lib/zlog_5424.c +++ b/lib/zlog_5424.c @@ -26,7 +26,7 @@ #include "frr_pthread.h" #include "command.h" #include "monotime.h" -#include "thread.h" +#include "event.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 2957b2908..22c0c4c04 100644 --- a/mgmtd/mgmt_be_adapter.c +++ b/mgmtd/mgmt_be_adapter.c @@ -7,7 +7,7 @@ */ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "sockopt.h" #include "network.h" #include "libfrr.h" diff --git a/mgmtd/mgmt_history.c b/mgmtd/mgmt_history.c index 75def3a05..600a5f564 100644 --- a/mgmtd/mgmt_history.c +++ b/mgmtd/mgmt_history.c @@ -7,7 +7,7 @@ #include <zebra.h> #include "md5.h" -#include "thread.h" +#include "event.h" #include "xref.h" #include "mgmt_fe_client.h" diff --git a/nhrpd/netlink_arp.c b/nhrpd/netlink_arp.c index 877659b4c..552730d12 100644 --- a/nhrpd/netlink_arp.c +++ b/nhrpd/netlink_arp.c @@ -14,7 +14,7 @@ #include <linux/neighbour.h> #include <linux/netfilter/nfnetlink_log.h> -#include "thread.h" +#include "event.h" #include "stream.h" #include "prefix.h" #include "nhrpd.h" diff --git a/nhrpd/nhrp_cache.c b/nhrpd/nhrp_cache.c index 42c6c2fbb..ac1c8f9eb 100644 --- a/nhrpd/nhrp_cache.c +++ b/nhrpd/nhrp_cache.c @@ -5,7 +5,7 @@ #include "zebra.h" #include "memory.h" -#include "thread.h" +#include "event.h" #include "hash.h" #include "nhrpd.h" diff --git a/nhrpd/nhrp_event.c b/nhrpd/nhrp_event.c index 9c1189083..25f5a701b 100644 --- a/nhrpd/nhrp_event.c +++ b/nhrpd/nhrp_event.c @@ -11,7 +11,7 @@ #include <sys/socket.h> #include <sys/un.h> -#include "thread.h" +#include "event.h" #include "zbuf.h" #include "log.h" #include "nhrpd.h" diff --git a/nhrpd/nhrp_interface.c b/nhrpd/nhrp_interface.c index d396f510e..7a0c3ba49 100644 --- a/nhrpd/nhrp_interface.c +++ b/nhrpd/nhrp_interface.c @@ -11,7 +11,7 @@ #include "zebra.h" #include "linklist.h" #include "memory.h" -#include "thread.h" +#include "event.h" #include "nhrpd.h" #include "os.h" diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c index 10d3c8f82..88bb1f871 100644 --- a/nhrpd/nhrp_main.c +++ b/nhrpd/nhrp_main.c @@ -12,7 +12,7 @@ #include "zebra.h" #include "privs.h" #include "getopt.h" -#include "thread.h" +#include "event.h" #include "sigevent.h" #include "lib/version.h" #include "log.h" diff --git a/nhrpd/nhrp_multicast.c b/nhrpd/nhrp_multicast.c index cdd79e25f..e37dfb5d8 100644 --- a/nhrpd/nhrp_multicast.c +++ b/nhrpd/nhrp_multicast.c @@ -18,7 +18,7 @@ #include <sys/types.h> #include <sys/socket.h> -#include "thread.h" +#include "event.h" #include "nhrpd.h" #include "netlink.h" #include "znl.h" diff --git a/nhrpd/nhrp_nhs.c b/nhrpd/nhrp_nhs.c index 49f881df1..358d1b94c 100644 --- a/nhrpd/nhrp_nhs.c +++ b/nhrpd/nhrp_nhs.c @@ -6,7 +6,7 @@ #include "zebra.h" #include "zbuf.h" #include "memory.h" -#include "thread.h" +#include "event.h" #include "nhrpd.h" #include "nhrp_protocol.h" diff --git a/nhrpd/nhrp_packet.c b/nhrpd/nhrp_packet.c index ecf8aa0b1..d201eb6cc 100644 --- a/nhrpd/nhrp_packet.c +++ b/nhrpd/nhrp_packet.c @@ -10,7 +10,7 @@ #include <netinet/if_ether.h> #include "nhrpd.h" #include "zbuf.h" -#include "thread.h" +#include "event.h" #include "hash.h" #include "nhrp_protocol.h" diff --git a/nhrpd/nhrp_peer.c b/nhrpd/nhrp_peer.c index 9b92cdffc..25ce59a40 100644 --- a/nhrpd/nhrp_peer.c +++ b/nhrpd/nhrp_peer.c @@ -11,7 +11,7 @@ #include "zebra.h" #include "memory.h" -#include "thread.h" +#include "event.h" #include "hash.h" #include "network.h" diff --git a/nhrpd/nhrp_shortcut.c b/nhrpd/nhrp_shortcut.c index 90fb1d67c..e5516ba72 100644 --- a/nhrpd/nhrp_shortcut.c +++ b/nhrpd/nhrp_shortcut.c @@ -10,7 +10,7 @@ #include "nhrpd.h" #include "table.h" #include "memory.h" -#include "thread.h" +#include "event.h" #include "log.h" #include "nhrp_protocol.h" diff --git a/nhrpd/nhrp_vc.c b/nhrpd/nhrp_vc.c index bffb2f6e9..65e9af854 100644 --- a/nhrpd/nhrp_vc.c +++ b/nhrpd/nhrp_vc.c @@ -7,7 +7,7 @@ #include "memory.h" #include "stream.h" #include "hash.h" -#include "thread.h" +#include "event.h" #include "jhash.h" #include "nhrpd.h" diff --git a/nhrpd/vici.c b/nhrpd/vici.c index 1dbb4e4f5..880e0c253 100644 --- a/nhrpd/vici.c +++ b/nhrpd/vici.c @@ -11,7 +11,7 @@ #include <sys/socket.h> #include <sys/un.h> -#include "thread.h" +#include "event.h" #include "zbuf.h" #include "log.h" #include "lib_errors.h" diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c index 5b2b204dd..407de01c5 100644 --- a/ospf6d/ospf6_abr.c +++ b/ospf6d/ospf6_abr.c @@ -12,7 +12,7 @@ #include "vty.h" #include "linklist.h" #include "command.h" -#include "thread.h" +#include "event.h" #include "plist.h" #include "filter.h" diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c index 5795690a7..e7fefb72a 100644 --- a/ospf6d/ospf6_area.c +++ b/ospf6d/ospf6_area.c @@ -8,7 +8,7 @@ #include "log.h" #include "memory.h" #include "linklist.h" -#include "thread.h" +#include "event.h" #include "vty.h" #include "command.h" #include "if.h" diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c index 57c873b53..8924c00a5 100644 --- a/ospf6d/ospf6_asbr.c +++ b/ospf6d/ospf6_asbr.c @@ -13,7 +13,7 @@ #include "routemap.h" #include "table.h" #include "plist.h" -#include "thread.h" +#include "event.h" #include "linklist.h" #include "lib/northbound_cli.h" diff --git a/ospf6d/ospf6_bfd.c b/ospf6d/ospf6_bfd.c index 6cc9c3013..1b879ae28 100644 --- a/ospf6d/ospf6_bfd.c +++ b/ospf6d/ospf6_bfd.c @@ -11,7 +11,7 @@ #include "linklist.h" #include "memory.h" #include "prefix.h" -#include "thread.h" +#include "event.h" #include "buffer.h" #include "stream.h" #include "zclient.h" diff --git a/ospf6d/ospf6_flood.c b/ospf6d/ospf6_flood.c index d519b0e11..a782d9730 100644 --- a/ospf6d/ospf6_flood.c +++ b/ospf6d/ospf6_flood.c @@ -6,7 +6,7 @@ #include <zebra.h> #include "log.h" -#include "thread.h" +#include "event.h" #include "linklist.h" #include "vty.h" #include "command.h" diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index 7afb47c75..5f0c3cf93 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -9,7 +9,7 @@ #include "if.h" #include "log.h" #include "command.h" -#include "thread.h" +#include "event.h" #include "prefix.h" #include "plist.h" #include "zclient.h" diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c index e7ce2f5f7..d57e56bb3 100644 --- a/ospf6d/ospf6_intra.c +++ b/ospf6d/ospf6_intra.c @@ -7,7 +7,7 @@ #include "log.h" #include "linklist.h" -#include "thread.h" +#include "event.h" #include "memory.h" #include "if.h" #include "prefix.h" diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c index fe085b4cb..d93115adc 100644 --- a/ospf6d/ospf6_lsa.c +++ b/ospf6d/ospf6_lsa.c @@ -12,7 +12,7 @@ #include "vty.h" #include "command.h" #include "memory.h" -#include "thread.h" +#include "event.h" #include "checksum.h" #include "frrstr.h" diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c index abc460249..6b5134a2b 100644 --- a/ospf6d/ospf6_main.c +++ b/ospf6d/ospf6_main.c @@ -9,7 +9,7 @@ #include <stdlib.h> #include "getopt.h" -#include "thread.h" +#include "event.h" #include "log.h" #include "command.h" #include "vty.h" diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c index a499190a1..45d03bafe 100644 --- a/ospf6d/ospf6_message.c +++ b/ospf6d/ospf6_message.c @@ -9,7 +9,7 @@ #include "log.h" #include "vty.h" #include "command.h" -#include "thread.h" +#include "event.h" #include "linklist.h" #include "lib_errors.h" #include "checksum.h" diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c index 5ab5a49a4..c90603e1a 100644 --- a/ospf6d/ospf6_neighbor.c +++ b/ospf6d/ospf6_neighbor.c @@ -7,7 +7,7 @@ #include "log.h" #include "memory.h" -#include "thread.h" +#include "event.h" #include "linklist.h" #include "vty.h" #include "command.h" diff --git a/ospf6d/ospf6_nssa.c b/ospf6d/ospf6_nssa.c index d62a3a632..cd3b742de 100644 --- a/ospf6d/ospf6_nssa.c +++ b/ospf6d/ospf6_nssa.c @@ -13,7 +13,7 @@ #include "vty.h" #include "linklist.h" #include "command.h" -#include "thread.h" +#include "event.h" #include "plist.h" #include "filter.h" diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c index 112934bf1..474cca0f3 100644 --- a/ospf6d/ospf6_spf.c +++ b/ospf6d/ospf6_spf.c @@ -13,7 +13,7 @@ #include "vty.h" #include "prefix.h" #include "linklist.h" -#include "thread.h" +#include "event.h" #include "lib_errors.h" #include "ospf6_lsa.h" diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index bd5aedb45..029848386 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -11,7 +11,7 @@ #include "linklist.h" #include "prefix.h" #include "table.h" -#include "thread.h" +#include "event.h" #include "command.h" #include "defaults.h" #include "lib/json.h" diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c index 257a0f2b0..eea487012 100644 --- a/ospf6d/ospf6d.c +++ b/ospf6d/ospf6d.c @@ -5,7 +5,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "linklist.h" #include "vty.h" #include "command.h" diff --git a/ospf6d/ospf6d.h b/ospf6d/ospf6d.h index 234a0e881..3a2eb71c3 100644 --- a/ospf6d/ospf6d.h +++ b/ospf6d/ospf6d.h @@ -7,7 +7,7 @@ #define OSPF6D_H #include "libospf.h" -#include "thread.h" +#include "event.h" #include "memory.h" DECLARE_MGROUP(OSPF6D); diff --git a/ospfclient/ospf_apiclient.c b/ospfclient/ospf_apiclient.c index c5bbc0150..a29c42227 100644 --- a/ospfclient/ospf_apiclient.c +++ b/ospfclient/ospf_apiclient.c @@ -8,7 +8,7 @@ #include <lib/version.h> #include "getopt.h" -#include "thread.h" +#include "event.h" #include "prefix.h" #include "linklist.h" #include "if.h" diff --git a/ospfclient/ospfclient.c b/ospfclient/ospfclient.c index cbc53ad35..970a039d8 100644 --- a/ospfclient/ospfclient.c +++ b/ospfclient/ospfclient.c @@ -43,7 +43,7 @@ struct zebra_privs_t ospfd_privs = {.user = NULL, free to use any thread library (like pthreads). */ #include "ospfd/ospf_dump.h" /* for ospf_lsa_header_dump */ -#include "thread.h" +#include "event.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 8f177cbce..91f4d77a8 100644 --- a/ospfd/ospf_abr.c +++ b/ospfd/ospf_abr.c @@ -7,7 +7,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/ospfd/ospf_api.c b/ospfd/ospf_api.c index 3cb1287be..922696f8b 100644 --- a/ospfd/ospf_api.c +++ b/ospfd/ospf_api.c @@ -18,7 +18,7 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "thread.h" +#include "event.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 086b5660b..cc1ca6647 100644 --- a/ospfd/ospf_apiserver.c +++ b/ospfd/ospf_apiserver.c @@ -18,7 +18,7 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "thread.h" +#include "event.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 6eada0b1a..85b5377e5 100644 --- a/ospfd/ospf_asbr.c +++ b/ospfd/ospf_asbr.c @@ -6,7 +6,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/ospfd/ospf_ase.c b/ospfd/ospf_ase.c index b43f0cb37..ad7dac0ab 100644 --- a/ospfd/ospf_ase.c +++ b/ospfd/ospf_ase.c @@ -6,7 +6,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "memory.h" #include "hash.h" #include "linklist.h" diff --git a/ospfd/ospf_bfd.c b/ospfd/ospf_bfd.c index 0b0016745..3ed54d3bf 100644 --- a/ospfd/ospf_bfd.c +++ b/ospfd/ospf_bfd.c @@ -12,7 +12,7 @@ #include "linklist.h" #include "memory.h" #include "prefix.h" -#include "thread.h" +#include "event.h" #include "buffer.h" #include "stream.h" #include "zclient.h" diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c index b74b84e37..d712d7b5f 100644 --- a/ospfd/ospf_dump.c +++ b/ospfd/ospf_dump.c @@ -9,7 +9,7 @@ #include "lib/bfd.h" #include "monotime.h" #include "linklist.h" -#include "thread.h" +#include "event.h" #include "prefix.h" #include "command.h" #include "stream.h" diff --git a/ospfd/ospf_ext.c b/ospfd/ospf_ext.c index 5faaed076..28f368e37 100644 --- a/ospfd/ospf_ext.c +++ b/ospfd/ospf_ext.c @@ -25,7 +25,7 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "thread.h" +#include "event.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 d0453bbc4..99bc4249f 100644 --- a/ospfd/ospf_flood.c +++ b/ospfd/ospf_flood.c @@ -12,7 +12,7 @@ #include "if.h" #include "command.h" #include "table.h" -#include "thread.h" +#include "event.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 07ce0d66e..522c9b71b 100644 --- a/ospfd/ospf_gr_helper.c +++ b/ospfd/ospf_gr_helper.c @@ -8,7 +8,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/ospfd/ospf_ia.c b/ospfd/ospf_ia.c index d3c9626d9..b4bf6cf3d 100644 --- a/ospfd/ospf_ia.c +++ b/ospfd/ospf_ia.c @@ -7,7 +7,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "memory.h" #include "hash.h" #include "linklist.h" diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c index 4ea367eca..6f0faabc7 100644 --- a/ospfd/ospf_interface.c +++ b/ospfd/ospf_interface.c @@ -6,7 +6,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "linklist.h" #include "prefix.h" #include "if.h" diff --git a/ospfd/ospf_ism.c b/ospfd/ospf_ism.c index 173ebdf20..bc236406d 100644 --- a/ospfd/ospf_ism.c +++ b/ospfd/ospf_ism.c @@ -7,7 +7,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.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 d3da5003a..c1f245d3b 100644 --- a/ospfd/ospf_ldp_sync.c +++ b/ospfd/ospf_ldp_sync.c @@ -9,7 +9,7 @@ #include "monotime.h" #include "memory.h" -#include "thread.h" +#include "event.h" #include "prefix.h" #include "table.h" #include "vty.h" diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c index 5c3f184c5..9ad1fca74 100644 --- a/ospfd/ospf_lsa.c +++ b/ospfd/ospf_lsa.c @@ -14,7 +14,7 @@ #include "memory.h" #include "stream.h" #include "log.h" -#include "thread.h" +#include "event.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 05fc5c95d..7c591c052 100644 --- a/ospfd/ospf_main.c +++ b/ospfd/ospf_main.c @@ -9,7 +9,7 @@ #include <lib/version.h> #include "bfd.h" #include "getopt.h" -#include "thread.h" +#include "event.h" #include "prefix.h" #include "linklist.h" #include "if.h" diff --git a/ospfd/ospf_neighbor.c b/ospfd/ospf_neighbor.c index 8338c4307..d341b2dba 100644 --- a/ospfd/ospf_neighbor.c +++ b/ospfd/ospf_neighbor.c @@ -11,7 +11,7 @@ #include "prefix.h" #include "memory.h" #include "command.h" -#include "thread.h" +#include "event.h" #include "stream.h" #include "table.h" #include "log.h" diff --git a/ospfd/ospf_network.c b/ospfd/ospf_network.c index e89ad020b..ba74e67a3 100644 --- a/ospfd/ospf_network.c +++ b/ospfd/ospf_network.c @@ -6,7 +6,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "linklist.h" #include "prefix.h" #include "if.h" diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c index 64bb45400..57aa49254 100644 --- a/ospfd/ospf_nsm.c +++ b/ospfd/ospf_nsm.c @@ -7,7 +7,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "memory.h" #include "hash.h" #include "linklist.h" diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c index fa04f092d..0626f1060 100644 --- a/ospfd/ospf_opaque.c +++ b/ospfd/ospf_opaque.c @@ -16,7 +16,7 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "thread.h" +#include "event.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 c4bccb3bc..1462ad48f 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -7,7 +7,7 @@ #include <zebra.h> #include "monotime.h" -#include "thread.h" +#include "event.h" #include "memory.h" #include "linklist.h" #include "prefix.h" diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c index a808ddc9f..2503f39a3 100644 --- a/ospfd/ospf_ri.c +++ b/ospfd/ospf_ri.c @@ -20,7 +20,7 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "thread.h" +#include "event.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 f731d1cf1..272ef5ce0 100644 --- a/ospfd/ospf_spf.c +++ b/ospfd/ospf_spf.c @@ -6,7 +6,7 @@ #include <zebra.h> #include "monotime.h" -#include "thread.h" +#include "event.h" #include "memory.h" #include "hash.h" #include "linklist.h" diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c index d1af08c65..00422e6b9 100644 --- a/ospfd/ospf_sr.c +++ b/ospfd/ospf_sr.c @@ -37,7 +37,7 @@ #include "sockunion.h" /* for inet_aton() */ #include "stream.h" #include "table.h" -#include "thread.h" +#include "event.h" #include "vty.h" #include "zclient.h" #include "sbuf.h" diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c index e3869abe5..2c4bd17d9 100644 --- a/ospfd/ospf_te.c +++ b/ospfd/ospf_te.c @@ -24,7 +24,7 @@ #include "vty.h" #include "stream.h" #include "log.h" -#include "thread.h" +#include "event.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 262f80546..610422bd5 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -10,7 +10,7 @@ #include "printfrr.h" #include "monotime.h" #include "memory.h" -#include "thread.h" +#include "event.h" #include "prefix.h" #include "table.h" #include "vty.h" diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index d321a6966..67da49c21 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -6,7 +6,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "command.h" #include "network.h" #include "prefix.h" diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c index 0296d9d9f..c3edc9dd5 100644 --- a/ospfd/ospfd.c +++ b/ospfd/ospfd.c @@ -5,7 +5,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "vty.h" #include "command.h" #include "linklist.h" diff --git a/pathd/path_main.c b/pathd/path_main.c index 3d35b9f9b..7d54123d7 100644 --- a/pathd/path_main.c +++ b/pathd/path_main.c @@ -6,7 +6,7 @@ #include <lib/version.h> #include "getopt.h" -#include "thread.h" +#include "event.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 21d127bcf..0e63b56f5 100644 --- a/pathd/path_pcep_config.c +++ b/pathd/path_pcep_config.c @@ -13,7 +13,7 @@ #include "pathd/path_pcep.h" #include "pathd/path_pcep_config.h" #include "pathd/path_pcep_debug.h" -#include "thread.h" +#include "event.h" #define MAX_XPATH 256 #define MAX_FLOAT_LEN 22 diff --git a/pathd/path_zebra.c b/pathd/path_zebra.c index efc016f75..28daac60b 100644 --- a/pathd/path_zebra.c +++ b/pathd/path_zebra.c @@ -5,7 +5,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "log.h" #include "lib_errors.h" #include "if.h" diff --git a/pbrd/pbr_main.c b/pbrd/pbr_main.c index 9b34815c4..2941dbeca 100644 --- a/pbrd/pbr_main.c +++ b/pbrd/pbr_main.c @@ -8,7 +8,7 @@ #include <lib/version.h> #include "getopt.h" -#include "thread.h" +#include "event.h" #include "prefix.h" #include "linklist.h" #include "if.h" diff --git a/pbrd/pbr_map.c b/pbrd/pbr_map.c index 0e18f1198..1519af4ee 100644 --- a/pbrd/pbr_map.c +++ b/pbrd/pbr_map.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "linklist.h" #include "prefix.h" #include "table.h" diff --git a/pbrd/pbr_zebra.c b/pbrd/pbr_zebra.c index 1b18853d2..c2c785fb6 100644 --- a/pbrd/pbr_zebra.c +++ b/pbrd/pbr_zebra.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "command.h" #include "network.h" #include "prefix.h" diff --git a/pimd/pim6_mld.c b/pimd/pim6_mld.c index fa699cca5..c722add84 100644 --- a/pimd/pim6_mld.c +++ b/pimd/pim6_mld.c @@ -19,7 +19,7 @@ #include "lib/jhash.h" #include "lib/prefix.h" #include "lib/checksum.h" -#include "lib/thread.h" +#include "lib/event.h" #include "termtable.h" #include "pimd/pim6_mld.h" diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index 136498beb..98f594d0c 100644 --- a/pimd/pim_ifchannel.c +++ b/pimd/pim_ifchannel.c @@ -7,7 +7,7 @@ #include <zebra.h> #include "linklist.h" -#include "thread.h" +#include "event.h" #include "memory.h" #include "if.h" #include "vrf.h" diff --git a/pimd/pim_main.c b/pimd/pim_main.c index ce4326c61..0a782455c 100644 --- a/pimd/pim_main.c +++ b/pimd/pim_main.c @@ -11,7 +11,7 @@ #include "lib/version.h" #include <getopt.h> #include "command.h" -#include "thread.h" +#include "event.h" #include <signal.h> #include "memory.h" diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c index 9d29a33a5..b3d30defe 100644 --- a/pimd/pim_msdp.c +++ b/pimd/pim_msdp.c @@ -12,7 +12,7 @@ #include <lib/prefix.h> #include <lib/sockunion.h> #include <lib/stream.h> -#include <lib/thread.h> +#include <event.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 a6f318e61..c3dd07696 100644 --- a/pimd/pim_msdp_packet.c +++ b/pimd/pim_msdp_packet.c @@ -8,7 +8,7 @@ #include <lib/log.h> #include <lib/network.h> #include <lib/stream.h> -#include <lib/thread.h> +#include "event.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 a6b5ee11b..3bf6b1d74 100644 --- a/pimd/pim_msdp_socket.c +++ b/pimd/pim_msdp_socket.c @@ -9,7 +9,7 @@ #include <lib/log.h> #include <lib/network.h> #include <lib/sockunion.h> -#include <lib/thread.h> +#include "event.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 1248db3de..697266e2b 100644 --- a/pimd/pim_pim.c +++ b/pimd/pim_pim.c @@ -7,7 +7,7 @@ #include <zebra.h> #include "log.h" -#include "thread.h" +#include "event.h" #include "memory.h" #include "if.h" #include "network.h" diff --git a/pimd/pim_register.c b/pimd/pim_register.c index 5144fe67b..42b013815 100644 --- a/pimd/pim_register.c +++ b/pimd/pim_register.c @@ -9,7 +9,7 @@ #include "log.h" #include "if.h" -#include "thread.h" +#include "event.h" #include "prefix.h" #include "vty.h" #include "plist.h" diff --git a/pimd/pim_time.c b/pimd/pim_time.c index c9555f531..3f3d67f59 100644 --- a/pimd/pim_time.c +++ b/pimd/pim_time.c @@ -11,7 +11,7 @@ #include <time.h> #include "log.h" -#include "thread.h" +#include "event.h" #include "lib_errors.h" #include "pim_time.h" diff --git a/pimd/pim_time.h b/pimd/pim_time.h index fd1e79e2b..a0707407e 100644 --- a/pimd/pim_time.h +++ b/pimd/pim_time.h @@ -10,7 +10,7 @@ #include <stdint.h> #include <zebra.h> -#include "thread.h" +#include "event.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 b0f115859..1ee044197 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -9,7 +9,7 @@ #include "log.h" #include "zclient.h" #include "memory.h" -#include "thread.h" +#include "event.h" #include "linklist.h" #include "vty.h" #include "plist.h" diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c index 08807d0dc..5f574eb5b 100644 --- a/pimd/pim_zlookup.c +++ b/pimd/pim_zlookup.c @@ -11,7 +11,7 @@ #include "zclient.h" #include "stream.h" #include "network.h" -#include "thread.h" +#include "event.h" #include "prefix.h" #include "vty.h" #include "lib_errors.h" diff --git a/python/xref2vtysh.py b/python/xref2vtysh.py index b5873a3aa..c325979d2 100644 --- a/python/xref2vtysh.py +++ b/python/xref2vtysh.py @@ -44,7 +44,7 @@ daemon_flags = { "lib/routemap.c": "VTYSH_RMAP", "lib/routemap_cli.c": "VTYSH_RMAP", "lib/spf_backoff.c": "VTYSH_ISISD", - "lib/thread.c": "VTYSH_ALL", + "lib/event.c": "VTYSH_ALL", "lib/vrf.c": "VTYSH_VRF", "lib/vty.c": "VTYSH_ALL", } diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index 3e6232172..309c18f9c 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -14,7 +14,7 @@ #include "table.h" #include "log.h" #include "stream.h" -#include "thread.h" +#include "event.h" #include "zclient.h" #include "filter.h" #include "sockopt.h" diff --git a/ripd/rip_main.c b/ripd/rip_main.c index e26424ade..b6166b14c 100644 --- a/ripd/rip_main.c +++ b/ripd/rip_main.c @@ -7,7 +7,7 @@ #include <lib/version.h> #include "getopt.h" -#include "thread.h" +#include "event.h" #include "command.h" #include "memory.h" #include "prefix.h" diff --git a/ripd/rip_peer.c b/ripd/rip_peer.c index a3cba598d..85cd97150 100644 --- a/ripd/rip_peer.c +++ b/ripd/rip_peer.c @@ -9,7 +9,7 @@ #include "prefix.h" #include "command.h" #include "linklist.h" -#include "thread.h" +#include "event.h" #include "memory.h" #include "ripd/ripd.h" diff --git a/ripd/ripd.c b/ripd/ripd.c index bde7e858f..8b21af92f 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -11,7 +11,7 @@ #include "command.h" #include "prefix.h" #include "table.h" -#include "thread.h" +#include "event.h" #include "memory.h" #include "log.h" #include "stream.h" diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c index 1fc6f2553..919f3c81d 100644 --- a/ripngd/ripng_interface.c +++ b/ripngd/ripng_interface.c @@ -17,7 +17,7 @@ #include "zclient.h" #include "command.h" #include "agg_table.h" -#include "thread.h" +#include "event.h" #include "privs.h" #include "vrf.h" #include "lib_errors.h" diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c index 14e69834c..dcdd0c1f7 100644 --- a/ripngd/ripng_main.c +++ b/ripngd/ripng_main.c @@ -12,7 +12,7 @@ #include "vty.h" #include "command.h" #include "memory.h" -#include "thread.h" +#include "event.h" #include "log.h" #include "prefix.h" #include "if.h" diff --git a/ripngd/ripng_peer.c b/ripngd/ripng_peer.c index 75a9ed77f..30b11aa14 100644 --- a/ripngd/ripng_peer.c +++ b/ripngd/ripng_peer.c @@ -13,7 +13,7 @@ #include "prefix.h" #include "command.h" #include "linklist.h" -#include "thread.h" +#include "event.h" #include "memory.h" #include "ripngd/ripngd.h" diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c index f01371f41..24ff1bcd0 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -8,7 +8,7 @@ #include "prefix.h" #include "filter.h" #include "log.h" -#include "thread.h" +#include "event.h" #include "memory.h" #include "if.h" #include "stream.h" diff --git a/sharpd/sharp_logpump.c b/sharpd/sharp_logpump.c index cadd81895..9ef9b2d0f 100644 --- a/sharpd/sharp_logpump.c +++ b/sharpd/sharp_logpump.c @@ -11,7 +11,7 @@ #include "prefix.h" #include "nexthop.h" #include "log.h" -#include "thread.h" +#include "event.h" #include "vrf.h" #include "zclient.h" #include "frr_pthread.h" diff --git a/sharpd/sharp_main.c b/sharpd/sharp_main.c index 9d33fc89a..1895a49d8 100644 --- a/sharpd/sharp_main.c +++ b/sharpd/sharp_main.c @@ -8,7 +8,7 @@ #include <lib/version.h> #include "getopt.h" -#include "thread.h" +#include "event.h" #include "prefix.h" #include "linklist.h" #include "if.h" diff --git a/sharpd/sharp_zebra.c b/sharpd/sharp_zebra.c index df06f5537..3c1943587 100644 --- a/sharpd/sharp_zebra.c +++ b/sharpd/sharp_zebra.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "command.h" #include "network.h" #include "prefix.h" diff --git a/staticd/static_main.c b/staticd/static_main.c index d42916219..1d9b0d16c 100644 --- a/staticd/static_main.c +++ b/staticd/static_main.c @@ -8,7 +8,7 @@ #include <lib/version.h> #include "getopt.h" -#include "thread.h" +#include "event.h" #include "command.h" #include "log.h" #include "memory.h" diff --git a/staticd/static_zebra.c b/staticd/static_zebra.c index f220b476f..6c59f04ee 100644 --- a/staticd/static_zebra.c +++ b/staticd/static_zebra.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include "thread.h" +#include "event.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 bb8acd2c4..209b4ad86 100644 --- a/tests/helpers/c/main.c +++ b/tests/helpers/c/main.c @@ -6,7 +6,7 @@ #include <lib/version.h> #include "getopt.h" -#include "thread.h" +#include "event.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 8f0b92d0f..2443f3866 100644 --- a/tests/isisd/test_fuzz_isis_tlv.c +++ b/tests/isisd/test_fuzz_isis_tlv.c @@ -9,7 +9,7 @@ #include "memory.h" #include "sbuf.h" #include "stream.h" -#include "thread.h" +#include "event.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 0cccf0567..37c22c543 100644 --- a/tests/isisd/test_isis_spf.c +++ b/tests/isisd/test_isis_spf.c @@ -8,7 +8,7 @@ #include <lib/version.h> #include "getopt.h" -#include "thread.h" +#include "event.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 29dad7d80..417038338 100644 --- a/tests/lib/cli/common_cli.c +++ b/tests/lib/cli/common_cli.c @@ -8,7 +8,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.h" #include "vty.h" #include "command.h" #include "memory.h" diff --git a/tests/lib/cxxcompat.c b/tests/lib/cxxcompat.c index 7aab88eeb..85dcea9e8 100644 --- a/tests/lib/cxxcompat.c +++ b/tests/lib/cxxcompat.c @@ -78,7 +78,7 @@ #include "lib/stream.h" #include "lib/table.h" #include "lib/termtable.h" -#include "lib/thread.h" +#include "event.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 3abda75f4..b841fea25 100644 --- a/tests/lib/northbound/test_oper_data.c +++ b/tests/lib/northbound/test_oper_data.c @@ -6,7 +6,7 @@ #include <zebra.h> -#include "thread.h" +#include "event.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 d68ee8a81..13f8daa5f 100644 --- a/tests/lib/test_assert.c +++ b/tests/lib/test_assert.c @@ -22,7 +22,7 @@ static void func_for_bt(int number) #include <zebra.h> #include "lib/zlog.h" -#include "lib/thread.h" +#include "event.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 282161c3d..187b8091d 100644 --- a/tests/lib/test_grpc.cpp +++ b/tests/lib/test_grpc.cpp @@ -14,7 +14,7 @@ #include "libfrr.h" #include "routing_nb.h" #include "northbound_cli.h" -#include "thread.h" +#include "event.h" #include "vrf.h" #include "vty.h" diff --git a/tests/lib/test_heavy.c b/tests/lib/test_heavy.c index 2d54fe6c6..7bce1584e 100644 --- a/tests/lib/test_heavy.c +++ b/tests/lib/test_heavy.c @@ -13,7 +13,7 @@ */ #include <zebra.h> -#include "thread.h" +#include "event.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 afbd20545..0cee1e863 100644 --- a/tests/lib/test_heavy_thread.c +++ b/tests/lib/test_heavy_thread.c @@ -14,7 +14,7 @@ #include <zebra.h> #include <math.h> -#include "thread.h" +#include "event.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 9b2cfa573..e09c4885c 100644 --- a/tests/lib/test_heavy_wq.c +++ b/tests/lib/test_heavy_wq.c @@ -13,7 +13,7 @@ */ #include <zebra.h> -#include "thread.h" +#include "event.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 015dc41db..8bf6f7fcc 100644 --- a/tests/lib/test_stream.c +++ b/tests/lib/test_stream.c @@ -6,7 +6,7 @@ #include <zebra.h> #include <stream.h> -#include <thread.h> +#include "event.h" #include "printfrr.h" diff --git a/tests/lib/test_timer_correctness.c b/tests/lib/test_timer_correctness.c index 37eb4939a..fa197cd1c 100644 --- a/tests/lib/test_timer_correctness.c +++ b/tests/lib/test_timer_correctness.c @@ -16,7 +16,7 @@ #include "memory.h" #include "prng.h" -#include "thread.h" +#include "event.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 21976e8d3..5af0604d1 100644 --- a/tests/lib/test_timer_performance.c +++ b/tests/lib/test_timer_performance.c @@ -14,7 +14,7 @@ #include <stdio.h> #include <unistd.h> -#include "thread.h" +#include "event.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 b8a2aef69..d40b37b92 100644 --- a/tests/ospfd/test_ospf_spf.c +++ b/tests/ospfd/test_ospf_spf.c @@ -1,7 +1,7 @@ #include <zebra.h> #include "getopt.h" -#include "thread.h" +#include "event.h" #include <lib/version.h> #include "vty.h" #include "command.h" diff --git a/vrrpd/vrrp.h b/vrrpd/vrrp.h index 9da9c8a51..5cdba8677 100644 --- a/vrrpd/vrrp.h +++ b/vrrpd/vrrp.h @@ -18,7 +18,7 @@ #include "lib/northbound.h" #include "lib/privs.h" #include "lib/stream.h" -#include "lib/thread.h" +#include "lib/event.h" #include "lib/vty.h" /* Global definitions */ diff --git a/vrrpd/vrrp_main.c b/vrrpd/vrrp_main.c index d3d230d20..90c3a7772 100644 --- a/vrrpd/vrrp_main.c +++ b/vrrpd/vrrp_main.c @@ -18,7 +18,7 @@ #include "lib/nexthop.h" #include "lib/privs.h" #include "lib/sigevent.h" -#include "lib/thread.h" +#include "lib/event.h" #include "lib/vrf.h" #include "lib/vty.h" diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c index 84f4d02a8..eb32cc966 100644 --- a/watchfrr/watchfrr.c +++ b/watchfrr/watchfrr.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include <thread.h> +#include "event.h" #include <log.h> #include <network.h> #include <sigevent.h> diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c index 21cad0137..8fb5b28c3 100644 --- a/zebra/if_netlink.c +++ b/zebra/if_netlink.c @@ -33,7 +33,7 @@ #include "table.h" #include "memory.h" #include "rib.h" -#include "thread.h" +#include "event.h" #include "privs.h" #include "nexthop.h" #include "vrf.h" diff --git a/zebra/irdp_interface.c b/zebra/irdp_interface.c index 0c9b6f3d3..28d6b89ed 100644 --- a/zebra/irdp_interface.c +++ b/zebra/irdp_interface.c @@ -24,7 +24,7 @@ #include "connected.h" #include "log.h" #include "zclient.h" -#include "thread.h" +#include "event.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 ddcad92bd..894097020 100644 --- a/zebra/irdp_main.c +++ b/zebra/irdp_main.c @@ -32,7 +32,7 @@ #include "connected.h" #include "log.h" #include "zclient.h" -#include "thread.h" +#include "event.h" #include "privs.h" #include "libfrr.h" #include "lib_errors.h" diff --git a/zebra/irdp_packet.c b/zebra/irdp_packet.c index 4f4f3772d..7903f14e1 100644 --- a/zebra/irdp_packet.c +++ b/zebra/irdp_packet.c @@ -34,7 +34,7 @@ #include "sockunion.h" #include "sockunion.h" #include "stream.h" -#include "thread.h" +#include "event.h" #include "vty.h" #include "zclient.h" #include "lib_errors.h" diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c index a980b56b3..fdf4b850d 100644 --- a/zebra/kernel_netlink.c +++ b/zebra/kernel_netlink.c @@ -15,7 +15,7 @@ #include "table.h" #include "memory.h" #include "rib.h" -#include "thread.h" +#include "event.h" #include "privs.h" #include "nexthop.h" #include "vrf.h" diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c index 915fd087f..04f484cd9 100644 --- a/zebra/kernel_socket.c +++ b/zebra/kernel_socket.c @@ -1255,7 +1255,7 @@ int rtm_write(int message, union sockunion *dest, union sockunion *mask, } -#include "thread.h" +#include "event.h" #include "zebra/zserv.h" /* For debug purpose. */ diff --git a/zebra/label_manager.h b/zebra/label_manager.h index c0bd8e369..e2f5d1901 100644 --- a/zebra/label_manager.h +++ b/zebra/label_manager.h @@ -14,7 +14,7 @@ #include <stdint.h> #include "lib/linklist.h" -#include "lib/thread.h" +#include "event.h" #include "lib/hook.h" #include "zebra/zserv.h" diff --git a/zebra/main.c b/zebra/main.c index c40a03551..49b928d09 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -8,7 +8,7 @@ #include <lib/version.h> #include "getopt.h" #include "command.h" -#include "thread.h" +#include "event.h" #include "filter.h" #include "memory.h" #include "prefix.h" diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index e4ddbd95d..e92fb1915 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -38,7 +38,7 @@ #include "table.h" #include "memory.h" #include "rib.h" -#include "thread.h" +#include "event.h" #include "privs.h" #include "nexthop.h" #include "vrf.h" diff --git a/zebra/rtadv.c b/zebra/rtadv.c index 1e0769fb6..7f9a8ed00 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -9,7 +9,7 @@ #include "memory.h" #include "sockopt.h" -#include "thread.h" +#include "event.h" #include "if.h" #include "stream.h" #include "log.h" diff --git a/zebra/table_manager.h b/zebra/table_manager.h index deed4fa30..eb460c291 100644 --- a/zebra/table_manager.h +++ b/zebra/table_manager.h @@ -9,7 +9,7 @@ #include <stdint.h> #include "lib/linklist.h" -#include "lib/thread.h" +#include "event.h" #include "lib/ns.h" #include "zebra/zserv.h" diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c index 15765b5e1..f7de5eb0c 100644 --- a/zebra/zebra_fpm.c +++ b/zebra/zebra_fpm.c @@ -11,7 +11,7 @@ #include "log.h" #include "libfrr.h" #include "stream.h" -#include "thread.h" +#include "event.h" #include "network.h" #include "command.h" #include "lib/version.h" diff --git a/zebra/zebra_gr.c b/zebra/zebra_gr.c index 3724ea090..c9881e51d 100644 --- a/zebra/zebra_gr.c +++ b/zebra/zebra_gr.c @@ -13,7 +13,7 @@ #include "lib/prefix.h" #include "lib/command.h" #include "lib/if.h" -#include "lib/thread.h" +#include "event.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 334eb6dc4..d9189206f 100644 --- a/zebra/zebra_mlag_private.c +++ b/zebra/zebra_mlag_private.c @@ -12,7 +12,7 @@ #include "hook.h" #include "module.h" -#include "thread.h" +#include "event.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 4aaf6f25a..dfb4875ff 100644 --- a/zebra/zebra_mpls.c +++ b/zebra/zebra_mpls.c @@ -13,7 +13,7 @@ #include "log.h" #include "sockunion.h" #include "linklist.h" -#include "thread.h" +#include "event.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 28f3c03ab..468acbdfe 100644 --- a/zebra/zebra_netns_notify.c +++ b/zebra/zebra_netns_notify.c @@ -17,7 +17,7 @@ #include <sys/inotify.h> #include <sys/stat.h> -#include "thread.h" +#include "event.h" #include "ns.h" #include "command.h" #include "memory.h" diff --git a/zebra/zebra_pw.c b/zebra/zebra_pw.c index dc56ba3c3..a3f7ba628 100644 --- a/zebra/zebra_pw.c +++ b/zebra/zebra_pw.c @@ -7,7 +7,7 @@ #include "log.h" #include "memory.h" -#include "thread.h" +#include "event.h" #include "command.h" #include "vrf.h" #include "lib/json.h" diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index 6c499b77d..5e9eda168 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -18,7 +18,7 @@ #include "sockunion.h" #include "srcdest_table.h" #include "table.h" -#include "thread.h" +#include "event.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 2666dc232..61a4559e0 100644 --- a/zebra/zebra_rnh.c +++ b/zebra/zebra_rnh.c @@ -13,7 +13,7 @@ #include "log.h" #include "sockunion.h" #include "linklist.h" -#include "thread.h" +#include "event.h" #include "workqueue.h" #include "prefix.h" #include "routemap.h" diff --git a/zebra/zserv.c b/zebra/zserv.c index e064c27ad..3563068a6 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -34,7 +34,7 @@ #include "lib/sockopt.h" /* for setsockopt_so_recvbuf, setsockopt... */ #include "lib/sockunion.h" /* for sockopt_reuseaddr, sockopt_reuseport */ #include "lib/stream.h" /* for STREAM_SIZE, stream (ptr only), ... */ -#include "lib/thread.h" /* for thread (ptr only), THREAD_ARG, ... */ +#include "event.h" /* for thread (ptr only), THREAD_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 1226cd711..0faea9dd7 100644 --- a/zebra/zserv.h +++ b/zebra/zserv.h @@ -19,7 +19,7 @@ #include "lib/vrf.h" /* for vrf_bitmap_t */ #include "lib/zclient.h" /* for redist_proto */ #include "lib/stream.h" /* for stream, stream_fifo */ -#include "lib/thread.h" /* for thread, thread_master */ +#include "event.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 */ |