Changeset 926

Timestamp:

08/06/08 19:49:37

Author:

robert

Message:

Added support for BuildOption?::s/getAbortRunOnError()

Files:

• trunk/src/vpb/MachinePool.cpp (modified) (3 diffs)
• trunk/src/vpb/TaskManager.cpp (modified) (3 diffs)

trunk/src/vpb/MachinePool.cpp

@@ -348 +348 @@
-            case(MachinePool::BLACKLIST_MACHINE_AND_RESUBMIT_TASK):
-            {
-Task %s has failed, blacklisting machine %s and resubmitting task
+\nWarning: Task %s has failed, blacklisting machine %s and resubmitting task.\n
-                setDone(true);
-                //setOperationQueue(0);
@@ -357 +357 @@
-            case(MachinePool::COMPLETE_RUNNING_TASKS_THEN_EXIT):
-            {
-   COMPLETE_RUNNING_TASKS_THEN_EXIT"
+\nWarning: Task %s on machine %s has failed, completing running tasks then exiting.\n",task->getFileName().c_str(),getHostName().c_str()
-                _machinePool->setTaskFailureOperation(MachinePool::IGNORE_FAILED_TASK);
-                System::instance()->getTaskManager()->setDone(true);
@@ -366 +366 @@
-            case(MachinePool::TERMINATE_RUNNING_TASKS_THEN_EXIT):
-            {
-   TERMINATE_RUNNING_TASKS_THEN_EXIT"
+\nWarning: Task %s on machine %s has failed, terminating running tasks then exiting.\n",task->getFileName().c_str(),getHostName().c_str()
-                _machinePool->setTaskFailureOperation(MachinePool::IGNORE_FAILED_TASK);
-                System::instance()->getTaskManager()->setDone(true);

trunk/src/vpb/TaskManager.cpp

@@ -274 +274 @@
-    log(osg::NOTICE,"Begining run");
-    
+    if (getBuildOptions() && getBuildOptions()->getAbortRunOnError())
+    {
+        getMachinePool()->setTaskFailureOperation(MachinePool::COMPLETE_RUNNING_TASKS_THEN_EXIT);
+    }
+
-    for(TaskSetList::iterator tsItr = _taskSetList.begin();
-        tsItr != _taskSetList.end() && !done();
@@ -359 +364 @@
-        // if (tasksFailed != 0) break;
-        
+        if (getBuildOptions() && getBuildOptions()->getAbortRunOnError() && tasksFailed>0)
+        {
+            log(osg::NOTICE,"Task failed aborting.");
+            break;
+        }
+        
+
-        if (getMachinePool()->getNumThreadsNotDone()==0)
-        {
@@ -677 +689 @@
-BuildOptions* TaskManager::getBuildOptions()
-{
-dynamic_cast<vpb::DatabaseBuilder*>(_terrainTile->getTerrainTechnique())
+_terrainTile.valid() ? dynamic_cast<vpb::DatabaseBuilder*>(_terrainTile->getTerrainTechnique()) : 0
-    return db ? db->getBuildOptions() : 0;
-}