Changeset 4253 for trunk/MagicSoft

Timestamp:

06/01/04 16:24:08 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MLog.cc (modified) (4 diffs)
• MLog.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -361 +361 @@
 
     // lock mutex
-    LockUpdate("UpdateGui");
+    if (!LockUpdate("UpdateGui"))
+    {
+        Warning("UpdateGui", "Execution skipped");
+        return;
+    }
 
     TGText &txt=*fGui->GetText();
@@ -392 +396 @@
 }
 
-void MLog::LockUpdate(const char *msg)
+bool 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)
+    {
+        Info("LockUpdate", "%s - mutex is already locked by this thread\n", msg);
+        return false;
+    }
+    return true;
+#endif
+}
+
+bool 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
-}
-
-void MLog::Lock(const char *msg)
+    {
+        Info("UnLockUpdate", "%s - tried to unlock mutex locked by other thread\n", msg);
+        return false;
+    }
+    return true;
+#endif
+}
+
+bool MLog::Lock(const char *msg)
 {
 #ifdef _REENTRANT
     if (fMuxStream->Lock()==13)
+    {
         Error("Lock", "%s - mutex is already locked by this thread\n", msg);
-#endif
-}
-
-void MLog::UnLock(const char *msg)
+        return false;
+    }
+//    while (fMuxStream->Lock()==13)
+//        usleep(1);
+//    {
+//        Error("Lock", "%s - mutex is already locked by this thread\n", msg);
+//        return false;
+//    }
+    return true;
+#endif
+}
+
+bool MLog::UnLock(const char *msg)
 {
 #ifdef _REENTRANT
     if (fMuxStream->UnLock()==13)
+    {
         Error("UnLock", "%s - tried to unlock mutex locked by other thread\n", msg);
+        return false;
+    }
+    return true;
 #endif
 }
@@ -430 +456 @@
 int MLog::sync()
 {
-    LockUpdate("sync");
+    if (!LockUpdate("sync"))
+        usleep(1);
     WriteBuffer();
     UnLockUpdate("sync");
@@ -466 +493 @@
     if (fOutputLevel <= fDebugLevel)
     {
-        LockUpdate("overflow");
+        if (!LockUpdate("overflow"))
+            usleep(1);
 
         *fPPtr++ = (char)i;

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -103 +103 @@
     ~MLog();
 
-    void LockUpdate(const char *msg);
-    void UnLockUpdate(const char *msg);
-
-    void Lock(const char *msg="");
-    void UnLock(const char *msg="");
+    bool LockUpdate(const char *msg);
+    bool UnLockUpdate(const char *msg);
+
+    bool Lock(const char *msg="");
+    bool UnLock(const char *msg="");
 
     void EnableDirectGui()  { fIsDirectGui = kTRUE; }