update for changes to PVData object monitoring

showConstructDestruct.h renamed as CDRMonitor.h

testApp/client/MockClientImpl.cpp

@@ -2,9 +2,10 @@
 /* Author:  Matej Sekoranja Date: 2010.12.18 */
 
 
+#include <epicsExit.h>
 #include <pvAccess.h>
 #include <iostream>
-#include <showConstructDestruct.h>
+#include <CDRMonitor.h>
 #include <lock.h>
 #include <standardPVField.h>
 
@@ -968,6 +969,7 @@ int main(int argc,char *argv[])
     context->destroy();
     
     std::cout << "-----------------------------------------------------------------------" << std::endl;
-    getShowConstructDestruct()->constuctDestructTotals(stdout);
+    epicsExitCallAtExits();
+    CDRMonitor::get().show(stdout);
     return(0);
 }

testApp/client/testCreateRequest.cpp

@@ -7,10 +7,11 @@
 #include <string.h>
 #include <stdio.h>
 #include <pvAccess.h>
-#include <showConstructDestruct.h>
+#include <CDRMonitor.h>
 #include <iostream>
 
 #include <epicsAssert.h>
+#include <epicsExit.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;
@@ -151,7 +152,8 @@ int main(int argc,char *argv[])
     testCreateRequest();
 
     std::cout << "-----------------------------------------------------------------------" << std::endl;
-    getShowConstructDestruct()->constuctDestructTotals(stdout);
+    epicsExitCallAtExits();
+    CDRMonitor::get().show(stdout);
     return 0;
 }
 

testApp/remote/testBlockingUDPClnt.cpp

@@ -10,7 +10,7 @@
 #include <logger.h>
 #include <inetAddressUtil.h>
 
-//#include <showConstructDestruct.h>
+//#include <CDRMonitor.h>
 
 #include <osiSock.h>
 

testApp/remote/testChannelSearchManager.cpp

@@ -1,8 +1,9 @@
 /* testChannelSearcManager.cpp */
 
+#include <epicsExit.h>
 #include <channelSearchManager.h>
 #include <sstream>
-#include <showConstructDestruct.h>
+#include <CDRMonitor.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;
@@ -429,7 +430,8 @@ int main(int argc,char *argv[])
     manager->cancel();
 
     context->destroy();
-    getShowConstructDestruct()->constuctDestructTotals(stdout);
+    epicsExitCallAtExits();
+    CDRMonitor::get().show(stdout);
 
     for(int i = 0; i < max_channels; i++)
     {

testApp/remote/testRemoteClientImpl.cpp

@@ -5,7 +5,8 @@
 
 #include <iostream>
 #include <sstream>
-#include <showConstructDestruct.h>
+#include <CDRMonitor.h>
+#include <epicsExit.h>
 #include <clientContextImpl.h>
 
 using namespace epics::pvData;
@@ -560,6 +561,7 @@ int main(int argc,char *argv[])
     printf("done.\n");
 
     std::cout << "-----------------------------------------------------------------------" << std::endl;
-    getShowConstructDestruct()->constuctDestructTotals(stdout);
+    epicsExitCallAtExits();
+    CDRMonitor::get().show(stdout);
     return(0);
 }

testApp/utils/configurationTest.cpp

@@ -4,9 +4,10 @@
  */
 
 #include "configuration.h"
-#include "showConstructDestruct.h"
+#include "CDRMonitor.h"
 
 #include <epicsAssert.h>
+#include <epicsExit.h>
 #include <iostream>
 #include <string>
 #include <stdlib.h>
@@ -68,7 +69,8 @@ int main(int argc, char *argv[])
 	assert(doubleProperty == 42);
 
 	if(configProvider) delete configProvider;
-	getShowConstructDestruct()->constuctDestructTotals(stdout);
+        epicsExitCallAtExits();
+        CDRMonitor::get().show(stdout);
 	return 0;
 }
 

testApp/utils/introspectionRegistryTest.cpp

@@ -8,11 +8,12 @@
 #include "introspectionRegistry.h"
 
 #include <epicsAssert.h>
+#include <epicsExit.h>
 #include <iostream>
 #include <string>
 #include <sstream>
 #include <vector>
-#include <showConstructDestruct.h>
+#include <CDRMonitor.h>
 
 namespace epics {
     namespace pvAccess {
@@ -443,7 +444,8 @@ int main(int argc, char *argv[])
 	if(clientRegistry) delete clientRegistry;
 	if(serverRegistry) delete serverRegistry;
 
-	getShowConstructDestruct()->showDeleteStaticExit(stdout);
+        epicsExitCallAtExits();
+        CDRMonitor::get().show(stdout);
 	cout << "DONE" << endl;
 	return 0;
 }

testApp/utils/namedLockPatternTest.cpp

@@ -4,9 +4,10 @@
  */
 
 #include "namedLockPattern.h"
-#include "showConstructDestruct.h"
+#include "CDRMonitor.h"
 
 #include <epicsAssert.h>
+#include <epicsExit.h>
 #include <iostream>
 
 #include <osiSock.h>
@@ -212,7 +213,8 @@ int main(int argc, char *argv[])
 		assert(true);
 	}
 
-	getShowConstructDestruct()->constuctDestructTotals(stdout);
+        epicsExitCallAtExits();
+        CDRMonitor::get().show(stdout);
 	return 0;
 }
 

testApp/utils/transportRegistryTest.cpp

@@ -5,9 +5,10 @@
 
 #include "transportRegistry.h"
 #include "introspectionRegistry.h"
-#include "showConstructDestruct.h"
+#include "CDRMonitor.h"
 
 #include <epicsAssert.h>
+#include <epicsExit.h>
 #include <iostream>
 #include <string>
 
@@ -145,7 +146,8 @@ int main(int argc, char *argv[])
 	if(addrArray) delete[] addrArray;
 	if(transportArrayIn) delete[] transportArrayIn;
 	if(registry) delete registry;
-	getShowConstructDestruct()->constuctDestructTotals(stdout);
+        epicsExitCallAtExits();
+        CDRMonitor::get().show(stdout);
 	return 0;
 }