Changeset 7138

Timestamp:

07/19/07 14:09:25

Author:

robert

Message:

Added support for using multiple load threads as a thread pool used by the MasterOperation?

Files:

• OpenSceneGraph/trunk/examples/osgterrain/osgterrain.cpp (modified) (8 diffs)

OpenSceneGraph/trunk/examples/osgterrain/osgterrain.cpp

@@ -52 +52 @@
-
-
+typedef std::vector< osg::ref_ptr<osg::GraphicsThread> > GraphicsThreads;
+
+class CountedBlock : public osg::Referenced
+{
+    public:
+    
+        CountedBlock(unsigned int blockCount);
+    
+        void completed();
+
+        void block();
+        
+        void reset();
+
+        void release();
+
+        void setBlockCount(unsigned int blockCount);
+
+    protected:
+
+        ~CountedBlock();
+
+        OpenThreads::Mutex _mut;
+        OpenThreads::Condition _cond;
+        unsigned int _numberOfBlocks;
+        unsigned int _blockCount;
+};
+
+CountedBlock::CountedBlock(unsigned int numberOfBlocks):
+    _numberOfBlocks(numberOfBlocks),
+    _blockCount(0)
+{
+}
+
+void CountedBlock::completed()
+{
+    OpenThreads::ScopedLock<OpenThreads::Mutex> mutlock(_mut);
+    if (_blockCount>0)
+    {
+        --_blockCount;
+
+        if (_blockCount==0)
+        {
+            // osg::notify(osg::NOTICE)<<"Released"<<std::endl;
+            _cond.broadcast();
+        }
+    }
+}
+
+void CountedBlock::block()
+{
+    OpenThreads::ScopedLock<OpenThreads::Mutex> mutlock(_mut);
+    if (_blockCount)
+        _cond.wait(&_mut);
+}
+
+void CountedBlock::release()
+{
+    OpenThreads::ScopedLock<OpenThreads::Mutex> mutlock(_mut);
+    if (_blockCount)
+    {
+        _blockCount = 0;
+        _cond.broadcast();
+    }
+}
+
+void CountedBlock::reset()
+{
+    OpenThreads::ScopedLock<OpenThreads::Mutex> mutlock(_mut);
+    if (_numberOfBlocks!=_blockCount)
+    {
+        if (_numberOfBlocks==0) _cond.broadcast();
+        _blockCount = _numberOfBlocks;
+    }
+}
+
+void CountedBlock::setBlockCount(unsigned int blockCount)
+{
+    _numberOfBlocks = blockCount;
+}
+
+CountedBlock::~CountedBlock()
+{
+    _blockCount = 0;
+    release();
+}
+
+class LoadAndCompileOperation : public osg::Operation
+{
+public:
+
+    LoadAndCompileOperation(const std::string& filename, GraphicsThreads& graphicsThreads, CountedBlock* block):
+        Operation("Load and compile Operation", false),
+        _filename(filename),
+        _graphicsThreads(graphicsThreads),
+        _block(block) {}
+
+    virtual void operator () (osg::Object* object)
+    {
+        // osg::notify(osg::NOTICE)<<"LoadAndCompileOperation "<<_filename<<std::endl;
+
+        _loadedModel = osgDB::readNodeFile(_filename);
+        if (_loadedModel.valid() && !_graphicsThreads.empty())
+        {
+            osg::ref_ptr<osgUtil::GLObjectsOperation> compileOperation = new osgUtil::GLObjectsOperation(_loadedModel.get());
+
+            for(GraphicsThreads::iterator gitr = _graphicsThreads.begin();
+                gitr != _graphicsThreads.end();
+                ++gitr)
+            {
+                (*gitr)->add( compileOperation.get() );
+                // requiresBarrier = true;
+            }
+        }
+        
+        if (_block.valid()) _block->completed();
+
+        // osg::notify(osg::NOTICE)<<"done LoadAndCompileOperation "<<_filename<<std::endl;
+    }
+    
+    std::string                 _filename;
+    GraphicsThreads             _graphicsThreads;
+    osg::ref_ptr<osg::Node>     _loadedModel;
+    osg::ref_ptr<CountedBlock>  _block;
+
+};
+
-class MasterOperation : public osg::Operation
-{
@@ -66 +193 @@
-    {
-    }
+    
+    /** Set the OperationQueue that the MasterOperation can use to place tasks like file loading on for other processes to handle.*/ 
+    void setOperationQueue(osg::OperationQueue* oq) { _operationQueue = oq; }
+    
+    osg::OperationQueue* getOperationQueue() { return _operationQueue.get(); }
-    
-    bool readMasterFile(Files& files) const
@@ -171 +303 @@
-
-            bool requiresBarrier = false;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    {
-(*gitr)->add( compileOperation.get() )
+nodesToAdd[(*litr)->_filename] = (*litr)->_loadedModel
-                        requiresBarrier = true;
-                    }
-                }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            if (requiresBarrier)
-            {
-
-
+endOfCompile
+endOfCompile
-                
-                for(GraphicsThreads::iterator gitr = threads.begin();
@@ -203 +381 @@
-                    ++gitr)
-                {
-
-
-
+
+
+
+
+
-                // wait for the graphics threads to complete.
-
+
+
+
-            }
-        }
@@ -295 +477 @@
-    virtual void release()
-    {
+        if (_operationQueue.valid()) _operationQueue->removeAllOperations();
+
-        _updatesMergedBlock.release();
-
+
+
-    }
-
@@ -307 +492 @@
-    FilenameNodeMap                     _nodesToAdd;
-    OpenThreads::Block                  _updatesMergedBlock;
-
+
+
+
+
+
-};
-
@@ -522 +711 @@
-    double h = 1.0;
-
-
-
-
-
-
-
+
+
-
-    osg::ref_ptr<MasterOperation> masterOperation;
@@ -773 +958 @@
-
-    // start operation thread if a master file has been used.
-
+
+
+
+
+
-    if (masterOperation.valid()) 
-    {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-