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

epicsThreadJoin() -> epicsThreadMustJoin()

Browse Source
This commit is contained in:
Michael Davidsaver
2019-06-23 07:30:48 -07:00
parent e8db975e7f
commit 5efce9ecc0
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/libcom/src/osi/epicsThread.cpp
View File

@@ -158,7 +158,7 @@ bool epicsThread::exitWait ( const double delay ) throw ()
epicsGuard < epicsMutex > guard ( this->mutex );
joined = true;
}
epicsThreadJoin(this->id);
epicsThreadMustJoin(this->id);
}
return true;
}
@@ -177,7 +177,7 @@ bool epicsThread::exitWait ( const double delay ) throw ()
joined = true;
epicsGuardRelease < epicsMutex > unguard ( guard );
epicsThreadJoin(this->id);
epicsThreadMustJoin(this->id);
}
}
catch ( std :: exception & except ) {

2
modules/libcom/src/osi/epicsThread.h
View File

@@ -89,7 +89,7 @@ epicsShareFunc epicsThreadId epicsShareAPI epicsThreadCreate (
epicsShareFunc epicsThreadId epicsShareAPI epicsThreadMustCreate (
const char * name, unsigned int priority, unsigned int stackSize,
EPICSTHREADFUNC funptr,void * parm );
epicsShareFunc void epicsThreadJoin(epicsThreadId id);
epicsShareFunc void epicsThreadMustJoin(epicsThreadId id);
epicsShareFunc void epicsShareAPI epicsThreadSuspendSelf(void);
epicsShareFunc void epicsShareAPI epicsThreadResume(epicsThreadId id);
epicsShareFunc unsigned int epicsShareAPI epicsThreadGetPriority(

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

@@ -363,7 +363,7 @@ threadMustCreate (const char *name,
return tid;
}
void epicsThreadJoin(epicsThreadId id)
void epicsThreadMustJoin(epicsThreadId id)
{
rtems_id target_tid = (rtems_id)id, self_tid;
struct taskVar *v;
@@ -389,7 +389,7 @@ void epicsThreadJoin(epicsThreadId id)
cantProceed("oopsj %s\n", rtems_status_text(sc));
if(sc != RTEMS_SUCCESSFUL) {
errlogPrintf("epicsThreadJoin('%s') -> %s\n", v->name, rtems_status_text(sc));
errlogPrintf("epicsThreadMustJoin('%s') -> %s\n", v->name, rtems_status_text(sc));
}
}

2
modules/libcom/src/osi/os/WIN32/osdThread.c
View File

@@ -662,7 +662,7 @@ epicsThreadId epicsThreadCreateOpt (
return ( epicsThreadId ) pParmWIN32;
}
void epicsThreadJoin(epicsThreadId id)
void epicsThreadMustJoin(epicsThreadId id)
{
win32ThreadParam * pParmWIN32 = id;

4
modules/libcom/src/osi/os/posix/osdThread.c
View File

@@ -557,7 +557,7 @@ epicsThreadCreateOpt (
status = pthread_sigmask(SIG_SETMASK,&oldSig,NULL);
checkStatusOnce(status,"pthread_sigmask");
if(pthreadInfo->joinable) {
/* extra ref for epicsThreadJoin() */
/* extra ref for epicsThreadMustJoin() */
epicsAtomicIncrIntT(&pthreadInfo->refcnt);
}
return(pthreadInfo);
@@ -600,7 +600,7 @@ static epicsThreadOSD *createImplicit(void)
return pthreadInfo;
}
void epicsThreadJoin(epicsThreadId id)
void epicsThreadMustJoin(epicsThreadId id)
{
void *ret = NULL;
int status;

2
modules/libcom/src/osi/os/vxWorks/osdThread.c
View File

@@ -223,7 +223,7 @@ epicsThreadCreateOpt (
return((epicsThreadId)tid);
}
void epicsThreadJoin(epicsThreadId id) {
void epicsThreadMustJoin(epicsThreadId id) {
#if EPICS_THREAD_CAN_JOIN
int tid = (int)id;