Changeset 205:ff9ade352076 in freeDiameter

Timestamp:

Feb 12, 2010, 6:29:08 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Simplified use of --dbg_file option

Files:

• freeDiameter/main.c (modified) (1 diff)
• include/freeDiameter/libfreeDiameter.h (modified) (2 diffs)

freeDiameter/main.c

@@ -234 +234 @@
                                 
                         case 'f':       /* Full debug for the function with this name.  */
+                                #ifdef DEBUG
                                 fd_debug_one_function = optarg;
+                                #else /* DEBUG */
+                                TRACE_DEBUG(INFO, "Error: must compile with DEBUG support to use this feature");
+                                return EINVAL;
+                                #endif /* DEBUG */
                                 break;
                                 
                         case 'F':       /* Full debug for the file with this name.  */
-                                fd_debug_one_file = optarg;
+                                #ifdef DEBUG
+                                fd_debug_one_file = basename(optarg);
+                                #else /* DEBUG */
+                                TRACE_DEBUG(INFO, "Error: must compile with DEBUG support to use this feature");
+                                return EINVAL;
+                                #endif /* DEBUG */
                                 break;
                                 

include/freeDiameter/libfreeDiameter.h

@@ -71 +71 @@
 #include <unistd.h>
 
+#ifdef DEBUG
+#include <libgen.h>     /* for basename if --dbg_file is specified */
+#endif /* DEBUG */
+
 /*============================================================*/
 /*                          DEBUG                             */
@@ -167 +171 @@
 #endif /* __PRETTY_FUNCTION__ */
 
+/* A version of __FILE__ without the full path */
+static char * file_bname = NULL;
+#define __STRIPPED_FILE__       (file_bname ?: (file_bname = basename(__FILE__)))
+
 /* Boolean for tracing at a certain level */
+#ifdef DEBUG
 #define TRACE_BOOL(_level_) ( ((_level_) <= local_debug_level + fd_g_debug_lvl)                                         \
                                 || (fd_debug_one_function && !strcmp(fd_debug_one_function, __PRETTY_FUNCTION__))       \
-                                || (fd_debug_one_file && !strcmp(fd_debug_one_file, __FILE__) ) )
+                                || (fd_debug_one_file && !strcmp(fd_debug_one_file, __STRIPPED_FILE__) ) )
+#else /* DEBUG */
+#define TRACE_BOOL(_level_) ((_level_) <= local_debug_level + fd_g_debug_lvl)
+#endif /* DEBUG */
 
 /* The general debug macro, each call results in two lines of debug messages (change the macro for more compact output) */