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

epicsThreadMustJoin() warn only on double self-join

Browse Source
This commit is contained in:
Michael Davidsaver
2019-06-23 08:56:32 -07:00
parent 86a942872a
commit 32b3eddb94
4 changed files with 108 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,11 +18,14 @@
#include <math.h>
#include "epicsThread.h"
#include "epicsEvent.h"
#include "epicsTime.h"
#include "errlog.h"
#include "epicsUnitTest.h"
#include "testMain.h"
namespace {
static epicsThreadPrivate<int> privateKey;
class myThread: public epicsThreadRunable {
@@ -60,35 +63,8 @@ void myThread::run()
testOk1(thread.getPriority() == epicsThreadGetPriority(self));
}
typedef struct info {
int isOkToBlock;
int didSomething;
} info;
extern "C" {
static void thread(void *arg)
void testMyThread()
{
info *pinfo = (info *)arg;
epicsThreadSetOkToBlock(pinfo->isOkToBlock);
testOk(epicsThreadIsOkToBlock() == pinfo->isOkToBlock,
"%s epicsThreadIsOkToBlock() = %d",
epicsThreadGetNameSelf(), pinfo->isOkToBlock);
pinfo->didSomething = 1;
}
}
MAIN(epicsThreadTest)
{
testPlan(11);
unsigned int ncpus = epicsThreadGetCPUs();
testDiag("System has %u CPUs", ncpus);
testOk1(ncpus > 0);
const int ntasks = 3;
myThread *myThreads[ntasks];
@@ -108,6 +84,65 @@ MAIN(epicsThreadTest)
myThreads[i]->thread.exitWait();
delete myThreads[i];
}
}
struct selfJoiner {
epicsEvent finished;
};
void joiner(void *arg) {
epicsEvent *finished = (epicsEvent*)arg;
// This is a no-op
epicsThreadMustJoin(epicsThreadGetIdSelf());
// This is a no-op as well, except for a warning.
eltc(0);
epicsThreadMustJoin(epicsThreadGetIdSelf());
eltc(1);
testPass("Check double self-join");
finished->signal();
}
typedef struct info {
int isOkToBlock;
int didSomething;
} info;
void testSelfJoin()
{
epicsEvent finished;
epicsThreadOpts opts;
epicsThreadOptsDefaults(&opts);
opts.priority = 50;
opts.joinable = 1;
(void)epicsThreadCreateOpt("selfjoin", &joiner, &finished, &opts);
// as this thread "joins" itself, we can't.
finished.wait();
}
} // namespace
extern "C" {
static void thread(void *arg)
{
info *pinfo = (info *)arg;
epicsThreadSetOkToBlock(pinfo->isOkToBlock);
testOk(epicsThreadIsOkToBlock() == pinfo->isOkToBlock,
"%s epicsThreadIsOkToBlock() = %d",
epicsThreadGetNameSelf(), pinfo->isOkToBlock);
pinfo->didSomething = 1;
}
}
static void testOkToBlock()
{
epicsThreadOpts opts;
epicsThreadOptsDefaults(&opts);
@@ -127,5 +162,20 @@ MAIN(epicsThreadTest)
epicsThreadMustJoin(threadA);
testOk1(infoA.didSomething);
}
MAIN(epicsThreadTest)
{
testPlan(12);
unsigned int ncpus = epicsThreadGetCPUs();
testDiag("System has %u CPUs", ncpus);
testOk1(ncpus > 0);
testMyThread();
testSelfJoin();
testOkToBlock();
return testDone();
}