Changeset 4107

Timestamp:

Jan 9, 2014 10:00:17 AM (10 years ago)

Author:

ldelgass

Message:

Add command-line options to nanovis/geovis/vtkvis servers to allow setting
file descriptors to use for client IO (i.e. which fds are used by nanoscale
to dup the socket). Must be 0-4 and check that trace log fd isn't used for
client IO.

Location:

trunk/packages/vizservers

Files:

• geovis/RenderServer.cpp (modified) (2 diffs)
• nanovis/nanovisServer.cpp (modified) (4 diffs)
• vtkvis/RenderServer.cpp (modified) (2 diffs)

trunk/packages/vizservers/geovis/RenderServer.cpp

@@ -444 +444 @@
     // Ignore SIGPIPE.  **Is this needed? **
     signal(SIGPIPE, SIG_IGN);
+
+    //const char *resourcePath = NULL;
+    while (1) {
+        int c = getopt(argc, argv, "p:i:o:");
+        if (c == -1) {
+            break;
+        }
+        switch (c) {
+        case 'p':
+            //resourcePath = optarg;
+            break;
+        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();
@@ -451 +483 @@
 
     TRACE("Starting GeoVis 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));
 
     /* This synchronizes the client with the server, so that the client 

trunk/packages/vizservers/nanovis/nanovisServer.cpp

@@ -464 +464 @@
     // Ignore SIGPIPE.  **Is this needed? **
     signal(SIGPIPE, SIG_IGN);
+
+    const char *resourcePath = NULL;
+    while (1) {
+        static struct option long_options[] = {
+            {"debug",   no_argument,       NULL, 'd'},
+            {"path",    required_argument, NULL, 'p'},
+            {0, 0, 0, 0}
+        };
+        int option_index = 0;
+        int c = getopt_long(argc, argv, "dp:i:o:", long_options, &option_index);
+        if (c == -1) {
+            break;
+        }
+        switch (c) {
+        case 'd':
+            NanoVis::debugFlag = true;
+            break;
+        case 'p':
+            resourcePath = optarg;
+            break;
+        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();
@@ -471 +512 @@
 
     TRACE("Starting NanoVis Server");
+    if (NanoVis::debugFlag) {
+        TRACE("Debugging on");
+    }
+
+    // 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));
 
     /* This synchronizes the client with the server, so that the client 
@@ -509 +564 @@
     glutReshapeFunc(reshape);
 
-    const char *path = NULL;
-    char *newPath = NULL;
-
-    while (1) {
-        static struct option long_options[] = {
-            {"debug",   no_argument,       NULL, 'd'},
-            {"path",    required_argument, NULL, 'p'},
-            {0, 0, 0, 0}
-        };
-        int option_index = 0;
-        int c = getopt_long(argc, argv, "dp:", long_options, &option_index);
-        if (c == -1) {
-            break;
-        }
-        switch (c) {
-        case 'd':
-            TRACE("Debugging on");
-            NanoVis::debugFlag = true;
-            break;
-        case 'p':
-            TRACE("Resource path: '%s'", optarg);
-            path = optarg;
-            break;
-        case '?':
-            break;
-        default:
-            fprintf(stderr,"unknown option '%c'.\n", c);
-            return 1;
-        }
-    }
-    if (path == NULL) {
+    char *newResourcePath = NULL;
+    if (resourcePath == NULL) {
         char *p;
 
         // See if we can derive the path from the location of the program.
         // Assume program is in the form <path>/bin/nanovis.
-        path = argv[0];
-        p = strrchr((char *)path, '/');
+        resourcePath = argv[0];
+        p = strrchr((char *)resourcePath, '/');
         if (p != NULL) {
             *p = '\0';
-            p = strrchr((char *)path, '/');
+            p = strrchr((char *)resourcePath, '/');
         }
         if (p == NULL) {
@@ -555 +581 @@
         }
         *p = '\0';
-        newPath = new char[(strlen(path) + 15) * 2 + 1];
-        sprintf(newPath, "%s/lib/shaders:%s/lib/resources", path, path);
-        path = newPath;
-        TRACE("No resource path specified, using: %s", path);
+        newResourcePath = new char[(strlen(resourcePath) + 15) * 2 + 1];
+        sprintf(newResourcePath, "%s/lib/shaders:%s/lib/resources", resourcePath, resourcePath);
+        resourcePath = newResourcePath;
+        TRACE("No resource path specified, using: %s", resourcePath);
+    } else {
+        TRACE("Resource path: '%s'", resourcePath);
     }
 
     FilePath::getInstance()->setWorkingDirectory(argc, (const char**) argv);
 
-    if (!NanoVis::init(path)) {
+    if (!NanoVis::init(resourcePath)) {
         exitService(1);
     }
-    if (newPath != NULL) {
-        delete [] newPath;
+    if (newResourcePath != NULL) {
+        delete [] newResourcePath;
     }
 

trunk/packages/vizservers/vtkvis/RenderServer.cpp

@@ -492 +492 @@
     // 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();
@@ -499 +527 @@
 
     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