Merge pull request #18756 from richardkchapman/mutex

HPCC-31981 Mutex code was inefficient Reviewed-by: Gavin Halliday <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Jun 19, 2024 · be024c6 · be024c6
2 parents 64b36aa + 501ef6d
commit be024c6
Show file tree

Hide file tree

Showing 12 changed files with 129 additions and 354 deletions.
diff --git a/deployment/deploy/DeployTask.cpp b/deployment/deploy/DeployTask.cpp
@@ -752,7 +752,7 @@ class CDeployTask : public CInterface, implements IDeployTask
          // Prompt to retry on error
          m_errorString.appendf("Cannot copy %s to %s: ", source, target);
 
-         synchronized block(s_monitor);
+         MonitorBlock block(s_monitor);
          if (m_pCallback->getAbortStatus())//has some other thread set the global abort flag?
            break; //go back to beginning of loop where we exit on abort
 
@@ -822,7 +822,7 @@ class CDeployTask : public CInterface, implements IDeployTask
 
      if (m_msgBoxOwner)//did this thread show the message box in last iteration of this loop?
      {
-       synchronized block(s_monitor);
+       MonitorBlock block(s_monitor);
        s_msgBoxActive = false;
        m_msgBoxOwner = false;//up for grabs by other threads
        s_monitor.notifyAll();

diff --git a/esp/esplib/pqueue.hpp b/esp/esplib/pqueue.hpp
diff --git a/system/jlib/jlog.cpp b/system/jlib/jlog.cpp
@@ -1437,7 +1437,7 @@ bool CLogMsgManager::MsgProcessor::flush(unsigned timeout)
         return false;
     try
     {
-        synchronized block(pullCycleMutex, timeout+start-now);
+        TimedMutexBlock block(pullCycleMutex, timeout+start-now);
     }
     catch(IException * e)
     {

diff --git a/system/jlib/jlog.ipp b/system/jlib/jlog.ipp
@@ -722,7 +722,7 @@ private:
         CallbackInterThreadQueueOf<LogMsg, MsgProcessor, false> q;
         unsigned droppingLimit;
         unsigned numToDrop = 1;
-        Mutex pullCycleMutex;
+        TimedMutex pullCycleMutex;
     };
     Owned<MsgProcessor> processor;