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

posix: use pthread_key_create() to cleanup epicsThreadOSD

Browse Source 
Ensure that cleanup happens for all threads,
including implicitly created.
This commit is contained in:
Michael Davidsaver
2022-05-03 22:41:38 -07:00
parent 3fadf4a26c
commit d019e9787a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,8 +217,9 @@ static epicsThreadOSD * init_threadInfo(const char *name,
return(pthreadInfo);
}
static void free_threadInfo(epicsThreadOSD *pthreadInfo)
static void free_threadInfo(void* raw)
{
epicsThreadOSD *pthreadInfo = raw;
int status;
if(epicsAtomicDecrIntT(&pthreadInfo->refcnt) > 0) return;
@@ -354,7 +355,8 @@ static void once(void)
checkStatusOnce(status, "pthread_atfork");
#endif
pthread_key_create(&getpthreadInfo,0);
checkStatusOnceQuit(pthread_key_create(&getpthreadInfo,&free_threadInfo),
"pthread_key_create","epicsThreadInit");
status = osdPosixMutexInit(&onceLock,PTHREAD_MUTEX_DEFAULT);
checkStatusOnceQuit(status,"osdPosixMutexInit","epicsThreadInit");
status = osdPosixMutexInit(&listLock,PTHREAD_MUTEX_DEFAULT);
@@ -439,7 +441,6 @@ static void * start_routine(void *arg)
(*pthreadInfo->createFunc)(pthreadInfo->createArg);
epicsExitCallAtThreadExits ();
free_threadInfo(pthreadInfo);
return(0);
}
@@ -733,7 +734,6 @@ LIBCOM_API void epicsStdCall epicsThreadExitMain(void)
cantProceed("epicsThreadExitMain");
}
else {
free_threadInfo(pthreadInfo);
pthread_exit(0);
}
}