Changeset 3452 for trunk/packages/vizservers/nanovis/Trace.cpp

Timestamp:

Mar 4, 2013 8:57:13 PM (11 years ago)

Author:

ldelgass

Message:

Remove XINETD define from nanovis. We only support server mode now, no glut
interaction loop with mouse/keyboard handlers. Fixes for trace logging to make
output closer to vtkvis: inlcude function name for trace messages, remove
newlines from format strings in macros since newlines get added by syslog.

File:

• trunk/packages/vizservers/nanovis/Trace.cpp (modified) (5 diffs)

trunk/packages/vizservers/nanovis/Trace.cpp

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ * Copyright (C) 2004-2013  HUBzero Foundation, LLC
+ *
+ * Author: George A. Howlett <gah@purdue.edu>
+ */
 #include <stdio.h>
 #include <stdarg.h>
@@ -9 +14 @@
 #include "Trace.h"
 
-static const char *syslogLevels[] = {
-    "emergency",                        /* System is unusable */
-    "alert",                            /* Action must be taken immediately */
-    "critical",                         /* Critical conditions */
-    "error",                            /* Error conditions */
-    "warning",                          /* Warning conditions */
-    "notice",                           /* Normal but significant condition */
-    "info",                             /* Informational */
-    "debug",                            /* Debug-level messages */
-};
+#define MSG_LEN 2047
 
 void 
-LogMessage(int priority, const char *path, int lineNum, const char* fmt, ...)
+LogMessage(int priority, const char *funcname,
+           const char *path, int lineNum, const char* fmt, ...)
 {
-#define MSG_LEN (2047)
     char message[MSG_LEN+1];
     const char *s;
@@ -36 +32 @@
         s++;
     }
-    length = snprintf(message, MSG_LEN, "%s: %s:%d ", 
-                      syslogLevels[priority], s, lineNum);
+    if (priority & LOG_DEBUG) {
+        length = snprintf(message, MSG_LEN, "%s:%d(%s): ", s, lineNum, funcname);
+    } else {
+        length = snprintf(message, MSG_LEN, "%s:%d: ", s, lineNum);
+    }
     length += vsnprintf(message + length, MSG_LEN - length, fmt, lst);
     message[MSG_LEN] = '\0';
-    syslog(priority, message, length);
+
+    syslog(priority, "%s", message);
 }
 
@@ -72 +72 @@
         mesg = "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT";             break;
     default:
-        TRACE("FB Status: %s: UNKNOWN framebuffer status %u\n", 
+        TRACE("FB Status: %s: UNKNOWN framebuffer status %u", 
                prefix, (unsigned int)status);
         return;
     }
-    TRACE("FB Status: %s: %s\n", prefix, mesg);
+    TRACE("FB Status: %s: %s", prefix, mesg);
 }
 
@@ -102 +102 @@
         mesg = "GL_INVALID_FRAMEBUFFER_OPERATION_EXT";  break;
     default:
-        TRACE("GL Status: %s: Unknown status %d\n", prefix, status);
+        TRACE("GL Status: %s: Unknown status %d", prefix, status);
         return false;
     } 
-    TRACE("GL Status: %s: %s\n", prefix, mesg);
+    TRACE("GL Status: %s: %s", prefix, mesg);
     return false;
 }