Changeset 887

Timestamp:

03/07/08 20:27:18

Author:

robert

Message:

Added nesting of secondary split level task directories, task and log files

Files:

• trunk/applications/osgdem/osgdem.cpp (modified) (1 diff)
• trunk/applications/vpbmaster/vpbmaster.cpp (modified) (2 diffs)
• trunk/include/vpb/BuildLog (modified) (1 diff)
• trunk/include/vpb/System (modified) (3 diffs)
• trunk/include/vpb/TaskManager (modified) (1 diff)
• trunk/src/vpb/DataSet.cpp (modified) (11 diffs)
• trunk/src/vpb/System.cpp (modified) (3 diffs)

trunk/applications/osgdem/osgdem.cpp

@@ -225 +225 @@
-            if (bo && !(bo->getLogFileName().empty()))
-            {
-
+(bo->getLogFileName())
-            }
-

trunk/applications/vpbmaster/vpbmaster.cpp

@@ -86 +86 @@
-    {
-        std::string sourceFileName = taskManager->getBuildName() + std::string("_master.source");
+        taskManager->setSourceFileName(sourceFileName);
+        taskManager->generateTasksFromSource();
+
-        taskManager->writeSource(tasksOutputFileName);
-
-        taskManager->generateTasksFromSource();
-        taskManager->writeTasks(tasksOutputFileName, true);
-        return 1;
@@ -104 +105 @@
-            tasksOutputFileName = taskManager->getBuildName() + std::string("_master.tasks");
-
+            taskManager->setSourceFileName(sourceFileName);
+            taskManager->generateTasksFromSource();
+
-            taskManager->writeSource(sourceFileName);
-
-            taskManager->generateTasksFromSource();
-            taskManager->writeTasks(tasksOutputFileName, true);
-            

trunk/include/vpb/BuildLog

@@ -185 +185 @@
-        const BuildLog* getBuildLog() const { return _buildLog.get(); }
-
-
+ const
-        {
-            if (level>osg::getNotifyLevel()) return;

trunk/include/vpb/System

@@ -35 +35 @@
-extern VPB_EXPORT std::string& getMachineFileName();
-extern VPB_EXPORT std::string& getCacheFileName();
+extern VPB_EXPORT unsigned int getMaxNumberOfFilesPerDirectory();
-
-inline bool getAttributeValue(const std::string& field, const std::string& name, std::string& value)
@@ -110 +111 @@
-        unsigned long getFileSize(const std::string& filename);
-
+        unsigned int getMaxNumberOfFilesPerDirectory() const { return _maxNumberOfFilesPerDirectory; } 
+
-    protected:
-    
@@ -122 +125 @@
-        std::string                 _machineFileName;
-        std::string                 _cacheFileName;
-
+unsigned int                _maxNumberOfFilesPerDirectory;        
-        
-        bool                        _trimOldestTiles;

trunk/include/vpb/TaskManager

@@ -66 +66 @@
-        const std::string& getBuildName() const { return _buildName; }
-        
+        void setSourceFileName(const std::string& sourceFileName) { _sourceFileName = sourceFileName; }
+        const std::string& getSourceFileName() const { return _sourceFileName; }
+
-        /** read the task list from file.*/
-        bool writeSource(const std::string& filename);

trunk/src/vpb/DataSet.cpp

@@ -2354 +2354 @@
-bool DataSet::generateTasks(TaskManager* taskManager)
-{
-
-
-
-
-
+
+
+
-    }
-
@@ -2463 +2461 @@
-    else
-    {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}
@@ -2581 +2598 @@
-        taskManager->addTask(taskfile.str(), app.str(), sourceFile);
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // need to create an intermediate level if required.
-    if (getDistributedBuildSecondarySplitLevel()!=0)
@@ -2588 +2627 @@
-        unsigned int level = getDistributedBuildSplitLevel()-1;
-
-
-
-
-
-
+
+
-            ++itr)
-        {
@@ -2598 +2634 @@
-            unsigned int tileY = itr->first.second;
-
+            unsigned int taskSet = taskCount / numTasksPerDirectory;
+
-            std::ostringstream taskfile;
-
+
+
-
-
@@ -2615 +2654 @@
-                std::ostringstream logfile;
-
-
+
+
-                app<<" --log "<<logfile.str();
-            }
-
-            taskManager->addTask(taskfile.str(), app.str(), sourceFile);
-
-
+
+
+
+
+
+
+
+
+
+
-    
-    // create the bottom level split
@@ -2627 +2675 @@
-        unsigned int level = bottomDistributedBuildLevel-1;
-
-
-
-
-
-
+
+
-            ++itr)
-        {
@@ -2637 +2682 @@
-            unsigned int tileY = itr->first.second;
-
+            unsigned int taskSet = taskCount / numTasksPerDirectory;
+
-            std::ostringstream taskfile;
-
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -2653 +2710 @@
-                std::ostringstream logfile;
-
-
+
+
+
+
+
+
+
+
+
+
+
-                app<<" --log "<<logfile.str();
-            }
-
-            taskManager->addTask(taskfile.str(), app.str(), sourceFile);
+
+            ++taskCount;
-        }
-    }
@@ -2667 +2736 @@
-int DataSet::run()
-{
-
-
-
-
-
+
+
+
-    }
-
@@ -2693 +2760 @@
-{
-    
+    log(osg::NOTICE,"DataSet::_run() %i %i",getDistributedBuildSplitLevel(),getDistributedBuildSecondarySplitLevel());
+
-    bool requiresGraphicsContextInMainThread = true;
-    

trunk/src/vpb/System.cpp

@@ -49 +49 @@
-std::string& vpb::getMachineFileName() { return System::instance()->getMachineFileName(); }
-std::string& vpb::getCacheFileName() { return System::instance()->getCacheFileName(); }
+unsigned int vpb::getMaxNumberOfFilesPerDirectory() { return System::instance()->getMaxNumberOfFilesPerDirectory(); }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -69 +70 @@
-    _taskDirectory = "tasks";
-    
+    _maxNumberOfFilesPerDirectory = 1000;
+    
-    readEnvironmentVariables();
-    
@@ -152 +155 @@
-    }
-    
+
+    str = getenv("VPB_MAXIMUM_OF_FILES_PER_DIRECTORY");
+    if (str) 
+    {
+        _maxNumberOfFilesPerDirectory = atoi(str);
+    }
-}
-