Changeset 6097

Timestamp:

02/06/07 12:03:13

Author:

robert

Message:

Further work on support for ThreadPerCamera?, and improved the efficiency of SingleThraeded?

Files:

• OpenSceneGraph/trunk/include/osgViewer/Viewer (modified) (4 diffs)
• OpenSceneGraph/trunk/src/osgViewer/Viewer.cpp (modified) (22 diffs)

OpenSceneGraph/trunk/include/osgViewer/Viewer

@@ -134 +134 @@
-        void getCameras(Cameras& cameras, bool onlyActive=true);
-
+        typedef std::vector<OpenThreads::Thread*> Threads;
+        void getAllThreads(Threads& threads, bool onlyActive=true);
+
+        typedef std::vector<osg::OperationsThread*> OperationsThreads;
+        void getOperationsThreads(OperationsThreads& threads, bool onlyActive=true);
+
-        /** Set the graphics operation to call on realization of the viewers graphics windows.*/
-        void setRealizeOperation(osg::Operation* op) { _realizeOperation = op; }
@@ -145 +151 @@
-        /** Start any threads required by the viewer, as per viewers ThreadingModel.*/
-        void startThreading();        
+
+
-
-        /** Set up the Operations to render the various viewer cameras on the viewers graphics windows.*/
@@ -153 +161 @@
-        void checkWindowStatus();
-        
+        inline void makeCurrent(osg::GraphicsContext* gc)
+        {
+            if (_currentContext==gc) return;
+            
+            releaseContext();
+            
+            if (gc && gc->makeCurrent()) _currentContext = gc;
+        }
+        
+        inline void releaseContext()
+        {
+            if (_currentContext.valid())
+            {
+                _currentContext->releaseContext();
+                _currentContext = 0;
+            }
+        }
+        
-        bool _firstFrame;
-        
@@ -184 +210 @@
-        
-        osg::ref_ptr<osg::Operation>        _realizeOperation;
+        
+        osg::observer_ptr<osg::GraphicsContext> _currentContext;
-};
-

OpenSceneGraph/trunk/src/osgViewer/Viewer.cpp

@@ -136 +136 @@
-    }
-    
+    osg::Camera* getCamera() { return _sceneView->getCamera(); }
+
-    virtual void operator () (osg::Object*)
-    {
@@ -243 +245 @@
-    }
-    
+    osg::Camera* getCamera() { return _sceneView[0]->getCamera(); }
+
-    void setGraphicsThreadDoesCull(bool flag)
-    {
@@ -491 +495 @@
-    {
-        osg::GraphicsContext* context = dynamic_cast<osg::GraphicsContext*>(object);
-
+
+
+
+
+
+
-
-        //osg::notify(osg::NOTICE)<<"GraphicsCall "<<std::endl;
@@ -533 +542 @@
-    _keyEventSetsDone(osgGA::GUIEventAdapter::KEY_Escape),
-    _quitEventSetsDone(true),
-//
-
+
+//
-//    _threadingModel(ThreadPerCamera),
-    _threadsRunning(false),
-fals
+tru
-    _endBarrierPosition(AfterSwapBuffers),
-    _numThreadsOnBarrier(0)
@@ -558 +567 @@
-    //osg::notify(osg::NOTICE)<<"Viewer::~Viewer()"<<std::endl;
-
+
+    Threads threads;
+    getAllThreads(threads);
+
+    osg::notify(osg::NOTICE)<<"start destrcutor getThreads = "<<threads.size()<<std::endl;
+
+
-    stopThreading();
-    
@@ -584 +600 @@
-    //osg::notify(osg::NOTICE)<<"finish Viewer::~Viewer()"<<std::endl;
-    
+    getAllThreads(threads);
+
+    osg::notify(osg::NOTICE)<<"end destrcutor getThreads = "<<threads.size()<<std::endl;
+
-}
-
@@ -715 +735 @@
-    if (!_threadsRunning) return;
-
-INFO
+NOTICE
-
-    Contexts contexts;
-    getContexts(contexts);
-
-
+
+
+
+
+
-
-    // reset any double buffer graphics objects
-
-
-
-
-
+g
+g
+g
+
+g
-        
-        OpenThreads::ScopedLock<OpenThreads::Mutex> lock( *(gc->getOperationsMutex()) );
@@ -745 +769 @@
-
-    // delete all the graphics threads.    
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    // reset any double buffer graphics objects
-
-
-
-
-
+g
+g
+g
+
+g
-        
-        OpenThreads::ScopedLock<OpenThreads::Mutex> lock( *(gc->getOperationsMutex()) );
@@ -780 +812 @@
-    _numThreadsOnBarrier = 0;
-    _endDynamicDrawBlock = 0;
-INFO
+NOTICE
-}
-
@@ -834 +866 @@
-unsigned int Viewer::computeNumberOfThreadsIncludingMainRequired()
-{
+    unsigned int numThreadsOnBarrier = 1;
+    switch(_threadingModel)
+    {
+        case(SingleThreaded): 
+            numThreadsOnBarrier = 1;
+            break;
+        case(ThreadPerContext): 
+        {
+            Contexts contexts;
+            getContexts(contexts);
+            numThreadsOnBarrier = contexts.size()+1;
+            break;
+        }   
+        case(ThreadPerCamera): 
+        {
+            Cameras cameras;
+            getCameras(cameras);
+            numThreadsOnBarrier = _useMainThreadForRenderingTraversal ? cameras.size() : cameras.size()+1;
+            break;
+        }
+    }
+    return numThreadsOnBarrier;
+}
+
+void Viewer::startThreading()
+{
+    if (_threadsRunning) return;
+    
+    osg::notify(osg::INFO)<<"Viewer::startThreading() - starting threading"<<std::endl;
+    
+    // release any context held by the main thread.
+    releaseContext();
+
-    Contexts contexts;
-    getContexts(contexts);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    // using multi-threading so make sure that new objects are allocated with thread safe ref/unref
@@ -888 +932 @@
-        getSceneData()->resizeGLObjectBuffers(osg::DisplaySettings::instance()->getMaxNumberOfGraphicsContexts());
-    }
-
-
-
-
-
-
+
+
+
-
-    int numProcessors = OpenThreads::GetNumberOfProcessors();
-
-
-
-
-
-
-
-
-
+
+
-    Contexts::iterator citr;
-
@@ -935 +969 @@
-    if (_threadingModel==ThreadPerContext)
-    {
-
-
-
-
-
-
-
+
+
-        _endDynamicDrawBlock = 0;
-    }
@@ -950 +979 @@
-        _endDynamicDrawBlock = new EndOfDynamicDrawBlock(numViewerDoubleBufferedRenderingOperation);
-    }
+    
+    if (_numThreadsOnBarrier>1)
+    {
+        _startRenderingBarrier = new osg::BarrierOperation(_numThreadsOnBarrier, osg::BarrierOperation::NO_OPERATION);
+        _endRenderingDispatchBarrier = new osg::BarrierOperation(_numThreadsOnBarrier, osg::BarrierOperation::NO_OPERATION);
+    }
+
+
+    osg::ref_ptr<osg::BarrierOperation> swapReadyBarrier = contexts.empty() ? 0 : new osg::BarrierOperation(contexts.size(), osg::BarrierOperation::NO_OPERATION);
-
-    osg::ref_ptr<osg::SwapBuffersOperation> swapOp = new osg::SwapBuffersOperation();
-
-
-
-
-
-
-
-
-
-
-
+
+
-        citr != contexts.end();
-
-
+
-    {
-        osg::GraphicsContext* gc = (*citr);
@@ -974 +1003 @@
-        gc->createGraphicsThread();
-
+#if 1
-        if (affinity) gc->getGraphicsThread()->setProcessorAffinity(processNum % numProcessors);
+#else
+        if (affinity) gc->getGraphicsThread()->setProcessorAffinity(1);
+#endif
-
-        gc->getGraphicsThread()->add(new ViewerCompileOperation(getSceneData()));
-
-        // add the startRenderingBarrier
-
+threadingModel==ThreadPerContext && _
-
-        // add the rendering operation itself.
-        gc->getGraphicsThread()->add(new ViewerRunOperations());
-
-
+threadingModel==ThreadPerContext && _
-        {
-            // add the endRenderingDispatchBarrier
@@ -990 +1023 @@
-        }
-
+        if (swapReadyBarrier.valid()) gc->getGraphicsThread()->add(swapReadyBarrier.get());
+
-        // add the swap buffers
-        gc->getGraphicsThread()->add(swapOp.get());
-
-
+threadingModel==ThreadPerContext && _
-        {
-            // add the endRenderingDispatchBarrier
@@ -999 +1034 @@
-        }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    for(citr = contexts.begin();
@@ -1093 +1184 @@
-    cameras.clear();
-    
-
+!
-
-    for(Slaves::iterator itr = _slaves.begin();
@@ -1099 +1190 @@
-        ++itr)
-    {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1741 +1887 @@
-            if (vdbro)
-            {
-
+ && !(vdbro->getCamera()->getCameraThread())
-                {
-                    vdbro->cull();
@@ -1747 +1893 @@
-            }
-        }
-
-    }
-
@@ -1757 +1902 @@
-        if (!((*itr)->getGraphicsThread()))
-        { 
-(*itr)->makeCurrent(
+makeCurrent(*itr
-            (*itr)->runOperations();
-            (*itr)->releaseContext();
-        }
-    }
-
-    // osg::notify(osg::NOTICE)<<"Joing _endRenderingDispatchBarrier block"<<std::endl;
+
+    // wait till the rendering dispatch is done.
+    if (_endRenderingDispatchBarrier.valid()) _endRenderingDispatchBarrier->block();
+
+    for(itr = contexts.begin();
+        itr != contexts.end();
+        ++itr)
+    {
+        if (_done) return;
+
+        if (!((*itr)->getGraphicsThread()))
+        { 
+            makeCurrent(*itr);
+            (*itr)->swapBuffers();
+        }
+    }
+
+    if (dp)
+    {
+        dp->signalEndFrame();
+    }
-
-    // wait till the dynamic draw is complete.
@@ -1773 +1938 @@
-    }
-
-    // wait till the rendering dispatch is done.
-    if (_endRenderingDispatchBarrier.valid()) _endRenderingDispatchBarrier->block();
-
-    for(itr = contexts.begin();
-        itr != contexts.end();
-        ++itr)
-    {
-        if (_done) return;
-
-        if (!((*itr)->getGraphicsThread()))
-        { 
-            (*itr)->makeCurrent();
-            (*itr)->swapBuffers();
-            (*itr)->releaseContext();
-        }
-    }
-
-    if (dp)
-    {
-        dp->signalEndFrame();
-    }
-
-    if (getStats() && getStats()->collectStats("update"))