Changeset 886

Timestamp:

03/06/08 18:12:11

Author:

robert

Message:

Added reporting of the source files that contribute to an osgdem run.

Files:

• trunk/include/vpb/DataSet (modified) (1 diff)
• trunk/include/vpb/Destination (modified) (1 diff)
• trunk/src/vpb/DataSet.cpp (modified) (6 diffs)
• trunk/src/vpb/Destination.cpp (modified) (1 diff)

trunk/include/vpb/DataSet

@@ -170 +170 @@
-        bool generateTasks(TaskManager* taskManager);
-
-
-
+
-
-

trunk/include/vpb/Destination

@@ -286 +286 @@
-    bool getSubTilesGenerated() const { return _subTileGenerated; }
-
+    DestinationTile::Sources getAllContributingSources();
-
-    typedef std::vector< osg::ref_ptr<DestinationTile> > TileList;

trunk/src/vpb/DataSet.cpp

@@ -1703 +1703 @@
-    
-    updateSourcesForDestinationGraphNeeds();
+    
-
-    log(osg::NOTICE, "completed DataSet::createDestination(%u)",numLevels);
@@ -2365 +2366 @@
-    }
-
-
-
-
-
-
-
-
-
-
+
-
-    if (getBuildLog())
@@ -2483 +2476 @@
-}
-
-_new
+Implementation
-{
-    log(osg::NOTICE,"DataSet::generateTasks_new");
@@ -2500 +2493 @@
-
-
-#if 1
-    if (!prepareForDestinationGraphCreation()) return false;
-
@@ -2669 +2661 @@
-    }
-
-#else
-
-    computeDestinationGraphFromSources(bottomDistributedBuildLevel+1);
-
-    if (!_destinationGraph.valid()) return false;
-
-    // initialize various tasks related settings
-    std::string sourceFile = taskManager->getSourceFileName();
-    std::string basename = taskManager->getBuildName();
-
-    std::string taskDirectory = getTaskDirectory();
-    if (!taskDirectory.empty()) taskDirectory += "/";
-
-    std::string logDirectory = getLogDirectory();
-    if (!logDirectory.empty()) logDirectory += "/";
-
-    std::string fileCacheName;
-    if (System::instance()->getFileCache()) fileCacheName = System::instance()->getFileCache()->getFileName(); 
-
-    bool logging = getNotifyLevel() > ALWAYS;
-
-    
-    // create root task
-    {
-        std::ostringstream taskfile;
-        taskfile<<taskDirectory<<basename<<"_root_L0_X0_Y0.task";
-
-        std::ostringstream app;
-        app<<"osgdem --run-path "<<taskManager->getRunPath()<<" -s "<<sourceFile<<" --record-subtile-on-leaf-tiles -l "<<getDistributedBuildSplitLevel()<<" --task "<<taskfile.str();
-
-        if (!fileCacheName.empty())
-        {
-            app<<" --cache "<<fileCacheName;
-        }
-
-        if (logging)
-        {
-            std::ostringstream logfile;
-            logfile<<logDirectory<<basename<<"_root_L0_X0_Y0.log";
-            app<<" --log "<<logfile.str();
-        }
-
-        taskManager->addTask(taskfile.str(), app.str(), sourceFile);
-    }
-    
-    
-    // need to create an intermediate level if required.
-    if (getDistributedBuildSecondarySplitLevel()!=0)
-    {
-
-        CollectSubtiles cs(getDistributedBuildSplitLevel()-1);
-        _destinationGraph->accept(cs);
-
-        for(CollectSubtiles::SubtileList::iterator itr = cs._subtileList.begin();
-            itr != cs._subtileList.end();
-            ++itr)
-        {
-            CompositeDestination* cd = itr->get();
-
-            std::ostringstream taskfile;
-            taskfile<<taskDirectory<<basename<<"_subtile_L"<<cd->_level<<"_X"<<cd->_tileX<<"_Y"<<cd->_tileY<<".task";
-
-
-            std::ostringstream app;
-            app<<"osgdem --run-path "<<taskManager->getRunPath()<<" -s "<<sourceFile<<" --record-subtile-on-leaf-tiles -l "<<getDistributedBuildSecondarySplitLevel()<<" --subtile "<<cd->_level<<" "<<cd->_tileX<<" "<<cd->_tileY<<" --task "<<taskfile.str();
-
-
-            if (!fileCacheName.empty())
-            {
-                app<<" --cache "<<fileCacheName;
-            }
-
-            if (logging)
-            {
-                std::ostringstream logfile;
-
-                logfile<<logDirectory<<basename<<"_subtile_L"<<cd->_level<<"_X"<<cd->_tileX<<"_Y"<<cd->_tileY<<".log";
-                app<<" --log "<<logfile.str();
-            }
-
-            taskManager->addTask(taskfile.str(), app.str(), sourceFile);
-        }
-    }
-    
-    // create the bottom level split
-    {    
-
-        // bottom set of tasks
-        CollectSubtiles cs(bottomDistributedBuildLevel-1);
-        _destinationGraph->accept(cs);
-
-        for(CollectSubtiles::SubtileList::iterator itr = cs._subtileList.begin();
-            itr != cs._subtileList.end();
-            ++itr)
-        {
-            CompositeDestination* cd = itr->get();
-
-            std::ostringstream taskfile;
-            taskfile<<taskDirectory<<basename<<"_subtile_L"<<cd->_level<<"_X"<<cd->_tileX<<"_Y"<<cd->_tileY<<".task";
-
-
-            std::ostringstream app;
-            app<<"osgdem --run-path "<<taskManager->getRunPath()<<" -s "<<sourceFile<<" --subtile "<<cd->_level<<" "<<cd->_tileX<<" "<<cd->_tileY<<" --task "<<taskfile.str();
-
-            if (!fileCacheName.empty())
-            {
-                app<<" --cache "<<fileCacheName;
-            }
-
-            if (logging)
-            {
-                std::ostringstream logfile;
-
-                logfile<<logDirectory<<basename<<"_subtile_L"<<cd->_level<<"_X"<<cd->_tileX<<"_Y"<<cd->_tileY<<".log";
-                app<<" --log "<<logfile.str();
-            }
-
-            taskManager->addTask(taskfile.str(), app.str(), sourceFile);
-        }
-    }
-#endif
-
-    return false;
-}
-
-bool DataSet::generateTasks_old(TaskManager* taskManager)
-{
-    loadSources();
-
-    if (!prepareForDestinationGraphCreation()) return false;
-
-    selectAppropriateSplitLevels();
-
-    if (getDistributedBuildSplitLevel()==0) return false;
-
-
-    computeDestinationGraphFromSources(getDistributedBuildSplitLevel()+1);
-
-    if (_destinationGraph.valid())
-    {
-        CollectSubtiles cs(getDistributedBuildSplitLevel()-1);
-        
-        _destinationGraph->accept(cs);
-        
-        std::string sourceFile = taskManager->getSourceFileName();
-        
-        std::string basename = taskManager->getBuildName();
-        std::string taskDirectory = getTaskDirectory();
-        if (!taskDirectory.empty()) taskDirectory += "/";
-        
-        std::string logDirectory = getLogDirectory();
-        if (!logDirectory.empty()) logDirectory += "/";
-
-        std::string fileCacheName;
-        if (System::instance()->getFileCache()) fileCacheName = System::instance()->getFileCache()->getFileName(); 
-        
-        bool logging = getNotifyLevel() > ALWAYS;
-        
-        // create root task
-        {
-            std::ostringstream taskfile;
-            taskfile<<taskDirectory<<basename<<"_root_L0_X0_Y0.task";
-
-            std::ostringstream app;
-            app<<"osgdem --run-path "<<taskManager->getRunPath()<<" -s "<<sourceFile<<" --record-subtile-on-leaf-tiles -l "<<getDistributedBuildSplitLevel()<<" --task "<<taskfile.str();
-
-            if (!fileCacheName.empty())
-            {
-                app<<" --cache "<<fileCacheName;
-            }
-
-            if (logging)
-            {
-                std::ostringstream logfile;
-                logfile<<logDirectory<<basename<<"_root_L0_X0_Y0.log";
-                app<<" --log "<<logfile.str();
-            }
-#if 0            
-            else
-            {
-                app<<" > /dev/null";
-            }
-#endif            
-
-            taskManager->addTask(taskfile.str(), app.str(), sourceFile);
-        }
-        
-        // taskManager->nextTaskSet();
-        
-        for(CollectSubtiles::SubtileList::iterator itr = cs._subtileList.begin();
-            itr != cs._subtileList.end();
-            ++itr)
-        {
-            CompositeDestination* cd = itr->get();
-            
-            std::ostringstream taskfile;
-            taskfile<<taskDirectory<<basename<<"_subtile_L"<<cd->_level<<"_X"<<cd->_tileX<<"_Y"<<cd->_tileY<<".task";
-
-
-            std::ostringstream app;
-            app<<"osgdem --run-path "<<taskManager->getRunPath()<<" -s "<<sourceFile<<" --subtile "<<cd->_level<<" "<<cd->_tileX<<" "<<cd->_tileY<<" --task "<<taskfile.str();
-
-            if (!fileCacheName.empty())
-            {
-                app<<" --cache "<<fileCacheName;
-            }
-
-            if (logging)
-            {
-                std::ostringstream logfile;
-
-                logfile<<logDirectory<<basename<<"_subtile_L"<<cd->_level<<"_X"<<cd->_tileX<<"_Y"<<cd->_tileY<<".log";
-                app<<" --log "<<logfile.str();
-            }
-#if 0
-            else
-            {
-                app<<" > /dev/null";
-            }
-#endif
-            taskManager->addTask(taskfile.str(), app.str(), sourceFile);
-        }
-
-    }
-    
-    return true;
-}
-
@@ -2973 +2741 @@
-            osgDB::writeNodeFile(*terrain,getIntermediateBuildName());
-            requiresGenerationOfTiles = false;
+        }
+    }
+    
+    
+    bool printOutContributingSources = true;
+    if (printOutContributingSources)
+    {
+        CompositeDestination* startPoint = _destinationGraph.get();
+        if (getGenerateSubtile())
+        {
+            startPoint = getComposite(getSubtileLevel(), getSubtileX(), getSubtileY());
+        }
+    
+        DestinationTile::Sources sources = startPoint->getAllContributingSources();
+        log(osg::NOTICE,"There are %d contributing source files:",sources.size());
+
+        for(DestinationTile::Sources::iterator itr = sources.begin();
+            itr != sources.end();
+            ++itr)
+        {
+            log(osg::NOTICE,"    %s",(*itr)->getFileName().c_str());
-        }
-    }

trunk/src/vpb/Destination.cpp

@@ -2941 +2941 @@
-    }
-}
+
+DestinationTile::Sources CompositeDestination::getAllContributingSources()
+{
+    typedef std::set<Source*> SourceSet;
+    SourceSet sourceSet;
+    
+    for(TileList::iterator titr=_tiles.begin();
+        titr!=_tiles.end();
+        ++titr)
+    {
+        DestinationTile* dt = titr->get();
+        for(DestinationTile::Sources::iterator itr = dt->_sources.begin();
+             itr != dt->_sources.end();
+             ++itr)
+        {
+            sourceSet.insert(itr->get());
+        }
+    }    
+    
+    return DestinationTile::Sources(sourceSet.begin(), sourceSet.end());
+}