Use atomic to store pending orphaned objects size

To avoid locking a mutex when the container is empty.

Author: elsid

include/osg/BufferObject

@@ -323,6 +323,7 @@ class OSG_EXPORT GLBufferObjectSet : public Referenced
         BufferObjectProfile     _profile;
         unsigned int            _numOfGLBufferObjects;
         GLBufferObjectList      _orphanedGLBufferObjects;
+        OpenThreads::Atomic     _pendingOrphanedGLBufferObjectsSize;
         GLBufferObjectVector    _pendingOrphanedGLBufferObjects;
 
         GLBufferObject*         _head;

include/osg/Texture

@@ -1177,6 +1177,7 @@ protected:
     Texture::TextureProfile     _profile;
     unsigned int                _numOfTextureObjects;
     Texture::TextureObjectList  _orphanedTextureObjects;
+    OpenThreads::Atomic         _pendingOrphanedTextureObjectsSize;
     TextureObjectVector         _pendingOrphanedTextureObjects;
 
     Texture::TextureObject*     _head;

src/osg/BufferObject.cpp

@@ -382,6 +382,7 @@ void GLBufferObjectSet::handlePendingOrphandedGLBufferObjects()
     _parent->getNumberActiveGLBufferObjects() -= numOrphaned;
 
     _pendingOrphanedGLBufferObjects.clear();
+    _pendingOrphanedGLBufferObjectsSize.exchange(0);
 
     CHECK_CONSISTENCY
 }
@@ -390,6 +391,7 @@ void GLBufferObjectSet::deleteAllGLBufferObjects()
 {
     // OSG_NOTICE<<"GLBufferObjectSet::deleteAllGLBufferObjects()"<<std::endl;
 
+    if (_pendingOrphanedGLBufferObjectsSize != 0)
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
         // OSG_NOTICE<<"GLBufferObjectSet::flushDeletedGLBufferObjects(..) handling orphans"<<std::endl;
@@ -466,6 +468,7 @@ void GLBufferObjectSet::discardAllGLBufferObjects()
 
 void GLBufferObjectSet::flushAllDeletedGLBufferObjects()
 {
+    if (_pendingOrphanedGLBufferObjectsSize != 0)
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
         // OSG_NOTICE<<"GLBufferObjectSet::flushDeletedGLBufferObjects(..) handling orphans"<<std::endl;
@@ -495,6 +498,7 @@ void GLBufferObjectSet::discardAllDeletedGLBufferObjects()
     // OSG_NOTICE<<"GLBufferObjectSet::discardAllDeletedGLBufferObjects()"<<std::endl;
 
     // clean up the pending orphans.
+    if (_pendingOrphanedGLBufferObjectsSize != 0)
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
         // OSG_NOTICE<<"GLBufferObjectSet::flushDeletedGLBufferObjects(..) handling orphans"<<std::endl;
@@ -519,6 +523,7 @@ void GLBufferObjectSet::discardAllDeletedGLBufferObjects()
 
 void GLBufferObjectSet::flushDeletedGLBufferObjects(double /*currentTime*/, double& availableTime)
 {
+    if (_pendingOrphanedGLBufferObjectsSize != 0)
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
         // OSG_NOTICE<<"GLBufferObjectSet::flushDeletedGLBufferObjects(..) handling orphans"<<std::endl;
@@ -794,6 +799,7 @@ void GLBufferObjectSet::orphan(GLBufferObject* to)
     // list.  This double buffered approach to handling orphaned TO's is used
     // to avoid having to mutex the process of appling active TO's.
     _pendingOrphanedGLBufferObjects.push_back(to);
+    ++_pendingOrphanedGLBufferObjectsSize;
 }
 
 void GLBufferObjectSet::remove(GLBufferObject* to)

src/osg/Texture.cpp

@@ -547,6 +547,7 @@ void TextureObjectSet::handlePendingOrphandedTextureObjects()
     _parent->getNumberActiveTextureObjects() -= numOrphaned;
 
     _pendingOrphanedTextureObjects.clear();
+    _pendingOrphanedTextureObjectsSize.exchange(0);
 
     CHECK_CONSISTENCY
 }
@@ -556,6 +557,7 @@ void TextureObjectSet::deleteAllTextureObjects()
 {
     // OSG_NOTICE<<"TextureObjectSet::deleteAllTextureObjects()"<<std::endl;
 
+    if (_pendingOrphanedTextureObjectsSize != 0)
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
         // OSG_NOTICE<<"TextureObjectSet::flushDeletedTextureObjects(..) handling orphans"<<std::endl;
@@ -619,6 +621,7 @@ void TextureObjectSet::discardAllTextureObjects()
     _tail = 0;
 
     _pendingOrphanedTextureObjects.clear();
+    _pendingOrphanedTextureObjectsSize.exchange(0);
     _orphanedTextureObjects.clear();
 
     unsigned int numDeleted = _numOfTextureObjects;
@@ -633,6 +636,7 @@ void TextureObjectSet::discardAllTextureObjects()
 void TextureObjectSet::flushAllDeletedTextureObjects()
 {
     // OSG_NOTICE<<"TextureObjectSet::flushAllDeletedTextureObjects()"<<std::endl;
+    if (_pendingOrphanedTextureObjectsSize != 0)
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
         // OSG_NOTICE<<"TextureObjectSet::flushDeletedTextureObjects(..) handling orphans"<<std::endl;
@@ -666,6 +670,7 @@ void TextureObjectSet::discardAllDeletedTextureObjects()
     // OSG_NOTICE<<"TextureObjectSet::discardAllDeletedTextureObjects()"<<std::endl;
 
     // clean up the pending orphans.
+    if (_pendingOrphanedTextureObjectsSize != 0)
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
         // OSG_NOTICE<<"TextureObjectSet::flushDeletedTextureObjects(..) handling orphans"<<std::endl;
@@ -691,6 +696,7 @@ void TextureObjectSet::flushDeletedTextureObjects(double /*currentTime*/, double
 {
     // OSG_NOTICE<<"TextureObjectSet::flushDeletedTextureObjects(..)"<<std::endl;
 
+    if (_pendingOrphanedTextureObjectsSize != 0)
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
         // OSG_NOTICE<<"TextureObjectSet::flushDeletedTextureObjects(..) handling orphans"<<std::endl;
@@ -756,6 +762,7 @@ void TextureObjectSet::flushDeletedTextureObjects(double /*currentTime*/, double
 
 bool TextureObjectSet::makeSpace(unsigned int& size)
 {
+    if (_pendingOrphanedTextureObjectsSize != 0)
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
         // OSG_NOTICE<<"TextureObjectSet::TextureObjectSet::makeSpace(..) handling orphans"<<std::endl;
@@ -980,6 +987,7 @@ void TextureObjectSet::orphan(Texture::TextureObject* to)
     // list.  This double buffered approach to handling orphaned TO's is used
     // to avoid having to mutex the process of appling active TO's.
     _pendingOrphanedTextureObjects.push_back(to);
+    ++_pendingOrphanedTextureObjectsSize;
 
 #if 0
     OSG_NOTICE<<"TextureObjectSet::orphan("<<to<<")  _pendingOrphanedTextureObjects.size()="<<_pendingOrphanedTextureObjects.size()<<std::endl;