epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Run epicsThreadTest::testJoining with different priorities

Browse Source 
A problem in the VxWorks epicsThreadMustJoin() only occurs when
the joining thread runs at a higher priority than its supervisor.
This commit is contained in:
Andrew Johnson
2020-01-02 16:22:35 -06:00
parent 3b20e71da5
commit 06728e0e0b
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/libcom/test/epicsThreadTest.cpp
View File

@@ -151,18 +151,26 @@ void joinTests(void *arg)
void testJoining()
{
epicsThreadOpts opts = EPICS_THREAD_OPTS_INIT;
epicsThreadOpts opts1 = EPICS_THREAD_OPTS_INIT;
epicsThreadOpts opts2 = EPICS_THREAD_OPTS_INIT;
epicsEvent finished, trigger;
struct joinStuff stuff = {
&opts, &trigger, &finished
&opts1, &trigger, &finished
};
opts.priority = 50;
opts.joinable = 1;
epicsThreadCreateOpt("parent", &joinTests, &stuff, &opts);
opts1.priority = 50;
opts2.priority = 40;
opts1.joinable = 1;
opts2.joinable = 1;
epicsThreadCreateOpt("parent", &joinTests, &stuff, &opts2);
// as selfjoin joins itself, we can't.
testOk(finished.wait(10.0), "Join tests completed");
// Thread 'parent' joins itself, so we can't.
testOk(finished.wait(10.0), "Join tests #1 completed");
// Repeat with opposite thread priorities
stuff.opts = &opts2;
epicsThreadCreateOpt("parent", &joinTests, &stuff, &opts1);
testOk(finished.wait(10.0), "Join tests #2 completed");
}
} // namespace
@@ -211,7 +219,7 @@ static void testOkToBlock()
MAIN(epicsThreadTest)
{
testPlan(13);
testPlan(15);
unsigned int ncpus = epicsThreadGetCPUs();
testDiag("System has %u CPUs", ncpus);