Changeset 698 for trunk

Timestamp:

May 4, 2007 12:13:55 PM (17 years ago)

Author:

nkissebe

Message:

add requests (pixel count) update for nanoscale compatability
additional error handling on process exits

File:

• trunk/gui/vizservers/pymolproxy/pymolproxy.c (modified) (8 diffs)

trunk/gui/vizservers/pymolproxy/pymolproxy.c

@@ -968 +968 @@
 {
         char buffer[800];
-        int bytes=0;
+        unsigned int bytes=0;
+        float samples = 0.0;
         struct pymol_proxy *pymol = (struct pymol_proxy *) cdata;
 
@@ -987 +988 @@
         waitForString(pymol, "image follows: ", buffer, 800);
 
-        sscanf(buffer, "image follows: %d\n", &bytes);
-
+        sscanf(buffer, "image follows: %d %f\n", &bytes, &samples);
+ 
+        write(3,&samples,sizeof(samples));
+  
     dyBufferSetLength(&pymol->image, bytes);
 
@@ -1010 +1013 @@
 {
         char buffer[800];
-        int bytes=0;
+        unsigned int bytes=0;
+        float samples = 0.0;
         struct pymol_proxy *pymol = (struct pymol_proxy *) cdata;
 
@@ -1029 +1033 @@
         waitForString(pymol, "image follows: ", buffer, 800);
 
-        sscanf(buffer, "image follows: %d\n", &bytes);
+        sscanf(buffer, "image follows: %d %f\n", &bytes, &samples);
+        write(3,&samples,sizeof(samples));
 
     dyBufferSetLength(&pymol->image, bytes);
@@ -1048 +1053 @@
 int pyMol_Proxy(int c_in, int c_out, char *command, char *argv[])
 {
-    int flags;
-        int status;
-        int eof;
+    int flags, status, result = 0;
         int pairIn[2];
         int pairOut[2];
@@ -1298 +1301 @@
     }
 
-        status = waitpid(pid, NULL, WNOHANG);
+        status = waitpid(pid, &result, WNOHANG);
 
         if (status == -1) 
@@ -1306 +1309 @@
                 kill(-pid, SIGTERM); // kill process group
                 alarm(5);
-                status = waitpid(pid, NULL, 0);
+                status = waitpid(pid, &result, 0);
                 alarm(0);
 
@@ -1314 +1317 @@
                         kill(-pid, SIGKILL); // kill process group
                         alarm(10);
-                        status = waitpid(pid, NULL, 0);
+                        status = waitpid(pid, &result, 0);
                         alarm(0); 
                 }
         }
 
-        fprintf(stderr, "pymolproxy: pymol server process ended\n");
+        fprintf(stderr, "pymolproxy: pymol server process ended (%d)\n", result);
 
         dyBufferFree(&pymol.image);