Changeset 11285 for OpenSceneGraph/trunk/include/osgDB/DatabasePager

Timestamp:

03/24/10 15:27:00 (3 years ago)

Author:

robert

Message:

Refactored the way that the RequestQueue?'s are pruned and highest prioty items taken from them so the operation is
now O(n) rather than O(nlogn) where n is the number of requests. The refactoring also cleans up the access of the
request lists so that the code is more readable/maintainable.

Files:

• OpenSceneGraph/trunk/include/osgDB/DatabasePager (modified) (3 diffs)

OpenSceneGraph/trunk/include/osgDB/DatabasePager

@@ -405 +405 @@
             bool isRequestCurrent (int frameNumber) const
             {
-                return frameNumber - _frameNumberLastRequest <= 1;
+                return _valid && (frameNumber - _frameNumberLastRequest <= 1);
             }
         };
@@ -412 +412 @@
         {
         public:
-            typedef std::vector< osg::ref_ptr<DatabaseRequest> > RequestList;
-
-            void sort();
-
-            RequestList         _requestList;
-            OpenThreads::Mutex  _requestMutex;
+
+            RequestQueue(DatabasePager* pager);
+
+            void add(DatabaseRequest* databaseRequest);
+
+            void takeFirst(osg::ref_ptr<DatabaseRequest>& databaseRequest);
+
+            /// prune all the old requests and then return true if requestList left empty
+            bool pruneOldRequestsAndCheckIfEmpty();
+
+            virtual void updateBlock() {}
+
+            void clear();
+
+            typedef std::list< osg::ref_ptr<DatabaseRequest> > RequestList;
+
+            DatabasePager*              _pager;
+            RequestList                 _requestList;
+            OpenThreads::Mutex          _requestMutex;
+            int                         _frameNumberLastPruned;
 
         protected:
@@ -435 +449 @@
             void release() { _block->release(); }
 
-            void updateBlock()
-            {
-                _block->set((!_requestList.empty() || !_childrenToDeleteList.empty()) &&
-                            !_pager->_databasePagerThreadPaused);
-            }
-
-            void clear();
-
-            void add(DatabaseRequest* databaseRequest);
-
-            void takeFirst(osg::ref_ptr<DatabaseRequest>& databaseRequest);
+            virtual void updateBlock();
+
 
             osg::ref_ptr<osg::RefBlock> _block;
 
-            DatabasePager*              _pager;
             std::string                 _name;
-            int                         _frameNumberLastPruned;
 
             OpenThreads::Mutex          _childrenToDeleteListMutex;