Changeset 4606

Timestamp:

Aug 2, 2014 12:47:55 AM (9 years ago)

Author:

ldelgass

Message:

More merges from trunk, including command-line arg. for file descriptors

Location:

vtkvis/branches/1.7

Files:

• . (modified) (1 prop)
• PolyData.cpp (modified) (1 diff)
• RenderServer.cpp (modified) (7 diffs)
• Renderer.cpp (modified) (1 diff)
• RendererCmd.cpp (modified) (1 diff)

vtkvis/branches/1.7/PolyData.cpp

@@ -239 +239 @@
         TRACE("DataSet is not a PolyData");
         vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New();
-        gf->UseStripsOn();
+        //gf->UseStripsOn();
         gf->ReleaseDataFlagOn();
 #ifdef USE_VTK6

vtkvis/branches/1.7/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");
+    // Create a stream associated with the output file descriptor
+    g_fOut = fdopen(g_fdOut, "w");
+    // If running without a socket, use stdout for debugging
+    if (g_fOut == NULL && g_fdOut != STDOUT_FILENO) {
+        g_fdOut = STDOUT_FILENO;
+        g_fOut = stdout;
+    }
 
     const char *user = getenv("USER");
@@ -428 +434 @@
     // 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 +446 @@
         free(logName);
     }
-
-    TRACE("Leave");
 }
 
@@ -444 +451 @@
 exitService()
 {
-    TRACE("Enter");
-
     serverStats(0);
 
@@ -488 +493 @@
     // Ignore SIGPIPE.  **Is this needed? **
     signal(SIGPIPE, SIG_IGN);
+
+    while (1) {
+        int c = getopt(argc, argv, "i:o:");
+        if (c == -1) {
+            break;
+        }
+        switch (c) {
+        case 'i': {
+            int fd = atoi(optarg);
+            if (fd >=0 && fd < 5) {
+                g_fdIn = fd;
+            }
+        }
+            break;
+        case 'o': {
+            int fd = atoi(optarg);
+            if (fd >=0 && fd < 5) {
+                g_fdOut = fd;
+            }
+        }
+            break;
+        case '?':
+            break;
+        default:
+            return 1;
+        }
+    }
+
     initService();
     initLog();
@@ -495 +528 @@
 
     TRACE("Starting VTKVis Server");
+
+    // Sanity check: log descriptor can't be used for client IO
+    if (fileno(g_fLog) == g_fdIn) {
+        ERROR("Invalid input file descriptor");
+        return 1;
+    }
+    if (fileno(g_fLog) == g_fdOut) {
+        ERROR("Invalid output file descriptor");
+        return 1;
+    }
+    TRACE("File descriptors: in %d out %d log %d", g_fdIn, g_fdOut, fileno(g_fLog));
 
 #ifdef WANT_TRACE

vtkvis/branches/1.7/Renderer.cpp

@@ -1558 +1558 @@
         if (axis == X_AXIS) {
             _cubeAxesActor->SetXLabelFormat(format);
+#ifdef USE_CUSTOM_AXES
             _cubeAxesActor->XAutoLabelFormatOff();
+#endif
         } else if (axis == Y_AXIS) {
             _cubeAxesActor->SetYLabelFormat(format);
+#ifdef USE_CUSTOM_AXES
             _cubeAxesActor->YAutoLabelFormatOff();
+#endif
         } else if (axis == Z_AXIS) {
             _cubeAxesActor->SetZLabelFormat(format);
+#ifdef USE_CUSTOM_AXES
             _cubeAxesActor->ZAutoLabelFormatOff();
+#endif
         }
         _needsRedraw = true;

vtkvis/branches/1.7/RendererCmd.cpp

@@ -12555 +12555 @@
                                          * available. */
     while (inBufPtr->isLineAvailable() || 
-           (select(1, &readFds, NULL, NULL, tvPtr) > 0)) {
+           (select(inBufPtr->file()+1, &readFds, NULL, NULL, tvPtr) > 0)) {
         size_t numBytes;
         unsigned char *buffer;