Changeset 1017

Timestamp:

08/16/10 13:38:04 (18 months ago)

Author:

robert

Message:

From Brad Christiansen,

"I have made changes in two areas that effect VPBMaster's operation. The motivation for the changes come from writing a GUI front end to VPBMaster.

The first is changes to the logging behavior:
- If a master log file is set, this is now also used as the operations log. This adds more detail to the master log file (it is clearer what has happened, particularly in the case of errors).
- Fixed a bug which meant the build log was not correctly passed to the DataSet?.

The second set of changes relate to the behavior of VPBMaster when a run is finished. Prior to my changes the VPBMaster executable would not terminate if the TaskManager? had spawned any threads, even once all tasks had completed. To change this behavior so VPBMaster would exit on completion I made two changes:

- Implemented the exit(int) function in TaskManager? (it was defined in the header but had no implementation)
- Called this method prior to VPBMaster returning from main so all thread are closed and VPBMaster exits cleanly."

Second submission:

"The return value of TaskManager?'s run method was ignored by vpbmaster, thus is the task manager failed to complete all its tasks, vpbmaster would still return 0. My change to vpbmaster checks the return value of TaskManager? run and sets the return value to 1 if the run method returns false."

Location:

trunk

Files:

• applications/vpbmaster/vpbmaster.cpp (modified) (7 diffs)
• src/vpb/TaskManager.cpp (modified) (3 diffs)

trunk/applications/vpbmaster/vpbmaster.cpp

@@ -68 +68 @@
     if (arguments.read("-h") || arguments.read("--help"))
     {
-        arguments.getApplicationUsage()->write(std::cout,osg::ApplicationUsage::COMMAND_LINE_OPTION);
+        arguments.getApplicationUsage()->write(std::cout,osg::ApplicationUsage::COMMAND_LINE_OPTION);        
         return 1;
     }
@@ -123 +123 @@
                 }
                 std::cout<< " : "<<itr->second.description<<std::endl;
-            }
-
+            }            
             return 1;
         }
@@ -145 +144 @@
         if (arguments.errors())
         {
-            arguments.writeErrorMessages(std::cout);
+            arguments.writeErrorMessages(std::cout);            
+            taskManager->exit(SIGTERM);
             return 1;
         }
@@ -156 +156 @@
 
             taskManager->writeSource(tasksOutputFileName);
-            taskManager->writeTasks(tasksOutputFileName, true);
+            taskManager->writeTasks(tasksOutputFileName, true); 
+            taskManager->exit(SIGTERM);
             return 1;
         }
@@ -178 +179 @@
                     {
                         // nothing to do.
+                        taskManager->exit(SIGTERM);
                         return 1;
                     }
@@ -206 +208 @@
                 if (taskManager->hasMachines())
                 {
-                    taskManager->run();
+                    if(!taskManager->run()) 
+                    {
+                        result = 1;
+                    }
+                    
                 }
                 else
@@ -235 +241 @@
 
     // make sure the OS writes changes to disk
-    vpb::sync();
-
+    vpb::sync();    
+    taskManager->log(osg::NOTICE,"Run Complete.");   
+    taskManager->exit(SIGTERM);
     return result;
 }

trunk/src/vpb/TaskManager.cpp

@@ -242 +242 @@
     while (arguments.read("--master-log",logFileName))
     {
-        setBuildLog(new BuildLog(logFileName));
+        BuildLog* bl = new BuildLog(logFileName);
+        setBuildLog(bl);
+        pushOperationLog(bl);
     }
 
@@ -408 +410 @@
         vpb::BuildOptions* bo = db ? db->getBuildOptions() : 0;
 
-        if (bo && !(bo->getLogFileName().empty()))
-        {
-            dataset->setBuildLog(new vpb::BuildLog);
-        }
+        if (getBuildLog())
+        {
+            dataset->setBuildLog(getBuildLog());
+        }
+        else if (bo && !(bo->getLogFileName().empty()))
+        {
+            dataset->setBuildLog(new vpb::BuildLog(bo->getLogFileName()));
+        }
+        
 
         if (_taskFile.valid())
@@ -1018 +1025 @@
 }
 
+void TaskManager::exit(int sig)
+{
+    handleSignal(sig);
+    setDone(true);
+}
+
 void TaskManager::handleSignal(int sig)
 {