Changeset 1895 for trunk/MagicSoft/Mars/mbase

Timestamp:

04/03/03 11:44:57 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MEvtLoop.cc (modified) (1 diff)
• MLog.cc (modified) (6 diffs)
• MLog.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -106 +106 @@
 {
     fName = name;
+
+    *fLog << inf << "Instantiated MEvtLoop (" << name << "), using ROOT v" << ROOTVER << endl;
 }
 

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -77 +77 @@
 #include <stdlib.h>     // mkstempe
 #include <fstream.h>
+#ifdef _REENTRANT
 #include <pthread.h>
+#endif
 #include <TGListBox.h>
 
@@ -102 +104 @@
     *this << '\0';
 
+#ifdef _REENTRANT
     //
     // Creat drawing semaphore
@@ -107 +110 @@
     fMuxGui = new pthread_mutex_t;
     pthread_mutex_init((pthread_mutex_t*)fMuxGui, NULL);
+#endif
 }
 
@@ -160 +164 @@
 {
     DeallocateFile();
+#ifdef _REENTRANT
     pthread_mutex_destroy((pthread_mutex_t*)fMuxGui);
+#endif
 }
 
@@ -227 +233 @@
     Lock();
 
-//    cout << "/---------------------------------------" << endl;
-
     for (int i=0; i<fNumLines; i++)
     {
         fgui->AddEntry(fGuiLines[i], fGuiLineId++);
-//        cout << fGuiLines[i] << endl;
         delete fGuiLines[i];
     }
 
     delete fGuiLines;
-
-//    cout << "\\---------------------------------------" << endl;
 
     fNumLines=0;
@@ -251 +252 @@
 void MLog::Lock()
 {
+#ifdef _REENTRANT
     pthread_mutex_lock((pthread_mutex_t*)fMuxGui);
+#endif
 }
 
 void MLog::UnLock()
 {
+#ifdef _REENTRANT
     pthread_mutex_unlock((pthread_mutex_t*)fMuxGui);
+#endif
 }
 

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -44 +44 @@
     Int_t     fNumLines;
 
+#ifdef _REENTRANT
     void *fMuxGui;            //! Mutex locking access of TGListBox
+#endif
 
     void Init();