Changeset 6619

Timestamp:

Nov 14, 2016 11:35:41 AM (7 years ago)

Author:

ldelgass

Message:

merge r6576:6577 from nanovis trunk (timeout option)

Location:

nanovis/branches/1.2

Files:

• . (modified) (1 prop)
• Command.cpp (modified) (3 diffs)
• Command.h (modified) (2 diffs)
• nanovisServer.cpp (modified) (4 diffs)
• nanovisServer.h (modified) (1 diff)

nanovis/branches/1.2/Command.cpp

@@ -2340 +2340 @@
 int
 nv::processCommands(Tcl_Interp *interp,
-                    ReadBuffer *inBufPtr, int fdOut)
+                    ReadBuffer *inBufPtr,
+                    int fdOut,
+                    struct timeval *timeout)
 {
     int ret = 1;
@@ -2352 +2354 @@
     FD_ZERO(&readFds);
     FD_SET(inBufPtr->file(), &readFds);
-    tvPtr = NULL;                       /* Wait for the first read. This is so
-                                         * that we don't spin when no data is
-                                         * available. */
+
+    bool polling = false;
+    if (timeout->tv_sec >= 0L) {
+        tv.tv_sec = timeout->tv_sec;
+        tv.tv_usec = timeout->tv_usec;
+        polling = tv.tv_sec == 0 && tv.tv_usec == 0;
+        tvPtr = &tv;
+    } else {
+        // Block until data available
+        tvPtr = NULL;
+        TRACE("Blocking on select()");
+    }
     while (inBufPtr->isLineAvailable() || 
-           (select(inBufPtr->file()+1, &readFds, NULL, NULL, tvPtr) > 0)) {
+           ((ret = select(inBufPtr->file()+1, &readFds, NULL, NULL, tvPtr)) > 0)) {
         size_t numBytes;
         unsigned char *buffer;
@@ -2393 +2404 @@
                 }
             }
-        }
-
+            if (status == TCL_OK) {
+                ret = 3;
+            }
+        }
+
+        polling = true;
         tv.tv_sec = tv.tv_usec = 0L;    /* On successive reads, we break out
                                          * if no data is available. */
         FD_SET(inBufPtr->file(), &readFds);
         tvPtr = &tv;
+    }
+    if (!polling && ret == 0 && timeout->tv_sec > 0L) {
+        // If idle timeout expired, disconnect
+        TRACE("Exiting server after timeout waiting for client command");
+        return -1;
     }
 

nanovis/branches/1.2/Command.h

@@ -13 +13 @@
 
 #include <unistd.h>
+#include <sys/time.h>
 
 #include <tcl.h>
@@ -44 +45 @@
 extern int processCommands(Tcl_Interp *interp,
                            ReadBuffer *inBufPtr,
-                           int fdOut);
+                           int fdOut,
+                           struct timeval *timeout);
 
 extern int handleError(Tcl_Interp *interp,

nanovis/branches/1.2/nanovisServer.cpp

@@ -57 +57 @@
 ResponseQueue *nv::g_queue = NULL;
 #endif
+long nv::g_idleTimeout = -1L;
 
 #ifdef USE_THREADS
@@ -385 +386 @@
 
 #if defined(USE_NEW_EVENT_LOOP) || defined(USE_THREADS)
-    if (processCommands(NanoVis::interp, g_inBufPtr, g_fdOut) < 0) {
+    struct timeval timeout;
+    timeout.tv_sec = g_idleTimeout;
+    timeout.tv_usec = 0L;
+    if (processCommands(NanoVis::interp, g_inBufPtr, g_fdOut, &timeout) < 0) {
         exitService(1);
     }
@@ -477 +481 @@
     const char *resourcePath = NULL;
     while (1) {
-        static struct option long_options[] = {
-            {"debug",   no_argument,       NULL, 'd'},
-            {"path",    required_argument, NULL, 'p'},
-            {0, 0, 0, 0}
-        };
-        int option_index = 0;
-        int c = getopt_long(argc, argv, "dp:i:o:", long_options, &option_index);
+        int c = getopt(argc, argv, "dp:i:o:t:");
         if (c == -1) {
             break;
@@ -507 +505 @@
             }
         }
+            break;
+        case 't':
+            // Idle timeout in seconds
+            g_idleTimeout = atol(optarg);
             break;
         case '?':

nanovis/branches/1.2/nanovisServer.h

@@ -50 +50 @@
     extern ResponseQueue *g_queue;
 #endif
+    extern long g_idleTimeout;
 
 #ifdef KEEPSTATS