Add option for not including the tracing stuff

It eats some space.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/Makefile b/Makefile
index aceee90a479d125d1126d4eccc4b95bd26d4c5af..c2e75ddad53479bf474bad02e01111f66348a55e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #CC    = /opt/intel/cce/9.1.045/bin/icc
 CC     = gcc
-DEBUGFLAGS = -D_FORTIFY_SOURCE=2
+DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG
 OPTFLAGS= -O2 -g $(EXTFLAGS)
 CFLAGS = -Wwrite-strings -Wall -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(DEBUGFLAGS) -rdynamic
 PROGS  = fio

diff --git a/fio.h b/fio.h
index c86e4629afef3116dd32cabf123a6d4bf3e94837..572670ec0acb9792af4e808d69570ff8ea64c617 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -982,6 +982,7 @@ enum {
        FD_DEBUG_MAX,
 };
 
+#ifdef FIO_INC_DEBUG
 struct debug_level {
        const char *name;
        unsigned long shift;
@@ -989,6 +990,7 @@ struct debug_level {
 extern struct debug_level debug_levels[];
 
 extern unsigned long fio_debug;
+
 #define dprint(type, str, args...)                             \
        do {                                                    \
                assert(type < FD_DEBUG_MAX);                    \
@@ -1008,5 +1010,9 @@ static inline void dprint_io_u(struct io_u *io_u, const char *p)
                dprint(FD_IO, "/%s", f->file_name);
        dprint(FD_IO, "\n");
 }
+#else
+#define dprint(type, str, args...)
+#define dprint_io_u(io_u, p)
+#endif
 
 #endif

diff --git a/init.c b/init.c
index 7fd38ad8e0c433491b9dcffb79376bc931f66471..721978f6626674cdfbb685ff860576c1bb286af6 100644 (file)
--- a/init.c
+++ b/init.c
@@ -779,6 +779,7 @@ static void usage(const char *name)
        printf("\t          \tMay be \"always\", \"never\" or \"auto\"\n");
 }
 
+#ifdef FIO_INC_DEBUG
 struct debug_level debug_levels[] = {
        { .name = "process",    .shift = FD_PROCESS, },
        { .name = "file",       .shift = FD_FILE, },
@@ -828,6 +829,12 @@ static void set_debug(const char *string)
                        log_err("fio: debug mask %s not found\n", opt);
        }
 }
+#else
+static void set_debug(const char *string)
+{
+       log_err("fio: debug tracing not included in build\n");
+}
+#endif
 
 static int parse_cmd_line(int argc, char *argv[])
 {