Skip to content

Commit

Permalink
Changes following review
Browse files Browse the repository at this point in the history 
Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
  • Loading branch information
@ghalliday
ghalliday committed Jan 8, 2025
1 parent 48b7e69 commit cd3fbd6
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 19 deletions.
3 changes: 1 addition & 2 deletions common/workunit/wujobq.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1269,9 +1269,8 @@ class CJobQueue: public CJobQueueBase, implements IJobQueue
Owned<IJobQueueItem> item;
if (prioritytransitiondelay)
{
unsigned timeout = prioritytransitiondelay;
bool usePrevPrio = true;
item.setown(dodequeue(minPrio, timeout, usePrevPrio, nullptr));
item.setown(dodequeue(minPrio, prioritytransitiondelay, usePrevPrio, nullptr));
}
if (!item)
item.setown(dodequeue(minPrio, timeout-prioritytransitiondelay, false, nullptr));
Expand Down
54 changes: 37 additions & 17 deletions testing/unittests/dalitests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3269,20 +3269,20 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( DaliSysInfoLoggerTester, "DaliSysInfoLogg


static constexpr bool traceJobQueue = false;
static unsigned jobQueueStartTick;
static unsigned jobQueueStartTick = 0;
//The following allows the tests to be slowed down to make it easier to debug problems
static constexpr unsigned tickScaling = 1;
static unsigned getJobQueueTick()
{
return (msTick() - jobQueueStartTick) / tickScaling;
}
static void JobQueueSleep(unsigned ms)
static void jobQueueSleep(unsigned ms)
{
MilliSleep(ms * tickScaling);
}
class JobQueueTester : public CppUnit::TestFixture
class DaliJobQueueTester : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE(JobQueueTester);
CPPUNIT_TEST_SUITE(DaliJobQueueTester);
CPPUNIT_TEST(testInit);
CPPUNIT_TEST(testSingle);
CPPUNIT_TEST(testDouble);
Expand All @@ -3303,8 +3303,8 @@ class JobQueueTester : public CppUnit::TestFixture
public:
JobProcessor(Semaphore & _startedSem, Semaphore & _processedSem, IJobQueue * _queue, unsigned _id)
: startedSem(_startedSem), processedSem(_processedSem), queue(_queue), id(_id)
{
}
{
}

virtual int run() override
{
Expand Down Expand Up @@ -3333,7 +3333,7 @@ class JobQueueTester : public CppUnit::TestFixture
log.append(",");
log.append(name).append("@").append(getJobQueueTick());
unsigned delay = item->getPort();
JobQueueSleep(delay);
jobQueueSleep(delay);
processedSem.signal();
return true;
}
Expand Down Expand Up @@ -3453,7 +3453,7 @@ class JobQueueTester : public CppUnit::TestFixture

void runTestCase(const char * name, const std::initializer_list<JobEntry> & jobs, const std::initializer_list<JobProcessorType> & processors, const std::initializer_list<const char *> & expectedResults, bool uniqueQueues)
{
Owned<IJobQueue> queue = createJobQueue("JobQueueTester");
Owned<IJobQueue> queue = createJobQueue("DaliJobQueueTester");
Semaphore startedSem;
Semaphore processedSem;

Expand All @@ -3465,7 +3465,7 @@ class JobQueueTester : public CppUnit::TestFixture
IJobQueue * processorQueue = queue;
if (uniqueQueues)
{
localQueue.setown(createJobQueue("JobQueueTester"));
localQueue.setown(createJobQueue("DaliJobQueueTester"));
processorQueue = localQueue;
}

Expand Down Expand Up @@ -3494,7 +3494,7 @@ class JobQueueTester : public CppUnit::TestFixture
jobQueueStartTick = msTick();
for (auto & job : jobs)
{
JobQueueSleep(job.delayMs);
jobQueueSleep(job.delayMs);
if (traceJobQueue)
DBGLOG("Add (%s, %d, %d) @%u", job.name, job.delayMs, job.processingMs, getJobQueueTick());
Owned<IJobQueueItem> item = createJobQueueItem(job.name);
Expand Down Expand Up @@ -3527,8 +3527,28 @@ class JobQueueTester : public CppUnit::TestFixture
{
JobProcessor & cur = jobProcessors.item(i3);
DBGLOG(" Result: '%s' '%s'", cur.queryOutput(), cur.queryLog());
// if (i3 < expectedResults.size())
// CPPUNIT_ASSERT_EQUAL(std::string(expectedResults.begin()[i3]), std::string(cur.queryOutput()));

//If expected results are provided, check that the result matches one of them (it is undefined which
//processor will match which result)
if (expectedResults.size())
{
bool matched = false;
StringBuffer expectedText;
for (auto & expected : expectedResults)
{
if (streq(expected, cur.queryOutput()))
{
matched = true;
break;
}
expectedText.append(", ").append(expected);
}
if (!matched)
{
DBGLOG("Result does not match any expected: %s", expectedText.str()+2);
CPPUNIT_ASSERT_MESSAGE("Result does not match any of the expected results", false);
}
}
}
}

Expand Down Expand Up @@ -3630,9 +3650,9 @@ class JobQueueTester : public CppUnit::TestFixture
void testDouble()
{
runTestCaseX2("2 wu, 2 standard", twoWuTest, { StandardProcessor, StandardProcessor }, { "abcd", "ABCD" });
runTestCaseX2("lo hi wu, 2 standard", lowHighTest, { StandardProcessor, StandardProcessor }, { "aBDc" "ACbd" });
runTestCaseX2("lo hi2 wu, 2 standard", lowHigh2Test, { StandardProcessor, StandardProcessor }, { "a"});
runTestCaseX2("lo hi2 wu, 2 thor", lowHigh2Test, { ThorProcessor, ThorProcessor }, {});
runTestCaseX2("lo hi wu, 2 standard", lowHighTest, { StandardProcessor, StandardProcessor }, { "abcd", "ABCD" });
runTestCaseX2("lo hi2 wu, 2 standard", lowHigh2Test, { StandardProcessor, StandardProcessor }, { "aBDc", "ACbd" });
runTestCaseX2("lo hi2 wu, 2 thor", lowHigh2Test, { ThorProcessor, ThorProcessor }, { "aBDc", "ACbd" });
runTestCaseX2("lo hi2 wu, 2 newthor", lowHigh2Test, { NewThorProcessor, NewThorProcessor }, {});

runTestCaseX2("lo hi3 wu, 2 thor", lowHigh3Test, { ThorProcessor, ThorProcessor }, {});
Expand All @@ -3648,7 +3668,7 @@ class JobQueueTester : public CppUnit::TestFixture
}
};

CPPUNIT_TEST_SUITE_REGISTRATION( JobQueueTester );
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( JobQueueTester, "JobQueueTester" );
CPPUNIT_TEST_SUITE_REGISTRATION( DaliJobQueueTester );
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( DaliJobQueueTester, "DaliJobQueueTester" );

#endif // _USE_CPPUNIT

0 comments on commit cd3fbd6

Please sign in to comment.