Changeset 6568

Timestamp:

Nov 3, 2016 10:57:57 PM (7 years ago)

Author:

ldelgass

Message:

Add optional idle timeout to vtkvis server. Allows server to close connection
and exit after a specified period without commands from the client.

Location:

vtkvis/trunk

Files:

• RenderServer.cpp (modified) (5 diffs)
• Renderer.cpp (modified) (2 diffs)
• Renderer.h (modified) (2 diffs)
• RendererCmd.cpp (modified) (3 diffs)
• RendererCmd.h (modified) (2 diffs)

vtkvis/trunk/RenderServer.cpp

@@ -482 +482 @@
     signal(SIGPIPE, SIG_IGN);
 
+    long idleTimeout = -1L;
     while (1) {
-        int c = getopt(argc, argv, "i:o:");
+        int c = getopt(argc, argv, "i:o:t:");
         if (c == -1) {
             break;
@@ -502 +503 @@
         }
             break;
+        case 't':
+            // Idle timeout in seconds
+            idleTimeout = atol(optarg);
+            break;
         case '?':
             break;
@@ -543 +548 @@
     g_inBufPtr = new ReadBuffer(g_fdIn, 1<<12);
 
+    g_renderer->setIdleTimeout(idleTimeout);
+
     Tcl_Interp *interp = Tcl_CreateInterp();
     ClientData clientData = NULL;
@@ -563 +570 @@
     // Start main server loop
     for (;;) {
-        if (processCommands(interp, clientData, g_inBufPtr, g_fdOut) < 0)
+        struct timeval timeout;
+        g_renderer->getTimeout(&timeout);
+        int cmdStatus = processCommands(interp, clientData, g_inBufPtr, g_fdOut, &timeout);
+        if (cmdStatus < 0)
             break;
 
@@ -577 +587 @@
             g_stats.nFrameBytes += imgData->GetDataSize() * imgData->GetDataTypeSize();
         } else {
-            TRACE("No render required");
-            sendAck(clientData, g_fdOut);
+            if (cmdStatus > 1) {
+                sendAck(clientData, g_fdOut);
+            } else {
+                TRACE("No render required and status = %d", cmdStatus);
+            }
         }
 

vtkvis/trunk/Renderer.cpp

@@ -76 +76 @@
     _needsCameraClippingRangeReset(false),
     _needsCameraReset(false),
+    _idleTimeout(-1L),
     _windowWidth(500),
     _windowHeight(500),
@@ -4646 +4647 @@
 
 /**
+ * \brief Get a timeout for select()
+ *
+ * For now, this just returns the idle timeout, if set.
+ *
+ * Potentially, this could be used to set a timeout based on the "unused" frame
+ * time from the previous render based on a target frame rate (and polling if
+ * we broke frame).
+ */
+void Renderer::getTimeout(struct timeval *tv)
+{
+    tv->tv_sec = _idleTimeout;
+    tv->tv_usec = 0L;
+}
+
+/**
  * \brief Cause the rendering to render a new image if needed
  *

vtkvis/trunk/Renderer.h

@@ -984 +984 @@
     void setWarpWarpScale(const DataSetId& id, double scale);
 
+    void setIdleTimeout(long timeout)
+    {
+        TRACE("Setting idle timeout to %ld sec", timeout);
+        _idleTimeout = timeout;
+    }
+
+    long getIdleTimeout()
+    {
+        return _idleTimeout;
+    }
+
+    void getTimeout(struct timeval *tv);
+
 private:
     typedef std::tr1::unordered_map<DataSetId, DataSet *> DataSetHashmap;
@@ -1086 +1099 @@
     bool _needsCameraClippingRangeReset;
     bool _needsCameraReset;
+
+    long _idleTimeout;
 
     int _windowWidth, _windowHeight;

vtkvis/trunk/RendererCmd.cpp

@@ -13070 +13070 @@
                         ClientData clientData,
                         ReadBuffer *inBufPtr, 
-                        int fdOut)
+                        int fdOut,
+                        struct timeval *timeout)
 {
     int ret = 1;
@@ -13082 +13083 @@
     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. */
-    while (inBufPtr->isLineAvailable() || 
-           (select(inBufPtr->file()+1, &readFds, NULL, NULL, tvPtr) > 0)) {
+
+    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() ||
+           ((ret = select(inBufPtr->file()+1, &readFds, NULL, NULL, tvPtr)) > 0)) {
         size_t numBytes;
         unsigned char *buffer;
@@ -13123 +13133 @@
                 }
             }
+            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;
     }
 

vtkvis/trunk/RendererCmd.h

@@ -9 +9 @@
 #define VTKVIS_RENDERERCMD_H
 
+#include <sys/time.h>
 #include <cstdio>
 #include <tcl.h>
@@ -28 +29 @@
                            ClientData clientData,
                            ReadBuffer *inBufPtr,
-                           int fdOut);
+                           int fdOut,
+                           struct timeval *timeout);
 
 extern int handleError(Tcl_Interp *interp,