EPICS_base/pva2pva
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

use initHook shutdown hooks

Browse Source
This commit is contained in:
Michael Davidsaver
2022-06-28 15:24:42 -07:00
parent b9ce6cbd6e
commit 3df05bf1ce
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pdbApp/pvalink.cpp
View File

@ -33,6 +33,10 @@
#include <epicsExport.h> /* defines epicsExportSharedSymbols */ #include <epicsExport.h> /* defines epicsExportSharedSymbols */
#if EPICS_VERSION_INT>=VERSION_INT(7,0,6,0)
# define HAVE_SHUTDOWN_HOOKS
#endif
int pvaLinkDebug; int pvaLinkDebug;
int pvaLinkIsolate; int pvaLinkIsolate;
@ -67,6 +71,7 @@ static void shutdownStep2()
pvaGlobal = NULL; pvaGlobal = NULL;
} }
#ifndef HAVE_SHUTDOWN_HOOKS
static void stopPVAPool(void*) static void stopPVAPool(void*)
{ {
try { try {
@ -84,8 +89,7 @@ static void finalizePVA(void*)
fprintf(stderr, "Error initializing pva link handling : %s\n", e.what()); fprintf(stderr, "Error initializing pva link handling : %s\n", e.what());
} }
} }
#endif
bool atexitInstalled;
/* The Initialization game... /* The Initialization game...
* *
@ -110,10 +114,13 @@ void initPVALink(initHookState state)
} }
pvaGlobal = new pvaGlobal_t; pvaGlobal = new pvaGlobal_t;
#ifndef HAVE_SHUTDOWN_HOOKS
static bool atexitInstalled;
if(!atexitInstalled) { if(!atexitInstalled) {
epicsAtExit(finalizePVA, NULL); epicsAtExit(finalizePVA, NULL);
atexitInstalled = true; atexitInstalled = true;
} }
#endif
} else if(state==initHookAfterInitDatabase) { } else if(state==initHookAfterInitDatabase) {
pvac::ClientProvider local("server:QSRV"), pvac::ClientProvider local("server:QSRV"),
@ -124,7 +131,10 @@ void initPVALink(initHookState state)
} else if(state==initHookAfterIocBuilt) { } else if(state==initHookAfterIocBuilt) {
// after epicsExit(exitDatabase) // after epicsExit(exitDatabase)
// so hook registered here will be run before iocShutdown() // so hook registered here will be run before iocShutdown()
#ifndef HAVE_SHUTDOWN_HOOKS
epicsAtExit(stopPVAPool, NULL); epicsAtExit(stopPVAPool, NULL);
#endif
Guard G(pvaGlobal->lock); Guard G(pvaGlobal->lock);
pvaGlobal->running = true; pvaGlobal->running = true;
@ -137,6 +147,13 @@ void initPVALink(initHookState state)
chan->open(); chan->open();
} }
#ifdef HAVE_SHUTDOWN_HOOKS
} else if(state==initHookAtShutdown) {
shutdownStep1();
} else if(state==initHookAfterShutdown) {
shutdownStep2();
#endif
} }
}catch(std::exception& e){ }catch(std::exception& e){
cantProceed("Error initializing pva link handling : %s\n", e.what()); cantProceed("Error initializing pva link handling : %s\n", e.what());