Changeset 2354 for trunk

Timestamp:

Aug 14, 2011, 10:59:03 AM (13 years ago)

Author:

gah

Message:

new nanoscale

File:

• trunk/packages/vizservers/nanoscale/server2.c (modified) (3 diffs)

trunk/packages/vizservers/nanoscale/server2.c

@@ -352 +352 @@
              hPtr = Tcl_NextHashEntry(&iter)) {
             RenderServer *serverPtr;
-            int f;
             pid_t child;
-            socklen_t length;
-            struct sockaddr_in newaddr;
 
             serverPtr = Tcl_GetHashValue(hPtr);
             if (!FD_ISSET(serverPtr->listenerFd, &readFds)) {
-                continue;
+                continue;               
             }
-            /* Accept the new connection. */
-            length = sizeof(newaddr);
-            f = accept(serverPtr->listenerFd, (struct sockaddr *)&newaddr, 
-                       &length);
-            if (f < 0) {
-                ERROR("can't accept server \"%s\": %s", serverPtr->name, 
-                      strerror(errno));
-                continue;
-            }
-            INFO("Connecting \"%s\" to %s\n", serverPtr->name, 
-                 inet_ntoa(newaddr.sin_addr));
-            
+            /* Rotate the display's screen number.  If we have multiple video
+             * cards, try to spread the jobs out among them.  */
             dispNum++;
             if (dispNum >= maxCards) {
@@ -385 +372 @@
             } else if (child == 0) {
                 int i;
+                int f;
+                socklen_t length;
+                struct sockaddr_in newaddr;
                 
                 /* Child process. */
@@ -397 +387 @@
                     }
                 }                           
+
+                /* Try to accept the connection and start the server.  */
+
+                /* Accept the new connection. */
+                length = sizeof(newaddr);
+                f = accept(serverPtr->listenerFd, (struct sockaddr *)&newaddr, 
+                           &length);
+                if (f < 0) {
+                    ERROR("can't accept server \"%s\": %s", serverPtr->name, 
+                          strerror(errno));
+                    exit(1);
+                }
+                INFO("Connecting \"%s\" to %s\n", serverPtr->name, 
+                     inet_ntoa(newaddr.sin_addr));
+                
                 dup2(f, 0);             /* Stdin */
                 dup2(f, 1);             /* Stdout */