Changeset 13041 for OpenSceneGraph/trunk/src/osg/OperationThread.cpp

Timestamp:

03/21/12 18:36:20 (15 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osg/OperationThread.cpp (modified) (19 diffs)

OpenSceneGraph/trunk/src/osg/OperationThread.cpp

@@ -56 +56 @@
 }
 
-bool OperationQueue::empty() 
-{ 
+bool OperationQueue::empty()
+{
 
   OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
-  return _operations.empty(); 
+  return _operations.empty();
 }
 
@@ -66 +66 @@
 {
   OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
-  return static_cast<unsigned int>(_operations.size()); 
+  return static_cast<unsigned int>(_operations.size());
 }
 
@@ -77 +77 @@
 
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
-    
+
     if (_operations.empty()) return osg::ref_ptr<Operation>();
-    
+
     if (_currentOperationIterator == _operations.end())
     {
@@ -85 +85 @@
         _currentOperationIterator = _operations.begin();
     }
-    
+
     ref_ptr<Operation> currentOperation = *_currentOperationIterator;
 
@@ -140 +140 @@
         {
             bool needToResetCurrentIterator = (_currentOperationIterator == itr);
-            
+
             itr = _operations.erase(itr);
-            
+
             if (needToResetCurrentIterator) _currentOperationIterator = itr;
-            
+
         }
         else ++itr;
@@ -153 +153 @@
 {
     OSG_INFO<<"Doing remove named operation"<<std::endl;
-    
+
     // acquire the lock on the operations queue to prevent anyone else for modifying it at the same time
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
@@ -161 +161 @@
         itr!=_operations.end();)
     {
-        if ((*itr)->getName()==name) 
+        if ((*itr)->getName()==name)
         {
             bool needToResetCurrentIterator = (_currentOperationIterator == itr);
-            
+
             itr = _operations.erase(itr);
-            
+
             if (needToResetCurrentIterator) _currentOperationIterator = itr;
         }
@@ -183 +183 @@
 
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
-    
+
     _operations.clear();
-    
+
     // reset current operator.
     _currentOperationIterator = _operations.begin();
@@ -201 +201 @@
     // reset current operation iterator to beginning if at end.
     if (_currentOperationIterator==_operations.end()) _currentOperationIterator = _operations.begin();
-    
+
     for(;
         _currentOperationIterator != _operations.end();
@@ -216 +216 @@
             ++_currentOperationIterator;
         }
-                
+
         // OSG_INFO<<"Doing op "<<_currentOperation->getName()<<" "<<this<<std::endl;
 
@@ -233 +233 @@
     _operationsBlock->release();
 }
- 
+
  void OperationQueue::releaseAllOperations()
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
-    
+
     for(Operations::iterator itr = _operations.begin();
         itr!=_operations.end();
@@ -301 +301 @@
     {
         OSG_INFO<<"set done "<<this<<std::endl;
-        
+
         {
             OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_threadMutex);
@@ -322 +322 @@
     if( isRunning() )
     {
-    
+
         _done = true;
 
@@ -330 +330 @@
             OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_threadMutex);
 
-            if (_operationQueue.valid()) 
+            if (_operationQueue.valid())
             {
                  _operationQueue->releaseOperationsBlock();
@@ -338 +338 @@
             if (_currentOperation.valid()) _currentOperation->release();
         }
-        
+
         // then wait for the the thread to stop running.
         while(isRunning())
@@ -347 +347 @@
                 OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_threadMutex);
 
-                if (_operationQueue.valid()) 
+                if (_operationQueue.valid())
                 {
                     _operationQueue->releaseOperationsBlock();
@@ -404 +404 @@
         ref_ptr<Operation> operation;
         ref_ptr<OperationQueue> operationQueue;
-        
+
         {
             OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_threadMutex);
@@ -426 +426 @@
             (*operation)(_parent.get());
 
-            {            
+            {
                 OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_threadMutex);
                 _currentOperation = 0;
@@ -434 +434 @@
         if (firstTime)
         {
-            // do a yield to get round a peculiar thread hang when testCancel() is called 
+            // do a yield to get round a peculiar thread hang when testCancel() is called
             // in certain circumstances - of which there is no particular pattern.
             YieldCurrentThread();
             firstTime = false;
         }
-        
+
         // OSG_NOTICE<<"operations.size()="<<_operations.size()<<" done="<<_done<<" testCancel()"<<testCancel()<<std::endl;