From: "Steven Rostedt (Google)" <rostedt@xxxxxxxxxxx>
Move the dprint() of trace-msg.c into trace-utils.c and export it such
that other applications could use it as well. It is now renamed to
tracecmd_debug().
Link: https://lore.kernel.org/linux-trace-devel/20220417184538.1044417-6-rostedt@xxxxxxxxxxx
Signed-off-by: Steven Rostedt (Google) <rostedt@xxxxxxxxxxx>
---
lib/trace-cmd/include/private/trace-cmd-private.h | 3 +++
lib/trace-cmd/trace-msg.c | 12 +-----------
lib/trace-cmd/trace-util.c | 12 ++++++++++++
3 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h
index 6e7b346cda07..766e0a762c2b 100644
--- a/lib/trace-cmd/include/private/trace-cmd-private.h
+++ b/lib/trace-cmd/include/private/trace-cmd-private.h
@@ -43,6 +43,9 @@ enum {
RINGBUF_TYPE_TIME_STAMP = 31,
};
+/* Can be overridden */
+void tracecmd_debug(const char *fmt, ...);
+
void tracecmd_record_ref(struct tep_record *record);
void tracecmd_set_debug(bool set_debug);
diff --git a/lib/trace-cmd/trace-msg.c b/lib/trace-cmd/trace-msg.c
index 6cf74f9b1c99..39465ade8ab3 100644
--- a/lib/trace-cmd/trace-msg.c
+++ b/lib/trace-cmd/trace-msg.c
@@ -31,17 +31,7 @@
typedef __u32 u32;
typedef __be32 be32;
-static inline void dprint(const char *fmt, ...)
-{
- va_list ap;
-
- if (!tracecmd_get_debug())
- return;
-
- va_start(ap, fmt);
- vprintf(fmt, ap);
- va_end(ap);
-}
+#define dprint(fmt, ...) tracecmd_debug(fmt, ##__VA_ARGS__)
/* Two (4k) pages is the max transfer for now */
#define MSG_MAX_LEN 8192
diff --git a/lib/trace-cmd/trace-util.c b/lib/trace-cmd/trace-util.c
index b5a0a1a601d4..9564c81a5c99 100644
--- a/lib/trace-cmd/trace-util.c
+++ b/lib/trace-cmd/trace-util.c
@@ -415,6 +415,18 @@ void __weak tracecmd_critical(const char *fmt, ...)
}
}
+void __weak tracecmd_debug(const char *fmt, ...)
+{
+ va_list ap;
+
+ if (!tracecmd_get_debug())
+ return;
+
+ va_start(ap, fmt);
+ vprintf(fmt, ap);
+ va_end(ap);
+}
+
#define LOG_BUF_SIZE 1024
static void __plog(const char *prefix, const char *fmt, va_list ap, FILE *fp)
{
--
2.35.1
|