Changeset 1118 for trunk/MagicSoft/Mars/mbase

Timestamp:

12/18/01 12:07:26 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MAGIC.h (modified) (1 diff)
• MTask.cc (modified) (1 diff)
• MTaskList.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MAGIC.h

@@ -17 +17 @@
 //
 const Int_t kCONTINUE = 2;
+const Int_t kSKIP     = 2;
 
 //

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -138 +138 @@
     fNumExecutions = 0;
 
-    if (!PreProcess(plist))
+    switch (PreProcess(plist))
+    {
+    case kFALSE:
         return kFALSE;
 
-    fIsPreprocessed = kTRUE;
-    return kTRUE;
+    case kTRUE:
+        fIsPreprocessed = kTRUE;
+        return kTRUE;
+
+    case kSKIP:
+        return kSKIP;
+    }
+
+    *fLog << err << dbginf << "PreProcess of " << GetDescriptor();
+    *fLog << " returned an unknown value... aborting." << endl;
+
+    return kFALSE;
 }
 

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -245 +245 @@
 // --------------------------------------------------------------------------
 //
+//  removes a task from the list (used in PreProcess).
+//  if kIsOwner is set the task is deleted. (see SetOwner())
+//
+void MTaskList::Remove(MTask *task)
+{
+    TObject *obj = fTasks->Remove(task);
+
+    if (TestBit(kIsOwner))
+        delete obj;
+}
+
+// --------------------------------------------------------------------------
+//
 //  do pre processing (before eventloop) of all tasks in the task-list
 //
@@ -267 +280 @@
         *fLog << all << task->GetName() << "... " << flush;
 
-        if (!task->CallPreProcess(fParList))
+        switch (task->CallPreProcess(fParList))
+        {
+        case kFALSE:
             return kFALSE;
+
+        case kTRUE:
+            continue;
+
+        case kSKIP:
+            Remove(task);
+            continue;
+        }
+
+        *fLog << err << dbginf << "PreProcess of " << task->GetDescriptor();
+        *fLog << " returned an unknown value... aborting." << endl;
+        return kFALSE;
     }