lib: move trace.h -> libfrr_trace.h

Signed-off-by: Quentin Young <qlyoung@nvidia.com>

10 files changed, 14 insertions, 14 deletions

diff --git a/lib/frr_pthread.c b/lib/frr_pthread.c
index 82d0c8c49..689284eb6 100644
--- a/lib/frr_pthread.c
+++ b/lib/frr_pthread.c
@@ -28,7 +28,7 @@
 #include "memory.h"
 #include "linklist.h"
 #include "zlog.h"
-#include "trace.h"
+#include "libfrr_trace.h"
 
 DEFINE_MTYPE_STATIC(LIB, FRR_PTHREAD, "FRR POSIX Thread")
 DEFINE_MTYPE_STATIC(LIB, PTHREAD_PRIM, "POSIX sync primitives")
diff --git a/lib/hash.c b/lib/hash.c
index d0dc63922..f34a2aae0 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -29,7 +29,7 @@
 #include "command.h"
 #include "libfrr.h"
 #include "frr_pthread.h"
-#include "trace.h"
+#include "libfrr_trace.h"
 
 DEFINE_MTYPE_STATIC(LIB, HASH, "Hash")
 DEFINE_MTYPE_STATIC(LIB, HASH_BACKET, "Hash Bucket")
diff --git a/lib/trace.c b/lib/libfrr_trace.c
index 7b6c09b38..2f300e6ee 100644
--- a/lib/trace.c
+++ b/lib/libfrr_trace.c
@@ -1,4 +1,4 @@
 #define TRACEPOINT_CREATE_PROBES
 #define TRACEPOINT_DEFINE
 
-#include "trace.h"
+#include "libfrr_trace.h"
diff --git a/lib/trace.h b/lib/libfrr_trace.h
index 5e0b13a65..337360852 100644
--- a/lib/trace.h
+++ b/lib/libfrr_trace.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#if !defined(_TRACE_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
-#define _TRACE_H
+#if !defined(_LIBFRR_TRACE_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define _LIBFRR_TRACE_H_
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -31,7 +31,7 @@
 #define TRACEPOINT_PROVIDER frr_libfrr
 
 #undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./trace.h"
+#define TRACEPOINT_INCLUDE "./libfrr_trace.h"
 
 #include <lttng/tracepoint.h>
 
diff --git a/lib/linklist.c b/lib/linklist.c
index 19a8514cd..ea206d89e 100644
--- a/lib/linklist.c
+++ b/lib/linklist.c
@@ -23,7 +23,7 @@
 
 #include "linklist.h"
 #include "memory.h"
-#include "trace.h"
+#include "libfrr_trace.h"
 
 DEFINE_MTYPE_STATIC(LIB, LINK_LIST, "Link List")
 DEFINE_MTYPE_STATIC(LIB, LINK_NODE, "Link Node")
diff --git a/lib/memory.c b/lib/memory.c
index 219ddcb63..6bc46b2f3 100644
--- a/lib/memory.c
+++ b/lib/memory.c
@@ -29,7 +29,7 @@
 
 #include "memory.h"
 #include "log.h"
-#include "trace.h"
+#include "libfrr_trace.h"
 
 static struct memgroup *mg_first = NULL;
 struct memgroup **mg_insert = &mg_first;
diff --git a/lib/subdir.am b/lib/subdir.am
index 54fdf429f..5c371f2cc 100644
--- a/lib/subdir.am
+++ b/lib/subdir.am
@@ -46,6 +46,7 @@ lib_libfrr_la_SOURCES = \
 	lib/lib_errors.c \
 	lib/lib_vty.c \
 	lib/libfrr.c \
+	lib/libfrr_trace.c \
 	lib/linklist.c \
 	lib/log.c \
 	lib/log_filter.c \
@@ -93,7 +94,6 @@ lib_libfrr_la_SOURCES = \
 	lib/table.c \
 	lib/termtable.c \
 	lib/thread.c \
-	lib/trace.c \
 	lib/typerb.c \
 	lib/typesafe.c \
 	lib/vector.c \
@@ -205,6 +205,7 @@ pkginclude_HEADERS += \
 	lib/lib_errors.h \
 	lib/lib_vty.h \
 	lib/libfrr.h \
+	lib/libfrr_trace.h \
 	lib/libospf.h \
 	lib/linklist.h \
 	lib/log.h \
@@ -252,7 +253,6 @@ pkginclude_HEADERS += \
 	lib/table.h \
 	lib/termtable.h \
 	lib/thread.h \
-	lib/trace.h \
 	lib/typerb.h \
 	lib/typesafe.h \
 	lib/vector.h \
@@ -413,9 +413,9 @@ lib_clippy_SOURCES = \
 	lib/command_py.c \
 	lib/defun_lex.l \
 	lib/graph.c \
+	lib/libfrr_trace.c \
 	lib/memory.c \
 	lib/vector.c \
-	lib/trace.c \
 	# end
 
 # (global) clippy rules for all directories
diff --git a/lib/table.c b/lib/table.c
index 0d1be2bef..26bcca4b2 100644
--- a/lib/table.c
+++ b/lib/table.c
@@ -27,7 +27,7 @@
 #include "table.h"
 #include "memory.h"
 #include "sockunion.h"
-#include "trace.h"
+#include "libfrr_trace.h"
 
 DEFINE_MTYPE_STATIC(LIB, ROUTE_TABLE, "Route table")
 DEFINE_MTYPE(LIB, ROUTE_NODE, "Route node")
diff --git a/lib/thread.c b/lib/thread.c
index 867945436..a15bd541d 100644
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -35,7 +35,7 @@
 #include "frratomic.h"
 #include "frr_pthread.h"
 #include "lib_errors.h"
-#include "trace.h"
+#include "libfrr_trace.h"
 
 DEFINE_MTYPE_STATIC(LIB, THREAD, "Thread")
 DEFINE_MTYPE_STATIC(LIB, THREAD_MASTER, "Thread master")
diff --git a/lib/zlog.c b/lib/zlog.c
index f28ff0861..aec8744b9 100644
--- a/lib/zlog.c
+++ b/lib/zlog.c
@@ -52,7 +52,7 @@
 #include "printfrr.h"
 #include "frrcu.h"
 #include "zlog.h"
-#include "trace.h"
+#include "libfrr_trace.h"
 
 DEFINE_MTYPE_STATIC(LIB, LOG_MESSAGE,  "log message")
 DEFINE_MTYPE_STATIC(LIB, LOG_TLSBUF,   "log thread-local buffer")