Changeset 3957 for trunk/MagicSoft/Mars/mbase

Timestamp:

05/04/04 15:27:25 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

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

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -149 +149 @@
     //
 #ifdef _REENTRANT
-    fMuxGui = new TMutex;
+    fMuxGui    = new TMutex;
+    fMuxStream = new TMutex;
 #endif
 
@@ -213 +214 @@
     delete fPlugins;
 #ifdef _REENTRANT
+    delete fMuxStream;
     delete fMuxGui;
 #endif
@@ -359 +361 @@
 
     // lock mutex
-    Lock("UpdateGui");
+    LockUpdate("UpdateGui");
 
     TGText &txt=*fGui->GetText();
@@ -387 +389 @@
 
     // release mutex
-    UnLock("UpdateGui");
+    UnLockUpdate("UpdateGui");
+}
+
+void MLog::LockUpdate(const char *msg)
+{
+#ifdef _REENTRANT
+    if (fMuxGui->Lock()==13)
+        Error("LockUpdate", "%s - mutex is already locked by this thread\n", msg);
+#endif
+}
+
+void MLog::UnLockUpdate(const char *msg)
+{
+#ifdef _REENTRANT
+    if (fMuxGui->UnLock()==13)
+        Error("UnLockUpdate", "%s - tried to unlock mutex locked by other thread\n", msg);
+#endif
 }
 
@@ -393 +411 @@
 {
 #ifdef _REENTRANT
-    if (fMuxGui->Lock()==13)
+    if (fMuxStream->Lock()==13)
         Error("Lock", "%s - mutex is already locked by this thread\n", msg);
 #endif
@@ -401 +419 @@
 {
 #ifdef _REENTRANT
-    if (fMuxGui->UnLock()==13)
+    if (fMuxStream->UnLock()==13)
         Error("UnLock", "%s - tried to unlock mutex locked by other thread\n", msg);
 #endif
@@ -412 +430 @@
 int MLog::sync()
 {
-    Lock("sync");
+    LockUpdate("sync");
     WriteBuffer();
-    UnLock("sync");
+    UnLockUpdate("sync");
 
     if (fDevice&eStdout)
@@ -448 +466 @@
     if (fOutputLevel <= fDebugLevel)
     {
-        Lock("overflow");
+        LockUpdate("overflow");
 
         *fPPtr++ = (char)i;
@@ -455 +473 @@
             WriteBuffer();
 
-        UnLock("overflow");
+        UnLockUpdate("overflow");
     }
 

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -71 +71 @@
 #ifdef _REENTRANT
     TMutex *fMuxGui;          //! Mutex locking access of TGListBox
+    TMutex *fMuxStream;       //! Mutex locking access to streaming
 #endif
 
@@ -102 +103 @@
     ~MLog();
 
-    void Lock(const char *msg);
-    void UnLock(const char *msg);
+    void LockUpdate(const char *msg);
+    void UnLockUpdate(const char *msg);
+
+    void Lock(const char *msg="");
+    void UnLock(const char *msg="");
 
     void EnableDirectGui()  { fIsDirectGui = kTRUE; }