Changeset 6635

Timestamp:

Nov 15, 2016 12:59:43 AM (7 years ago)

Author:

ldelgass

Message:

merge from pymolproxy trunk

Location:

pymolproxy/branches/1.0

Files:

• . (modified) (1 prop)
• pymolproxy.c (modified) (11 diffs)

pymolproxy/branches/1.0/pymolproxy.c

@@ -104 +104 @@
 static int pymolIsAlive = TRUE;
 static int statsFile = -1;
+static long idleTimeout = -1L;
 
 #define READ_DEBUG  1
@@ -121 +122 @@
 #define VIEWPORT_PENDING        (1<<10)
 
-#define IO_TIMEOUT (30000)
 #define CLIENT_READ  STDIN_FILENO
 #define CLIENT_WRITE STDOUT_FILENO
@@ -2064 +2064 @@
     ERROR("pymol (%d) died unexpectedly", stats.pid);
     pymolIsAlive = FALSE;
-    /*DoExit(1);*/
 }
 
@@ -2232 +2231 @@
     }
 
-    DEBUG("attempting to signal (SIGTERM) pymol server.");
+    DEBUG("Attempting to signal (SIGTERM) pymol server.");
     kill(-p->pid, SIGTERM); /* Kill process group */
     alarm(5);
@@ -2266 +2265 @@
     PymolProxy *p = clientData;
     Tcl_DString command;
+    fd_set readFds;
+    int ret = 1;
     struct timeval tv, *tvPtr;
+    int polling = 0;
 
 #if READ_DEBUG
@@ -2273 +2275 @@
     Tcl_DStringInit(&command);
     while (pymolIsAlive) {
-        tvPtr = NULL;
+        FD_ZERO(&readFds);
+        FD_SET(p->client.fd, &readFds);
+
+        if (idleTimeout >= 0L) {
+            tv.tv_sec = idleTimeout;
+            tv.tv_usec = 0L;
+            polling = (tv.tv_sec == 0 && tv.tv_usec == 0) ? 1 : 0;
+            tvPtr = &tv;
+        } else {
+            tvPtr = NULL;
+        }
 #if READ_DEBUG
         DEBUG("Start I/O set");
 #endif
-        while ((pymolIsAlive) && (WaitForNextLine(&p->client, tvPtr))) {
+        while (pymolIsAlive &&
+               (IsLineAvailable(&p->client) ||
+                (ret = select(p->client.fd+1, &readFds, NULL, NULL, tvPtr)) > 0)) {
             size_t numBytes;
             const char *line;
@@ -2302 +2316 @@
                     DEBUG("TCL_BREAK found");
 #endif
+                    ret = 2;
                     break;              /* This was caused by a "imgflush"
                                          * command. Break out of the read
                                          * loop and allow a new image to be
                                          * rendered. */
+                } else if (result != TCL_OK) {
+                    ret = 0;
+                } else {
+                    ret = 3;
                 }
                 if (p->flags & FORCE_UPDATE) {
@@ -2314 +2333 @@
                 }
             }
+            polling = 1;
             tv.tv_sec = 0L;
             tv.tv_usec = 0L;            /* On successive reads, we break
                                          * out if no data is available. */
+            FD_SET(p->client.fd, &readFds);
             tvPtr = &tv;
         }
@@ -2322 +2343 @@
         DEBUG("Finish I/O set");
 #endif
+        if (ret < 0) {
+            DEBUG("Error in select(): %s", strerror(errno));
+            goto done;
+        }
+        if (!polling && ret == 0 && idleTimeout > 0L) {
+            // If idle timeout expired, disconnect
+            DEBUG("Exiting server after timeout waiting for client command");
+            goto done;
+        }
         /* Handle all the pending setting changes now. */
         UpdateSettings(p);
@@ -2434 +2464 @@
     size_t numBytes;
 
+    while (1) {
+        int c = getopt(argc, argv, "t:");
+        if (c == -1) {
+            break;
+        }
+        switch (c) {
+        case 't':
+            idleTimeout = atol(optarg);
+            break;
+        case '?':
+            break;
+        default:
+            return 1;
+        }
+    }
+
     frecord = NULL;
     if (recording) {
@@ -2451 +2497 @@
     openlog("pymolproxy", LOG_CONS | LOG_PERROR | LOG_PID, LOG_USER);
     DEBUG("Starting pymolproxy");
-
-    InitProxy(&proxy, argv + 1);
+    DEBUG("Idle timeout: %ld", idleTimeout);
+
+    InitProxy(&proxy, argv + optind);
     if (pthread_create(&thread1, NULL, &ClientToServer, &proxy) < 0) {
         ERROR("Can't create reader thread: %s", strerror(errno));