Changeset 1743 for trunk/MagicSoft/Mars

Timestamp:

02/06/03 11:35:56 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MLog.cc (modified) (11 diffs)
• MLog.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -45 +45 @@
 #include <stdlib.h>     // mkstempe
 #include <fstream.h>
+#include <pthread.h>
 #include <TGListBox.h>
 
@@ -68 +69 @@
     setp(&fBuffer, &fBuffer+1);
     *this << '\0';
+
+    //
+    // Creat drawing semaphore
+    //
+    fMuxGui = new pthread_mutex_t;
+    pthread_mutex_init((pthread_mutex_t*)fMuxGui, NULL);
 }
 
@@ -75 +82 @@
 // 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), fGuiLineId(0), fout(NULL), fOutAllocated(kFALSE), fgui(NULL)
+MLog::MLog(int i) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(i), fIsNull(kFALSE), fGuiLineId(0), fout(NULL), fOutAllocated(kFALSE), fgui(NULL), fNumLines(0)
 {
     Init();
@@ -85 +92 @@
 // 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), fGuiLineId(0),  fout(&out), fOutAllocated(kFALSE), fgui(NULL)
+MLog::MLog(ofstream &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fGuiLineId(0),  fout(&out), fOutAllocated(kFALSE), fgui(NULL), fNumLines(0)
 {
     Init();
@@ -95 +102 @@
 // TGListBox as the default output device
 //
-MLog::MLog(TGListBox &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eGui), fGuiLineId(0),  fout(NULL), fOutAllocated(kFALSE), fgui(&out)
+MLog::MLog(TGListBox &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eGui), fGuiLineId(0),  fout(NULL), fOutAllocated(kFALSE), fgui(&out), fNumLines(0)
 {
     Init();
@@ -106 +113 @@
 // 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), fGuiLineId(0),  fgui(NULL)
+MLog::MLog(const char *fname, int flag) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fGuiLineId(0),  fgui(NULL), fNumLines(0)
 {
     Init();
@@ -112 +119 @@
     AllocateFile(fname);
     CheckFlag(eFile, flag);
+}
+
+// --------------------------------------------------------------------------
+//
+//  Destructor, destroying the gui mutex.
+//
+MLog::~MLog()
+{
+    DeallocateFile();
+    pthread_mutex_destroy((pthread_mutex_t*)fMuxGui);
 }
 
@@ -153 +170 @@
     if (fDevice&eGui && fgui)
     {
+        char **newstr = new char*[fNumLines+1];
+
+        for (int i=0; i<fNumLines; i++)
+            newstr[i] = fGuiLines[i];
+
+        if (fNumLines>0)
+            delete fGuiLines;
+
         char *dummy = new char[len];
         memcpy(dummy, fBase, len-1);
-        *(dummy+len-1)='\0';
-        fgui->AddEntry(dummy, fGuiLineId);
-        fgui->SetTopEntry(fGuiLineId++);
-        fgui->SetBit(kHasChanged);
-        delete dummy;
+        dummy[len-1]='\0';
+
+        newstr[fNumLines++] = dummy;
+
+        fGuiLines = newstr;
     }
 }
 
+void MLog::UpdateGui()
+{
+    if (fNumLines==0)
+        return;
+
+    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;
+
+    fgui->SetTopEntry(fGuiLineId-1);
+    fgui->SetBit(kHasChanged);
+
+    UnLock();
+}
+
+void MLog::Lock()
+{
+    pthread_mutex_lock((pthread_mutex_t*)fMuxGui);
+}
+
+void MLog::UnLock()
+{
+    pthread_mutex_unlock((pthread_mutex_t*)fMuxGui);
+}
+
 // --------------------------------------------------------------------------
 //
@@ -169 +232 @@
 int MLog::sync()
 {
+    Lock();
     WriteBuffer();
+    UnLock();
 
     if (fDevice&eStdout)
@@ -197 +262 @@
     // no output if
     //
-    if (fOutputLevel > fDebugLevel)
-        return 0;
-
-    *fPPtr++ = (char)i;
-
-    if (fPPtr == fEPtr)
-        WriteBuffer();
+    if (fOutputLevel <= fDebugLevel)
+    {
+        Lock();
+
+        *fPPtr++ = (char)i;
+
+        if (fPPtr == fEPtr)
+            WriteBuffer();
+
+        UnLock();
+    }
 
     return 0;
@@ -215 +284 @@
 void MLog::AllocateFile(const char *fname)
 {
-    fout = fname ? new ofstream(fname) : new ofstream(mkstemp("logXXXXXX"));
+    char *txt = (char*)"logXXXXXX";
+    fout = fname ? new ofstream(fname) : new ofstream(mkstemp(txt));
     fOutAllocated = kTRUE;
 }

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -40 +40 @@
     TGListBox *fgui;          //! Listbox output
 
+    Bool_t fIsDirectGui;      //! Pipe text directly to the GUI (for single threaded environments)
+    char   **fGuiLines;      //! Lines to pipe to gui
+    Int_t     fNumLines;
+
+    void *fMuxGui;            //! Mutex locking access of TGListBox
+
     void Init();
 
@@ -58 +64 @@
 
     MLog(MLog &log);
+    ~MLog();
 
-    ~MLog()
-    {
-        DeallocateFile();
-    }
+    void Lock();
+    void UnLock();
+
+    void EnableDirectGui()  { fIsDirectGui = kTRUE; }
+    void DisableDirectGui() { fIsDirectGui = kFALSE; }
+    void UpdateGui();
 
     void SetDebugLevel(int i)           { fDebugLevel  =  i;  }
-    int GetDebugLevel() const           { return fDebugLevel; }
+    int  GetDebugLevel() const          { return fDebugLevel; }
     void SetOutputLevel(int i)          { fOutputLevel =  i;  }
     void SetOutputDevice(int i)         { fDevice      =  i;  }