Changeset 2374 for trunk/packages

Timestamp:

Aug 15, 2011 3:37:50 PM (13 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers/nanovis

Files:

• Trace.cpp (modified) (2 diffs)
• nanovis.cpp (modified) (3 diffs)

trunk/packages/vizservers/nanovis/Trace.cpp

@@ -8 +8 @@
 #include <GL/glut.h>
 #include <syslog.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 */
+};
 
 void 
@@ -25 +36 @@
         s++;
     }
-    length = snprintf(message, MSG_LEN, "line %d of \"%s\": ", lineNum, s);
+    length = snprintf(message, MSG_LEN, "nanovis (%d) %s: %s:%d ", 
+                      getpid(), syslogLevels[priority],  s, lineNum);
     length += vsnprintf(message + length, MSG_LEN - length, fmt, lst);
     message[MSG_LEN] = '\0';

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -133 +133 @@
 bool NanoVis::axis_on = true;
 bool NanoVis::config_pending = false;
-bool NanoVis::debug_flag = false;
+bool NanoVis::debug_flag = true;
 
 Tcl_Interp *NanoVis::interp;
@@ -2270 +2270 @@
     glutDisplayFunc(NanoVis::render);
 #else
-    write(1, "nanovis ", 8);
     glutDisplayFunc(NanoVis::display);
     glutReshapeFunc(NanoVis::resize_offscreen_buffer);
@@ -2375 +2374 @@
 
 #ifdef XINETD
+#ifdef notdef
     signal(SIGPIPE,SIG_IGN);
+#endif
+    write(1, "nanovis ", 8);
     NvInitService();
 #endif