Changeset 696

Timestamp:

May 3, 2007 8:12:36 PM (17 years ago)

Author:

nkissebe

Message:

pretty up pymolproxy error handling

File:

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

trunk/gui/vizservers/pymolproxy/pymolproxy.c

@@ -143 +143 @@
                 if ((result < 0) && (errno != EAGAIN) && (errno != EINTR))
                 { 
-                        fprintf(stderr,"Error reading sock(%d), %d/%s\n", sock, errno,strerror(errno));
+                        fprintf(stderr,"pymolproxy: Error reading sock(%d), %d/%s\n", sock, errno,strerror(errno));
                         break;
                 }
@@ -336 +336 @@
 
     if (waitForString(pymol, "PyMOL>", buffer, 800)) {
-        fprintf(stderr,"Timeout reading data [%s]\n",buffer);
+        fprintf(stderr,"pymolproxy: Timeout reading data [%s]\n",buffer);
                 pymol->error = 1;
                 pymol->status = TCL_ERROR;
@@ -681 +681 @@
         pymol->immediate_update |= push;
         pymol->invalidate_cache = 1;
-fprintf(stderr,"LabelCmd: state = %d, pymolstate = %d\n",state,pymol->labels);
+
     if (state) {
                 sendf(pymol, "set label_color,white,all\n");
@@ -866 +866 @@
         
         if (tmpf <= 0) 
-            fprintf(stderr,"error opening file %d\n",errno);
+            fprintf(stderr,"pymolproxy: error opening file %d\n",errno);
 
     write(tmpf,pdbdata,strlen(pdbdata));
@@ -1111 +1111 @@
 
                 execvp(command,argv);
-                fprintf(stderr,"Failed to start pyMol\n");
+                fprintf(stderr,"pymolproxy: Failed to start pyMol\n");
                 exit(-1);
         }
@@ -1177 +1177 @@
         //  send images back
 
-        if (1)
-                fprintf(stderr,"Pymol Ready.\n");
-
         gettimeofday(&end, NULL);
 
@@ -1210 +1207 @@
                 if ( status < 0 )
                 {
-                        fprintf(stderr, "POLL ERROR: status = %d, errno = %d, %s \n", status,errno,strerror(errno));
+                        fprintf(stderr, "pymolproxy: POLL ERROR: status = %d, errno = %d, %s \n", status,errno,strerror(errno));
                 }
                 else if (status > 0)
@@ -1216 +1213 @@
                         gettimeofday(&now,NULL);
 
-            if (ufd[0].revents) {
-
+            if (ufd[0].revents) { /* Client Stdout Connection: command input */
                             if (read(ufd[0].fd,&ch,1) <= 0) 
                             {
-                                    fprintf(stderr,"EOF or Lost Connection. status = %d, errno = %d, %s \n", status,errno,strerror(errno));
-                                    break;
+                                    if (errno != EINTR)
+                                        {
+                                        fprintf(stderr,"pymolproxy: Lost Client Connection.\n");
+                                        break;
+                                        }
                             }
                             else
@@ -1237 +1236 @@
                         }
 
-                        if (ufd[1].revents ) {
+                        if (ufd[1].revents ) { /* pyMol Stdout Connection: pymol (unexpected) output */
                             if (read(ufd[1].fd, &ch, 1) <= 0)
                                 {
-                                    if (errno == EAGAIN)
-                                            fprintf(stderr,"EAGAIN error reading pymol stdout... retrying.\n");
-                    else {
-                                        fprintf(stderr,"Lost PyMol Session. (errno=%d)\n",errno);
+                                    if (errno != EINTR) {
+                                        fprintf(stderr,"pymolproxy: lost connection (stdout) to pymol server\n");
                                                 break;
                                         }
@@ -1255 +1252 @@
                                             dyBufferAppend(&dybuffer, &ch, 1);
                                                 fprintf(stderr,"STDOUT>%s",dybuffer.data);
-
-                                                if (dybuffer.data[0]=='I' && dybuffer.data[1] == 0)
-                                                    pymol.need_update = 1;
-
                                                 dyBufferSetLength(&dybuffer,0);
                                         }
@@ -1264 +1257 @@
                         }
 
-                        if (ufd[2].revents) {
+                        if (ufd[2].revents) { /* pyMol Stderr Connection: pymol standard error output */
                                 if (read(ufd[2].fd, &ch, 1) <= 0)
                                 {
-                                    if (errno == EAGAIN) 
-                                            fprintf(stderr,"EAGAIN error reading pymol stderr... retrying.\n");
-                        else {
-                                            fprintf(stderr,"Lost PyMol Stderr Session. (errno=%d)\n", errno);
+                                    if (errno != EINTR) { 
+                                            fprintf(stderr,"pymolproxy: lost connection (stderr) to pymol server\n");
                                                 break;
                                         }
@@ -1281 +1272 @@
                                                 dyBufferAppend(&dybuffer2, &ch, 1);
                                                 fprintf(stderr,"stderr>%s", dybuffer2.data);
-
                                                 dyBufferSetLength(&dybuffer2,0);
                                         }
@@ -1308 +1298 @@
     }
 
-        fprintf(stderr,"Waiting for process to end\n");
-
         status = waitpid(pid, NULL, WNOHANG);
 
         if (status == -1) 
-                fprintf(stderr, "Error waiting on process (%d)\n", errno);
+                fprintf(stderr, "pymolproxy: error waiting on pymol server to exit (%d)\n", errno);
         else if (status == 0) {
-                fprintf(stderr, "Attempting to SIGTERM process.\n");
+                fprintf(stderr, "pymolproxy: attempting to SIGTERM pymol server\n");
                 kill(-pid, SIGTERM); // kill process group
                 alarm(5);
@@ -1323 +1311 @@
                 while ((status == -1) && (errno == EINTR))
                 {
-                        fprintf(stderr, "Attempting to SIGKILL process.\n");
+                        fprintf(stderr, "pymolproxy: Attempting to SIGKILL process.\n");
                         kill(-pid, SIGKILL); // kill process group
                         alarm(10);
@@ -1331 +1319 @@
         }
 
-        fprintf(stderr, "Process ended\n");
+        fprintf(stderr, "pymolproxy: pymol server process ended\n");
 
         dyBufferFree(&pymol.image);