*** empty log message ***

7 files changed, 283 insertions, 43 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Metrics.dsp b/TAO/orbsvcs/orbsvcs/Metrics.dsp
index 10416a54af8..89ccac6d454 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics.dsp
+++ b/TAO/orbsvcs/orbsvcs/Metrics.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "METRICS_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_METRICS_BUILD_DLL" /YX /FD /c

+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_METRICS_BUILD_DLL" /YX /FD /c

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

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

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 TAO_Svc_Utils.lib TAO.lib ace.lib TAO_PortableServer.lib TAO_RTEvent.lib /nologo /dll /machine:I386 /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAO_Svc_Utils.lib TAO.lib ace.lib TAO_PortableServer.lib TAO_RTEvent.lib /nologo /dll /incremental:yes /machine:I386 /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

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

 

@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "METRICS_EXPORTS" /YX /FD  /c

-# ADD CPP /nologo /MTd /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 CPP /nologo /MTd /W3 /Gm /GR /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 MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

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

@@ -97,15 +97,7 @@ SOURCE=.\Metrics\Metrics_FrameManager.cpp
 # Begin Source File

 

 SOURCE=.\Metrics\Metrics_FrameManager_T.cpp

-

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

-

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

-

 # PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

@@ -114,15 +106,7 @@ SOURCE=.\Metrics\Metrics_LocalCache.cpp
 # Begin Source File

 

 SOURCE=.\Metrics\Metrics_LocalCache_T.cpp

-

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

-

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

-

 # PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

@@ -135,15 +119,7 @@ SOURCE=.\Metrics\Metrics_UpcallMonitor.cpp
 # Begin Source File

 

 SOURCE=.\Metrics\Metrics_UpcallMonitor_T.cpp

-

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

-

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

-

 # PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

@@ -219,6 +195,42 @@ SOURCE=.\Metrics.idl
 

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

 

+# PROP Ignore_Default_Tool 1

+# Begin Custom Build

+InputPath=.\Metrics.idl

+InputName=Metrics

+

+BuildCmds= \

+	..\..\..\bin\tao_idl -Ge 1 -I../..  -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

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

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

 

 # PROP Ignore_Default_Tool 1

diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h
index f1ad017f20d..d764e32f9d5 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h
@@ -17,18 +17,17 @@
 
 #include "Metrics_Utils.h"
 
-#if defined (__ACE_INLINE__)
-#include "Metrics_FrameManager.i"
-#endif /* __ACE_INLINE__ */
-
 #include "Metrics_FrameManager_T.h"
 
-typedef TAO_Metrics_FrameManager<ACE_SYNCH_MUTEX>
-TAO_METRICS_FRAME_MGR_TYPE;
+typedef TAO_Metrics_FrameManager<ACE_SYNCH_MUTEX> TAO_METRICS_FRAME_MGR_TYPE;
 
 typedef ACE_Singleton<TAO_METRICS_FRAME_MGR_TYPE, ACE_SYNCH_MUTEX>
 TAO_METRICS_FRAME_MGR_SINGLETON;
 
+#if defined (__ACE_INLINE__)
+#include "Metrics_FrameManager.i"
+#endif /* __ACE_INLINE__ */
+
 
 #endif /* METRICS_FRAME_MANAGER_H */
 
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h
index 6eefdbf19f9..3d79831963d 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h
@@ -261,6 +261,10 @@ protected:
   // Lock for synchronizing access to the map.
 };
 
+#if defined (__ACE_INLINE__)
+#include "Metrics_FrameManager_T.i"
+#endif /* __ACE_INLINE__ */
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Metrics_FrameManager_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
@@ -269,9 +273,5 @@ protected:
 #pragma implementation ("Metrics_FrameManager_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
-#if defined (__ACE_INLINE__)
-#include "Metrics_FrameManager_T.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* METRICS_FRAME_MANAGER_T_H */
 
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
index bd03f64ec0a..e51ecd60f01 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
@@ -186,10 +186,6 @@ private:
 };
 
 
-#if defined (__ACE_INLINE__)
-#include "Metrics_UpcallMonitor.i"
-#endif /* __ACE_INLINE__ */
-
 class TAO_Metrics_Export TAO_Metrics_ReportingUpcallMonitor
   : public POA_Metrics::ReportingQoSMonitor
 {
@@ -291,6 +287,9 @@ private:
   // The monitor we're wrapping.
 };
 
+#if defined (__ACE_INLINE__)
+#include "Metrics_UpcallMonitor.i"
+#endif /* __ACE_INLINE__ */
 
 #include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Metrics_Static.dsp b/TAO/orbsvcs/orbsvcs/Metrics_Static.dsp
new file mode 100644
index 00000000000..b7b3525b271
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Metrics_Static.dsp
@@ -0,0 +1,223 @@
+# Microsoft Developer Studio Project File - Name="Metrics_Static" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

+

+CFG=Metrics_Static - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Metrics_Static.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Metrics_Static.mak" CFG="Metrics_Static - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Metrics_Static - Win32 Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "Metrics_Static - Win32 Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

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

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Target_Dir ""

+LINK32=link.exe -lib

+MTL=midl.exe

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "../" /I "../../" /I "../../../" /I "../../../../" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "TAO_METRICS_BUILD_DLL" /YX /FD /c

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo

+# ADD LIB32 /nologo

+

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

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "Debug"

+# 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 /MTd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /I "../../../../" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D TAO_METRICS_HAS_DLL=0 /YX /FD   /c

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo

+# ADD LIB32 /nologo

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Metrics_Static - Win32 Release"

+# Name "Metrics_Static - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_FrameManager.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_FrameManager_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_LocalCache.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_LocalCache_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_Logger.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_UpcallMonitor.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_UpcallMonitor_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_Utils.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\MetricsC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\MetricsS.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=..\Metrics\metrics_export.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_FrameManager.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_FrameManager_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_LocalCache.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_LocalCache_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_Logger.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_UpcallMonitor.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_UpcallMonitor_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_Utils.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\MetricsC.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\MetricsS.h

+# End Source File

+# End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+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\Metrics_LocalCache_T.i

+# End Source File

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_UpcallMonitor.i

+# End Source File

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_UpcallMonitor_T.i

+# End Source File

+# Begin Source File

+

+SOURCE=..\Metrics\Metrics_Utils.i

+# End Source File

+# End Group

+# Begin Group "IDL files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\Metrics.idl

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/TAO/orbsvcs/orbsvcs/RTSched_Static.dsp b/TAO/orbsvcs/orbsvcs/RTSched_Static.dsp
index 5f1eeef536a..efd634c8986 100644
--- a/TAO/orbsvcs/orbsvcs/RTSched_Static.dsp
+++ b/TAO/orbsvcs/orbsvcs/RTSched_Static.dsp
@@ -40,8 +40,10 @@ RSC=rc.exe
 # PROP Output_Dir ""

 # PROP Intermediate_Dir "LIB\Release\RTSched"

 # PROP Target_Dir ""

+LINK32=link.exe -lib

+MTL=midl.exe

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "_LIB" /D "_MBCS" /D "TAO_AS_STATIC_LIBS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../" /I "../../" /I "../../../" /D "_LIB" /D "_MBCS" /D "TAO_AS_STATIC_LIBS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -64,6 +66,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir "LIB\Debug\RTSched"

 # 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 /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_LIB" /D "_MBCS" /D "TAO_AS_STATIC_LIBS" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsw b/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsw
index 6616f84600c..3ccb4af66ae 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsw
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsw
@@ -162,7 +162,7 @@ Package=<4>
 

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

 

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

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

 

 Package=<5>

 {{{

@@ -170,6 +170,9 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name RTSched_Static

+    End Project Dependency

 }}}

 

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