parse-events: Move parse-event utils to separate file

Move the util functions used by parse-events into a separate file
and compile it with the libparsevents library. Also add "__die()"
equivalent functions that are always available.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

4 files changed, 116 insertions, 68 deletions

diff --git a/Makefile b/Makefile
index cd4db4a..7dde5cf 100644
--- a/Makefile
+++ b/Makefile
@@ -223,7 +223,7 @@ TRACE_GRAPH_MAIN_OBJS = trace-graph-main.o $(TRACE_GRAPH_OBJS) $(TRACE_GUI_OBJS)
 KERNEL_SHARK_OBJS = $(TRACE_VIEW_OBJS) $(TRACE_GRAPH_OBJS) $(TRACE_GUI_OBJS) \
         kernel-shark.o
 
-PEVENT_LIB_OBJS = parse-events.o trace-seq.o parse-filter.o
+PEVENT_LIB_OBJS = parse-events.o trace-seq.o parse-filter.o parse-utils.o
 TCMD_LIB_OBJS = $(PEVENT_LIB_OBJS) trace-util.o trace-input.o trace-ftrace.o \
                         trace-output.o trace-record.o
 
diff --git a/parse-events.h b/parse-events.h
index 0c6a330..5afbd1a 100644
--- a/parse-events.h
+++ b/parse-events.h
@@ -342,11 +342,21 @@ struct pevent {
         struct event_format *last_event;
 };
 
+/* Can be overridden */
 void die(char *fmt, ...);
 void *malloc_or_die(unsigned int size);
 void warning(char *fmt, ...);
 void pr_stat(char *fmt, ...);
 
+/* Always available */
+void __die(char *fmt, ...);
+void __warning(char *fmt, ...);
+void __pr_stat(char *fmt, ...);
+
+void __vdie(char *fmt, ...);
+void __vwarning(char *fmt, ...);
+void __vpr_stat(char *fmt, ...);
+
 static inline unsigned short
 __data2host2(struct pevent *pevent, unsigned short data)
 {
diff --git a/parse-utils.c b/parse-utils.c
new file mode 100644
index 0000000..103bbd8
--- /dev/null
+++ b/parse-utils.c
@@ -0,0 +1,105 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <errno.h>
+
+#define __weak __attribute__((weak))
+
+void __vdie(char *fmt, va_list ap)
+{
+        int ret = errno;
+
+        if (errno)
+                perror("trace-cmd");
+        else
+                ret = -1;
+
+        fprintf(stderr, "  ");
+        vfprintf(stderr, fmt, ap);
+
+        fprintf(stderr, "\n");
+        exit(ret);
+}
+
+void __die(char *fmt, ...)
+{
+        va_list ap;
+
+        va_start(ap, fmt);
+        __vdie(fmt, ap);
+        va_end(ap);
+}
+
+void __weak die(char *fmt, ...)
+{
+        va_list ap;
+
+        va_start(ap, fmt);
+        __vdie(fmt, ap);
+        va_end(ap);
+}
+
+void __vwarning(char *fmt, va_list ap)
+{
+        if (errno)
+                perror("trace-cmd");
+        errno = 0;
+
+        fprintf(stderr, "  ");
+        vfprintf(stderr, fmt, ap);
+
+        fprintf(stderr, "\n");
+}
+
+void __warning(char *fmt, ...)
+{
+        va_list ap;
+
+        va_start(ap, fmt);
+        __vwarning(fmt, ap);
+        va_end(ap);
+}
+
+void __weak warning(char *fmt, ...)
+{
+        va_list ap;
+
+        va_start(ap, fmt);
+        __vwarning(fmt, ap);
+        va_end(ap);
+}
+
+void __vpr_stat(char *fmt, va_list ap)
+{
+        vprintf(fmt, ap);
+        printf("\n");
+}
+
+void __pr_stat(char *fmt, ...)
+{
+        va_list ap;
+
+        va_start(ap, fmt);
+        __vpr_stat(fmt, ap);
+        va_end(ap);
+}
+
+void __weak pr_stat(char *fmt, ...)
+{
+        va_list ap;
+
+        va_start(ap, fmt);
+        __vpr_stat(fmt, ap);
+        va_end(ap);
+}
+
+void __weak *malloc_or_die(unsigned int size)
+{
+        void *data;
+
+        data = malloc(size);
+        if (!data)
+                die("malloc");
+        return data;
+}
diff --git a/trace-util.c b/trace-util.c
index 7f6f0bb..0397732 100644
--- a/trace-util.c
+++ b/trace-util.c
@@ -38,8 +38,6 @@
 int tracecmd_disable_sys_plugins;
 int tracecmd_disable_plugins;
 
-#define __weak __attribute__((weak))
-
 #define _STR(x) #x
 #define STR(x) _STR(x)
 
@@ -53,71 +51,6 @@ struct plugin_list {
         void                    *handle;
 };
 
-void __weak die(char *fmt, ...)
-{
-        va_list ap;
-        int ret = errno;
-
-        if (errno)
-                perror("trace-cmd");
-        else
-                ret = -1;
-
-        va_start(ap, fmt);
-        fprintf(stderr, "  ");
-        vfprintf(stderr, fmt, ap);
-        va_end(ap);
-
-        fprintf(stderr, "\n");
-        exit(ret);
-}
-
-void __weak warning(char *fmt, ...)
-{
-        va_list ap;
-
-        if (errno)
-                perror("trace-cmd");
-        errno = 0;
-
-        va_start(ap, fmt);
-        fprintf(stderr, "  ");
-        vfprintf(stderr, fmt, ap);
-        va_end(ap);
-
-        fprintf(stderr, "\n");
-}
-
-void __weak pr_stat(char *fmt, ...)
-{
-        va_list ap;
-
-        va_start(ap, fmt);
-        vprintf(fmt, ap);
-        va_end(ap);
-
-        printf("\n");
-}
-
-void __weak *malloc_or_die(unsigned int size)
-{
-        void *data;
-
-        data = malloc(size);
-        if (!data)
-                die("malloc");
-        return data;
-}
-
-int __weak bigendian(void)
-{
-        unsigned char str[] = { 0x1, 0x2, 0x3, 0x4 };
-        unsigned int *ptr;
-
-        ptr = (unsigned int *)str;
-        return *ptr == 0x01020304;
-}
-
 void parse_cmdlines(struct pevent *pevent,
                     char *file, int size __unused)
 {