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

more RTEMS join

Browse Source
This commit is contained in:
Michael Davidsaver
2019-06-23 19:28:03 -07:00
parent 93a96e33c0
commit 14440b2d9d
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/libcom/src/osi/os/RTEMS/osdThread.c
View File

@@ -366,7 +366,7 @@ threadMustCreate (const char *name,
void epicsThreadMustJoin(epicsThreadId id)
{
rtems_id target_tid = (rtems_id)id, self_tid;
struct taskVar *v;
struct taskVar *v = 0;
rtems_task_ident (RTEMS_SELF, 0, &self_tid);
@@ -375,10 +375,11 @@ void epicsThreadMustJoin(epicsThreadId id)
rtems_task_get_note (target_tid, RTEMS_NOTEPAD_TASKVAR, &note);
v = (void *)note;
}
/* 'v' may be NULL if 'id' represents a non-EPICS thread other than _main_. */
if(!v->joinable) {
if(!v || !v->joinable) {
if(epicsThreadGetIdSelf()==id) {
errlogPrintf("Warning: %s thread self-join of unjoinable\n", v->name);
errlogPrintf("Warning: %s thread self-join of unjoinable\n", v ? v->name : "non-EPICS thread");
} else {
/* try to error nicely, however in all likelyhood de-ref of

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

@@ -172,10 +172,17 @@ MAIN(epicsThreadTest)
unsigned int ncpus = epicsThreadGetCPUs();
testDiag("System has %u CPUs", ncpus);
testOk1(ncpus > 0);
testDiag("main() thread %p", epicsThreadGetIdSelf());
testMyThread();
testSelfJoin();
testOkToBlock();
// attempt to self-join from a non-EPICS thread
// to make sure it does nothing as expected
eltc(0);
epicsThreadMustJoin(epicsThreadGetIdSelf());
eltc(1);
return testDone();
}