Changeset 2377 for trunk/packages

Timestamp:

Aug 15, 2011, 8:35:09 PM (13 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers

Files:

• nanoscale/server2.c (modified) (2 diffs)
• nanovis/NvEventLog.cpp (modified) (1 diff)
• nanovis/nanovis.cpp (modified) (4 diffs)

trunk/packages/vizservers/nanoscale/server2.c

@@ -251 +251 @@
 main(int argc, char **argv)
 {
+#ifdef SA_NOCLDWAIT
+    struct sigaction action;
+#endif
     fd_set serverFds;
     int maxFd;                          /* Highest file descriptor in use. */
@@ -332 +335 @@
         exit(1);
     }
-
+#ifdef SA_NOCLDWAIT
+    memset(&action, 0, sizeof(action));
+    action.sa_flags = SA_NOCLDWAIT;
+#endif
+     signal(SIGPIPE, SIG_IGN);
+#ifdef SA_NOCLDWAIT
+    sigaction(SIGCHLD, &action, 0);
+#else
+    signal(SIGCHLD, SIG_IGN);
+#endif
 
     /* Build the array of servers listener file descriptors. */

trunk/packages/vizservers/nanovis/NvEventLog.cpp

@@ -36 +36 @@
     //open log and map stderr to log file
     NanoVis::logfile = fopen(logName, "w");
-    close(2);
     dup2(fileno(NanoVis::logfile), 2);
     /* dup2(2,1); */

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -2245 +2245 @@
     char *newPath;
     struct timeval tv;
-
+        int n;
     newPath = NULL;
     path = NULL;
@@ -2251 +2251 @@
 
     openlog("nanovis", LOG_CONS | LOG_PERROR | LOG_PID,  LOG_USER);
+    INFO("writing marker to stdout");
+    if ((n = write(1, "NanoVis ", 8)) != 8) {
+       INFO("short write %d", n);
+    }
     gettimeofday(&tv, NULL);
     stats.start = tv;
@@ -2370 +2374 @@
 #endif
     }
+
     R2FilePath::getInstance()->setWorkingDirectory(argc, (const char**) argv);
     vrFilePath::getInstance()->setWorkingDirectory(argc, (const char**) argv);
@@ -2377 +2382 @@
     signal(SIGPIPE,SIG_IGN);
 #endif
-    write(1, "nanovis ", 8);
     NvInitService();
 #endif