trace-cmd/kernelshark: Implement versioning of the tools

Have the versions of the tools in the Makefile and automate the updating
of them when the numbers in the Makefile change.

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

7 files changed, 88 insertions, 13 deletions

diff --git a/.gitignore b/.gitignore
index 2f8bf85..8e8f5a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ trace-graph
 trace-view
 *.pyc
 *.swp
+tc_version.h
+ks_version.h
 ctracecmd_wrap.c
-
 ctracecmdgui_wrap.c
diff --git a/Makefile b/Makefile
index 125cb8b..28a7270 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,16 @@
+# trace-cmd version
+TC_VERSION = 0
+TC_PATCHLEVEL = 6
+TC_EXTRAVERSION =
+
+# Kernel Shark version
+KS_VERSION = 0
+KS_PATCHLEVEL = 1
+KS_EXTRAVERSION =
+
+# file format version
+FILE_VERSION = 0
+
 CC = gcc
 AR = ar
 EXT = -std=gnu99
@@ -8,13 +21,27 @@ LIBS = -L. -ltracecmd -ldl
 PACKAGES= gtk+-2.0
 
 ifeq ($(BUILDGUI), 1)
-CONFIG_FLAGS = $(shell pkg-config --cflags $(PACKAGES)) \
+CONFIG_FLAGS = $(shell pkg-config --cflags $(PACKAGES)) -DBUILDGUI \
         -DGTK_VERSION=$(shell pkg-config --modversion gtk+-2.0 | \
         awk 'BEGIN{FS="."}{ a = ($$1 * (2^16)) + $$2 * (2^8) + $$3; printf ("%d", a);}')
 
 CONFIG_LIBS = $(shell pkg-config --libs $(PACKAGES))
+
+VERSION         = $(KS_VERSION)
+PATCHLEVEL      = $(KS_PATCHLEVEL)
+EXTRAVERSION    = $(KS_EXTRAVERSION)
+
+else
+
+VERSION         = $(TC_VERSION)
+PATCHLEVEL      = $(TC_PATCHLEVEL)
+EXTRAVERSION    = $(TC_EXTRAVERSION)
+
 endif
 
+TRACECMD_VERSION = $(TC_VERSION).$(TC_PATCHLEVEL).$(TC_EXTRAVERSION)
+KERNELSHARK_VERSION = $(KS_VERSION).$(KS_PATCHLEVEL).$(KS_EXTRAVERSION)
+
 CFLAGS = -g -Wall $(CONFIG_FLAGS)
 
 %.o: %.c
@@ -23,9 +50,9 @@ CFLAGS = -g -Wall $(CONFIG_FLAGS)
 PLUGINS =  plugin_hrtimer.so plugin_mac80211.so plugin_sched_switch.so \
         plugin_kmem.so
 
-CMD_TARGETS = libparsevent.a libtracecmd.a trace-cmd  $(PLUGINS)
+CMD_TARGETS = libparsevent.a libtracecmd.a trace-cmd  $(PLUGINS) tc_version.h
 
-GUI_TARGETS = trace-graph trace-view kernelshark
+GUI_TARGETS = trace-graph trace-view kernelshark ks_version.h
 
 ###
 #    Default we just build trace-cmd
@@ -45,7 +72,7 @@ LIB_FILE = libtracecmd.a
 HEADERS = parse-events.h trace-cmd.h trace-local.h trace-hash.h
 
 trace-read.o::          $(HEADERS) 
-trace-cmd.o::           $(HEADERS) $(LIB_FILE)
+trace-cmd.o::           $(HEADERS) $(LIB_FILE) tc_version.h
 trace-util.o::          $(HEADERS)
 trace-ftrace.o::        $(HEADERS)
 trace-input.o::         $(HEADERS)
@@ -55,7 +82,7 @@ trace-view-main.o::	$(HEADERS) trace-view-store.h trace-view.h libtracecmd.a
 trace-filter.o::        $(HEADERS)
 trace-graph.o::         $(HEADERS) trace-graph.h
 trace-graph-main.o::    $(HEADERS) trace-graph.h libtracecmd.a
-kernel-shark.o::        $(HEADERS) kernel-shark.h libtracecmd.a
+kernel-shark.o::        $(HEADERS) kernel-shark.h libtracecmd.a ks_version.h
 
 TRACE_VIEW_OBJS = trace-view.o trace-view-store.o trace-filter.o trace-compat.o \
         trace-hash.o
@@ -150,6 +177,31 @@ plugin_mac80211.so: plugin_mac80211.o
         $(CC) -shared -nostartfiles -o $@ $<
 
 
+define make_version.h
+        @(echo \#define VERSION_CODE $(shell                                            \
+        expr $(VERSION) \* 256 + $(PATCHLEVEL));                                        \
+        echo '#define EXTRAVERSION ' $(EXTRAVERSION);                                   \
+        echo '#define VERSION_STRING "'$(VERSION).$(PATCHLEVEL)$(EXTRAVERSION)'"';      \
+        echo '#define FILE_VERSION '$(FILE_VERSION);                                    \
+        ) > $1
+endef
+
+define update_version.h
+        $(call make_version.h, $@.tmp);         \
+        if [ -r $@ ] && cmp -s $@ $@.tmp; then  \
+                rm -f $@.tmp;                   \
+        else                                    \
+                echo '  UPD $@';                \
+                mv -f $@.tmp $@;                \
+        fi;
+endef
+
+ks_version.h: force
+        $(call update_version.h)
+
+tc_version.h: force
+        $(call update_version.h)
+
 PYTHON_INCLUDES = `python-config --includes`
 PYGTK_CFLAGS = `pkg-config --cflags pygtk-2.0`
 
diff --git a/kernel-shark.c b/kernel-shark.c
index 533a8af..8820109 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -31,8 +31,7 @@
 #include "trace-compat.h"
 #include "trace-cmd.h"
 #include "kernel-shark.h"
-
-#define version "0.1.1"
+#include "version.h"
 
 #define DEBUG_LEVEL     0
 #if DEBUG_LEVEL > 0
@@ -55,6 +54,7 @@ void usage(char *prog)
 {
         printf("Usage: %s\n", prog);
         printf("  -h    Display this help message\n");
+        printf("  -v    Display version and exit\n");
         printf("  -i    input_file, default is %s\n", default_input_file);
 }
 
@@ -520,11 +520,16 @@ void kernel_shark(int argc, char **argv)
         GtkWidget *spin;
         int c;
 
-        while ((c = getopt(argc, argv, "hi:")) != -1) {
+        while ((c = getopt(argc, argv, "hvi:")) != -1) {
                 switch(c) {
                 case 'h':
                         usage(basename(argv[0]));
                         return;
+                case 'v':
+                        printf("%s - %s\n",
+                               basename(argv[0]),
+                               VERSION_STRING);
+                        return;
                 case 'i':
                         input_file = optarg;
                         break;
diff --git a/trace-cmd.c b/trace-cmd.c
index b755ebe..45d8568 100644
--- a/trace-cmd.c
+++ b/trace-cmd.c
@@ -34,6 +34,7 @@
 #include <errno.h>
 
 #include "trace-local.h"
+#include "version.h"
 
 #define _STR(x) #x
 #define STR(x) _STR(x)
@@ -753,7 +754,7 @@ void usage(char **argv)
                "          -e list available events\n"
                "          -p list available plugins\n"
                "          -o list available options\n"
-               "\n", p, TRACECMD_VERSION, p, p, p, p, p, p, p);
+               "\n", p, VERSION_STRING, p, p, p, p, p, p, p);
         exit(-1);
 }
 
diff --git a/trace-cmd.h b/trace-cmd.h
index d0b5c92..2c46ac8 100644
--- a/trace-cmd.h
+++ b/trace-cmd.h
@@ -4,8 +4,6 @@
 #include <stdlib.h>
 #include "parse-events.h"
 
-#define TRACECMD_VERSION "0.5"
-
 void parse_cmdlines(struct pevent *pevent, char *file, int size);
 void parse_proc_kallsyms(struct pevent *pevent, char *file, unsigned int size);
 void parse_ftrace_printk(char *file, unsigned int size);
diff --git a/trace-output.c b/trace-output.c
index 8f21fe4..66f95fb 100644
--- a/trace-output.c
+++ b/trace-output.c
@@ -17,6 +17,7 @@
 #include <errno.h>
 
 #include "trace-cmd.h"
+#include "version.h"
 
 struct tracecmd_output {
         int             fd;
@@ -520,7 +521,7 @@ static struct tracecmd_output *create_file(const char *output_file, int cpus)
         if (do_write_check(handle, buf, 10))
                 goto out_free;
 
-        if (do_write_check(handle, TRACECMD_VERSION, strlen(TRACECMD_VERSION) + 1))
+        if (do_write_check(handle, FILE_VERSION_STRING, strlen(FILE_VERSION_STRING) + 1))
                 goto out_free;
 
         /* save endian */
diff --git a/version.h b/version.h
new file mode 100644
index 0000000..68ce79e
--- /dev/null
+++ b/version.h
@@ -0,0 +1,17 @@
+#ifndef _VERSION_H
+#define _VERSION_H
+
+#define VERSION(a, b) (((a) << 8) + (b))
+
+#ifdef BUILDGUI
+#include "ks_version.h"
+#else
+#include "tc_version.h"
+#endif
+
+#define _STR(x) #x
+#define STR(x)  _STR(x)
+
+#define FILE_VERSION_STRING STR(FILE_VERSION)
+
+#endif /* _VERSION_H */