Changeset 2519

Timestamp:

11/17/03 14:29:54 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• NEWS (modified) (1 diff)
• mbase/MLog.cc (modified) (15 diffs)
• mbase/MLog.h (modified) (6 diffs)
• mbase/MStatusDisplay.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -3 +3 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2003/11/17: Thomas Bretz
+ 
+   * mbase/MLog.cc:
+     - replaced pthread_mutex by a TMutex
+     - renamed fgui to fGui
+     - renamed fout to fOut
+     
+   * mbase/MStatusDisplay.cc:
+     - removed ==13 using TryLock() (this was wrong)
+
+
+
  2003/11/15: Thomas Bretz, Abelardo Moralejo
+
+   REMARK: These changes are preliminary! I want to implement a
+           more straight forward solution piping fSerialNumber
+           when calling SetupFill(). Don't relay on the current
+           code!
 
    * mhist/MH.h: 
@@ -19 +36 @@
    * NEWS: 
      - updated.
+
+
 
  2003/11/14: Abelardo Moralejo
@@ -28 +47 @@
        The change consists in the addittion in MF::IsAlNum of ';' as 
        a possible alphanumeric character in the string.
+
+
 
  2003/11/13: Thomas Bretz

trunk/MagicSoft/Mars/NEWS

@@ -5 +5 @@
      multi-telescope files which can be produced with the coming
      camera version 0.7.
+
+
 
  *** Version 0.8.2 (2003/11/10)

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -101 +101 @@
 
 #ifdef _REENTRANT
-// FIXME: Replace Mutex by TMutex
-#include <pthread.h>
+#include <TMutex.h>
 #endif
 #include <TGTextView.h>
@@ -148 +147 @@
     // Creat drawing semaphore
     //
-    fMuxGui = new pthread_mutex_t;
-    pthread_mutex_init((pthread_mutex_t*)fMuxGui, NULL);
+    fMuxGui = new TMutex;
 #endif
 }
@@ -158 +156 @@
 // which is used for the output (i)
 //
-MLog::MLog(int i) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(i), fIsNull(kFALSE), fout(NULL), fOutAllocated(kFALSE), fgui(NULL), fNumLines(0)
+MLog::MLog(int i) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(i), fIsNull(kFALSE), fOut(NULL), fOutAllocated(kFALSE), fGui(NULL), fNumLines(0)
 {
     Init();
@@ -168 +166 @@
 // ofstream as the default output device
 //
-MLog::MLog(ofstream &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fout(&out), fOutAllocated(kFALSE), fgui(NULL), fNumLines(0)
+MLog::MLog(ofstream &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fOut(&out), fOutAllocated(kFALSE), fGui(NULL), fNumLines(0)
 {
     Init();
@@ -178 +176 @@
 // TGTextView as the default output device
 //
-MLog::MLog(TGTextView &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eGui), fout(NULL), fOutAllocated(kFALSE), fgui(&out), fNumLines(0)
+MLog::MLog(TGTextView &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eGui), fOut(NULL), fOutAllocated(kFALSE), fGui(&out), fNumLines(0)
 {
     Init();
@@ -189 +187 @@
 // or not.
 //
-MLog::MLog(const char *fname, int flag) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fgui(NULL), fNumLines(0)
+MLog::MLog(const char *fname, int flag) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fGui(NULL), fNumLines(0)
 {
     Init();
@@ -205 +203 @@
     DeallocateFile();
 #ifdef _REENTRANT
-    pthread_mutex_destroy((pthread_mutex_t*)fMuxGui);
+    delete fMuxGui;
 #endif
 }
@@ -310 +308 @@
         Output(cerr, len);
 
-    if (fDevice&eFile && fout)
-        fout->write(fBase, len);
-
-    if (fDevice&eGui && fgui)
+    if (fDevice&eFile && fOut)
+        fOut->write(fBase, len);
+
+    if (fDevice&eGui && fGui)
     {
         // check whether the current text was flushed or endl'ed
@@ -348 +346 @@
     Lock();
 
-    TGText &txt=*fgui->GetText();
+    TGText &txt=*fGui->GetText();
 
     // copy lines to TGListBox
@@ -367 +365 @@
 
     // show last entry
-    fgui->Layout();
-    fgui->SetVsbPosition(txt.RowCount()-1);
+    fGui->Layout();
+    fGui->SetVsbPosition(txt.RowCount()-1);
 
     // tell a main loop, that list box contents have changed
-    fgui->SetBit(kHasChanged);
+    fGui->SetBit(kHasChanged);
 
     // release mutex
@@ -380 +378 @@
 {
 #ifdef _REENTRANT
-    pthread_mutex_lock((pthread_mutex_t*)fMuxGui);
+    fMuxGui->Lock();
 #endif
 }
@@ -387 +385 @@
 {
 #ifdef _REENTRANT
-    pthread_mutex_unlock((pthread_mutex_t*)fMuxGui);
+    fMuxGui->UnLock();
 #endif
 }
@@ -411 +409 @@
         cerr.flush();
 
-    if (fDevice&eFile && fout)
-        fout->flush();
+    if (fDevice&eFile && fOut)
+        fOut->flush();
 
     return 0;
@@ -455 +453 @@
     // gcc 3.2:
     char *txt = (char*)"logXXXXXX";
-    fout = fname ? new ofstream(fname) : new ofstream(/*mkstemp(*/txt/*)*/);
+    fOut = fname ? new ofstream(fname) : new ofstream(/*mkstemp(*/txt/*)*/);
     fOutAllocated = kTRUE;
 }
@@ -467 +465 @@
 {
     if (fOutAllocated)
-        delete fout;
+        delete fOut;
 }
 

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -13 +13 @@
 #define bsz    160 // two standard lines
 
+class TMutex;
 class TGTextView;
 
@@ -57 +58 @@
     Bool_t fIsNull;           //! Switch output completely off
 
-    ofstream   *fout;          //! possible file output stream
+    ofstream   *fOut;          //! possible file output stream
     Bool_t      fOutAllocated; //! flag if fout is created by MLogging
-    TGTextView *fgui;          //! Text View output
+    TGTextView *fGui;          //! Text View output
 
     Bool_t     fIsDirectGui;  //! Pipe text directly to the GUI (for single threaded environments)
@@ -67 +68 @@
 
 #ifdef _REENTRANT
-    void *fMuxGui;            //! Mutex locking access of TGListBox
+    TMutex *fMuxGui;          //! Mutex locking access of TGListBox
 #endif
 
@@ -119 +120 @@
     void SetOutputGui(TGTextView *out, int flag=-1)
     {
-        fgui = out;
+        fGui = out;
         CheckFlag(eGui, flag);
     }
@@ -133 +134 @@
         //
         DeallocateFile();
-        fout = &out;
+        fOut = &out;
         CheckFlag(eFile, flag);
     }
@@ -162 +163 @@
         // I would implement a GetFileName-function, too.
         //
-        if (!fout)
+        if (!fOut)
             ReallocateFile(NULL);
-        return *fout;
+        return *fOut;
     }
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -894 +894 @@
     // in the same thread
     //
-    if (fMutex->TryLock()==13)
+    if (fMutex->TryLock())
         return;