Changeset 3592 in orxonox.OLD

Timestamp:

Mar 17, 2005, 3:33:58 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: debug.h: now ability to choose between modular and not modular in configure through —disable-modular-debug. Also made it more runtime-proove. so now you have to set the mode in orxonox.cc too.

Location:

orxonox/trunk

Files:

• config.h.in (modified) (1 diff)
• configure (modified) (3 diffs)
• configure.ac (modified) (2 diffs)
• src/defs/debug.h (modified) (16 diffs)
• src/orxonox.cc (modified) (1 diff)

orxonox/trunk/config.h.in

@@ -89 +89 @@
 #undef HAVE__BOOL
 
+/* if Modular-DUBUG mode is enabled */
+#undef MODULAR_DEBUG
+
 /* Name of package */
 #undef PACKAGE

orxonox/trunk/configure

@@ -867 +867 @@
   --enable-debug          compiles in debug mode. Lots of debug info about the
                           game.
+  --disable-modular-debug compiles in modular-debug mode, that logs
+                          differently on the many modules of orxonox.
   --enable-sub-projects   also builds the subProjects while make from srcdir
   --enable-documentation  also builds the sDocumentation while make from
@@ -3862 +3864 @@
 if test x$DEBUG = xno; then
         echo "no"
-        echo " -> Setting debuglevel to 3. (orxonox is still in Development. It really is needed."
-        DEBUG=3
+        echo " -> Setting debuglevel to 4. (orxonox is still in Development. It really is needed."
+        DEBUG=4
 elif test x$DEBUG = xyes; then
         echo "yes"
@@ -3878 +3880 @@
 
 
+
+#---------------#
+# Modular Debug #
+#---------------#
+MODULAR_DEBUG=yes
+echo "$as_me:$LINENO: checking if Modular-DEBUG-mode should be ebabled" >&5
+echo $ECHO_N "checking if Modular-DEBUG-mode should be ebabled... $ECHO_C" >&6
+# Check whether --enable-modular-debug or --disable-modular-debug was given.
+if test "${enable_modular_debug+set}" = set; then
+  enableval="$enable_modular_debug"
+  MODULAR_DEBUG=$enableval
+fi;
+
+if test x$MODULAR_DEBUG = xno; then
+        echo "no"
+elif test x$MODULAR_DEBUG = xyes; then
+        echo "yes"
+
+cat >>confdefs.h <<_ACEOF
+#define MODULAR_DEBUG 1
+_ACEOF
+
+fi
 
 #--------------#

orxonox/trunk/configure.ac

@@ -56 +56 @@
 if test x$DEBUG = xno; then 
         echo "no"
-        echo " -> Setting debuglevel to 3. (orxonox is still in Development. It really is needed."
-        DEBUG=3
+        echo " -> Setting debuglevel to 4. (orxonox is still in Development. It really is needed."
+        DEBUG=4
 elif test x$DEBUG = xyes; then
         echo "yes"
@@ -68 +68 @@
 
 AC_SUBST(DEBUG)
+
+#---------------#
+# Modular Debug #
+#---------------#
+MODULAR_DEBUG=yes
+AC_MSG_CHECKING([if Modular-DEBUG-mode should be ebabled])
+AC_ARG_ENABLE([modular-debug], 
+        AC_HELP_STRING( [--disable-modular-debug], [compiles in modular-debug mode, that logs differently on the many modules of orxonox.]),
+         MODULAR_DEBUG=$enableval)
+
+if test x$MODULAR_DEBUG = xno; then 
+        echo "no"
+elif test x$MODULAR_DEBUG = xyes; then
+        echo "yes"
+        AC_DEFINE_UNQUOTED(MODULAR_DEBUG, 1, [if Modular-DUBUG mode is enabled])
+fi
 
 #--------------#

orxonox/trunk/src/defs/debug.h

@@ -36 +36 @@
 #define vDEBUGING       5
 
+extern int verbose;
+
+#ifndef MODULAR_DEBUG
+#define HARD_DEBUG_LEVEL DEBUG
+#else /* MODULAR_DEBUG */
 #ifndef DEBUG_SPECIAL_MODULE
-extern int verbose;
-#else
+#define HARD_DEBUG_LEVEL DEBUG
+#else /* DEBUG_SPECIAL_MODULE */
 // DEFINE MODULES \\
 #define DEBUG_MODULE_ORXONOX            0
@@ -54 +59 @@
 #define DEBUG_MODULE_NULL_PARENT        0
 
-#define verbose DEBUG_SPECIAL_MODULE
-
-#endif
+
+#define HARD_DEBUG_LEVEL DEBUG_SPECIAL_MODULE
+#endif /* DEBUG_SPECIAL_MODULE */
+#endif /* MODULAR_DEBUG */
 ///////////////////////////////////////////////////
 /// PRINTF: prints with filename and linenumber ///
@@ -66 +72 @@
            PRINTF ## x
 
-#if DEBUG >= ERR
+#if HARD_DEBUG_LEVEL >= ERR
 #define PRINTF1 \
     if (verbose >= ERR) \
@@ -74 +80 @@
 #endif
      
-#if DEBUG >= WARN
+#if HARD_DEBUG_LEVEL >= WARN
 #define PRINTF2 \
      if (verbose >= WARN) \
@@ -83 +89 @@
 #endif
      
-#if DEBUG >= INFO
+#if HARD_DEBUG_LEVEL >= INFO
 #define PRINTF3 \
      if (verbose >= INFO) \
@@ -91 +97 @@
 #endif
      
-#if DEBUG >= DEBUGING
+#if HARD_DEBUG_LEVEL >= DEBUGING
 #define PRINTF4 \
      if (verbose >= DEBUGING) \
@@ -99 +105 @@
 #endif
      
-#if DEBUG >= vDEBUGING
+#if HARD_DEBUG_LEVEL >= vDEBUGING
 #define PRINTF5 \
      if (verbose >= vDEBUGING) \
@@ -122 +128 @@
   PRINT ## x
 
-#if DEBUG >= ERR
+#if HARD_DEBUG_LEVEL >= ERR
 #define PRINT1  \
   if (verbose >= ERR)   \
@@ -130 +136 @@
 #endif
 
-#if DEBUG >= WARN
+#if HARD_DEBUG_LEVEL >= WARN
 #define PRINT2 \
   if (verbose >= WARN) \
@@ -139 +145 @@
 #endif
 
-#if DEBUG >= INFO
+#if HARD_DEBUG_LEVEL >= INFO
 #define PRINT3 \
   if (verbose >= INFO) \
@@ -147 +153 @@
 #endif
 
-#if DEBUG >= DEBUGING
+#if HARD_DEBUG_LEVEL >= DEBUGING
 #define PRINT4 \
   if (verbose >= DEBUGING) \
@@ -155 +161 @@
 #endif
 
-#if DEBUG >= vDEBUGING
+#if HARD_DEBUG_LEVEL >= vDEBUGING
 #define PRINT5 \
      if (verbose >= vDEBUGING) \
@@ -178 +184 @@
            COUT ## x
 
-#if DEBUG >= 1
+#if HARD_DEBUG_LEVEL >= 1
 #define COUT1 \
     if (verbose >= 1 ) \
@@ -186 +192 @@
 #endif
      
-#if DEBUG >= 2
+#if HARD_DEBUG_LEVEL >= 2
 #define COUT2 \
      if (verbose >= 2 ) \
@@ -195 +201 @@
 #endif
      
-#if DEBUG >= 3
+#if HARD_DEBUG_LEVEL >= 3
 #define COUT3 \
      if (verbose >= 3 ) \
@@ -203 +209 @@
 #endif
      
-#if DEBUG >= 4
+#if HARD_DEBUG_LEVEL >= 4
 #define COUT4 \
      if (verbose >= 4 ) \

orxonox/trunk/src/orxonox.cc

@@ -31 +31 @@
 #include "game_loader.h"
 #include <string.h>
-int verbose = 3;
+int verbose = 4;
 
 using namespace std;