Changeset 1233

Timestamp:

Nov 25, 2008 9:34:52 AM (15 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers

Files:

• nanoscale/server.c (modified) (4 diffs)
• start_viz.sh.in (modified) (1 diff)

trunk/packages/vizservers/nanoscale/server.c

@@ -39 +39 @@
 fd_set pipe_rfds;           // Descriptors that are pipes to children.
 fd_set service_rfds[MAX_SERVICES];
-int maxScreens = 1;
-int nRequests = -1;
+int maxCards = 1;
+int dispNum = -1;
 char displayVar[200];
 
@@ -244 +244 @@
 
         switch(c) {
-        case 'x': /* Number of screens */
+        case 'x': /* Number of video cards */
             maxScreens = strtoul(optarg, 0, 0);
-            if ((maxScreens < 1) || (maxScreens > 10)) {
-                fprintf(stderr, "bad number of max screens specified\n");
+            if ((maxCards < 1) || (maxCards > 10)) {
+                fprintf(stderr, "bad number of max videocards specified\n");
                 return 1;
             }
@@ -582 +582 @@
                     perror("fcntl");
                 }
-                nRequests++;
-              
+                dispNum++;
+                if (dispNum >= maxCards) {
+                    dispNum = 0;
+                }
                 // Fork the new process.  Connect i/o to the new socket.
                 status = fork();
@@ -608 +610 @@
                                     close(fd);
                               
-                                if (maxScreens > 1) {
-                                    int dispNum;
-
-                                    dispNum = nRequests % maxScreens;
+                                if (maxCards > 1) {
                                     displayVar[11] = dispNum + '0';
                                 }

trunk/packages/vizservers/start_viz.sh.in

@@ -25 +25 @@
 export PATH LD_LIBRARY_PATH PYMOL_PATH
 
-nscreens=`lspci | fgrep VGA | wc -l`
-nanoscale="${dir}/bin/nanoscale -S${nscreens} -b $nanoscale_port -s $broadcast"
+nvideo=`lspci | fgrep VGA | wc -l`
+nanoscale="${dir}/bin/nanoscale -x ${nvideo} -b $nanoscale_port -s $broadcast"
 nanovis="${dir}/bin/nanovis -p ${dir}/lib/shaders:${dir}/lib/resources"
 pymolproxy="${dir}/bin/pymolproxy ${dir}/bin/pymol -p -q -i -x -X 0 -Y 0"