Changeset 10407

Timestamp:

06/25/09 15:00:01 (4 years ago)

Author:

robert

Message:

From Ulrich Hertlein, "please find attached some typo fixes in DatabasePager? and a tweak to only print the addLoadedDataToSceneGraph stats when some work was actually done."

Files:

• OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp (modified) (8 diffs)

OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
  * This library is open source and may be redistributed and/or modified under  
@@ -889 +889 @@
     }
 
+    _changeAutoUnRef = true;
+    _valueAutoUnRef = false;
+ 
     _changeAnisotropy = false;
     _valueAnisotropy = 1.0f;
 
-
-    
     const char* ptr=0;
 
@@ -1274 +1275 @@
     double timestamp = framestamp?framestamp->getReferenceTime():0.0;
     int frameNumber = framestamp?framestamp->getFrameNumber():_frameNumber;
-    
+ 
+#ifdef WITH_REQUESTNODEFILE_TIMING
     static int previousFrame = -1;
     static double totalTime = 0.0;
     
-
     if (previousFrame!=frameNumber)
     {
-        // osg::notify(osg::NOTICE)<<"requestNodeFiles for "<<previousFrame<<" time = "<<totalTime<<std::endl;
+        osg::notify(osg::NOTICE)<<"requestNodeFiles for "<<previousFrame<<" time = "<<totalTime<<std::endl;
 
         previousFrame = frameNumber;
         totalTime = 0.0;
     }
-
+#endif
     
     // search to see if filename already exist in the file loaded list.
@@ -1296 +1297 @@
         if (databaseRequest)
         {
-            osg::notify(osg::INFO)<<"DatabasePager::fileRequest("<<fileName<<") updating already assigned."<<std::endl;
+            osg::notify(osg::INFO)<<"DatabasePager::requestNodeFile("<<fileName<<") updating already assigned."<<std::endl;
 
             RequestQueue* requestQueue = databaseRequest->_requestQueue;
@@ -1320 +1321 @@
             if (databaseRequestRef->referenceCount()==1)
             {
-                osg::notify(osg::INFO)<<"DatabasePager::fileRquest("<<fileName<<") orphaned, resubmitting."<<std::endl;
+                osg::notify(osg::INFO)<<"DatabasePager::requestNodeFile("<<fileName<<") orphaned, resubmitting."<<std::endl;
 
                 databaseRequest->_frameNumberFirstRequest = frameNumber;
@@ -1340 +1341 @@
     if (!foundEntry)
     {
-        osg::notify(osg::INFO)<<"In DatabasePager::fileRquest("<<fileName<<")"<<std::endl;
+        osg::notify(osg::INFO)<<"In DatabasePager::requestNodeFile("<<fileName<<")"<<std::endl;
         
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_fileRequestQueue->_requestMutex);
@@ -1394 +1395 @@
     }
 
+#ifdef WITH_REQUESTNODEFILE_TIMING
     totalTime += osg::Timer::instance()->delta_m(start_tick, osg::Timer::instance()->tick());
+#endif
 }
 
@@ -1506 +1509 @@
     osg::Timer_t last = osg::Timer::instance()->tick();
 
-    osg::notify(osg::DEBUG_INFO)<<"Done DatabasePager::addLoadedDataToSceneGraph"<<
-        osg::Timer::instance()->delta_m(before,mid)<<"ms,\t"<<
-        osg::Timer::instance()->delta_m(mid,last)<<"ms"<<
-        "  objects"<<localFileLoadedList.size()<<std::endl<<std::endl;
-    
+    if (!localFileLoadedList.empty())
+    {
+        osg::notify(osg::DEBUG_INFO)<<"Done DatabasePager::addLoadedDataToSceneGraph"<<
+            osg::Timer::instance()->delta_m(before,mid)<<"ms,\t"<<
+            osg::Timer::instance()->delta_m(mid,last)<<"ms"<<
+            "  objects"<<localFileLoadedList.size()<<std::endl<<std::endl;
+    } 
 }