Changeset 1991 for trunk/packages

Timestamp:

Dec 8, 2010, 6:06:20 PM (14 years ago)

Author:

gah

Message:

Clean up debugging/printing traces

Location:

trunk/packages/vizservers/nanovis

Files:

• PerfQuery.h (modified) (1 diff)
• Trace.cpp (modified) (2 diffs)
• Trace.h (modified) (2 diffs)
• global.h (modified) (1 diff)
• nanovis.cpp (modified) (6 diffs)

trunk/packages/vizservers/nanovis/PerfQuery.h

@@ -32 +32 @@
                     &bitsSupported);
     if(bitsSupported == 0) {
-        TRACE("occlusion query not supported!\n");
+        INFO("occlusion query not supported!\n");
         return false;
     } else {
-        TRACE("Occlusion query with %d bits supported\n", bitsSupported);
+        INFO("Occlusion query with %d bits supported\n", bitsSupported);
         return true;
     }

trunk/packages/vizservers/nanovis/Trace.cpp

@@ +1 @@
+
 #include "nanovis.h"
 #include <Trace.h>
@@ -6 +7 @@
 #include <GL/glew.h>
 #include <GL/glut.h>
-
-static bool trace = false;
+#include <syslog.h>
 
 void 
-PrintMessage(const char *mesg, const char *fileName, int lineNum, 
-             const char* format, ...)
+LogMessage(int priority, const char *path, int lineNum, const char* fmt, ...)
 {
-    char buff[1024];
+#define MSG_LEN (2047)
+    char message[MSG_LEN+1];
+    const char *s;
+    int length;
     va_list lst;
-    FILE *f;
 
-    f = NanoVis::logfile;
-    if (f == NULL) {
-        f = stderr;
+    va_start(lst, fmt);
+    s = strrchr(path, '/');
+    if (s == NULL) {
+        s = path;
+    } else {
+        s++;
     }
-    va_start(lst, format);
-    vsnprintf(buff, 1023, format, lst);
-    buff[1023] = '\0';
-    fprintf(f, "%s at line %d of \"%s\": %s\n", mesg, lineNum, fileName, buff);
-    fflush(f);
+    length = snprintf(message, MSG_LEN, "line %d of \"%s\": ", lineNum, s);
+    length += vsnprintf(message + length, MSG_LEN - length, fmt, lst);
+    message[MSG_LEN] = '\0';
+    syslog(priority, message, length);
 }
 

trunk/packages/vizservers/nanovis/Trace.h

@@ -4 +4 @@
 #include <GL/glew.h>
 #include <GL/glut.h>
+#include <syslog.h>
 
 #define MAKE_STRING(x) #x
@@ -9 +10 @@
 #define AT __FILE__ ":" NEWSTRING(__LINE__)
 
-extern void PrintMessage(const char *mesg, const char *fileName, int lineNum,
+extern void LogMessage(int priority, const char *fileName, int lineNum,
                          const char* format, ...);
 
-#define ERROR(...)      PrintMessage("Error", __FILE__, __LINE__, __VA_ARGS__)
+#define ERROR(...)      LogMessage(LOG_ERR, __FILE__, __LINE__, __VA_ARGS__)
 #ifdef WANT_TRACE
-#define TRACE(...)      PrintMessage("Trace", __FILE__, __LINE__, __VA_ARGS__)
+#define TRACE(...)      LogMessage(LOG_DEBUG, __FILE__, __LINE__, __VA_ARGS__)
 #else 
 #define TRACE(...) 
 #endif
-#define WARN(...)       PrintMessage("Warning", __FILE__, __LINE__, __VA_ARGS__)
-#define INFO(...)       PrintMessage("Info", __FILE__, __LINE__, __VA_ARGS__)
+#define WARN(...)       LogMessage(LOG_WARNING, __FILE__, __LINE__, __VA_ARGS__)
+#define INFO(...)       LogMessage(LOG_INFO, __FILE__, __LINE__, __VA_ARGS__)
 
 

trunk/packages/vizservers/nanovis/global.h

@@ -106 +106 @@
 system_info()
 {
-    TRACE("-----------------------------------------------------------\n");
-    TRACE("OpenGL driver: %s %s\n", glGetString(GL_VENDOR), 
+    INFO("-----------------------------------------------------------\n");
+    INFO("OpenGL driver: %s %s\n", glGetString(GL_VENDOR), 
            glGetString(GL_VERSION));
-    TRACE("Graphics hardware: %s\n", glGetString(GL_RENDERER));
-    TRACE("-----------------------------------------------------------\n");
+    INFO("Graphics hardware: %s\n", glGetString(GL_RENDERER));
+    INFO("-----------------------------------------------------------\n");
 }
 

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -397 +397 @@
     WriteStats("nanovis", code);
 #endif
+    closelog();
     exit(code);
 }
@@ -769 +770 @@
 {
     // print system information
-    TRACE("-----------------------------------------------------------\n");
-    TRACE("OpenGL driver: %s %s\n", glGetString(GL_VENDOR), 
+    INFO("-----------------------------------------------------------\n");
+    INFO("OpenGL driver: %s %s\n", glGetString(GL_VENDOR), 
            glGetString(GL_VERSION));
-    TRACE("Graphics hardware: %s\n", glGetString(GL_RENDERER));
-    TRACE("-----------------------------------------------------------\n");
+    INFO("Graphics hardware: %s\n", glGetString(GL_RENDERER));
+    INFO("-----------------------------------------------------------\n");
     if (path == NULL) {
         ERROR("No path defined for shaders or resources\n");
@@ -784 +785 @@
         //assert(false);
     }
-    TRACE("Status: Using GLEW %s\n", glewGetString(GLEW_VERSION));
+    INFO("Using GLEW %s\n", glewGetString(GLEW_VERSION));
 
     if (!R2FilePath::getInstance()->setPath(path)) {
@@ -2248 +2249 @@
     path = NULL;
     NanoVis::stdin = stdin;
-    NanoVis::logfile = stderr;
-
+
+    openlog("nanovis", LOG_CONS | LOG_PERROR | LOG_PID,  LOG_USER);
     gettimeofday(&tv, NULL);
     stats.start = tv;
@@ -2276 +2277 @@
         static struct option long_options[] = {
             {"infile",  required_argument, NULL,           0},
-            {"logfile", required_argument, NULL,           1},
             {"path",    required_argument, NULL,           2},
             {"debug",   no_argument,       NULL,           3},
@@ -2317 +2317 @@
             }
             break;
-        case 1:
-        case 'l':
-            NanoVis::logfile = fopen(optarg, "w");
-            if (NanoVis::logfile == NULL) {
-                perror(optarg);
-                return 2;
-            }
-            break;
         case 4:
         case 'r':