epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

dbScan: avoid race on shutdown

Browse Source
This commit is contained in:
Michael Davidsaver
2015-07-16 17:05:41 -04:00
parent 138e2f1ad5
commit 8bfa40d858
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ioc/db/dbScan.c
View File

@@ -178,10 +178,6 @@ void scanCleanup(void)
epicsRingPointerDelete(onceQ);
epicsEventDestroy(startStopEvent);
epicsEventDestroy(onceSem);
onceSem = startStopEvent = NULL;
free(periodicTaskId);
papPeriodic = NULL;
periodicTaskId = NULL;
@@ -191,7 +187,8 @@ long scanInit(void)
{
int i;
startStopEvent = epicsEventMustCreate(epicsEventEmpty);
if(!startStopEvent)
startStopEvent = epicsEventMustCreate(epicsEventEmpty);
scanCtl = ctlPause;
initPeriodic();
@@ -643,7 +640,8 @@ static void initOnce(void)
if ((onceQ = epicsRingPointerCreate(onceQueueSize)) == NULL) {
cantProceed("initOnce: Ring buffer create failed\n");
}
onceSem = epicsEventMustCreate(epicsEventEmpty);
if(!onceSem)
onceSem = epicsEventMustCreate(epicsEventEmpty);
onceTaskId = epicsThreadCreate("scanOnce",
epicsThreadPriorityScanLow + nPeriodic,
epicsThreadGetStackSize(epicsThreadStackBig), onceTask, 0);