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

posix: epicsThreadCreateOpt() avoid leak of joinable on EPERM

Browse Source 
On a system where RT priorities have been probed.
When creating a joinable thread, but still fails
with EPERM, the first epicsThreadOSD was leaked.
This commit is contained in:
Michael Davidsaver
2024-06-11 12:23:52 -07:00
committed by Andrew Johnson
parent 78b575f487
commit 012139638d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -615,6 +615,10 @@ epicsThreadCreateOpt(const char * name,
start_routine, pthreadInfo);
if (status==EPERM) {
/* Try again without SCHED_FIFO*/
if (pthreadInfo->joinable) {
int cnt = epicsAtomicDecrIntT(&pthreadInfo->refcnt);
assert(cnt==1);
}
free_threadInfo(pthreadInfo);
pthreadInfo = init_threadInfo(name, opts->priority, stackSize,
@ -630,12 +634,15 @@ epicsThreadCreateOpt(const char * name,
if (status) {
if (pthreadInfo->joinable) {
/* release extra ref which would have been for epicsThreadMustJoin() */
epicsAtomicDecrIntT(&pthreadInfo->refcnt);
int cnt = epicsAtomicDecrIntT(&pthreadInfo->refcnt);
assert(cnt==1);
}
free_threadInfo(pthreadInfo);
return 0;
}
/* New thread starting and is now responsible for one free_threadInfo().
* If joinable, then caller responsible for arranging one epicsThreadMustJoin()
*/
status = pthread_sigmask(SIG_SETMASK, &oldSig, NULL);
checkStatusOnce(status, "pthread_sigmask");