From d1fca67cf297f78aba15eaa0d9b511097c416710 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Thu, 28 Dec 2017 11:08:13 -0600
Subject: [PATCH] ioc: shutdown PVA server via epicsAtExit()

Otherwise is shutdown in global dtor.
Better to use epicsAtExit() which has
some ordering
---
 src/ioc/PVAServerRegister.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/ioc/PVAServerRegister.cpp b/src/ioc/PVAServerRegister.cpp
index dba4b96..fbee91f 100644
--- a/src/ioc/PVAServerRegister.cpp
+++ b/src/ioc/PVAServerRegister.cpp
@@ -103,10 +103,16 @@ void pvasr(int lvl)
     }
 }
 
+void pva_server_cleanup(void *)
+{
+    stopPVAServer();
+}
+
 void initStartPVAServer(initHookState state)
 {
     pvd::Lock G(the_server_lock);
     if(state==initHookAfterIocRunning && !the_server) {
+        epicsAtExit(&pva_server_cleanup, 0);
         startitup();
 
     } else if(state==initHookAtIocPause) {
@@ -114,7 +120,6 @@ void initStartPVAServer(initHookState state)
     }
 }
 
-
 void registerStartPVAServer(void)
 {
     epics::iocshRegister<const char*, &startPVAServer>("startPVAServer", "provider names");