Changeset 1661 for trunk/MagicSoft/Mars/mbase

Timestamp:

11/21/02 15:04:04 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

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

trunk/MagicSoft/Mars/mbase/MTask.h

@@ -65 +65 @@
     virtual ~MTask();
 
-    void SetFilter(MFilter *filter) { fFilter=filter; }
+    virtual void SetFilter(MFilter *filter) { fFilter=filter; }
     const MFilter *GetFilter() const      { return fFilter; }
+    MFilter *GetFilter()  { return fFilter; } // for MContinue only
     virtual void PrintStatistics(const Int_t lvl=0, Bool_t title=kFALSE) const;
 

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -135 +135 @@
 }
 
-
-// --------------------------------------------------------------------------
-//
-// schedule task for execution, whether as first task, or after
-// 'where'. 'tType' is the event type which should be processed
-//
-Bool_t MTaskList::AddToList(MTask *task, const char *type, MTask *where)
-{
-    // FIXME: We agreed to put the task into list in an ordered way.
-
+Bool_t MTaskList::CheckAddToList(MTask *task, const char *type, const MTask *where) const
+{
     //
     // Sanity check
@@ -182 +174 @@
     }
 
-    if (where)
-    {
-        if (!fTasks->FindObject(where))
-        {
-            *fLog << err << dbginf << "Error: Cannot find task after which the new task should be scheduled!" << endl;
-            return kFALSE;
-        }
-    }
-
-    *fLog << inf << "Adding " << name << " to " << GetName() << " for " << type << "... " << flush;
-
+    if (!where)
+        return kTRUE;
+
+    if (fTasks->FindObject(where))
+        return kTRUE;
+
+    *fLog << err << dbginf << "Error: Cannot find task after which the new task should be scheduled!" << endl;
+    return kFALSE;
+}
+
+
+// --------------------------------------------------------------------------
+//
+// schedule task for execution, before 'where'.
+// 'type' is the event type which should be processed
+//
+Bool_t MTaskList::AddToListBefore(MTask *task, const MTask *where, const char *type)
+{
+    // FIXME: We agreed to put the task into list in an ordered way.
+    if (!CheckAddToList(task, type, where))
+        return kFALSE;
+
+    *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << type << "... " << flush;
+    task->SetStreamId(type);
+    fTasks->AddBefore((TObject*)where, task);
+    *fLog << "Done." << endl;
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// schedule task for execution, after 'where'.
+// 'type' is the event type which should be processed
+//
+Bool_t MTaskList::AddToListAfter(MTask *task, const MTask *where, const char *type)
+{
+    // FIXME: We agreed to put the task into list in an ordered way.
+
+    if (!CheckAddToList(task, type, where))
+        return kFALSE;
+
+    *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << type << "... " << flush;
+    task->SetStreamId(type);
+    fTasks->AddAfter((TObject*)where, task);
+    *fLog << "Done." << endl;
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// schedule task for execution, 'type' is the event type which should
+// be processed
+//
+Bool_t MTaskList::AddToList(MTask *task, const char *type)
+{
+    // FIXME: We agreed to put the task into list in an ordered way.
+
+    if (!CheckAddToList(task, type))
+        return kFALSE;
+
+    *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << type << "... " << flush;
     task->SetStreamId(type);
     fTasks->Add(task);
-
     *fLog << "Done." << endl;
 
@@ -325 +368 @@
         *fLog << all << task->GetName() << "... " << flush;
 
-        if (CheckClassForProcess(task->IsA()))
-            fTasksProcess.Add(task);
-
         //
         // PreProcess the task and check for it's return value.
@@ -350 +390 @@
 
     *fLog << all << endl;
+
+    Next.Reset();
+
+    //
+    // loop over all tasks for preproccesing
+    //
+    while ((task=(MTask*)Next()))
+        if (CheckClassForProcess(task->IsA()))
+            fTasksProcess.Add(task);
 
     return kTRUE;

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -35 +35 @@
     void StreamPrimitive(ofstream &out) const;
 
+    Bool_t CheckAddToList(MTask *task, const char *tType, const MTask *where=NULL) const;
+
 public:
     MTaskList(const char *name=NULL, const char *title=NULL);
@@ -43 +45 @@
     void SetLogStream(MLog *log);
 
-    Bool_t AddToList(MTask *task, const char *tType="All", MTask *where = NULL);
+    Bool_t AddToListBefore(MTask *task, const MTask *where, const char *tType="All");
+    Bool_t AddToListAfter(MTask *task, const MTask *where, const char *tType="All");
+    Bool_t AddToList(MTask *task, const char *tType="All");
 
     TObject *FindObject(const char *name) const;