Changeset 2454 for trunk/MagicSoft/Mars/mbase

Timestamp:

11/03/03 15:41:36 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

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

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -75 +75 @@
 #include <TTime.h>          // TTime
 #include <TFile.h>          // gFile
+#include <TThread.h>        // TThread::Self()
 #include <TDatime.h>        // TDatime
 #include <TSystem.h>        // gSystem
@@ -372 +373 @@
         fProgress->SetPosition(num/fNumEvents);
 
-    //
-    // Handle GUI events (display changes)
-    //
+
+    // FIXME: This is a workaround, because TApplication::Run is not
+    //        thread safe against ProcessEvents. We assume, that if
+    //        we are not in the Main-Thread ProcessEvents() is
+    //        called by the TApplication Event Loop...
+    if (!TThread::Self()/*gApplication->InheritsFrom(TRint::Class())*/)
+    {
+        //
+        // Handle GUI events (display changes)
+        //
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,02,06)
-    gSystem->ProcessEvents();
+        gSystem->ProcessEvents();
 #else
-    // FIXME: This is a workaround, because TApplication::Run is not thread safe against ProcessEvents
-    if (gApplication->InheritsFrom(TRint::Class()))
-    {
         if (fDisplay)
             gSystem->ProcessEvents();
@@ -386 +391 @@
             if (fProgress)
                 gClient->ProcessEventsFor(fProgress);
-    }
 #endif
+    }
 
     return rc;
@@ -485 +490 @@
         //fProgress->SetPosition(maxcnt>0 ? TMath::Min(maxcnt, entries) : entries);
         fProgress->SetPosition(1);
-        // FIXME: This is a workaround, because TApplication::Run is not thread safe against ProcessEvents
-        if (gApplication->InheritsFrom(TRint::Class()))
+
+        // FIXME: This is a workaround, because TApplication::Run is not
+        //        thread safe against ProcessEvents. We assume, that if
+        //        we are not in the Main-Thread ProcessEvents() is
+        //        called by the TApplication Event Loop...
+        if (!TThread::Self()/*gApplication->InheritsFrom(TRint::Class())*/)
         {
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,02,06)

trunk/MagicSoft/Mars/mbase/MTask.h

@@ -71 +71 @@
     virtual void PrintStatistics(const Int_t lvl=0, Bool_t title=kFALSE) const;
 
-    UInt_t GetNumExecutions() { return fNumExecutions; }
+    UInt_t GetNumExecutions() const { return fNumExecutions; }
 
     virtual Bool_t ReInit(MParList *pList);

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -308 +308 @@
         if (!task->ReInit(pList?pList:fParList))
         {
-            *fLog << err << "ERROR - ReInit if Task " << task->GetDescriptor() << " failed." << endl;
+            *fLog << err << "ERROR - ReInit of Task '" << task->GetDescriptor() << "' failed." << endl;
             return kFALSE;
         }