Changeset 6404 for geovis/trunk

Timestamp:

Jun 21, 2016, 12:53:52 AM (8 years ago)

Author:

ldelgass

Message:

Add optional idle timeout to geovis server

Location:

geovis/trunk

Files:

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

geovis/trunk/RenderServer.cpp

@@ -232 +232 @@
 
 static void
-exitService()
+exitService(int code)
 {
     TRACE("Enter");
 
-    serverStats(g_stats, 0);
+    serverStats(g_stats, code);
 
     // close log file
@@ -297 +297 @@
     std::string resourcePath;
     double maxbitrate = 1.0e8;
+    long idleTimeout = -1L;
     while (1) {
-        int c = getopt(argc, argv, "r:p:i:o:");
+        int c = getopt(argc, argv, "r:p:i:o:t:");
         if (c == -1) {
             break;
@@ -323 +324 @@
             }
         }
+            break;
+        case 't':
+            // Idle timeout in seconds
+            idleTimeout = atol(optarg);
             break;
         case '?':
@@ -365 +370 @@
     }
     g_renderer->setResourcePath(resourcePath);
+    g_renderer->setIdleTimeout(idleTimeout);
 
     TRACE("Default Tcl encoding dir: %s", Tcl_GetDefaultEncodingDir());
@@ -385 +391 @@
     // Start main server loop
     for (;;) {
-        long timeout = g_renderer->getTimeout();
+        struct timeval timeout;
+        g_renderer->getTimeout(&timeout);
 #ifdef SLEEP_AFTER_QUEUE_FRAME
         g_renderer->markFrameStart();
 #endif
-        int cmdStatus = processCommands(interp, NULL, g_inBufPtr, g_fdOut, timeout);
+        int cmdStatus = processCommands(interp, NULL, g_inBufPtr, g_fdOut, &timeout);
         if (cmdStatus < 0)
             break;
@@ -476 +483 @@
 
     closeLog();
-    exitService();
+    exitService(0);
 
     return 0;

geovis/trunk/Renderer.cpp

@@ -127 +127 @@
     _windowWidth(500),
     _windowHeight(500),
+    _idleTimeout(-1L),
     _pickPending(false),
     _scaleBarUnits(UNITS_METERS)
@@ -2854 +2855 @@
 
 /**
- * \brief Get a timeout in usecs for select()
+ * \brief Get a timeout for select()
  * 
  * If the paging thread is idle, returns <0 indicating that the
@@ -2861 +2862 @@
  * rate, return the remaining frame time.
  */
-long Renderer::getTimeout()
-{
-    if (!checkNeedToDoFrame())
+void Renderer::getTimeout(struct timeval *tv)
+{
+    if (!checkNeedToDoFrame()) {
         // <0 means no timeout, block until socket has data
-        return -1L;
-    if (_lastFrameTime < _minFrameTime) {
-        return (long)1.0e6*(_minFrameTime - _lastFrameTime);
+        // If _idleTimeout is positive, server will disconnect after timeout
+        tv->tv_sec = _idleTimeout;
+        tv->tv_usec = 0L;
+    } else if (_lastFrameTime < _minFrameTime) {
+        tv->tv_sec = 0L;
+        tv->tv_usec = (long)1.0e6*(_minFrameTime - _lastFrameTime);
     } else {
         // No timeout (poll)
-        return 0L;
+        tv->tv_sec = tv->tv_usec = 0L;
     }
 }

geovis/trunk/Renderer.h

@@ -9 +9 @@
 #define GEOVIS_RENDERER_H
 
+#include <sys/time.h> // For struct timeval
 #include <ctime> // For time_t
 #include <string>
@@ -528 +529 @@
     void markFrameEnd();
 
-    long getTimeout();
+    void setIdleTimeout(long timeout)
+    {
+        if (timeout != -1L &&
+            (double)timeout < _minFrameTime) {
+            ERROR("Timeout must be more than %g sec", _minFrameTime);
+            return;
+        }
+        TRACE("Setting idle timeout to %ld sec", timeout);
+        _idleTimeout = timeout;
+    }
+
+    long getIdleTimeout()
+    {
+        return _idleTimeout;
+    }
+
+    void getTimeout(struct timeval *tv);
 
     void mapNodeUpdate();
@@ -642 +659 @@
     float _bgColor[3];
 
+    long _idleTimeout;
     double _minFrameTime;
     double _lastFrameTime;

geovis/trunk/RendererCmd.cpp

@@ -17 +17 @@
 #include <unistd.h>
 #include <sys/select.h>
+#include <sys/time.h>
 #include <sys/uio.h>
 #include <tcl.h>
@@ -96 +97 @@
     ReadBuffer::BufferStatus status;
     status = g_inBufPtr->followingData((unsigned char *)bytes, len);
+    g_stats.nDataBytes += len;
     TRACE("followingData status: %d", status);
     return (status == ReadBuffer::OK);
@@ -2421 +2423 @@
         }
         g_renderer->addModelLayer(name, geomOpts, pos, cache, lighting, visible);
-   } else if (type[0] == 't' && strcmp(type, "text") == 0) {
+    } else if (type[0] == 't' && strcmp(type, "text") == 0) {
         char *driver = Tcl_GetString(objv[5]);
         char *format = Tcl_GetString(objv[6]);
@@ -3766 +3768 @@
                         ReadBuffer *inBufPtr, 
                         int fdOut,
-                        long timeout)
+                        struct timeval *timeout)
 {
     int ret = 1;
@@ -3778 +3780 @@
     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. */
-    if (timeout >= 0L) {
-        tv.tv_sec = 0L;
-        tv.tv_usec = timeout;
+
+    bool polling = false;
+    if (timeout->tv_sec >= 0L) {
+        tv.tv_sec = timeout->tv_sec;
+        tv.tv_usec = timeout->tv_usec;
         tvPtr = &tv;
     } else {
+        // Block until data available
+        tvPtr = NULL;
         TRACE("Blocking on select()");
     }
@@ -3842 +3845 @@
         }
 
+        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;
     }
 

geovis/trunk/RendererCmd.h

@@ -9 +9 @@
 #define GEOVIS_RENDERERCMD_H
 
+#include <sys/time.h>
 #include <cstdio>
 #include <tcl.h>
@@ -31 +32 @@
                            ReadBuffer *inBufPtr,
                            int fdOut,
-                           long timeout = -1);
+                           struct timeval *timeout);
 
 extern int handleError(Tcl_Interp *interp,