Added trace-cmd.h

Move trace-cmd specific items from parse-event.h to new trace-cmd.h.

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

4 files changed, 35 insertions, 25 deletions

diff --git a/parse-events.h b/parse-events.h
index c5db4dc..2f950dd 100644
--- a/parse-events.h
+++ b/parse-events.h
@@ -45,24 +45,6 @@ extern int trace_seq_do_printf(struct trace_seq *s);
 
 /* ----------------------- pevent ----------------------- */
 
-/* unique to trace-cmd */
-extern unsigned int page_size;
-void usage(char **argv);
-
-#ifndef PAGE_MASK
-#define PAGE_MASK (page_size - 1)
-#endif
-
-enum {
-        RINGBUF_TYPE_PADDING            = 29,
-        RINGBUF_TYPE_TIME_EXTEND        = 30,
-        RINGBUF_TYPE_TIME_STAMP         = 31,
-};
-
-#ifndef TS_SHIFT
-#define TS_SHIFT                27
-#endif
-
 #define NSECS_PER_SEC           1000000000ULL
 #define NSECS_PER_USEC          1000ULL
 
@@ -212,16 +194,10 @@ extern int old_format;
 
 void parse_set_info(int nr_cpus, int long_sz);
 
-void trace_report(int argc, char **argv);
-
 void die(char *fmt, ...);
 void *malloc_or_die(unsigned int size);
 void warning(char *fmt, ...);
 
-void parse_cmdlines(char *file, int size);
-void parse_proc_kallsyms(char *file, unsigned int size);
-void parse_ftrace_printk(char *file, unsigned int size);
-
 extern int file_bigendian;
 extern int host_bigendian;
 
diff --git a/trace-cmd.c b/trace-cmd.c
index ca1fbfa..4234832 100644
--- a/trace-cmd.c
+++ b/trace-cmd.c
@@ -34,7 +34,7 @@
 #include <errno.h>
 
 #include "parse-events.h"
-
+#include "trace-cmd.h"
 
 #define VERSION "0.5"
 
diff --git a/trace-cmd.h b/trace-cmd.h
new file mode 100644
index 0000000..369e796
--- /dev/null
+++ b/trace-cmd.h
@@ -0,0 +1,33 @@
+#ifndef _TRACE_CMD_H
+#define _TRACE_CMD_H
+
+extern int input_fd;
+extern const char *input_file;
+
+extern unsigned int page_size;
+
+#ifndef PAGE_MASK
+#define PAGE_MASK (page_size - 1)
+#endif
+
+void usage(char **argv);
+int read_trace_header(void);
+int read_trace_files(void);
+
+void trace_report(int argc, char **argv);
+
+void parse_cmdlines(char *file, int size);
+void parse_proc_kallsyms(char *file, unsigned int size);
+void parse_ftrace_printk(char *file, unsigned int size);
+
+enum {
+        RINGBUF_TYPE_PADDING            = 29,
+        RINGBUF_TYPE_TIME_EXTEND        = 30,
+        RINGBUF_TYPE_TIME_STAMP         = 31,
+};
+
+#ifndef TS_SHIFT
+#define TS_SHIFT                27
+#endif
+
+#endif /* _TRACE_CMD_H */
diff --git a/trace-read.c b/trace-read.c
index 355a811..1c62c4b 100644
--- a/trace-read.c
+++ b/trace-read.c
@@ -37,6 +37,7 @@
 #include <errno.h>
 
 #include "parse-events.h"
+#include "trace-cmd.h"
 
 int input_fd;
 const char *input_file = "trace.dat";