Changeset 4105 for trunk/packages/vizservers/vtkvis

Timestamp:

Jan 8, 2014 8:32:39 PM (10 years ago)

Author:

ldelgass

Message:

Prep servers for accepting arguments to change file descriptors for IO. This
will allow us to send stdout to the trace log along with stderr so chatty
libraries won't send garbage to the socket. Fall back to stdin/stdout to allow
debugging without nanoscale.

File:

• trunk/packages/vizservers/vtkvis/RenderServer.cpp (modified) (5 diffs)

trunk/packages/vizservers/vtkvis/RenderServer.cpp

@@ -45 +45 @@
 int VtkVis::g_fdIn = STDIN_FILENO; ///< Input file descriptor
 int VtkVis::g_fdOut = STDOUT_FILENO; ///< Output file descriptor
-FILE *VtkVis::g_fOut = stdout; ///< Output file handle
+FILE *VtkVis::g_fOut = NULL; ///< Output file handle
 FILE *VtkVis::g_fLog = NULL; ///< Trace logging file handle
 Renderer *VtkVis::g_renderer = NULL; ///< Main render worker
@@ -407 +407 @@
 initService()
 {
-    TRACE("Enter");
+    g_fOut = fdopen(g_fdOut, "w");
+    // If running without socket, use stdout for debugging
+    if (g_fOut == NULL && g_fdOut != STDOUT_FILENO) {
+        g_fdOut = STDOUT_FILENO;
+        g_fOut = fdopen(g_fdOut, "w");
+    }
 
     const char *user = getenv("USER");
@@ -428 +433 @@
     // open log and map stderr to log file
     g_fLog = fopen(logName, "w");
-    close(STDERR_FILENO);
     dup2(fileno(g_fLog), STDERR_FILENO);
-    // flush junk
-    fflush(stderr);
+    // If we are writing to socket, map stdout to log
+    if (g_fdOut != STDOUT_FILENO) {
+        dup2(fileno(g_fLog), STDOUT_FILENO);
+    }
+
+    fflush(stdout);
 
     // clean up malloc'd memory
@@ -437 +445 @@
         free(logName);
     }
-
-    TRACE("Leave");
 }
 
@@ -444 +450 @@
 exitService()
 {
-    TRACE("Enter");
-
     serverStats(0);