Changeset 4111 for trunk/packages/vizservers/vtkvis

Timestamp:

Jan 12, 2014, 2:48:38 PM (11 years ago)

Author:

ldelgass

Message:

Revert some changes from r4108: nanovis and vtkvis redirect stdout/stderr to
the trace log. Default to using stdin/stdout in nanovis/vtkvis when no command
line option is given. Add command line options to nanoscale config file to
set socket descriptor for nanovis/vtkvis/geovis.

File:

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

trunk/packages/vizservers/vtkvis/RenderServer.cpp

@@ -43 +43 @@
 
 int VtkVis::g_statsFile = -1; ///< Stats output file descriptor.
-#define CLIENT_READ     (3)
-#define CLIENT_WRITE    (4)
-int VtkVis::g_fdIn = CLIENT_READ; ///< Input file descriptor
-int VtkVis::g_fdOut = CLIENT_WRITE; ///< Output file descriptor
+int VtkVis::g_fdIn = STDIN_FILENO; ///< Input file descriptor
+int VtkVis::g_fdOut = STDOUT_FILENO; ///< Output file descriptor
 FILE *VtkVis::g_fOut = NULL; ///< Output file handle
 FILE *VtkVis::g_fLog = NULL; ///< Trace logging file handle
@@ -409 +407 @@
 initService()
 {
-    // Create a stream associated with the client read file descriptor.  If
-    // we're not using a socket (fdopen of descriptor 4 will return NULL),
-    // then use descriptor 1 and stdout respectively.
+    // Create a stream associated with the output file descriptor
     g_fOut = fdopen(g_fdOut, "w");
-    // If running without socket, use stdout for debugging
+    // If running without a socket, use stdout for debugging
     if (g_fOut == NULL && g_fdOut != STDOUT_FILENO) {
         g_fdOut = STDOUT_FILENO;
@@ -436 +432 @@
     }
 
-    // Nanoscale automatically redirects stdout and stderr to log files.
     // open log and map stderr to log file
     g_fLog = fopen(logName, "w");
     dup2(fileno(g_fLog), STDERR_FILENO);
+    // 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