[Traverso-commit] traverso/src common/Debugger.cpp common/Debugge...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/10/29 08:59:15

Modified files:
        src/common     : Debugger.cpp Debugger.h 
        src/traverso   : Main.cpp 

Log message:
        * Rename namespace Debugger to TraversoDebugger to avoid namespace 
collision on mac os x (Thanks to David for submitting the patch)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/common/Debugger.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/common/Debugger.h?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Main.cpp?cvsroot=traverso&r1=1.8&r2=1.9

Patches:
Index: common/Debugger.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/common/Debugger.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- common/Debugger.cpp 20 Oct 2007 17:38:16 -0000      1.1
+++ common/Debugger.cpp 29 Oct 2007 08:59:14 -0000      1.2
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
  
-    $Id: Debugger.cpp,v 1.1 2007/10/20 17:38:16 r_sijrier Exp $
+    $Id: Debugger.cpp,v 1.2 2007/10/29 08:59:14 r_sijrier Exp $
 */
 
 #include <stdlib.h>
@@ -25,7 +25,7 @@
 
 #include "Debugger.h"
 
-namespace Debugger
+namespace TraversoDebugger
 {
 int ntabs = 0;
 int debugLevel = OFF;
@@ -34,13 +34,13 @@
 bool logging = false;
 }
 
-void Debugger::fill_tabs()
+void TraversoDebugger::fill_tabs()
 {
         for (int i=0; i < ntabs; i++)
                 printf("|   ");
 }
 
-QString Debugger::get_tabs()
+QString TraversoDebugger::get_tabs()
 {
         QString t="";
         for (int i=0; i < ntabs; i++)
@@ -49,36 +49,36 @@
 }
 
 
-void Debugger::more_tabs()
+void TraversoDebugger::more_tabs()
 {
         ntabs++;
 }
 
 
-void Debugger::less_tabs()
+void TraversoDebugger::less_tabs()
 {
         ntabs--;
 }
 
 
-void Debugger::set_debug_level(int l)
+void TraversoDebugger::set_debug_level(int l)
 {
         debugLevel = l;
 }
 
 
-int Debugger::get_debug_level()
+int TraversoDebugger::get_debug_level()
 {
         return debugLevel;
 }
 
 
-void Debugger::create_log(QString fn)
+void TraversoDebugger::create_log(QString fn)
 {
         logFileName = QString(getenv("HOME")) + "/" + fn;
         logFile = fopen(logFileName.toAscii(),"a+");
         if (!logFile) {
-                PERROR("Cannot create Debugger Log file 
(%s)",fn.toAscii().data());
+                PERROR("Cannot create TraversoDebugger Log file 
(%s)",fn.toAscii().data());
                 logging=false;
         } else {
                 fclose(logFile);
@@ -88,14 +88,14 @@
 
 
 
-void Debugger::close_log()
+void TraversoDebugger::close_log()
 {
         logging=false;
 }
 
 
 
-void Debugger::log(QString s)
+void TraversoDebugger::log(QString s)
 {
         const char* sc = s.toAscii();
         int len = s.length();
@@ -104,7 +104,7 @@
         fclose(logFile);
 }
 
-bool Debugger::is_logging()
+bool TraversoDebugger::is_logging()
 {
         return logging;
 }
@@ -114,7 +114,7 @@
 
 static void print_enter(int lvl, const char* file, const char* function)
 {
-        using namespace Debugger;
+        using namespace TraversoDebugger;
 
         if (get_debug_level()>=lvl) {
                 if (is_logging()) {
@@ -134,7 +134,7 @@
 
 static void print_exit(int lvl, const char* file, const char* function)
 {
-        using namespace Debugger;
+        using namespace TraversoDebugger;
 
         if (get_debug_level()>=lvl) {
                 if (is_logging()) {
@@ -166,7 +166,7 @@
 ConstructorEnter::ConstructorEnter(int level, const char* file, const char* 
function)
                 : m_file(file), m_function(function), lvl(level)
 {
-        using namespace Debugger;
+        using namespace TraversoDebugger;
         if (get_debug_level()>=lvl) {
                 if (is_logging()) {
                         QString output = get_tabs() + "ENTERING " + 
QString(m_function) + " (CONSTRUCTOR)\n";
@@ -189,7 +189,7 @@
 
 ConstructorEnter::~ ConstructorEnter( )
 {
-        using namespace Debugger;
+        using namespace TraversoDebugger;
         if (get_debug_level()>=lvl) {
                 if (is_logging()) {
                         less_tabs();
@@ -213,7 +213,7 @@
 DestructorEnter::DestructorEnter(int level, const char* file, const char* 
function)
                 : m_file(file), m_function(function), lvl(level)
 {
-        using namespace Debugger;
+        using namespace TraversoDebugger;
         if (get_debug_level()>=lvl) {
                 if (is_logging()) {
                         QString output = get_tabs() + "ENTERING " + 
QString(m_function) + " (DESTRUCTOR)\n";
@@ -236,7 +236,7 @@
 
 DestructorEnter::~ DestructorEnter( )
 {
-        using namespace Debugger;
+        using namespace TraversoDebugger;
         if (get_debug_level()>=lvl) {
                 if (is_logging()) {
                         less_tabs();

Index: common/Debugger.h
===================================================================
RCS file: /sources/traverso/traverso/src/common/Debugger.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- common/Debugger.h   20 Oct 2007 17:38:16 -0000      1.1
+++ common/Debugger.h   29 Oct 2007 08:59:14 -0000      1.2
@@ -17,11 +17,11 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-    $Id: Debugger.h,v 1.1 2007/10/20 17:38:16 r_sijrier Exp $
+    $Id: Debugger.h,v 1.2 2007/10/29 08:59:14 r_sijrier Exp $
 */
 
-#ifndef DEBUGGER_H
-#define DEBUGGER_H
+#ifndef TRAVERSO_DEBUGGER_H
+#define TRAVERSO_DEBUGGER_H
 
 #include <QString>
 
@@ -69,31 +69,31 @@
        ~DestructorEnter();
 };
 
-#define PMESG(args...)          { using namespace Debugger; if 
(get_debug_level()>=BASIC)       { if (is_logging())  { QString x; 
x.sprintf(args); QString output = get_tabs() + "[ " + x + " ]\n"; log(output); 
} else { fill_tabs(); CHANGE_COLOR_MAGENTA; printf("[ "); printf(args); 
printf(" ]"); CHANGE_COLOR_WHITE; printf("\n"); } } }
-#define PMESG2(args...)         { using namespace Debugger; if 
(get_debug_level()>=FLOOD)       { if (is_logging())  { QString x; 
x.sprintf(args); QString output = get_tabs() + "[ " + x + " ]\n"; log(output); 
} else { fill_tabs(); CHANGE_COLOR_MAGENTA; printf("[ "); printf(args); 
printf(" ]"); CHANGE_COLOR_WHITE; printf("\n"); } } }
-#define PMESG3(args...)         { using namespace Debugger; if 
(get_debug_level()>=SUPER_FLOOD) { if (is_logging())  { QString x; 
x.sprintf(args); QString output = get_tabs() + "[ " + x + " ]\n"; log(output); 
} else { fill_tabs(); CHANGE_COLOR_MAGENTA; printf("[ "); printf(args); 
printf(" ]"); CHANGE_COLOR_WHITE; printf("\n"); } } }
-#define PMESG4(args...)         { using namespace Debugger; if 
(get_debug_level()>=ALL)         { if (is_logging())  { QString x; 
x.sprintf(args); QString output = get_tabs() + "[ " + x + " ]\n"; log(output); 
} else { fill_tabs(); CHANGE_COLOR_MAGENTA; printf("[ "); printf(args); 
printf(" ]"); CHANGE_COLOR_WHITE; printf("\n"); } } }
-
-#define PDEBUG(args...)         { using namespace Debugger; if (is_logging()) 
{ QString x; x.sprintf(args); QString output = "DEBUG : " + QString(__FILE__) + 
"::" + QString(__FUNCTION__) + ":" + x + "\n"; log(output); } else { 
CHANGE_COLOR_GREEN; printf("DEBUG : ");printf("%s",__FILE__); printf("::"); 
printf("%s",__FUNCTION__); printf(":"); printf(args); CHANGE_COLOR_WHITE; 
printf("\n"); } }
-#define PERROR(args...)         { using namespace Debugger; if (is_logging()) 
{ QString x; x.sprintf(args); QString output = "\n *** Error in " + 
QString(__PRETTY_FUNCTION__) + "\n" + x + "\n\n"; } else {  printf("\n"); 
CHANGE_COLOR_RED; printf("*** Error in "); printf("%s",__PRETTY_FUNCTION__); 
printf("\n"); printf(args); CHANGE_COLOR_WHITE; printf("\n\n"); } }
-#define PERROR2(args...)        { using namespace Debugger; if (is_logging()) 
{ QString x; x.sprintf(args); QString output = "\n *** Error in " + 
QString(__PRETTY_FUNCTION__) + "\n" + x + "\n\n"; } else if 
(get_debug_level()>=FLOOD) {  printf("\n"); CHANGE_COLOR_RED; printf("*** Error 
in "); printf("%s",__PRETTY_FUNCTION__); printf("\n"); printf(args); 
CHANGE_COLOR_WHITE; printf("\n\n"); } }
-#define PWARN(args...)          { using namespace Debugger; if (is_logging()) 
{ QString x; x.sprintf(args); QString output = "WARNING: " + x + "\n"; 
log(output); } else { CHANGE_COLOR_YELLOW; printf("WARNING: "); printf(args); 
CHANGE_COLOR_WHITE; printf("\n"); } }
-#define PWARN2(args...)         { using namespace Debugger; if 
(get_debug_level()>=FLOOD) { if (is_logging()) { QString x; x.sprintf(args); 
QString output = "WARNING: " + x + "\n"; log(output); } else { 
CHANGE_COLOR_YELLOW; printf("WARNING: "); printf(args); CHANGE_COLOR_WHITE; 
printf("\n"); } } }
-
-
-#define PENTER                 FunctionEnter enter(Debugger::BASIC, __FILE__, 
__FUNCTION__)
-#define PENTER2                        FunctionEnter enter(Debugger::FLOOD, 
__FILE__, __FUNCTION__)
-#define PENTER3                        FunctionEnter 
enter(Debugger::SUPER_FLOOD, __FILE__, __FUNCTION__)
-#define PENTER4                        FunctionEnter enter(Debugger::ALL, 
__FILE__, __FUNCTION__)
-
-#define PENTERCONS              ConstructorEnter enter(Debugger::BASIC, 
__FILE__, __FUNCTION__)
-#define PENTERDES                 DestructorEnter enter(Debugger::BASIC, 
__FILE__, __FUNCTION__)
-#define PENTERCONS2            ConstructorEnter enter(Debugger::FLOOD, 
__FILE__, __FUNCTION__)
-#define PENTERDES2               DestructorEnter enter(Debugger::FLOOD, 
__FILE__, __FUNCTION__)
-#define PENTERCONS3            ConstructorEnter enter(Debugger::SUPER_FLOOD, 
__FILE__, __FUNCTION__)
-#define PENTERDES3               DestructorEnter enter(Debugger::SUPER_FLOOD, 
__FILE__, __FUNCTION__)
-#define PENTERCONS4            ConstructorEnter enter(Debugger::ALL, __FILE__, 
__FUNCTION__)
-#define PENTERDES4               DestructorEnter enter(Debugger::ALL, 
__FILE__, __FUNCTION__)
+#define PMESG(args...)          { using namespace TraversoDebugger; if 
(get_debug_level()>=BASIC)       { if (is_logging())  { QString x; 
x.sprintf(args); QString output = get_tabs() + "[ " + x + " ]\n"; log(output); 
} else { fill_tabs(); CHANGE_COLOR_MAGENTA; printf("[ "); printf(args); 
printf(" ]"); CHANGE_COLOR_WHITE; printf("\n"); } } }
+#define PMESG2(args...)         { using namespace TraversoDebugger; if 
(get_debug_level()>=FLOOD)       { if (is_logging())  { QString x; 
x.sprintf(args); QString output = get_tabs() + "[ " + x + " ]\n"; log(output); 
} else { fill_tabs(); CHANGE_COLOR_MAGENTA; printf("[ "); printf(args); 
printf(" ]"); CHANGE_COLOR_WHITE; printf("\n"); } } }
+#define PMESG3(args...)         { using namespace TraversoDebugger; if 
(get_debug_level()>=SUPER_FLOOD) { if (is_logging())  { QString x; 
x.sprintf(args); QString output = get_tabs() + "[ " + x + " ]\n"; log(output); 
} else { fill_tabs(); CHANGE_COLOR_MAGENTA; printf("[ "); printf(args); 
printf(" ]"); CHANGE_COLOR_WHITE; printf("\n"); } } }
+#define PMESG4(args...)         { using namespace TraversoDebugger; if 
(get_debug_level()>=ALL)         { if (is_logging())  { QString x; 
x.sprintf(args); QString output = get_tabs() + "[ " + x + " ]\n"; log(output); 
} else { fill_tabs(); CHANGE_COLOR_MAGENTA; printf("[ "); printf(args); 
printf(" ]"); CHANGE_COLOR_WHITE; printf("\n"); } } }
+
+#define PDEBUG(args...)         { using namespace TraversoDebugger; if 
(is_logging()) { QString x; x.sprintf(args); QString output = "DEBUG : " + 
QString(__FILE__) + "::" + QString(__FUNCTION__) + ":" + x + "\n"; log(output); 
} else { CHANGE_COLOR_GREEN; printf("DEBUG : ");printf("%s",__FILE__); 
printf("::"); printf("%s",__FUNCTION__); printf(":"); printf(args); 
CHANGE_COLOR_WHITE; printf("\n"); } }
+#define PERROR(args...)         { using namespace TraversoDebugger; if 
(is_logging()) { QString x; x.sprintf(args); QString output = "\n *** Error in 
" + QString(__PRETTY_FUNCTION__) + "\n" + x + "\n\n"; } else {  printf("\n"); 
CHANGE_COLOR_RED; printf("*** Error in "); printf("%s",__PRETTY_FUNCTION__); 
printf("\n"); printf(args); CHANGE_COLOR_WHITE; printf("\n\n"); } }
+#define PERROR2(args...)        { using namespace TraversoDebugger; if 
(is_logging()) { QString x; x.sprintf(args); QString output = "\n *** Error in 
" + QString(__PRETTY_FUNCTION__) + "\n" + x + "\n\n"; } else if 
(get_debug_level()>=FLOOD) {  printf("\n"); CHANGE_COLOR_RED; printf("*** Error 
in "); printf("%s",__PRETTY_FUNCTION__); printf("\n"); printf(args); 
CHANGE_COLOR_WHITE; printf("\n\n"); } }
+#define PWARN(args...)          { using namespace TraversoDebugger; if 
(is_logging()) { QString x; x.sprintf(args); QString output = "WARNING: " + x + 
"\n"; log(output); } else { CHANGE_COLOR_YELLOW; printf("WARNING: "); 
printf(args); CHANGE_COLOR_WHITE; printf("\n"); } }
+#define PWARN2(args...)         { using namespace TraversoDebugger; if 
(get_debug_level()>=FLOOD) { if (is_logging()) { QString x; x.sprintf(args); 
QString output = "WARNING: " + x + "\n"; log(output); } else { 
CHANGE_COLOR_YELLOW; printf("WARNING: "); printf(args); CHANGE_COLOR_WHITE; 
printf("\n"); } } }
+
+
+#define PENTER                 FunctionEnter enter(TraversoDebugger::BASIC, 
__FILE__, __FUNCTION__)
+#define PENTER2                        FunctionEnter 
enter(TraversoDebugger::FLOOD, __FILE__, __FUNCTION__)
+#define PENTER3                        FunctionEnter 
enter(TraversoDebugger::SUPER_FLOOD, __FILE__, __FUNCTION__)
+#define PENTER4                        FunctionEnter 
enter(TraversoDebugger::ALL, __FILE__, __FUNCTION__)
+
+#define PENTERCONS              ConstructorEnter 
enter(TraversoDebugger::BASIC, __FILE__, __FUNCTION__)
+#define PENTERDES                 DestructorEnter 
enter(TraversoDebugger::BASIC, __FILE__, __FUNCTION__)
+#define PENTERCONS2            ConstructorEnter enter(TraversoDebugger::FLOOD, 
__FILE__, __FUNCTION__)
+#define PENTERDES2               DestructorEnter 
enter(TraversoDebugger::FLOOD, __FILE__, __FUNCTION__)
+#define PENTERCONS3            ConstructorEnter 
enter(TraversoDebugger::SUPER_FLOOD, __FILE__, __FUNCTION__)
+#define PENTERDES3               DestructorEnter 
enter(TraversoDebugger::SUPER_FLOOD, __FILE__, __FUNCTION__)
+#define PENTERCONS4            ConstructorEnter enter(TraversoDebugger::ALL, 
__FILE__, __FUNCTION__)
+#define PENTERDES4               DestructorEnter enter(TraversoDebugger::ALL, 
__FILE__, __FUNCTION__)
 
 #else
 
@@ -129,7 +129,7 @@
 
 #endif
 /*!
- Debugger is a collection of macros that makes easier the job of debugging a  
Application.
+ TraversoDebugger is a collection of macros that makes easier the job of 
debugging a  Application.
 
  PENTER - Outputs a message when entering a method in level 1. Used in the 
FIRST line of a method;
  PEXIT  - Outputs a message when leaving a method in level 1. Used in the LAST 
line of a method,
@@ -150,7 +150,7 @@
  Same can be done for PENTERCONS2, PEXITCONS2, PENTERCONS3... and so on...
  */
 
-namespace Debugger
+namespace TraversoDebugger
         {
         static const int OFF = 0;         //< no debug output at all
         static const int BASIC = 1;       //< only level 1 calls
@@ -158,23 +158,23 @@
         static const int SUPER_FLOOD = 3; //< all previous plus low level JMB 
messages
         static const int ALL = 4;         //< all messages (including in timer 
loops)
 
-        //! Used internally by Debugger. Align the output with the level of 
execution in a given moment
+        //! Used internally by TraversoDebugger. Align the output with the 
level of execution in a given moment
         void fill_tabs();
 
-        //! Used internally by Debugger. Get a " " (space) sequence whch 
aligns the output with the level of execution in a given moment,
+        //! Used internally by TraversoDebugger. Get a " " (space) sequence 
whch aligns the output with the level of execution in a given moment,
         QString get_tabs();
 
 
-        //! Used internally by Debugger. Increase one level of execution in 
output messages
+        //! Used internally by TraversoDebugger. Increase one level of 
execution in output messages
         void more_tabs();
 
-        //! Used internally by Debugger. Decrease one level of execution in 
output messages
+        //! Used internally by TraversoDebugger. Decrease one level of 
execution in output messages
         void less_tabs();
 
         //! Set the debug level
         void set_debug_level(int l);
 
-        //! Used internally by Debugger. Returns true if debugOn flag is true.
+        //! Used internally by TraversoDebugger. Returns true if debugOn flag 
is true.
         int get_debug_level();
 
         //! create a log file "fn" under home dir and enable copy of all 
debugging messagem to this file.
@@ -183,7 +183,7 @@
         //! close the log file
         void close_log();
 
-        //! Used internally by Debugger. Feed the log file.
+        //! Used internally by TraversoDebugger. Feed the log file.
         void log(QString msg);
 
         //! Used internally to check if output is stdout or a log file

Index: traverso/Main.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Main.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- traverso/Main.cpp   17 Apr 2007 19:56:46 -0000      1.8
+++ traverso/Main.cpp   29 Oct 2007 08:59:15 -0000      1.9
@@ -67,19 +67,19 @@
        signal(SIGSEGV, catch_signal);
 #endif
 
-       Debugger::set_debug_level(Debugger::OFF);
+       TraversoDebugger::set_debug_level(TraversoDebugger::OFF);
        if (argc > 1) {
                for (int i=1; i<argc; i++) {
                        if (strcmp(argv[i],"--d1")==0)
-                                       
Debugger::set_debug_level(Debugger::BASIC);
+                                       
TraversoDebugger::set_debug_level(TraversoDebugger::BASIC);
                        if (strcmp(argv[i],"--d2")==0)
-                                       
Debugger::set_debug_level(Debugger::FLOOD);
+                                       
TraversoDebugger::set_debug_level(TraversoDebugger::FLOOD);
                        if (strcmp(argv[i],"--d3")==0)
-                                       
Debugger::set_debug_level(Debugger::SUPER_FLOOD);
+                                       
TraversoDebugger::set_debug_level(TraversoDebugger::SUPER_FLOOD);
                        if (strcmp(argv[i],"--d4")==0)
-                                       
Debugger::set_debug_level(Debugger::ALL);
+                                       
TraversoDebugger::set_debug_level(TraversoDebugger::ALL);
                        if (strcmp(argv[i],"--log")==0)
-                                       Debugger::create_log("traverso.log");
+                                       
TraversoDebugger::create_log("traverso.log");
                        if ((strcmp(argv[i],"--help")==0) || 
(strcmp(argv[i],"-h")==0)) {
                                printf("\nUsage: traverso [OPTIONS]\n\n");
                                printf("Valid OPTIONS are :\n\n");