From bac8851132b28579dd9d85a3f0deed08f8d9a0b1 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 23 Mar 2020 18:22:16 -0700 Subject: [PATCH] Revert "asCaStop() join worker thread" This reverts commit afc31f2f064974e97ef61a9dc6cc58692a1b0a5f. # Conflicts: # modules/database/src/ioc/as/asCa.c --- modules/database/src/ioc/as/asCa.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/modules/database/src/ioc/as/asCa.c b/modules/database/src/ioc/as/asCa.c index 21bb47f5f..d0180448b 100644 --- a/modules/database/src/ioc/as/asCa.c +++ b/modules/database/src/ioc/as/asCa.c @@ -229,23 +229,20 @@ static void asCaTask(void) void asCaStart(void) { - epicsThreadOpts opts = EPICS_THREAD_OPTS_INIT; - - opts.stackSize = epicsThreadGetStackSize(epicsThreadStackBig); - opts.priority = epicsThreadPriorityScanLow - 3; - opts.joinable = 1; - if(asCaDebug) printf("asCaStart called\n"); if(firstTime) { - firstTime = FALSE; + firstTime = FALSE; asCaTaskLock=epicsMutexMustCreate(); asCaTaskWait=epicsEventMustCreate(epicsEventEmpty); asCaTaskAddChannels=epicsEventMustCreate(epicsEventEmpty); asCaTaskClearChannels=epicsEventMustCreate(epicsEventEmpty); - threadid = epicsThreadCreateOpt("asCaTask", (EPICSTHREADFUNC)asCaTask, 0, &opts); - if(threadid==0) { - errMessage(0,"asCaStart: taskSpawn Failure\n"); - } + threadid = epicsThreadCreate("asCaTask", + (epicsThreadPriorityScanLow - 3), + epicsThreadGetStackSize(epicsThreadStackBig), + (EPICSTHREADFUNC)asCaTask,0); + if(threadid==0) { + errMessage(0,"asCaStart: taskSpawn Failure\n"); + } } epicsMutexMustLock(asCaTaskLock); epicsEventSignal(asCaTaskAddChannels); @@ -263,8 +260,6 @@ void asCaStop(void) epicsEventMustWait(asCaTaskWait); if(asCaDebug) printf("asCaStop done\n"); epicsMutexUnlock(asCaTaskLock); - epicsThreadMustJoin(threadid); - threadid = 0; } int ascar(int level) { return ascarFP(stdout,level);}