*** empty log message ***

11 files changed, 332 insertions, 111 deletions

diff --git a/ChangeLog b/ChangeLog
index 42b870705bf..dbf2ddbf85e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+
+	
 Mon Jul 21 08:59:14 2003  Irfan Pyarali  <irfan@oomworks.com>
 
 	* ace\UUID.cpp (get_systemtime): 
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 5dbbdb7fdf4..3ffecb55aa8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,24 @@
+Mon Jul 21 16:28:46 2003 Stephen Torri  <storri@cs.wustl.edu>
+
+	* TAO/TAOACE.dsw:
+
+	  Added Metrics.dsp to workspace.
+
+	* TAO/orbsvcs/orbsvcs/Metrics.dsp:
+	* TAO/orbsvcs/orbsvcs/Metrics/Metrics.dsp:
+	  Moved project file from Metrics subdirectory to match
+	  orbsvcs file convention in TAO/orbsvcs/orbsvcs
+
+	* TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h:
+	* TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h:
+	* TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp:
+	* TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h:
+	* TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp:
+	
+	  Hide class behind #ifdef statements if the configuration for
+	  ACE lacks ACE_METRICS_COLLECTION and ACE_COMPILE_TIMEPORBES
+
+
 Mon Jul 21 16:24:07 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/append.cpp:
@@ -28,6 +49,7 @@ Mon Jul 21 15:58:39 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 `	  ULONG_MAX. Thanks to Scott Clarke <sclarke@ideorlando.org>
 	  for reporting the bug.
 
+
 Mon Jul 21 19:33:24 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * docs/orbsvcs.html:
diff --git a/TAO/TAOACE.dsw b/TAO/TAOACE.dsw
index 78bf4f9ad0c..480338bd4ca 100644
--- a/TAO/TAOACE.dsw
+++ b/TAO/TAOACE.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "ACE DLL"=..\ace\ace_dll.dsp - Package Owner=<4>

+Project: "ACE DLL"="..\ace\ace_dll.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -15,7 +15,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "ACEXML DLL"=..\ACEXML\common\ACEXML.dsp - Package Owner=<4>

+Project: "ACEXML DLL"="..\ACEXML\common\ACEXML.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -30,7 +30,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "ACEXML_Parser DLL"=..\ACEXML\parser\parser\ACEXML_Parser.dsp - Package Owner=<4>

+Project: "ACEXML_Parser DLL"="..\ACEXML\parser\parser\ACEXML_Parser.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -45,7 +45,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "ACE_QoS DLL"=..\ace\QoS\ACE_QoS.dsp - Package Owner=<4>

+Project: "ACE_QoS DLL"="..\ace\QoS\ACE_QoS.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -57,7 +57,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "ACE_SSL"=..\ace\SSL\ACE_SSL.dsp - Package Owner=<4>

+Project: "ACE_SSL"="..\ace\SSL\ACE_SSL.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -72,7 +72,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "AV"=.\orbsvcs\orbsvcs\AV.dsp - Package Owner=<4>

+Project: "AV"=".\orbsvcs\orbsvcs\AV.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -105,7 +105,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "BiDirGIOP"=.\tao\BiDir_GIOP\TAO_BiDir_GIOP.dsp - Package Owner=<4>

+Project: "BiDirGIOP"=".\tao\BiDir_GIOP\TAO_BiDir_GIOP.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -120,7 +120,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Concurrency_Service"=.\orbsvcs\Concurrency_Service\Concurrency_Service.dsp - Package Owner=<4>

+Project: "Concurrency_Service"=".\orbsvcs\Concurrency_Service\Concurrency_Service.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -138,7 +138,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CosConcurrency"=.\orbsvcs\orbsvcs\CosConcurrency.dsp - Package Owner=<4>

+Project: "CosConcurrency"=".\orbsvcs\orbsvcs\CosConcurrency.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -159,7 +159,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CosEvent"=.\orbsvcs\orbsvcs\CosEvent.dsp - Package Owner=<4>

+Project: "CosEvent"=".\orbsvcs\orbsvcs\CosEvent.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -183,7 +183,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CosEvent_Service"=.\orbsvcs\CosEvent_Service\CosEvent_Service.dsp - Package Owner=<4>

+Project: "CosEvent_Service"=".\orbsvcs\CosEvent_Service\CosEvent_Service.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -201,7 +201,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CosLifeCycle"=.\orbsvcs\orbsvcs\CosLifeCycle.dsp - Package Owner=<4>

+Project: "CosLifeCycle"=".\orbsvcs\orbsvcs\CosLifeCycle.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -222,7 +222,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CosLoadBalancing"=.\orbsvcs\orbsvcs\CosLoadBalancing.dsp - Package Owner=<4>

+Project: "CosLoadBalancing"=".\orbsvcs\orbsvcs\CosLoadBalancing.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -240,7 +240,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CosNaming"=.\orbsvcs\orbsvcs\CosNaming.dsp - Package Owner=<4>

+Project: "CosNaming"=".\orbsvcs\orbsvcs\CosNaming.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -261,7 +261,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CosNotification"=.\orbsvcs\orbsvcs\CosNotification.dsp - Package Owner=<4>

+Project: "CosNotification"=".\orbsvcs\orbsvcs\CosNotification.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -282,7 +282,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CosProperty"=.\orbsvcs\orbsvcs\CosProperty.dsp - Package Owner=<4>

+Project: "CosProperty"=".\orbsvcs\orbsvcs\CosProperty.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -306,7 +306,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CosTime"=.\orbsvcs\orbsvcs\CosTime.dsp - Package Owner=<4>

+Project: "CosTime"=".\orbsvcs\orbsvcs\CosTime.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -327,7 +327,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CosTrading"=.\orbsvcs\orbsvcs\CosTrading.dsp - Package Owner=<4>

+Project: "CosTrading"=".\orbsvcs\orbsvcs\CosTrading.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -354,7 +354,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Domain"=.\tao\Domain\TAO_Domain.dsp - Package Owner=<4>

+Project: "Domain"=".\tao\Domain\TAO_Domain.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -372,7 +372,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "DsEventLogAdmin"=.\orbsvcs\orbsvcs\DsEventLogAdmin.dsp - Package Owner=<4>

+Project: "DsEventLogAdmin"=".\orbsvcs\orbsvcs\DsEventLogAdmin.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -390,7 +390,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "DsLogAdmin"=.\orbsvcs\orbsvcs\DsLogAdmin.dsp - Package Owner=<4>

+Project: "DsLogAdmin"=".\orbsvcs\orbsvcs\DsLogAdmin.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -411,7 +411,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "DsNotifyLogAdmin"=.\orbsvcs\orbsvcs\DsNotifyLogAdmin.dsp - Package Owner=<4>

+Project: "DsNotifyLogAdmin"=".\orbsvcs\orbsvcs\DsNotifyLogAdmin.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -429,7 +429,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Dump_Schedule"=.\orbsvcs\Dump_Schedule\Dump_Schedule.dsp - Package Owner=<4>

+Project: "Dump_Schedule"=".\orbsvcs\Dump_Schedule\Dump_Schedule.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -450,7 +450,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "DynamicAny"=.\tao\DynamicAny\TAO_DynamicAny.dsp - Package Owner=<4>

+Project: "DynamicAny"=".\tao\DynamicAny\TAO_DynamicAny.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -465,7 +465,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "DynamicInterface"=.\tao\DynamicInterface\TAO_DynamicInterface.dsp - Package Owner=<4>

+Project: "DynamicInterface"=".\tao\DynamicInterface\TAO_DynamicInterface.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -483,7 +483,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "ETCL DLL"=.\orbsvcs\orbsvcs\ETCL\ETCL.dsp - Package Owner=<4>

+Project: "ETCL DLL"=".\orbsvcs\orbsvcs\ETCL\ETCL.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -498,7 +498,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Event_Service"=.\orbsvcs\Event_Service\Event_Service.dsp - Package Owner=<4>

+Project: "Event_Service"=".\orbsvcs\Event_Service\Event_Service.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -528,7 +528,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "FT ORB"=.\orbsvcs\orbsvcs\FT_ORB.dsp - Package Owner=<4>

+Project: "FT ORB"=".\orbsvcs\orbsvcs\FT_ORB.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -552,7 +552,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Fault Tolerance"=.\orbsvcs\orbsvcs\Fault_Tolerance.dsp - Package Owner=<4>

+Project: "Fault Tolerance"=".\orbsvcs\orbsvcs\Fault_Tolerance.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -591,7 +591,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "IFRService"=.\orbsvcs\orbsvcs\IFRService.dsp - Package Owner=<4>

+Project: "IFRService"=".\orbsvcs\orbsvcs\IFRService.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -618,7 +618,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "IFR_Client"=.\tao\IFR_Client\TAO_IFR_Client.dsp - Package Owner=<4>

+Project: "IFR_Client"=".\tao\IFR_Client\TAO_IFR_Client.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -633,7 +633,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "IFR_Service"=.\orbsvcs\IFR_Service\IFR_Service.dsp - Package Owner=<4>

+Project: "IFR_Service"=".\orbsvcs\IFR_Service\IFR_Service.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -648,7 +648,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "IORInterceptor"=.\tao\IORInterceptor\TAO_IORInterceptor.dsp - Package Owner=<4>

+Project: "IORInterceptor"=".\tao\IORInterceptor\TAO_IORInterceptor.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -666,7 +666,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "IORManip"=.\tao\IORManipulation\TAO_IORManip.dsp - Package Owner=<4>

+Project: "IORManip"=".\tao\IORManipulation\TAO_IORManip.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -681,7 +681,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "IORTable"=.\tao\IORTable\TAO_IORTable.dsp - Package Owner=<4>

+Project: "IORTable"=".\tao\IORTable\TAO_IORTable.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -696,7 +696,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "ImR_Activator"=.\orbsvcs\ImplRepo_Service\ImR_Activator.dsp - Package Owner=<4>

+Project: "ImR_Activator"=".\orbsvcs\ImplRepo_Service\ImR_Activator.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -720,7 +720,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "ImplRepo_Service"=.\orbsvcs\ImplRepo_Service\implrepo.dsp - Package Owner=<4>

+Project: "ImplRepo_Service"=".\orbsvcs\ImplRepo_Service\implrepo.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -753,7 +753,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "LifeCycle_Service"=.\orbsvcs\LifeCycle_Service\LifeCycle_Service.dsp - Package Owner=<4>

+Project: "LifeCycle_Service"=".\orbsvcs\LifeCycle_Service\LifeCycle_Service.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -774,7 +774,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "LoadManager"=.\orbsvcs\LoadBalancer\LoadManager.dsp - Package Owner=<4>

+Project: "LoadManager"=".\orbsvcs\LoadBalancer\LoadManager.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -789,7 +789,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "LoadMonitor"=.\orbsvcs\LoadBalancer\LoadMonitor.dsp - Package Owner=<4>

+Project: "LoadMonitor"=".\orbsvcs\LoadBalancer\LoadMonitor.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -804,7 +804,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Messaging"=.\tao\Messaging\TAO_Messaging.dsp - Package Owner=<4>

+Project: "Messaging"=".\tao\Messaging\TAO_Messaging.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -819,7 +819,37 @@ Package=<4>
 

 ###############################################################################

 

-Project: "NT_Naming_Service"=.\orbsvcs\Naming_Service\NT_Naming_Service.dsp - Package Owner=<4>

+Project: "Metrics"=".\orbsvcs\orbsvcs\Metrics.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name CosTime

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name RTSched

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name RTEvent

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "NT_Naming_Service"=".\orbsvcs\Naming_Service\NT_Naming_Service.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -834,7 +864,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Naming_Service"=.\orbsvcs\Naming_Service\Naming_Service.dsp - Package Owner=<4>

+Project: "Naming_Service"=".\orbsvcs\Naming_Service\Naming_Service.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -849,7 +879,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Notify_Service"=.\orbsvcs\Notify_Service\Notify_Service.dsp - Package Owner=<4>

+Project: "Notify_Service"=".\orbsvcs\Notify_Service\Notify_Service.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -867,7 +897,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "ObjRefTemplate"=.\tao\ObjRefTemplate\TAO_ObjRefTemplate.dsp - Package Owner=<4>

+Project: "ObjRefTemplate"=".\tao\ObjRefTemplate\TAO_ObjRefTemplate.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -885,7 +915,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "PortableGroup"=.\orbsvcs\orbsvcs\PortableGroup.dsp - Package Owner=<4>

+Project: "PortableGroup"=".\orbsvcs\orbsvcs\PortableGroup.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -906,7 +936,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "PortableServer"=.\tao\PortableServer\TAO_PortableServer.dsp - Package Owner=<4>

+Project: "PortableServer"=".\tao\PortableServer\TAO_PortableServer.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -927,7 +957,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "RTCORBA"=.\tao\RTCORBA\TAO_RTCORBA.dsp - Package Owner=<4>

+Project: "RTCORBA"=".\tao\RTCORBA\TAO_RTCORBA.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -942,7 +972,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "RTCORBAEvent"=.\orbsvcs\orbsvcs\RTCORBAEvent.dsp - Package Owner=<4>

+Project: "RTCORBAEvent"=".\orbsvcs\orbsvcs\RTCORBAEvent.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -966,7 +996,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "RTEvent"=.\orbsvcs\orbsvcs\RTEvent.dsp - Package Owner=<4>

+Project: "RTEvent"=".\orbsvcs\orbsvcs\RTEvent.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -996,7 +1026,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "RTEventLog"=.\orbsvcs\orbsvcs\RTEventLog.dsp - Package Owner=<4>

+Project: "RTEventLog"=".\orbsvcs\orbsvcs\RTEventLog.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1017,7 +1047,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "RTOLDEvent"=.\orbsvcs\orbsvcs\RTOLDEvent.dsp - Package Owner=<4>

+Project: "RTOLDEvent"=".\orbsvcs\orbsvcs\RTOLDEvent.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1041,7 +1071,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "RTPortableServer"=.\tao\RTPortableServer\TAO_RTPortableServer.dsp - Package Owner=<4>

+Project: "RTPortableServer"=".\tao\RTPortableServer\TAO_RTPortableServer.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1062,7 +1092,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "RTSched"=.\orbsvcs\orbsvcs\RTSched.dsp - Package Owner=<4>

+Project: "RTSched"=".\orbsvcs\orbsvcs\RTSched.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1086,7 +1116,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "RTSchedEvent"=.\orbsvcs\orbsvcs\RTSchedEvent.dsp - Package Owner=<4>

+Project: "RTSchedEvent"=".\orbsvcs\orbsvcs\RTSchedEvent.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1110,7 +1140,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "RTScheduler"=.\tao\RTScheduling\TAO_RTScheduler.dsp - Package Owner=<4>

+Project: "RTScheduler"=".\tao\RTScheduling\TAO_RTScheduler.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1122,7 +1152,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "RT_Notification DLL"=.\orbsvcs\orbsvcs\RT_Notification.dsp - Package Owner=<4>

+Project: "RT_Notification DLL"=".\orbsvcs\orbsvcs\RT_Notification.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1143,7 +1173,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SSLIOP"=.\orbsvcs\orbsvcs\SSLIOP.dsp - Package Owner=<4>

+Project: "SSLIOP"=".\orbsvcs\orbsvcs\SSLIOP.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1161,7 +1191,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Scheduling_Service"=.\orbsvcs\Scheduling_Service\Scheduling_Service.dsp - Package Owner=<4>

+Project: "Scheduling_Service"=".\orbsvcs\Scheduling_Service\Scheduling_Service.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1179,7 +1209,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Security"=.\orbsvcs\orbsvcs\Security.dsp - Package Owner=<4>

+Project: "Security"=".\orbsvcs\orbsvcs\Security.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1200,7 +1230,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SmartProxies"=.\tao\SmartProxies\SmartProxies.dsp - Package Owner=<4>

+Project: "SmartProxies"=".\tao\SmartProxies\SmartProxies.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1215,7 +1245,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Svc Utils"=.\orbsvcs\orbsvcs\Svc_Utils.dsp - Package Owner=<4>

+Project: "Svc Utils"=".\orbsvcs\orbsvcs\Svc_Utils.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1236,7 +1266,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "TAO DLL"=.\tao\TAO.dsp - Package Owner=<4>

+Project: "TAO DLL"=".\tao\TAO.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1251,7 +1281,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "TAO_IDL Compiler"=.\TAO_IDL\tao_idl.dsp - Package Owner=<4>

+Project: "TAO_IDL Compiler"=".\TAO_IDL\tao_idl.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1269,7 +1299,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "TAO_IDL_BE_DLL"=.\TAO_IDL\TAO_IDL_BE_DLL.dsp - Package Owner=<4>

+Project: "TAO_IDL_BE_DLL"=".\TAO_IDL\TAO_IDL_BE_DLL.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1284,7 +1314,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "TAO_IDL_FE_DLL"=.\TAO_IDL\TAO_IDL_FE_DLL.dsp - Package Owner=<4>

+Project: "TAO_IDL_FE_DLL"=".\TAO_IDL\TAO_IDL_FE_DLL.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1302,7 +1332,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "TAO_IFR_BE_DLL"=.\orbsvcs\IFR_Service\TAO_IFR_BE_DLL.dsp - Package Owner=<4>

+Project: "TAO_IFR_BE_DLL"=".\orbsvcs\IFR_Service\TAO_IFR_BE_DLL.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1320,7 +1350,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "TAO_Strategies"=.\tao\Strategies\TAO_Strategies.dsp - Package Owner=<4>

+Project: "TAO_Strategies"=".\tao\Strategies\TAO_Strategies.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1335,7 +1365,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Trading_Service"=.\orbsvcs\Trading_Service\Trading_Service.dsp - Package Owner=<4>

+Project: "Trading_Service"=".\orbsvcs\Trading_Service\Trading_Service.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1356,7 +1386,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "TypeCodeFactory"=.\tao\TypeCodeFactory\TypeCodeFactory.dsp - Package Owner=<4>

+Project: "TypeCodeFactory"=".\tao\TypeCodeFactory\TypeCodeFactory.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1371,7 +1401,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Valuetype"=.\tao\Valuetype\TAO_Valuetype.dsp - Package Owner=<4>

+Project: "Valuetype"=".\tao\Valuetype\TAO_Valuetype.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1386,7 +1416,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "gperf"=..\apps\gperf\src\gperf.dsp - Package Owner=<4>

+Project: "gperf"="..\apps\gperf\src\gperf.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1404,7 +1434,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "tao_ifr"=.\orbsvcs\IFR_Service\tao_ifr.dsp - Package Owner=<4>

+Project: "tao_ifr"=".\orbsvcs\IFR_Service\tao_ifr.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1422,7 +1452,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "tao_imr"=.\orbsvcs\ImplRepo_Service\tao_imr.dsp - Package Owner=<4>

+Project: "tao_imr"=".\orbsvcs\ImplRepo_Service\tao_imr.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics.dsp b/TAO/orbsvcs/orbsvcs/Metrics.dsp
index 7474bf75484..d23bfe445e5 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics.dsp
+++ b/TAO/orbsvcs/orbsvcs/Metrics.dsp
@@ -67,8 +67,8 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""

 LINK32=link.exe -lib

 MTL=midl.exe

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD   /c

-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_METRICS_BUILD_DLL" /YX /FD   /c

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /I "../../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_METRICS_BUILD_DLL" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -89,43 +89,35 @@ LIB32=link.exe -lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=.\Metrics_FrameManager.cpp

+SOURCE=.\Metrics\Metrics_FrameManager.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_FrameManager_T.cpp

+SOURCE=.\Metrics\Metrics_LocalCache.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_LocalCache.cpp

+SOURCE=.\Metrics\Metrics_Logger.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_LocalCache_T.cpp

+SOURCE=.\Metrics\Metrics_UpcallMonitor.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_Logger.cpp

+SOURCE=.\Metrics\Metrics_Utils.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_UpcallMonitor.cpp

+SOURCE=.\MetricsC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_UpcallMonitor_T.cpp

+SOURCE=.\MetricsS.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_Utils.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\MetricsC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\MetricsS.cpp

+SOURCE=.\MetricsS_T.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -133,47 +125,51 @@ SOURCE=..\MetricsS.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=.\metrics_export.h

+SOURCE=.\Metrics\metrics_export.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Metrics\Metrics_FrameManager.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_FrameManager.h

+SOURCE=.\Metrics\Metrics_FrameManager_T.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_FrameManager_T.h

+SOURCE=.\Metrics\Metrics_LocalCache.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_LocalCache.h

+SOURCE=.\Metrics\Metrics_LocalCache_T.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_LocalCache_T.h

+SOURCE=.\Metrics\Metrics_Logger.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_Logger.h

+SOURCE=.\Metrics\Metrics_UpcallMonitor.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_UpcallMonitor.h

+SOURCE=.\Metrics\Metrics_UpcallMonitor_T.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_UpcallMonitor_T.h

+SOURCE=.\Metrics\Metrics_Utils.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_Utils.h

+SOURCE=.\MetricsC.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\MetricsC.h

+SOURCE=.\MetricsS.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\MetricsS.h

+SOURCE=.\MetricsS_T.h

 # End Source File

 # End Group

 # Begin Group "IDL Files"

@@ -181,7 +177,51 @@ SOURCE=..\MetricsS.h
 # PROP Default_Filter ".idl"

 # Begin Source File

 

-SOURCE=..\Metrics.idl

+SOURCE=Metrics.idl

+

+!IF  "$(CFG)" == "Metrics - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "Metrics - Win32 Debug"

+

+# PROP Intermediate_Dir "DLL\Debug\Metrics"

+# PROP Ignore_Default_Tool 1

+# Begin Custom Build

+InputPath=Metrics.idl

+InputName=Metrics

+

+BuildCmds= \

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao  -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Metrics_Export -Wb,export_include=Metrics\metrics_export.h $(InputName).idl

+

+"MetricsC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"MetricsC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"MetricsC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"MetricsS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"MetricsS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"MetricsS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"MetricsS_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"MetricsS_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"MetricsS_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Inline Files"

@@ -189,31 +229,39 @@ SOURCE=..\Metrics.idl
 # PROP Default_Filter ".i"

 # Begin Source File

 

-SOURCE=.\Metrics_FrameManager.i

+SOURCE=.\Metrics\Metrics_FrameManager.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Metrics\Metrics_FrameManager_T.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Metrics\Metrics_LocalCache.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_FrameManager_T.i

+SOURCE=.\Metrics\Metrics_UpcallMonitor.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_LocalCache.i

+SOURCE=.\Metrics\Metrics_UpcallMonitor_T.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_LocalCache_T.i

+SOURCE=.\Metrics\Metrics_Utils.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_UpcallMonitor.i

+SOURCE=.\MetricsC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_UpcallMonitor_T.i

+SOURCE=.\MetricsS.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Metrics_Utils.i

+SOURCE=.\MetricsS_T.i

 # End Source File

 # End Group

 # End Target

diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
index 64573be7d5d..1b20d291bc5 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
@@ -6,6 +6,10 @@
 
 ACE_RCSID(Metrics_Logger, Metrics_Logger, "$Id$")
 
+#if defined (ACE_METRICS_COLLECTION)
+
+#if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
+
 const int    OPEN_CLOSE_BANNER_CYCLE = 4;
 
 
@@ -893,3 +897,7 @@ template class ACE_Hash_Map_Entry<CORBA::ULong, CORBA::String_var *>;
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong, CORBA::String_var *, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Entry<CORBA::ULong, CORBA::String_var *>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */
+#endif /* ACE_METRICS_COLLECTION */
+
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h
index fb0d59da184..3a1c3c0d0de 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h
@@ -5,6 +5,10 @@
 
 #if ! defined (VXWORKS)
 
+#if defined (ACE_METRICS_COLLECTION)
+
+#if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
+
 // Comment out both of these to disable output
 #  define METRICS_LOGGER_ERROR_OUTPUT_ENABLED
 #  define METRICS_LOGGER_DEBUG_OUTPUT_ENABLED
@@ -208,5 +212,7 @@ TAO_METRICS_LOGGER_REF_SINGLETON;
 typedef ACE_Singleton<TAO_Metrics_Logger, ACE_SYNCH_MUTEX>
 TAO_METRICS_LOGGER_SINGLETON;
 
+#endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */
+#endif /* ACE_METRICS_COLLECTION */
 
 #endif /* METRICS_LOGGER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp
index 90b873deef9..bf74bd7eff3 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp
@@ -5,6 +5,10 @@
 
 #include "Metrics_UpcallMonitor.h"
 
+#if defined (ACE_METRICS_COLLECTION)
+
+#if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
+
 #if !defined (__ACE_INLINE__)
 #include "Metrics_UpcallMonitor.i"
 #endif /* __ACE_INLINE__ */
@@ -16,5 +20,11 @@ template class TAO_Metrics_LocalCache<ACE_Thread_Mutex, ACE_New_Allocator>;
 #pragma instantiate TAO_Metrics_LocalCache<ACE_Thread_Mutex, ACE_New_Allocator>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+#else
+#error ACE_COMPILE_TIMEPROBES must be defined in order to collect metrics
+#endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */
+#endif /* ACE_METRICS_COLLECTION */
+
+
 #endif /* METRICS_UPCALL_MONITOR_CPP */
 
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
index 8155067e989..2d18b1678e1 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
@@ -3,6 +3,10 @@
 #ifndef METRICS_UPCALL_MONITOR_H
 #define METRICS_UPCALL_MONITOR_H
 
+#if defined (ACE_METRICS_COLLECTION)
+
+#if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
+
 #if ! defined (VXWORKS)
 
 // Comment out both of these to disable output
@@ -245,5 +249,7 @@ typedef TAO_METRICS_MONITOR_ADAPTER_TYPE TAO_METRICS_MONITOR_ADAPTER;
 typedef TAO_METRICS_MONITOR_SINGLETON_TYPE TAO_METRICS_MONITOR_SINGLETON;
 #endif
 
+#endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */
+#endif /* ACE_METRICS_COLLECTION */
 
 #endif /* METRICS_UPCALL_MONITOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
index 4aedfec3295..d07f924e6d8 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
@@ -3,9 +3,18 @@
 #ifndef METRICS_UTILS_CPP
 #define METRICS_UTILS_CPP
 
+#if defined (ACE_METRICS_COLLECTION)
+
+#if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
+
+
+#include "ace/Metrics_Cache.h"
 #include "Metrics_Utils.h"
 #include "Metrics_LocalCache.h"
 
+
+
+
 /////////////////////////////
 // Class TAO_Metrics_Utils //
 /////////////////////////////
@@ -524,4 +533,9 @@ template class ACE_Singleton<WSOA_Metrics_Handles, ACE_Thread_Mutex>;
 #pragma instantiate ACE_Singleton<WSOA_Metrics_Handles, ACE_Thread_Mutex>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+#else
+#error ACE_COMPILE_TIMEPROBES must be defined in order to collect metrics
+#endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */
+#endif /* ACE_METRICS_COLLECTION */
+
 #endif /* METRICS_UTILS_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h
index 12a17e5b239..7b86fb1c94d 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h
@@ -3,6 +3,11 @@
 #ifndef METRICS_UTILS_H
 #define METRICS_UTILS_H
 
+
+#if defined (ACE_METRICS_COLLECTION)
+
+#if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
+
 #if ! defined (VXWORKS)
 
 // Comment out both of these to disable output
@@ -121,9 +126,59 @@ public:
 typedef ACE_Singleton<WSOA_Metrics_Handles, ACE_SYNCH_MUTEX>
 WSOA_METRICS_HANDLES_SINGLETON;
 
+/**
+ * NOTE: This is a simple macro which calls the appropriate registration function with the cache to
+ *       store the data from this pointer. At the ACE level there is no need to give a PROBE_TYPE
+ *       because there is only one probe type (ACE_Timeprobe).
+ *
+ * USAGE_LEVEL: TAO
+ *
+ * Q1: Where is this and the next macro used? One example is on TAO/orbsvcs/orbsvcs/Metrics. No where in the ace code.
+ *    So is this a ACE or TAO macro? 
+ *
+ * Q2: Is the function (register + METRICS_REGION) a ACE or TAO?
+ * A2: TAO. Define in Metrics_Local_Cache_T.h. The only METRICS_REGION that exists is 'base_metrics'. Used
+ *     in $TAO_ROOT/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
+ *
+ * @param METRICS_PTR - Initialized pointer to the Metrics_Cache. This pointer is used to register the probe
+ *                      with the associated cache.
+ * @param METIRCS_REGION - At present there is only one 'base_metrics'.
+ * @param PROBE_NAME - String name of the probe
+ * @param PROBE_TYPE - Unsigned integer representing the probe type
+ * @param METRICS_HANDLE - Variable used to contain the metrics probe handle that is the result of this function
+ *                         The type of the handle is a RtecScheduler::handle_t
+ */
+#  define REGISTER_METRICS_PROBE_RETURN(METRICS_PTR,METRICS_REGION,PROBE_NAME,PROBE_TYPE,METRICS_HANDLE) \
+do { if((METRICS_PTR->metrics_enabled())) { \
+METRICS_HANDLE = METRICS_PTR-> \
+register_##METRICS_REGION ( \
+PROBE_NAME, \
+PROBE_TYPE); \
+} } while (0)
+
+/**
+ * Same as above but instead of just reporting information to a cache there is also reference to a Metrics_Loger (TAO feature).
+ * The logger is used to record the information. The type of probe is register with the logger
+ *
+ * USAGE_LEVEL: TAO
+ */
+#  define REGISTER_METRICS_REPORTING_PROBE_RETURN(METRICS_PTR,METRICS_REGION,PROBE_NAME,PROBE_TYPE,METRICS_LOGGER_REF,METRICS_HANDLE) \
+do { if((METRICS_PTR->metrics_enabled())) { \
+METRICS_HANDLE = METRICS_PTR-> \
+register_##METRICS_REGION## ( \
+PROBE_NAME, \
+PROBE_TYPE, \
+METRICS_LOGGER_REF); \
+} } while (0)
+
+
+
 
 #if defined (__ACE_INLINE__)
 #include "Metrics_Utils.i"
 #endif /* __ACE_INLINE__ */
 
+#endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */
+#endif /* ACE_METRICS_COLLECTION */
+
 #endif /* METRICS_UTILS_H */
diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp
index 0f7393a5415..1cd45a34eec 100644
--- a/ace/ace_dll.dsp
+++ b/ace/ace_dll.dsp
@@ -582,6 +582,10 @@ SOURCE=.\Method_Request.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Metrics_Cache.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Msg_WFMO_Reactor.cpp

 # End Source File

 # Begin Source File

@@ -1694,6 +1698,14 @@ SOURCE=.\Method_Request.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Metrics_Cache.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Metrics_Cache_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Min_Max.h

 # End Source File

 # Begin Source File

@@ -2770,6 +2782,14 @@ SOURCE=.\Message_Queue_T.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Metrics_Cache.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Metrics_Cache_T.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Module.i

 # End Source File

 # Begin Source File