testChannelAccess/testServer: more stable shutdown

testApp/remote/testADCSim.cpp

@@ -318,7 +318,7 @@ void SimADC::run()
 
         cycle();
     }
-    printf("SimADC shutdown\n");
+    //printf("SimADC shutdown\n");
 }
 
 SimADC::smart_pointer_type createSimADC(const std::string& name)

testApp/remote/testChannelAccess.cpp

@@ -77,8 +77,9 @@ class ChannelAccessIFRemoteTest: public ChannelAccessIFTest  {
     ~ChannelAccessIFRemoteTest() {
       m_serverContextAction.stop();   
       ClientFactory::stop();
-      structureChangedListeners.clear();
-      structureStore.clear();
+
+      // shutdown SIGSEG problems
+      epicsThreadSleep(2.0);
     }
 
   private:

testApp/remote/testServer.cpp

@@ -2617,9 +2617,16 @@ void testServer(int timeToRun)
     unregisterChannelProviderFactory(factory);
 
     structureChangedListeners.clear();
-    structureStore.clear();
-
+    {
+       Lock guard(structureStoreMutex);
+       structureStore.clear();
+    }
     ctx.reset();
+
+    unregisterChannelProviderFactory(factory);
+
+
+    shutdownSimADCs();
 }
 
 void testServerShutdown()
@@ -2690,8 +2697,6 @@ int main(int argc, char *argv[])
 
     testServer(timeToRun);
 
-    shutdownSimADCs();
-
     cout << "Done" << endl;
 
     if (cleanupAndReport)