Changeset 4025

Timestamp:

Oct 30, 2013, 11:56:27 AM (11 years ago)

Author:

ldelgass

Message:

First pass at polling events

Location:

trunk/packages/vizservers/geovis

Files:

• RenderServer.cpp (modified) (1 diff)
• Renderer.cpp (modified) (4 diffs)
• Renderer.h (modified) (2 diffs)
• RendererCmd.cpp (modified) (2 diffs)
• RendererCmd.h (modified) (1 diff)

trunk/packages/vizservers/geovis/RenderServer.cpp

@@ -484 +484 @@
     // Start main server loop
     for (;;) {
-        if (processCommands(interp, NULL, g_inBufPtr, g_fdOut) < 0)
+        long timeout = g_renderer->getTimeout();
+        if (processCommands(interp, NULL, g_inBufPtr, g_fdOut, timeout) < 0)
             break;
 

trunk/packages/vizservers/geovis/Renderer.cpp

@@ -43 +43 @@
     _bgColor[1] = 0;
     _bgColor[2] = 0;
+    _minFrameTime = 1.0/30.0;
+    _lastFrameTime = _minFrameTime;
     _viewer = new osgViewer::Viewer();
     _viewer->setThreadingModel(osgViewer::ViewerBase::SingleThreaded);
@@ -323 +325 @@
 }
 
+long Renderer::getTimeout()
+{
+    if (_lastFrameTime < _minFrameTime) {
+        (long)1000000.0*(_minFrameTime - _lastFrameTime);
+    } else {
+        return 0L;
+    }
+}
+
+bool isPagerIdle()
+{
+    return (!_viewer->getDatabasePager()->requiresUpdateSceneGraph() &&
+            !_viewer->getDatabasePager()->getRequestsInProgress());
+}
+
 /**
  * \brief Cause the rendering to render a new image if needed
@@ -333 +350 @@
     TRACE("Enter needsRedraw=%d",  _needsRedraw ? 1 : 0);
 
-    if (_needsRedraw) {
-        double _runMaxFrameRate = 60.0;
-        double minFrameTime = _runMaxFrameRate>0.0 ? 1.0/_runMaxFrameRate : 0.0;
+    if (_needsRedraw || !isPagerIdle()) {
         osg::Timer_t startFrameTick = osg::Timer::instance()->tick();
         TRACE("Before frame()");
@@ -341 +356 @@
         TRACE("After frame()");
         osg::Timer_t endFrameTick = osg::Timer::instance()->tick();
-        double frameTime = osg::Timer::instance()->delta_s(startFrameTick, endFrameTick);
-        TRACE("Frame time: %g sec", frameTime);
+        _lastFrameTime = osg::Timer::instance()->delta_s(startFrameTick, endFrameTick);
+        TRACE("Frame time: %g sec", _lastFrameTime);
+#if 0
         if (frameTime < minFrameTime) {
             TRACE("Sleeping for %g secs", minFrameTime-frameTime);
             OpenThreads::Thread::microSleep(static_cast<unsigned int>(1000000.0*(minFrameTime-frameTime)));
         }
+#endif
         if (_viewer->getViewerStats() != NULL) {
             _viewer->getViewerStats()->report(std::cerr, _viewer->getViewerStats()->getLatestFrameNumber());

trunk/packages/vizservers/geovis/Renderer.h

@@ -212 +212 @@
     }
 
+    long getTimeout();
+
+    bool isPagerIdle();
+
 private:
     void initCamera();
@@ -218 +222 @@
     int _windowWidth, _windowHeight;
     float _bgColor[3];
+
+    double _minFrameTime;
+    double _lastFrameTime;
 
     osg::ref_ptr<osg::Node> _sceneRoot;

trunk/packages/vizservers/geovis/RendererCmd.cpp

@@ -543 +543 @@
                         ClientData clientData,
                         ReadBuffer *inBufPtr, 
-                        int fdOut)
+                        int fdOut,
+                        long timeout)
 {
     int ret = 1;
@@ -558 +559 @@
                                          * that we don't spin when no data is
                                          * available. */
+    if (timeout >= 0L) {
+        tv.tv_sec = 0L;
+        tv.tv_usec = timeout;
+        tvPtr = &tv;
+    }
     while (inBufPtr->isLineAvailable() || 
            (select(1, &readFds, NULL, NULL, tvPtr) > 0)) {

trunk/packages/vizservers/geovis/RendererCmd.h

@@ -28 +28 @@
                            ClientData clientData,
                            ReadBuffer *inBufPtr,
-                           int fdOut);
+                           int fdOut,
+                           long timeout = -1);
 
 extern int handleError(Tcl_Interp *interp,