HPCC-31545 Thread pool wait time reporting

Signed-off-by: Mark Kelly <[email protected]>
hpcc-systems · Mar 28, 2024 · 9aade6b · 9aade6b
1 parent ca74c00
commit 9aade6b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/system/jlib/jthread.cpp b/system/jlib/jthread.cpp
@@ -1006,7 +1006,16 @@ class CThreadPool: public CThreadPoolBase, implements IThreadPool, public CInter
     PooledThreadHandle _start(void *param,const char *name, bool noBlock, unsigned timeout=0)
     {
         CCycleTimer startTimer;
-        bool timedout = defaultmax && !availsem.wait(noBlock ? 0 : (timeout>0?timeout:delay));
+        bool waited = false;
+        bool timedout = false;
+        if (defaultmax)
+        {
+            waited = !availsem.wait(0);
+            if (noBlock)
+                timedout = waited;
+            else if (waited)
+                timedout = !availsem.wait(timeout>0?timeout:delay);
+        }
         PooledThreadHandle ret;
         {
             CriticalBlock block(crit);
@@ -1023,7 +1032,7 @@ class CThreadPool: public CThreadPoolBase, implements IThreadPool, public CInter
             if (traceStartDelayPeriod)
             {
                 ++startsInPeriod;
-                if (timedout)
+                if (waited)
                 {
                     startDelayInPeriod += startTimer.elapsedCycles();
                     if (overAllTimer.elapsedCycles() >= queryOneSecCycles()*traceStartDelayPeriod) // check avg. delay per minute
@@ -2683,4 +2692,4 @@ void PerfTracer::dostop()
 #else
     UNIMPLEMENTED;
 #endif
-}
+}
diff --git a/thorlcr/slave/slavmain.cpp b/thorlcr/slave/slavmain.cpp
@@ -1185,7 +1185,7 @@ class CKJService : public CSimpleInterfaceOf<IKJService>, implements IThreaded,
     {
         Owned<CProcessorFactory> factory = new CProcessorFactory(*this);
         processorPool.setown(createThreadPool("KJService processor pool", factory, this, keyLookupMaxProcessThreads, 10000));
-        processorPool->setStartDelayTracing(60000);
+        processorPool->setStartDelayTracing(60);
     }
 public:
     IMPLEMENT_IINTERFACE_USING(CSimpleInterfaceOf<IKJService>);