diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2023-03-07 14:22:48 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2023-03-24 08:32:17 -0400 |
| commit | 24a58196ddcff2215d382d8a677c2dcdc898e03c (patch) | |
| tree | 96e008127cbe222d07aefc8b31d2176f64a1e21a /lib | |
| parent | cd9d0537411d0a74cd19ae36f6d3716c8ccbb4c1 (diff) | |
*: Convert event.h to frrevent.h
We should probably prevent any type of namespace collision
with something else.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bfd.c | 2 | ||||
| -rw-r--r-- | lib/command.c | 2 | ||||
| -rw-r--r-- | lib/event.c | 2 | ||||
| -rw-r--r-- | lib/frr_pthread.h | 2 | ||||
| -rw-r--r-- | lib/frr_zmq.c | 2 | ||||
| -rw-r--r-- | lib/frr_zmq.h | 2 | ||||
| -rw-r--r-- | lib/frrevent.h (renamed from lib/event.h) | 8 | ||||
| -rw-r--r-- | lib/ldp_sync.c | 2 | ||||
| -rw-r--r-- | lib/libfrr.h | 2 | ||||
| -rw-r--r-- | lib/libfrr_trace.h | 2 | ||||
| -rw-r--r-- | lib/mgmt_fe_client.h | 2 | ||||
| -rw-r--r-- | lib/mgmt_msg.c | 2 | ||||
| -rw-r--r-- | lib/mgmt_msg.h | 2 | ||||
| -rw-r--r-- | lib/northbound.h | 2 | ||||
| -rw-r--r-- | lib/northbound_grpc.cpp | 2 | ||||
| -rw-r--r-- | lib/pullwr.h | 2 | ||||
| -rw-r--r-- | lib/qobj.c | 2 | ||||
| -rw-r--r-- | lib/resolver.c | 2 | ||||
| -rw-r--r-- | lib/resolver.h | 2 | ||||
| -rw-r--r-- | lib/sigevent.h | 2 | ||||
| -rw-r--r-- | lib/smux.h | 2 | ||||
| -rw-r--r-- | lib/spf_backoff.c | 2 | ||||
| -rw-r--r-- | lib/subdir.am | 2 | ||||
| -rw-r--r-- | lib/systemd.c | 2 | ||||
| -rw-r--r-- | lib/vty.c | 2 | ||||
| -rw-r--r-- | lib/vty.h | 2 | ||||
| -rw-r--r-- | lib/wheel.c | 2 | ||||
| -rw-r--r-- | lib/workqueue.c | 2 | ||||
| -rw-r--r-- | lib/zclient.c | 2 | ||||
| -rw-r--r-- | lib/zlog.c | 2 | ||||
| -rw-r--r-- | lib/zlog_5424.c | 2 |
31 files changed, 34 insertions, 34 deletions
@@ -10,7 +10,7 @@ #include "command.h" #include "memory.h" #include "prefix.h" -#include "event.h" +#include "frrevent.h" #include "stream.h" #include "vrf.h" #include "zclient.h" diff --git a/lib/command.c b/lib/command.c index be766f7cd1..97ea200ff4 100644 --- a/lib/command.c +++ b/lib/command.c @@ -17,7 +17,7 @@ #include "memory.h" #include "log.h" #include "log_vty.h" -#include "event.h" +#include "frrevent.h" #include "vector.h" #include "linklist.h" #include "vty.h" diff --git a/lib/event.c b/lib/event.c index f95e98a7fe..9d3378b9bf 100644 --- a/lib/event.c +++ b/lib/event.c @@ -8,7 +8,7 @@ #include <zebra.h> #include <sys/resource.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "frrcu.h" #include "log.h" diff --git a/lib/frr_pthread.h b/lib/frr_pthread.h index 36d0bdae80..f91044dfae 100644 --- a/lib/frr_pthread.h +++ b/lib/frr_pthread.h @@ -11,7 +11,7 @@ #include "frratomic.h" #include "memory.h" #include "frrcu.h" -#include "event.h" +#include "frrevent.h" #ifdef __cplusplus extern "C" { diff --git a/lib/frr_zmq.c b/lib/frr_zmq.c index 0b17e781e5..b28dd7f1bb 100644 --- a/lib/frr_zmq.c +++ b/lib/frr_zmq.c @@ -15,7 +15,7 @@ #include <zebra.h> #include <zmq.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "frr_zmq.h" #include "log.h" diff --git a/lib/frr_zmq.h b/lib/frr_zmq.h index 44f209b250..73da3770f4 100644 --- a/lib/frr_zmq.h +++ b/lib/frr_zmq.h @@ -7,7 +7,7 @@ #ifndef _FRRZMQ_H #define _FRRZMQ_H -#include "event.h" +#include "frrevent.h" #include <zmq.h> #ifdef __cplusplus diff --git a/lib/event.h b/lib/frrevent.h index 107949900a..b05885a985 100644 --- a/lib/event.h +++ b/lib/frrevent.h @@ -33,7 +33,7 @@ struct rusage_t { #endif struct timeval real; }; -#define RUSAGE_T struct rusage_t +#define RUSAGE_T struct rusage_t #define GETRUSAGE(X) event_getrusage(X) @@ -118,10 +118,10 @@ struct event { struct timeval sands; /* rest of time sands value. */ } u; struct timeval real; - struct cpu_event_history *hist; /* cache pointer to cpu_history */ - unsigned long yield; /* yield time in microseconds */ + struct cpu_event_history *hist; /* cache pointer to cpu_history */ + unsigned long yield; /* yield time in microseconds */ const struct xref_eventsched *xref; /* origin location */ - pthread_mutex_t mtx; /* mutex for thread.c functions */ + pthread_mutex_t mtx; /* mutex for thread.c functions */ bool ignore_timer_late; }; diff --git a/lib/ldp_sync.c b/lib/ldp_sync.c index b0608c391a..d55819dfaf 100644 --- a/lib/ldp_sync.c +++ b/lib/ldp_sync.c @@ -10,7 +10,7 @@ #include "memory.h" #include "prefix.h" #include "log.h" -#include "event.h" +#include "frrevent.h" #include "stream.h" #include "zclient.h" #include "table.h" diff --git a/lib/libfrr.h b/lib/libfrr.h index a60580e1d6..c05bc01e4f 100644 --- a/lib/libfrr.h +++ b/lib/libfrr.h @@ -11,7 +11,7 @@ #include "typesafe.h" #include "sigevent.h" #include "privs.h" -#include "event.h" +#include "frrevent.h" #include "log.h" #include "getopt.h" #include "module.h" diff --git a/lib/libfrr_trace.h b/lib/libfrr_trace.h index 4d25f55804..05c958fa42 100644 --- a/lib/libfrr_trace.h +++ b/lib/libfrr_trace.h @@ -21,7 +21,7 @@ #include <lttng/tracepoint.h> #include "hash.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "linklist.h" #include "table.h" diff --git a/lib/mgmt_fe_client.h b/lib/mgmt_fe_client.h index 2269a72ac0..aa3371f03c 100644 --- a/lib/mgmt_fe_client.h +++ b/lib/mgmt_fe_client.h @@ -13,7 +13,7 @@ extern "C" { #endif #include "mgmt_pb.h" -#include "event.h" +#include "frrevent.h" #include "mgmtd/mgmt_defines.h" /*************************************************************** diff --git a/lib/mgmt_msg.c b/lib/mgmt_msg.c index e7564f2688..3f55f82024 100644 --- a/lib/mgmt_msg.c +++ b/lib/mgmt_msg.c @@ -10,7 +10,7 @@ #include "network.h" #include "sockopt.h" #include "stream.h" -#include "event.h" +#include "frrevent.h" #include "mgmt_msg.h" diff --git a/lib/mgmt_msg.h b/lib/mgmt_msg.h index 90dab8da76..e2dd2d476a 100644 --- a/lib/mgmt_msg.h +++ b/lib/mgmt_msg.h @@ -8,7 +8,7 @@ #define _MGMT_MSG_H #include "stream.h" -#include "event.h" +#include "frrevent.h" #define MGMT_MSG_MARKER (0x4D724B21u) /* ASCII - "MrK!"*/ diff --git a/lib/northbound.h b/lib/northbound.h index 59703363ba..1723a87e4e 100644 --- a/lib/northbound.h +++ b/lib/northbound.h @@ -7,7 +7,7 @@ #ifndef _FRR_NORTHBOUND_H_ #define _FRR_NORTHBOUND_H_ -#include "event.h" +#include "frrevent.h" #include "hook.h" #include "linklist.h" #include "openbsd-tree.h" diff --git a/lib/northbound_grpc.cpp b/lib/northbound_grpc.cpp index 5ce80fb5fb..6c33351cef 100644 --- a/lib/northbound_grpc.cpp +++ b/lib/northbound_grpc.cpp @@ -12,7 +12,7 @@ #include "log.h" #include "libfrr.h" #include "lib/version.h" -#include "event.h" +#include "frrevent.h" #include "command.h" #include "lib_errors.h" #include "northbound.h" diff --git a/lib/pullwr.h b/lib/pullwr.h index a589389c3b..ef2e01c04e 100644 --- a/lib/pullwr.h +++ b/lib/pullwr.h @@ -10,7 +10,7 @@ #include <stdbool.h> #include <stdint.h> -#include "event.h" +#include "frrevent.h" #include "stream.h" #ifdef __cplusplus diff --git a/lib/qobj.c b/lib/qobj.c index 6ebdcbf9cb..b9630e7547 100644 --- a/lib/qobj.c +++ b/lib/qobj.c @@ -7,7 +7,7 @@ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "hash.h" #include "log.h" diff --git a/lib/resolver.c b/lib/resolver.c index d5915040be..99bf356eb3 100644 --- a/lib/resolver.c +++ b/lib/resolver.c @@ -12,7 +12,7 @@ #include "typesafe.h" #include "jhash.h" -#include "event.h" +#include "frrevent.h" #include "lib_errors.h" #include "resolver.h" #include "command.h" diff --git a/lib/resolver.h b/lib/resolver.h index aba4e16c06..87e8ecdc4a 100644 --- a/lib/resolver.h +++ b/lib/resolver.h @@ -6,7 +6,7 @@ #ifndef _FRR_RESOLVER_H #define _FRR_RESOLVER_H -#include "event.h" +#include "frrevent.h" #include "sockunion.h" #ifdef __cplusplus diff --git a/lib/sigevent.h b/lib/sigevent.h index 34753e1fd5..0b07f594c1 100644 --- a/lib/sigevent.h +++ b/lib/sigevent.h @@ -8,7 +8,7 @@ #ifndef _FRR_SIGNAL_H #define _FRR_SIGNAL_H -#include <event.h> +#include <frrevent.h> #ifdef __cplusplus extern "C" { diff --git a/lib/smux.h b/lib/smux.h index 366bf6fea3..cec4d2a1bf 100644 --- a/lib/smux.h +++ b/lib/smux.h @@ -9,7 +9,7 @@ #include <net-snmp/agent/net-snmp-agent-includes.h> #include <net-snmp/agent/snmp_vars.h> -#include "event.h" +#include "frrevent.h" #include "hook.h" #ifdef __cplusplus diff --git a/lib/spf_backoff.c b/lib/spf_backoff.c index ab9c94445a..1053d8f695 100644 --- a/lib/spf_backoff.c +++ b/lib/spf_backoff.c @@ -17,7 +17,7 @@ #include "command.h" #include "memory.h" -#include "event.h" +#include "frrevent.h" #include "vty.h" DEFINE_MTYPE_STATIC(LIB, SPF_BACKOFF, "SPF backoff"); diff --git a/lib/subdir.am b/lib/subdir.am index 9f2f4033fc..469fac2446 100644 --- a/lib/subdir.am +++ b/lib/subdir.am @@ -288,7 +288,7 @@ pkginclude_HEADERS += \ lib/systemd.h \ lib/table.h \ lib/termtable.h \ - lib/event.h \ + lib/frrevent.h \ lib/trace.h \ lib/typerb.h \ lib/typesafe.h \ diff --git a/lib/systemd.c b/lib/systemd.c index bd364ad668..56a53a6e78 100644 --- a/lib/systemd.c +++ b/lib/systemd.c @@ -7,7 +7,7 @@ #include <zebra.h> #include <sys/un.h> -#include "event.h" +#include "frrevent.h" #include "systemd.h" #include "lib_errors.h" @@ -22,7 +22,7 @@ #include <stdio.h> #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "buffer.h" #include "command.h" #include "sockunion.h" @@ -18,7 +18,7 @@ #include <regex.h> #endif /* HAVE_LIBPCRE2_POSIX */ -#include "event.h" +#include "frrevent.h" #include "log.h" #include "sockunion.h" #include "qobj.h" diff --git a/lib/wheel.c b/lib/wheel.c index d9362bac47..e17995c64a 100644 --- a/lib/wheel.c +++ b/lib/wheel.c @@ -6,7 +6,7 @@ */ #include "zebra.h" #include "linklist.h" -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "wheel.h" #include "log.h" diff --git a/lib/workqueue.c b/lib/workqueue.c index 3b677e0085..fa5d585360 100644 --- a/lib/workqueue.c +++ b/lib/workqueue.c @@ -6,7 +6,7 @@ */ #include <zebra.h> -#include "event.h" +#include "frrevent.h" #include "memory.h" #include "workqueue.h" #include "linklist.h" diff --git a/lib/zclient.c b/lib/zclient.c index d708a711a4..95093a56f5 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -14,7 +14,7 @@ #include "vrf_int.h" #include "if.h" #include "log.h" -#include "event.h" +#include "frrevent.h" #include "zclient.h" #include "memory.h" #include "table.h" diff --git a/lib/zlog.c b/lib/zlog.c index 618325d09d..309a955fa9 100644 --- a/lib/zlog.c +++ b/lib/zlog.c @@ -48,7 +48,7 @@ #include "frrcu.h" #include "zlog.h" #include "libfrr_trace.h" -#include "event.h" +#include "frrevent.h" DEFINE_MTYPE_STATIC(LIB, LOG_MESSAGE, "log message"); DEFINE_MTYPE_STATIC(LIB, LOG_TLSBUF, "log thread-local buffer"); diff --git a/lib/zlog_5424.c b/lib/zlog_5424.c index 984ab5d1f5..c15bdece29 100644 --- a/lib/zlog_5424.c +++ b/lib/zlog_5424.c @@ -26,7 +26,7 @@ #include "frr_pthread.h" #include "command.h" #include "monotime.h" -#include "event.h" +#include "frrevent.h" #include "lib/version.h" #include "lib/lib_errors.h" |
