From a93932427088c190103424795b1c0074561baf75 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Wed, 18 Oct 2017 17:13:46 -0500
Subject: [PATCH] Added call to dbStopServers() in iocShutdown()

Renamed buildRSRV => buildServers.
Don't call other dbXxxServers() routines or announce their related
initHook states when in buildIsolated mode.
---
 src/ioc/misc/iocInit.c | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/ioc/misc/iocInit.c b/src/ioc/misc/iocInit.c
index 738d9b472..c6d6e4a14 100644
--- a/src/ioc/misc/iocInit.c
+++ b/src/ioc/misc/iocInit.c
@@ -75,7 +75,7 @@ static enum {
     iocVirgin, iocBuilding, iocBuilt, iocRunning, iocPaused, iocStopped
 } iocState = iocVirgin;
 static enum {
-    buildRSRV, buildIsolated
+    buildServers, buildIsolated
 } iocBuildMode;
 
 /* define forward references*/
@@ -210,7 +210,7 @@ int iocBuild(void)
     if (dbThreadRealtimeLock)
         epicsThreadRealtimeLock();
 
-    if (!status) iocBuildMode = buildRSRV;
+    if (!status) iocBuildMode = buildServers;
     return status;
 }
 
@@ -246,9 +246,11 @@ int iocRun(void)
     if (iocState == iocBuilt)
         initHookAnnounce(initHookAfterInterruptAccept);
 
-    dbRunServers();
+    if (iocBuildMode == buildServers) {
+        dbRunServers();
+        initHookAnnounce(initHookAfterCaServerRunning);
+    }
 
-    initHookAnnounce(initHookAfterCaServerRunning);
     if (iocState == iocBuilt)
         initHookAnnounce(initHookAtEnd);
 
@@ -268,8 +270,10 @@ int iocPause(void)
     }
     initHookAnnounce(initHookAtIocPause);
 
-    dbPauseServers();
-    initHookAnnounce(initHookAfterCaServerPaused);
+    if (iocBuildMode == buildServers) {
+        dbPauseServers();
+        initHookAnnounce(initHookAfterCaServerPaused);
+    }
 
     dbCaPause();
     scanPause();
@@ -702,27 +706,37 @@ static void doFreeRecord(dbRecordType *pdbRecordType, dbCommon *precord,
 
 int iocShutdown(void)
 {
-    if (iocState == iocVirgin || iocState == iocStopped) return 0;
+    if (iocState == iocVirgin || iocState == iocStopped)
+        return 0;
+
     iterateRecords(doCloseLinks, NULL);
-    if (iocBuildMode==buildIsolated) {
+
+    if (iocBuildMode == buildIsolated) {
         /* stop and "join" threads */
         scanStop();
         callbackStop();
     }
+    else
+        dbStopServers();
+
     dbCaShutdown(); /* must be before dbFreeRecord and dbChannelExit */
-    if (iocBuildMode==buildIsolated) {
+
+    if (iocBuildMode == buildIsolated) {
         /* free resources */
         scanCleanup();
         callbackCleanup();
+
         iterateRecords(doFreeRecord, NULL);
         dbLockCleanupRecords(pdbbase);
+
         asShutdown();
         dbChannelExit();
         dbProcessNotifyExit();
         iocshFree();
     }
+
     iocState = iocStopped;
-    iocBuildMode = buildRSRV;
+    iocBuildMode = buildServers;
     return 0;
 }