HPCC-32954 Add unit tests for the jobqueue

Signed-off-by: Gavin Halliday <[email protected]>
hpcc-systems · Nov 19, 2024 · d6dcd8c · d6dcd8c
1 parent 92149e3
commit d6dcd8c
Show file tree

Hide file tree

Showing 4 changed files with 402 additions and 0 deletions.
diff --git a/common/workunit/wujobq.cpp b/common/workunit/wujobq.cpp
@@ -1264,6 +1264,20 @@ class CJobQueue: public CJobQueueBase, implements IJobQueue
     }
 
 
+    IJobQueueItem *dequeue(int minPrio, unsigned timeout, unsigned prioritytransitiondelay) override
+    {
+        Owned<IJobQueueItem> item;
+        if (prioritytransitiondelay)
+        {
+            unsigned timeout = prioritytransitiondelay;
+            bool usePrevPrio = true;
+            item.setown(dodequeue(minPrio, timeout, usePrevPrio, nullptr));
+        }
+        if (!item)
+            item.setown(dodequeue(minPrio, timeout-prioritytransitiondelay, false, nullptr));
+        return item.getClear();
+    }
+
     void placeonqueue(sQueueData &qd, IJobQueueItem *qitem,unsigned idx) // takes ownership of qitem
     {
         Owned<IJobQueueItem> qi = qitem;

diff --git a/common/workunit/wujobq.hpp b/common/workunit/wujobq.hpp
@@ -120,6 +120,7 @@ interface IJobQueue: extends IJobQueueConst
     virtual void connect(bool validateitemsessions)=0;     // must be called before dequeueing
                                                                 // validateitemsessions ensures that all queue items have running session
     virtual IJobQueueItem *dequeue(unsigned timeout=INFINITE)=0;
+    virtual IJobQueueItem *dequeue(int minPrio, unsigned timeout, unsigned prioritytransitiondelay)=0;
     virtual void disconnect()=0;    // signal no longer wil be dequeing (optional - done automatically on release)
     virtual void getStats(unsigned &connected,unsigned &waiting, unsigned &enqueued)=0; // this not quick as validates clients still running
     virtual bool waitStatsChange(unsigned timeout)=0;

diff --git a/testing/unittests/CMakeLists.txt b/testing/unittests/CMakeLists.txt
@@ -78,6 +78,7 @@ include_directories (
          ./../../dali/base
          ./../../system/security/shared
          ./../../common/deftype
+         ./../../common/workunit
          ./../../system/security/cryptohelper
          ./../../configuration/configmgr/configmgrlib
          ${HPCC_SOURCE_DIR}/system/masking/include
@@ -118,6 +119,7 @@ target_link_libraries ( unittests
          esphttp
          esdllib
          logginglib
+         workunit
          ${CppUnit_LIBRARIES}
     )