Changeset 560 for code/branches/FICN/src/orxonox/core

Timestamp:

Dec 17, 2007, 3:20:46 AM (16 years ago)

Author:

landauf

Message:

• changed output from std::cout to COUT(level)
• added SoftDebugLevel config-variable (its a hack, but it works fine)

Location:

code/branches/FICN/src/orxonox/core

Files:

• CMakeLists.txt (modified) (1 diff)
• Debug.h (modified) (17 diffs)
• Error.cc (modified) (3 diffs)
• SignalHandler.cc (modified) (4 diffs)

code/branches/FICN/src/orxonox/core/CMakeLists.txt

@@ -11 +11 @@
   SignalHandler.cc
   ArgReader.cc
+  DebugLevel.cc
 )
 

code/branches/FICN/src/orxonox/core/Debug.h

@@ -25 +25 @@
 
 #include <stdio.h>
+
+int getSoftDebugLevel();
 
 // DEFINE ERROR MODES
@@ -38 +40 @@
 
 #define ORX_HARD_DEBUG_LEVEL ORX_DEBUG
-#define ORX_SOFT_DEBUG_LEVEL ORX_WARNING // <-- fix that! should be a configurable setting
+//#define ORX_SOFT_DEBUG_LEVEL ORX_WARNING // <-- fix that! should be a configurable setting
 
 ///////////////////////////////////////////////////
@@ -61 +63 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_ERROR
    #define PRINTF1 \
-    if (ORX_SOFT_DEBUG_LEVEL >= ORX_ERROR) \
+    if (getSoftDebugLevel() >= ORX_ERROR) \
      printf("Error (in %s, line %d): ", __FILE__, __LINE__), PRINT_EXEC
   #else
@@ -69 +71 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_WARNING
    #define PRINTF2 \
-    if (ORX_SOFT_DEBUG_LEVEL >= ORX_WARNING) \
+    if (getSoftDebugLevel() >= ORX_WARNING) \
      printf("Warning (in %s, line %d): ", __FILE__, __LINE__), PRINT_EXEC
   #else
@@ -77 +79 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_INFO
    #define PRINTF3 \
-    if (ORX_SOFT_DEBUG_LEVEL >= ORX_INFO) \
+    if (getSoftDebugLevel() >= ORX_INFO) \
      printf("Info (in %s, line %d): ", __FILE__, __LINE__), PRINT_EXEC
   #else
@@ -85 +87 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_DEBUG
    #define PRINTF4 \
-    if (ORX_SOFT_DEBUG_LEVEL >= ORX_DEBUG) \
+    if (getSoftDebugLevel() >= ORX_DEBUG) \
      printf("Debug (in %s, line %d): ", __FILE__, __LINE__), PRINT_EXEC
   #else
@@ -93 +95 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_vDEBUG
    #define PRINTF5 \
-    if (ORX_SOFT_DEBUG_LEVEL >= ORX_vDEBUG) \
+    if (getSoftDebugLevel() >= ORX_vDEBUG) \
      printf("vDebug (in %s, line %d): ", __FILE__, __LINE__), PRINT_EXEC
   #else
@@ -124 +126 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_ERROR
    #define PRINT1  \
-    if (ORX_SOFT_DEBUG_LEVEL >= ORX_ERROR)  \
+    if (getSoftDebugLevel() >= ORX_ERROR)  \
      PRINT_EXEC
   #else
@@ -132 +134 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_WARNING
    #define PRINT2 \
-    if (ORX_SOFT_DEBUG_LEVEL >= ORX_WARNING) \
+    if (getSoftDebugLevel() >= ORX_WARNING) \
      PRINT_EXEC
   #else
@@ -140 +142 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_INFO
    #define PRINT3 \
-    if (ORX_SOFT_DEBUG_LEVEL >= ORX_INFO) \
+    if (getSoftDebugLevel() >= ORX_INFO) \
      PRINT_EXEC
   #else
@@ -148 +150 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_DEBUG
    #define PRINT4 \
-    if (ORX_SOFT_DEBUG_LEVEL >= ORX_DEBUG) \
+    if (getSoftDebugLevel() >= ORX_DEBUG) \
      PRINT_EXEC
   #else
@@ -156 +158 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_vDEBUG
    #define PRINT5 \
-    if (ORX_SOFT_DEBUG_LEVEL >= ORX_vDEBUG) \
+    if (getSoftDebugLevel() >= ORX_vDEBUG) \
      PRINT_EXEC
   #else
@@ -188 +190 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_ERROR
    #define COUT1  \
-    if (ORX_SOFT_DEBUG_LEVEL >= ORX_ERROR)  \
+    if (getSoftDebugLevel() >= ORX_ERROR)  \
      COUT_EXEC
   #else
@@ -197 +199 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_WARNING
    #define COUT2 \
-    if (ORX_SOFT_DEBUG_LEVEL >= ORX_WARNING) \
+    if (getSoftDebugLevel() >= ORX_WARNING) \
      COUT_EXEC
   #else
@@ -206 +208 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_INFO
    #define COUT3 \
-    if (ORX_SOFT_DEBUG_LEVEL >= ORX_INFO) \
+    if (getSoftDebugLevel() >= ORX_INFO) \
      COUT_EXEC
   #else
@@ -215 +217 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_DEBUG
    #define COUT4 \
-    if (ORX_SOFT_DEBUG_LEVEL >= ORX_DEBUG) \
+    if (getSoftDebugLevel() >= ORX_DEBUG) \
      COUT_EXEC
   #else
@@ -224 +226 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_vDEBUG
    #define COUT5 \
-    if (ORX_SOFT_DEBUG_LEVEL >= ORX_vDEBUG) \
+    if (getSoftDebugLevel() >= ORX_vDEBUG) \
      COUT_EXEC
   #else

code/branches/FICN/src/orxonox/core/Error.cc

@@ -27 +27 @@
 
 #include "Error.h"
+#include "Debug.h"
 
 namespace orxonox
@@ -42 +43 @@
         Error::Error(int errorCode, std::string errorMsg)
         {
-                std::cout << "############################ "<< std::endl
+                COUT(1) << "############################ "<< std::endl
                                                         << "#         Error "<<errorCode<< "          #"<< std::endl
                                                         << "############################ "<< std::endl
@@ -58 +59 @@
                         }
                 }
-                std::cout << errorMsg << std::endl<< std::endl;
+                COUT(1) << errorMsg << std::endl<< std::endl;
         }
 }

code/branches/FICN/src/orxonox/core/SignalHandler.cc

@@ -14 +14 @@
 */
 
+#include <assert.h>
+
 #include "SignalHandler.h"
-#include <assert.h>
+#include "Debug.h"
 
 SignalHandler * SignalHandler::singletonRef = NULL;
@@ -101 +103 @@
   }
 
-  printf( "recieved signal %s\ntry to write backtrace to file orxonox.log\n", sigName.c_str() );
+  PRINTF(0)( "recieved signal %s\ntry to write backtrace to file orxonox.log\n", sigName.c_str() );
 
   int sigPipe[2];
@@ -129 +131 @@
     if ( someData != 0x12345678 )
     {
-      printf("something went wrong :(\n");
+      PRINTF(0)("something went wrong :(\n");
     }
 
@@ -278 +280 @@
   if ( fwrite( bt.c_str(), 1, bt.length(), f ) != bt.length() )
   {
-    printf( ( std::string("could not write %d byte to ") + getInstance()->fileName ).c_str(), bt.length());
+    PRINTF(0)( ( std::string("could not write %d byte to ") + getInstance()->fileName ).c_str(), bt.length());
     exit(EXIT_FAILURE);
   }