Changeset 925

Timestamp:

08/06/08 17:17:34

Author:

robert

Message:

Added support for aborting the current task when FATAL messages are logged, with
DataSet? now generating FATAL log messages when AbortTaskOnError? is set (as it is now by default).

Files:

• trunk/applications/osgdem/osgdem.cpp (modified) (5 diffs)
• trunk/include/vpb/BuildLog (modified) (4 diffs)
• trunk/include/vpb/BuildOptions (modified) (2 diffs)
• trunk/src/vpb/BuildOptions.cpp (modified) (2 diffs)
• trunk/src/vpb/BuildOptionsIO.cpp (modified) (1 diff)
• trunk/src/vpb/Commandline.cpp (modified) (2 diffs)
• trunk/src/vpb/DataSet.cpp (modified) (1 diff)

trunk/applications/osgdem/osgdem.cpp

@@ -204 +204 @@
-    }
-
-
-    double duration = 0.0;
-
@@ -238 +237 @@
-            vpb::sync();
-
-int 
+
-
-            if (dataset->getBuildLog() && report)
@@ -249 +248 @@
-            dataset->log(osg::NOTICE,"Elapsed time = %f",duration);
-            
+            if (taskFile.valid())
+            {
+                taskFile->setStatus(vpb::Task::COMPLETED);
+            }
+
+        }
+        catch(std::string str)
+        {
+            printf("Caught exception : %s\n",str.c_str());
+            
+            taskFile->setStatus(vpb::Task::FAILED);
+
+            result = 1;
+
-        }
-        catch(...)
-        {
-            printf("Caught exception.\n");
+            
+            taskFile->setStatus(vpb::Task::FAILED);
+
+            result = 1;
-        }
-
@@ -261 +278 @@
-    if (taskFile.valid())
-    {
-        taskFile->setStatus(vpb::Task::COMPLETED);
-        taskFile->setProperty("duration",duration);
-        taskFile->write();
@@ -269 +285 @@
-    vpb::sync();
-    
-0
+result
-}
-

trunk/include/vpb/BuildLog

@@ -36 +36 @@
-#include <sstream>
-#include <fstream>
+#include <iostream>
-
-
@@ -98 +99 @@
-        void log(osg::NotifySeverity level, const char* message, ...);
-        
+        void log(osg::NotifySeverity level, const std::string& message);
+
-        void setStartPendingTime(double t) { _startPendingTime = t; }
-        double getStartPendingTime() const { return _startPendingTime; }
@@ -192 +195 @@
-        const BuildLog* getBuildLog() const { return _buildLog.get(); }
-
+        void log(osg::NotifySeverity level, const std::string& message) const
+        {
+            if (level>osg::getNotifyLevel()) return;
+        
+            if (_buildLog.valid())
+            {
+                _buildLog->log(level, message);
+            }
+            else 
+            {
+                std::cout<<message<<std::endl;
+            }
+            
+            if (level==osg::FATAL) throw message;
+        }
+        
-        void log(osg::NotifySeverity level, const char* format, ...) const
-        {
@@ -202 +221 @@
-                vsnprintf(str, sizeof(str), format, args);
-                _buildLog->log(level, str);
+
+                if (level==osg::FATAL) throw std::string(str);
-            }
-            else 
-            {
-                vprintf(format, args); printf("\n");
+
+                if (level==osg::FATAL) 
+                {
+                    char str[1024];
+                    vsnprintf(str, sizeof(str), format, args);
+                    throw std::string(str);
+                }
-            }
-            va_end(args);
-
+
+
-
-    protected:

trunk/include/vpb/BuildOptions

@@ -261 +261 @@
-        LayerInheritance getLayerInheritance() const { return _layerInheritance; }
-
+        void setAbortTaskOnError(bool flag) { _abortTaskOnError = flag; }
+        bool getAbortTaskOnError() const { return _abortTaskOnError; }
+
+        void setAbortRunOnError(bool flag) { _abortRunOnError = flag; }
+        bool getAbortRunOnError() const { return _abortRunOnError; }
-        
-    protected:
@@ -323 +328 @@
-
-        LayerInheritance                            _layerInheritance;
+        
+        bool                                        _abortTaskOnError;
+        bool                                        _abortRunOnError;
-};
-

trunk/src/vpb/BuildOptions.cpp

@@ -74 +74 @@
-    
-    _layerInheritance = INHERIT_NEAREST_AVAILABLE;
+    
+    _abortTaskOnError = true;
+    _abortRunOnError = false;
-}
-
@@ -148 +151 @@
-    
-    _layerInheritance = rhs._layerInheritance;
+    
+    _abortTaskOnError = rhs._abortTaskOnError;
+    _abortRunOnError = rhs._abortRunOnError;
-}
-

trunk/src/vpb/BuildOptionsIO.cpp

@@ -221 +221 @@
-        { AEP(LayerInheritance); AEV(INHERIT_LOWEST_AVAILABLE); AEV(INHERIT_NEAREST_AVAILABLE); AEV(NO_INHERITANCE); }
-
+        ADD_BOOL_PROPERTY(AbortTaskOnError);
+        ADD_BOOL_PROPERTY(AbortRunOnError);
-    }
-    

trunk/src/vpb/Commandline.cpp

@@ -497 +497 @@
-    usage.addCommandLineOption("--interpolate-imagery","Enable the use of interpolation when sampling data from source imagery.");
-    usage.addCommandLineOption("--no-interpolate-imagery","Disable the use of interpolation when sampling data from source imagery.");
+    usage.addCommandLineOption("--abort-task-on-error","Hint to osgdem to abort the build when any errors occur.");
+    usage.addCommandLineOption("--no-abort-task-on-error","Hint to osgdem to abort the build when any errors occur.");
+    usage.addCommandLineOption("--abort-run-on-error","Hint to vpbmaster to abort the run when any errors occur.");
+    usage.addCommandLineOption("--no-abort-run-on-error","Hint to vpbmaster to abort the run when any errors occur.");
-}
-
@@ -775 +779 @@
-
-    while (arguments.read("--type-attribute",typeAttributeName)) {}
+
+    while (arguments.read("--abort-task-on-error")) { buildOptions->setAbortTaskOnError(true); }
+    while (arguments.read("--no-abort-task-on-error")) { buildOptions->setAbortTaskOnError(false); }
+
+    while (arguments.read("--abort-run-on-error")) { buildOptions->setAbortRunOnError(true); }
+    while (arguments.read("--no-abort-run-on-error")) { buildOptions->setAbortRunOnError(false); }
-
-    float ratio=0.0f;

trunk/src/vpb/DataSet.cpp

@@ -1485 +1485 @@
-            if (!result.success())
-            {
-
+
+
-            }
-        }
-        else
-        {
-
+
+
-        }
-    }