diff options
-rw-r--r-- | TAO/orbsvcs/orbsvcs/CosNaming.dsp | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/CosTime.dsp | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Metrics.dsp | 202 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Metrics/Metrics.dsp | 220 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp | 65 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h | 9 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h | 71 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i | 94 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/RTEvent.dsp | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/orbsvcs.dsw | 70 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/orbsvcs_static.dsw | 56 | ||||
-rw-r--r-- | ace/Metrics_Cache_T.cpp | 2 | ||||
-rw-r--r-- | ace/ace_dll.dsp | 3 |
14 files changed, 584 insertions, 218 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.dsp b/TAO/orbsvcs/orbsvcs/CosNaming.dsp index 8d7e2c4431e..e7813d587af 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming.dsp +++ b/TAO/orbsvcs/orbsvcs/CosNaming.dsp @@ -72,7 +72,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 "CosNaming_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_NAMING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_NAMING" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_NAMING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_NAMING" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.dsp b/TAO/orbsvcs/orbsvcs/CosTime.dsp index 6ef95e177bd..7709f9ffbf2 100644 --- a/TAO/orbsvcs/orbsvcs/CosTime.dsp +++ b/TAO/orbsvcs/orbsvcs/CosTime.dsp @@ -72,7 +72,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 "CosTime_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_TIME_BUILD_DLL" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_TIME_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
diff --git a/TAO/orbsvcs/orbsvcs/Metrics.dsp b/TAO/orbsvcs/orbsvcs/Metrics.dsp index 23e90f087a1..10416a54af8 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics.dsp +++ b/TAO/orbsvcs/orbsvcs/Metrics.dsp @@ -40,9 +40,10 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
+# 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 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_Metrics_BUILD_DLL" /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 BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -52,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 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"
!ELSEIF "$(CFG)" == "Metrics - Win32 Debug"
@@ -65,9 +66,10 @@ LINK32=link.exe # PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
+# 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 /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"
@@ -77,7 +79,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 /debug /machine:I386 /pdbtype:sept
-# ADD 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 /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 TAO_Svc_Utilsd.lib TAOd.lib aced.lib TAO_PortableServerd.lib TAO_RTEventd.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
!ENDIF
@@ -94,19 +96,6 @@ SOURCE=.\Metrics\Metrics_FrameManager.cpp # End Source File
# Begin Source File
-SOURCE=.\Metrics\Metrics_FrameManager.i
-
-!IF "$(CFG)" == "Metrics - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Metrics - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\Metrics\Metrics_FrameManager_T.cpp
!IF "$(CFG)" == "Metrics - Win32 Release"
@@ -120,36 +109,10 @@ SOURCE=.\Metrics\Metrics_FrameManager_T.cpp # End Source File
# Begin Source File
-SOURCE=.\Metrics\Metrics_FrameManager_T.i
-
-!IF "$(CFG)" == "Metrics - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Metrics - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\Metrics\Metrics_LocalCache.cpp
# End Source File
# Begin Source File
-SOURCE=.\Metrics\Metrics_LocalCache.i
-
-!IF "$(CFG)" == "Metrics - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Metrics - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\Metrics\Metrics_LocalCache_T.cpp
!IF "$(CFG)" == "Metrics - Win32 Release"
@@ -163,19 +126,6 @@ SOURCE=.\Metrics\Metrics_LocalCache_T.cpp # End Source File
# Begin Source File
-SOURCE=.\Metrics\Metrics_LocalCache_T.i
-
-!IF "$(CFG)" == "Metrics - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Metrics - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\Metrics\Metrics_Logger.cpp
# End Source File
# Begin Source File
@@ -184,19 +134,6 @@ SOURCE=.\Metrics\Metrics_UpcallMonitor.cpp # End Source File
# Begin Source File
-SOURCE=.\Metrics\Metrics_UpcallMonitor.i
-
-!IF "$(CFG)" == "Metrics - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Metrics - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\Metrics\Metrics_UpcallMonitor_T.cpp
!IF "$(CFG)" == "Metrics - Win32 Release"
@@ -210,33 +147,15 @@ SOURCE=.\Metrics\Metrics_UpcallMonitor_T.cpp # End Source File
# Begin Source File
-SOURCE=.\Metrics\Metrics_UpcallMonitor_T.i
-
-!IF "$(CFG)" == "Metrics - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Metrics - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
+SOURCE=.\Metrics\Metrics_Utils.cpp
# End Source File
# Begin Source File
-SOURCE=.\Metrics\Metrics_Utils.cpp
+SOURCE=.\MetricsC.cpp
# End Source File
# Begin Source File
-SOURCE=.\Metrics\Metrics_Utils.i
-
-!IF "$(CFG)" == "Metrics - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Metrics - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
+SOURCE=.\MetricsS.cpp
# End Source File
# End Group
# Begin Group "Header Files"
@@ -278,6 +197,14 @@ SOURCE=.\Metrics\Metrics_UpcallMonitor_T.h 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 "Resource Files"
@@ -334,5 +261,100 @@ BuildCmds= \ # End Source File
# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\Metrics\Metrics_FrameManager.i
+
+!IF "$(CFG)" == "Metrics - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Metrics - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics\Metrics_FrameManager_T.i
+
+!IF "$(CFG)" == "Metrics - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Metrics - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics\Metrics_LocalCache.i
+
+!IF "$(CFG)" == "Metrics - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Metrics - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics\Metrics_LocalCache_T.i
+
+!IF "$(CFG)" == "Metrics - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Metrics - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics\Metrics_UpcallMonitor.i
+
+!IF "$(CFG)" == "Metrics - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Metrics - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics\Metrics_UpcallMonitor_T.i
+
+!IF "$(CFG)" == "Metrics - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Metrics - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics\Metrics_Utils.i
+
+!IF "$(CFG)" == "Metrics - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Metrics - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF
+
+# End Source File
+# End Group
# End Target
# End Project
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics.dsp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics.dsp new file mode 100644 index 00000000000..7474bf75484 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics.dsp @@ -0,0 +1,220 @@ +# Microsoft Developer Studio Project File - Name="Metrics" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=Metrics - 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.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.mak" CFG="Metrics - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Metrics - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "Metrics - 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 - 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 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /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 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Metrics___Win32_Debug"
+# PROP BASE Intermediate_Dir "Metrics___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Metrics___Win32_Debug"
+# PROP Intermediate_Dir "Metrics___Win32_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 /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 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 - Win32 Release"
+# Name "Metrics - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Metrics_FrameManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_FrameManager_T.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_LocalCache.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_LocalCache_T.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_Logger.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_UpcallMonitor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_UpcallMonitor_T.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
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\metrics_export.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_FrameManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_FrameManager_T.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_LocalCache.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_LocalCache_T.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_Logger.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_UpcallMonitor.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_UpcallMonitor_T.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\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 "IDL Files"
+
+# PROP Default_Filter ".idl"
+# Begin Source File
+
+SOURCE=..\Metrics.idl
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter ".i"
+# Begin Source File
+
+SOURCE=.\Metrics_FrameManager.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_FrameManager_T.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_LocalCache.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_LocalCache_T.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_UpcallMonitor.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_UpcallMonitor_T.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Metrics_Utils.i
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp index 233a96c5c5c..c89d94dda29 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp @@ -52,7 +52,7 @@ TAO_Metrics_Logger::TAO_Metrics_Logger (int generate_events, } #endif /* METRICS_LOGGER_SENDS_EVENTS */ - if (generate_log_) + if (generate_log_) { if (log_filename_) { @@ -67,7 +67,7 @@ TAO_Metrics_Logger::TAO_Metrics_Logger (int generate_events, #endif return; } - + if (generate_export_file_) { export_file_ = ACE_OS::fopen ("remote_logger_export.excel", "w+"); @@ -105,7 +105,7 @@ TAO_Metrics_Logger::TAO_Metrics_Logger (int generate_events, TAO_Metrics_Logger::~TAO_Metrics_Logger () { - if (generate_log_) + if (generate_log_) { if (log_filename_) { @@ -123,7 +123,7 @@ TAO_Metrics_Logger::~TAO_Metrics_Logger () { // ACE_OS::fclose (log_file_); } - } + } #if defined (METRICS_LOGGER_SENDS_EVENTS) if (this->generate_events_) @@ -209,13 +209,16 @@ TAO_Metrics_Logger::svc (void) // Sends a banner to be written to the log file and to the visualization browser. void -TAO_Metrics_Logger::send_banner (const char *banner, - CORBA::Environment &ACE_TRY_ENV) +TAO_Metrics_Logger:: +send_banner ( + const char * banner + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) { - //Added to remove Linux warning (Boeing Extension) - ACE_UNUSED_ARG(ACE_TRY_ENV); - - // Package up the data and put it on the task queue. + // Package up the data and put it on the task queue. TAO_Metrics_Logger_Data *data; ACE_NEW (data, @@ -234,7 +237,7 @@ TAO_Metrics_Logger::send_banner (const char *banner, ACE_ERROR ((LM_ERROR, "TAO_Metrics_Logger::send_banner putq failed")); #endif - } + } } void @@ -306,7 +309,7 @@ TAO_Metrics_Logger::log_aggregate_QoS (const Metrics::QoSParameter_Set & qos_par ACE_ERROR ((LM_ERROR, "TAO_Metrics_Logger::log_aggregate_QoS putq failed")); #endif - } + } #endif } @@ -339,10 +342,10 @@ TAO_Metrics_Logger::process_aggregate_QoS (const Metrics::QoSParameter_Set & qos if (this->generate_events_) { this->qos_data_.hrt_deadlines_missed = 0; - this->qos_data_.hrt_deadlines_made = 0; - this->qos_data_.hrt_operations_cancelled = 0; + this->qos_data_.hrt_deadlines_made = 0; + this->qos_data_.hrt_operations_cancelled = 0; this->qos_data_.srt_deadlines_missed = 0; - this->qos_data_.srt_deadlines_made = 0; + this->qos_data_.srt_deadlines_made = 0; this->qos_data_.srt_operations_cancelled = 0; } #endif /* METRICS_LOGGER_SENDS_EVENTS */ @@ -354,20 +357,20 @@ TAO_Metrics_Logger::process_aggregate_QoS (const Metrics::QoSParameter_Set & qos { if (qos_params [i].is_hrt) { - this->qos_data_.hrt_deadlines_missed += + this->qos_data_.hrt_deadlines_missed += qos_params [i].deadlines_missed; - this->qos_data_.hrt_deadlines_made += + this->qos_data_.hrt_deadlines_made += qos_params [i].deadlines_made; - this->qos_data_.hrt_operations_cancelled += + this->qos_data_.hrt_operations_cancelled += qos_params [i].operations_cancelled; } else { - this->qos_data_.srt_deadlines_missed += + this->qos_data_.srt_deadlines_missed += qos_params [i].deadlines_missed; - this->qos_data_.srt_deadlines_made += + this->qos_data_.srt_deadlines_made += qos_params [i].deadlines_made; - this->qos_data_.srt_operations_cancelled += + this->qos_data_.srt_operations_cancelled += qos_params [i].operations_cancelled; } } @@ -425,7 +428,7 @@ TAO_Metrics_Logger::process_aggregate_QoS (const Metrics::QoSParameter_Set & qos } -// Binds the names of various timeprobes to their identifiers so +// Binds the names of various timeprobes to their identifiers so // that ids alone can be used (for efficiency) in passing data. void @@ -522,7 +525,7 @@ TAO_Metrics_Logger::log_timeprobe_data (const Metrics::TimeprobeParameter_Set & ACE_ERROR ((LM_ERROR, "TAO_Metrics_Logger::log_timeprobe_data putq failed")); #endif - } + } } @@ -537,7 +540,7 @@ TAO_Metrics_Logger::process_timeprobe_data (const Metrics::TimeprobeParameter_Se { // log_file_ = ACE_OS::fopen (log_filename_, "a+"); } - + ACE_OS::fprintf (log_file_, "\n\n\n" "Interval (usec): %9lu \n\n" @@ -554,7 +557,7 @@ TAO_Metrics_Logger::process_timeprobe_data (const Metrics::TimeprobeParameter_Se // We can get away with it here for now since the intervals are small enough to not roll over. (u_long) ACE_U64_TO_U32(interval)/10 ); } - + #if defined (METRICS_LOGGER_SENDS_EVENTS) Metrics::Time queue_time = 0; Metrics::Time hrt_op_time = 0; @@ -595,7 +598,7 @@ TAO_Metrics_Logger::process_timeprobe_data (const Metrics::TimeprobeParameter_Se if (probe_name_map_.find (timeprobe_params [i].probe_id, probe_name) == 0 && probe_name != 0) { - if (timeprobe_params [i].cross_thread_probe && + if (timeprobe_params [i].cross_thread_probe && timeprobe_params [i].is_full_interval) { if (generate_totals_) @@ -701,7 +704,7 @@ TAO_Metrics_Logger::process_timeprobe_data (const Metrics::TimeprobeParameter_Se } else { - if (timeprobe_params [i].cross_thread_probe && + if (timeprobe_params [i].cross_thread_probe && timeprobe_params [i].is_full_interval) { if (generate_totals_) @@ -780,7 +783,7 @@ TAO_Metrics_Logger::process_timeprobe_data (const Metrics::TimeprobeParameter_Se ACE_OS::strcat(format_spec, " "); ACE_OS::strcat(format_spec, ACE_UINT64_FORMAT_SPECIFIER); ACE_OS::strcat(format_spec, " *** Cross Thread Event ***\n"); - + ACE_OS::strcpy(export_spec, " [id: %lu] \t "); ACE_OS::strcat(export_spec, ACE_UINT64_FORMAT_SPECIFIER); ACE_OS::strcat(export_spec, " \t "); @@ -819,7 +822,7 @@ TAO_Metrics_Logger::process_timeprobe_data (const Metrics::TimeprobeParameter_Se { CORBA::Any any; - util_data_.hrt_op_utilization = + util_data_.hrt_op_utilization = ACE_static_cast ( CORBA::Double, ACE_UINT64_DBLCAST_ADAPTER (hrt_op_time)) @@ -827,7 +830,7 @@ TAO_Metrics_Logger::process_timeprobe_data (const Metrics::TimeprobeParameter_Se CORBA::Double, ACE_UINT64_DBLCAST_ADAPTER (interval)); - util_data_.srt_op_utilization = + util_data_.srt_op_utilization = ACE_static_cast ( CORBA::Double, ACE_UINT64_DBLCAST_ADAPTER (srt_op_time)) @@ -835,7 +838,7 @@ TAO_Metrics_Logger::process_timeprobe_data (const Metrics::TimeprobeParameter_Se CORBA::Double, ACE_UINT64_DBLCAST_ADAPTER (interval)); - util_data_.queue_utilization = + util_data_.queue_utilization = ACE_static_cast ( CORBA::Double, ACE_UINT64_DBLCAST_ADAPTER (queue_time)) diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h index e5359d14ae8..077446d9588 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h @@ -114,10 +114,19 @@ public: virtual int svc (void); // Active object loop for processing logged data. + virtual void send_banner ( + const char * banner + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); +/* void send_banner (const char *banner, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); // Sends a banner to be written to the log file and to the visualization browser. +*/ void process_banner (const char *banner); // Writes banner to the log file and/or to the visualization browser. diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h index 9bd6f30a3da..bd03f64ec0a 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h @@ -60,6 +60,15 @@ public: ~TAO_Metrics_UpcallMonitor (); // Destructor. + virtual void report_made_deadline ( + RtecScheduler::handle_t handle + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + , Metrics::INTERNAL_0 + )); +/* virtual void report_made_deadline (RtecScheduler::handle_t handle, CORBA::Environment &ACE_TRY_ENV @@ -68,7 +77,17 @@ public: Metrics::INTERNAL_0)); // Reports a successful upcall. - virtual void +*/ + virtual void report_missed_deadline ( + RtecScheduler::handle_t handle + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + , Metrics::INTERNAL_1 + )); +/* + virtual void report_missed_deadline (RtecScheduler::handle_t handle, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) @@ -105,6 +124,48 @@ public: Metrics::INTERNAL_7, Metrics::INTERNAL_8)); // Resets the aggregate QoS information for the given operation. +*/ + + virtual void reset_statistics ( + RtecScheduler::handle_t handle + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + , Metrics::INTERNAL_7 + , Metrics::INTERNAL_8 + )); + + + // TAO_IDL - Generated from + // C:\ACE+TAO\ACE_Metrics_EC\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 + + virtual void get_aggregate_QoS ( + RtecScheduler::handle_t handle, + Metrics::QoSParameter_t_out qos + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + , Metrics::INTERNAL_2 + , Metrics::INTERNAL_3 + )); + + + // TAO_IDL - Generated from + // C:\ACE+TAO\ACE_Metrics_EC\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45 + + virtual void get_aggregate_QoS_set ( + const Metrics::Handle_Set_t & handle_set, + Metrics::QoSParameter_Set_out qos_set + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + , Metrics::INTERNAL_4 + , Metrics::INTERNAL_5 + )); + MONITOR_MAP &missed_map (); // Accessor for map of operation handle to a count of deadlines missed. @@ -125,6 +186,10 @@ private: }; +#if defined (__ACE_INLINE__) +#include "Metrics_UpcallMonitor.i" +#endif /* __ACE_INLINE__ */ + class TAO_Metrics_Export TAO_Metrics_ReportingUpcallMonitor : public POA_Metrics::ReportingQoSMonitor { @@ -227,10 +292,6 @@ private: }; -#if defined (__ACE_INLINE__) -#include "Metrics_UpcallMonitor.i" -#endif /* __ACE_INLINE__ */ - #include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.h" typedef TAO_Metrics_UpcallMonitorAdapter<ACE_SYNCH_MUTEX, ACE_New_Allocator> diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i index 77cb2d37708..8d5c745bfc1 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i @@ -5,12 +5,12 @@ #ifndef METRICS_UPCALL_MONITOR_I #define METRICS_UPCALL_MONITOR_I -//# if defined (METRICS_USES_OP_CANCELLATION) +//# if defined (METRICS_USES_OP_CANCELLATION) //# undef METRICS_USES_OP_CANCELLATION //# endif /* METRICS_USES_OP_CANCELLATION */ -# if ! defined (METRICS_USES_OP_CANCELLATION) -# define METRICS_USES_OP_CANCELLATION +# if ! defined (METRICS_USES_OP_CANCELLATION) +# define METRICS_USES_OP_CANCELLATION # endif /* ! METRICS_USES_OP_CANCELLATION */ @@ -36,10 +36,14 @@ TAO_Metrics_UpcallMonitor::~TAO_Metrics_UpcallMonitor () ACE_INLINE void TAO_Metrics_UpcallMonitor:: -report_made_deadline (RtecScheduler::handle_t handle, - CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_0)) +report_made_deadline ( + RtecScheduler::handle_t handle + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + , Metrics::INTERNAL_0 + )) { CORBA::ULong count = 0; MONITOR_MAP_ENTRY *entry; @@ -58,10 +62,14 @@ report_made_deadline (RtecScheduler::handle_t handle, ACE_INLINE void TAO_Metrics_UpcallMonitor:: -report_missed_deadline (RtecScheduler::handle_t handle, - CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_1)) +report_missed_deadline ( + RtecScheduler::handle_t handle + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + , Metrics::INTERNAL_1 + )) { CORBA::ULong count = 0; MONITOR_MAP_ENTRY *entry; @@ -80,12 +88,17 @@ report_missed_deadline (RtecScheduler::handle_t handle, // Get the aggregate QoS statistics collected so far by the monitor. ACE_INLINE void -TAO_Metrics_UpcallMonitor::get_aggregate_QoS (RtecScheduler::handle_t handle, - Metrics::QoSParameter_t_out qos, - CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_2, - Metrics::INTERNAL_3)) +TAO_Metrics_UpcallMonitor:: +get_aggregate_QoS ( + RtecScheduler::handle_t handle, + Metrics::QoSParameter_t_out qos + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + , Metrics::INTERNAL_2 + , Metrics::INTERNAL_3 + )) { CORBA::ULong made_count = 0; CORBA::ULong missed_count = 0; @@ -122,13 +135,17 @@ TAO_Metrics_UpcallMonitor::get_aggregate_QoS (RtecScheduler::handle_t handle, // passed set. ACE_INLINE void -TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set ( - const Metrics::Handle_Set_t & handle_set, - Metrics::QoSParameter_Set_out qos_set, - CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_4, - Metrics::INTERNAL_5)) +TAO_Metrics_UpcallMonitor:: +get_aggregate_QoS_set ( + const Metrics::Handle_Set_t & handle_set, + Metrics::QoSParameter_Set_out qos_set + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + , Metrics::INTERNAL_4 + , Metrics::INTERNAL_5 + )) { CORBA::ULong made_count = 0; CORBA::ULong missed_count = 0; @@ -179,11 +196,16 @@ TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set ( // Resets the aggregate QoS information for the given operation. ACE_INLINE void -TAO_Metrics_UpcallMonitor::reset_statistics (RtecScheduler::handle_t handle, - CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_7, - Metrics::INTERNAL_8)) +TAO_Metrics_UpcallMonitor:: +reset_statistics ( + RtecScheduler::handle_t handle + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + , Metrics::INTERNAL_7 + , Metrics::INTERNAL_8 + )) { CORBA::ULong count = 0; @@ -201,7 +223,7 @@ TAO_Metrics_UpcallMonitor::reset_statistics (RtecScheduler::handle_t handle, // Accessor for map of operation handle to a count of deadlines missed. -ACE_INLINE +ACE_INLINE TAO_Metrics_UpcallMonitor::MONITOR_MAP & TAO_Metrics_UpcallMonitor::missed_map () { @@ -210,7 +232,7 @@ TAO_Metrics_UpcallMonitor::missed_map () // Accessor for map of operation handle to a count of deadlines made. -ACE_INLINE +ACE_INLINE TAO_Metrics_UpcallMonitor::MONITOR_MAP & TAO_Metrics_UpcallMonitor::made_map () { @@ -244,7 +266,7 @@ report_made_deadline (RtecScheduler::handle_t handle, ACE_THROW_SPEC ((CORBA::SystemException, Metrics::INTERNAL_0)) { - monitor_.report_made_deadline (handle, ACE_TRY_ENV); + monitor_.report_made_deadline (handle); } // Reports an unsuccessful upcall. @@ -256,7 +278,7 @@ report_missed_deadline (RtecScheduler::handle_t handle, ACE_THROW_SPEC ((CORBA::SystemException, Metrics::INTERNAL_1)) { - monitor_.report_missed_deadline (handle, ACE_TRY_ENV); + monitor_.report_missed_deadline (handle); } @@ -270,7 +292,7 @@ TAO_Metrics_ReportingUpcallMonitor::get_aggregate_QoS (RtecScheduler::handle_t h Metrics::INTERNAL_2, Metrics::INTERNAL_3)) { - monitor_.get_aggregate_QoS (handle, qos, ACE_TRY_ENV); + monitor_.get_aggregate_QoS (handle, qos); } @@ -286,7 +308,7 @@ TAO_Metrics_ReportingUpcallMonitor::get_aggregate_QoS_set ( Metrics::INTERNAL_4, Metrics::INTERNAL_5)) { - monitor_.get_aggregate_QoS_set (handle_set, qos_set, ACE_TRY_ENV); + monitor_.get_aggregate_QoS_set (handle_set, qos_set); } @@ -300,7 +322,7 @@ TAO_Metrics_ReportingUpcallMonitor::reset_statistics (RtecScheduler::handle_t ha Metrics::INTERNAL_7, Metrics::INTERNAL_8)) { - monitor_.reset_statistics (handle, ACE_TRY_ENV); + monitor_.reset_statistics (handle); } diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp index 5596ddb3f3d..6a99d6d529b 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp @@ -52,7 +52,7 @@ TAO_Metrics_Utils::set_mission_state (int i, Metrics::QoSLogger_ptr logger) ACE_TRY_NEW_ENV { - logger->send_banner (banner, ACE_TRY_ENV); + logger->send_banner (banner); ACE_TRY_CHECK; } ACE_CATCHANY @@ -398,7 +398,7 @@ WSOA_Metrics_Handles::WSOA_Metrics_Handles () TAO_Metrics_Utils::QUO, this->tile_received_first_metrics_handle_); - RtecScheduler::handle_t temp_metrics_handle; + //RtecScheduler::handle_t temp_metrics_handle; for (i = 1; i <= WSOA_METRICS_MAX_TILING_FACTOR; ++i) { ::sprintf (registration_name, "tile_received_%d", i); diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.dsp b/TAO/orbsvcs/orbsvcs/RTEvent.dsp index 37af62ca41d..8a613250610 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent.dsp +++ b/TAO/orbsvcs/orbsvcs/RTEvent.dsp @@ -72,7 +72,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 "RTEvent_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_RTEVENT_BUILD_DLL" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_RTEVENT_BUILD_DLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs.dsw b/TAO/orbsvcs/orbsvcs/orbsvcs.dsw index 9cf1ac2a910..ff80b08fe7e 100644 --- a/TAO/orbsvcs/orbsvcs/orbsvcs.dsw +++ b/TAO/orbsvcs/orbsvcs/orbsvcs.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ###############################################################################
-Project: "AV"=.\AV.dsp - Package Owner=<4>
+Project: "AV"=".\AV.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -24,7 +24,7 @@ Package=<4> ###############################################################################
-Project: "CosConcurrency"=.\CosConcurrency.dsp - Package Owner=<4>
+Project: "CosConcurrency"=".\CosConcurrency.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -36,7 +36,7 @@ Package=<4> ###############################################################################
-Project: "CosEvent"=.\CosEvent.dsp - Package Owner=<4>
+Project: "CosEvent"=".\CosEvent.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -54,7 +54,7 @@ Package=<4> ###############################################################################
-Project: "CosLifeCycle"=.\CosLifeCycle.dsp - Package Owner=<4>
+Project: "CosLifeCycle"=".\CosLifeCycle.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -69,7 +69,7 @@ Package=<4> ###############################################################################
-Project: "CosLoadBalancing"=.\CosLoadBalancing.dsp - Package Owner=<4>
+Project: "CosLoadBalancing"=".\CosLoadBalancing.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -84,7 +84,7 @@ Package=<4> ###############################################################################
-Project: "CosNaming"=.\CosNaming.dsp - Package Owner=<4>
+Project: "CosNaming"=".\CosNaming.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -99,7 +99,7 @@ Package=<4> ###############################################################################
-Project: "CosNotification"=.\CosNotification.dsp - Package Owner=<4>
+Project: "CosNotification"=".\CosNotification.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -117,7 +117,7 @@ Package=<4> ###############################################################################
-Project: "CosProperty"=.\CosProperty.dsp - Package Owner=<4>
+Project: "CosProperty"=".\CosProperty.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -129,7 +129,7 @@ Package=<4> ###############################################################################
-Project: "CosTime"=.\CosTime.dsp - Package Owner=<4>
+Project: "CosTime"=".\CosTime.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -144,7 +144,7 @@ Package=<4> ###############################################################################
-Project: "CosTrading"=.\CosTrading.dsp - Package Owner=<4>
+Project: "CosTrading"=".\CosTrading.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -156,7 +156,7 @@ Package=<4> ###############################################################################
-Project: "DsEventLogAdmin"=.\DsEventLogAdmin.dsp - Package Owner=<4>
+Project: "DsEventLogAdmin"=".\DsEventLogAdmin.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -168,7 +168,7 @@ Package=<4> ###############################################################################
-Project: "DsLogAdmin"=.\DsLogAdmin.dsp - Package Owner=<4>
+Project: "DsLogAdmin"=".\DsLogAdmin.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -186,7 +186,7 @@ Package=<4> ###############################################################################
-Project: "DsNotifyLogAdmin"=.\DsNotifyLogAdmin.dsp - Package Owner=<4>
+Project: "DsNotifyLogAdmin"=".\DsNotifyLogAdmin.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -198,7 +198,7 @@ Package=<4> ###############################################################################
-Project: "ETCL DLL"=.\ETCL\ETCL.dsp - Package Owner=<4>
+Project: "ETCL DLL"=".\ETCL\ETCL.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -210,7 +210,7 @@ Package=<4> ###############################################################################
-Project: "FT ORB"=.\FT_ORB.dsp - Package Owner=<4>
+Project: "FT ORB"=".\FT_ORB.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -222,7 +222,7 @@ Package=<4> ###############################################################################
-Project: "Fault Tolerance"=.\Fault_Tolerance.dsp - Package Owner=<4>
+Project: "Fault Tolerance"=".\Fault_Tolerance.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -249,7 +249,25 @@ Package=<4> ###############################################################################
-Project: "PortableGroup"=.\PortableGroup.dsp - Package Owner=<4>
+Project: "Metrics"=".\Metrics.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name CosNaming
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name RTSched
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "PortableGroup"=".\PortableGroup.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -264,7 +282,7 @@ Package=<4> ###############################################################################
-Project: "RTCORBAEvent"=.\RTCORBAEvent.dsp - Package Owner=<4>
+Project: "RTCORBAEvent"=".\RTCORBAEvent.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -279,7 +297,7 @@ Package=<4> ###############################################################################
-Project: "RTEvent"=.\RTEvent.dsp - Package Owner=<4>
+Project: "RTEvent"=".\RTEvent.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -300,7 +318,7 @@ Package=<4> ###############################################################################
-Project: "RTEventLog"=.\RTEventLog.dsp - Package Owner=<4>
+Project: "RTEventLog"=".\RTEventLog.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -312,7 +330,7 @@ Package=<4> ###############################################################################
-Project: "RTOLDEvent"=.\RTOLDEvent.dsp - Package Owner=<4>
+Project: "RTOLDEvent"=".\RTOLDEvent.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -330,7 +348,7 @@ Package=<4> ###############################################################################
-Project: "RTSched"=.\RTSched.dsp - Package Owner=<4>
+Project: "RTSched"=".\RTSched.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -348,7 +366,7 @@ Package=<4> ###############################################################################
-Project: "RTSchedEvent"=.\RTSchedEvent.dsp - Package Owner=<4>
+Project: "RTSchedEvent"=".\RTSchedEvent.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -366,7 +384,7 @@ Package=<4> ###############################################################################
-Project: "SSLIOP"=.\SSLIOP.dsp - Package Owner=<4>
+Project: "SSLIOP"=".\SSLIOP.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -378,7 +396,7 @@ Package=<4> ###############################################################################
-Project: "Security"=.\Security.dsp - Package Owner=<4>
+Project: "Security"=".\Security.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -390,7 +408,7 @@ Package=<4> ###############################################################################
-Project: "Svc Utils"=.\Svc_Utils.dsp - Package Owner=<4>
+Project: "Svc Utils"=".\Svc_Utils.dsp" - Package Owner=<4>
Package=<5>
{{{
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsw b/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsw index 42773b795eb..6616f84600c 100644 --- a/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsw +++ b/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ###############################################################################
-Project: "AV_Static"=.\AV_Static.dsp - Package Owner=<4>
+Project: "AV_Static"=".\AV_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -15,7 +15,7 @@ Package=<4> ###############################################################################
-Project: "CosConcurrency_Static"=.\CosConcurrency_Static.dsp - Package Owner=<4>
+Project: "CosConcurrency_Static"=".\CosConcurrency_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -27,7 +27,7 @@ Package=<4> ###############################################################################
-Project: "CosEvent_Static"=.\CosEvent_Static.dsp - Package Owner=<4>
+Project: "CosEvent_Static"=".\CosEvent_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -39,7 +39,7 @@ Package=<4> ###############################################################################
-Project: "CosLifeCycle_Static"=.\CosLifeCycle_Static.dsp - Package Owner=<4>
+Project: "CosLifeCycle_Static"=".\CosLifeCycle_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -51,7 +51,7 @@ Package=<4> ###############################################################################
-Project: "CosLoadBalancing_Static"=.\CosLoadBalancing_Static.dsp - Package Owner=<4>
+Project: "CosLoadBalancing_Static"=".\CosLoadBalancing_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -66,7 +66,7 @@ Package=<4> ###############################################################################
-Project: "CosNaming_Static"=.\CosNaming_Static.dsp - Package Owner=<4>
+Project: "CosNaming_Static"=".\CosNaming_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -78,7 +78,7 @@ Package=<4> ###############################################################################
-Project: "CosNotification_Static"=.\CosNotification_Static.dsp - Package Owner=<4>
+Project: "CosNotification LIB"=".\CosNotification_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -90,7 +90,7 @@ Package=<4> ###############################################################################
-Project: "CosProperty_Static"=.\CosProperty_Static.dsp - Package Owner=<4>
+Project: "CosProperty_Static"=".\CosProperty_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -102,7 +102,7 @@ Package=<4> ###############################################################################
-Project: "CosTime_Static"=.\CosTime_Static.dsp - Package Owner=<4>
+Project: "CosTime_Static"=".\CosTime_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -114,7 +114,7 @@ Package=<4> ###############################################################################
-Project: "CosTrading_Static"=.\CosTrading_Static.dsp - Package Owner=<4>
+Project: "CosTrading_Static"=".\CosTrading_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -126,7 +126,7 @@ Package=<4> ###############################################################################
-Project: "DsLogAdmin_Static"=.\DsLogAdmin_Static.dsp - Package Owner=<4>
+Project: "DsLogAdmin_Static"=".\DsLogAdmin_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -138,7 +138,7 @@ Package=<4> ###############################################################################
-Project: "FT ORB"=.\FT_ORB.dsp - Package Owner=<4>
+Project: "FT ORB"=".\FT_ORB.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -150,7 +150,7 @@ Package=<4> ###############################################################################
-Project: "Fault Tolerance"=.\Fault_Tolerance.dsp - Package Owner=<4>
+Project: "Fault Tolerance"=".\Fault_Tolerance.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -162,7 +162,19 @@ Package=<4> ###############################################################################
-Project: "PortableGroup_Static"=.\PortableGroup_Static.dsp - Package Owner=<4>
+Project: "Metrics"=".\Metrics\Metrics.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "PortableGroup_Static"=".\PortableGroup_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -177,7 +189,7 @@ Package=<4> ###############################################################################
-Project: "RTCORBAEvent_Static"=.\RTCORBAEvent_Static.dsp - Package Owner=<4>
+Project: "RTCORBAEvent_Static"=".\RTCORBAEvent_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -189,7 +201,7 @@ Package=<4> ###############################################################################
-Project: "RTEvent_Static"=.\RTEvent_Static.dsp - Package Owner=<4>
+Project: "RTEvent_Static"=".\RTEvent_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -204,7 +216,7 @@ Package=<4> ###############################################################################
-Project: "RTOLDEvent_Static"=.\RTOLDEvent_Static.dsp - Package Owner=<4>
+Project: "RTOLDEvent_Static"=".\RTOLDEvent_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -216,7 +228,7 @@ Package=<4> ###############################################################################
-Project: "RTSchedEvent_Static"=.\RTSchedEvent_Static.dsp - Package Owner=<4>
+Project: "RTSchedEvent_Static"=".\RTSchedEvent_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -228,7 +240,7 @@ Package=<4> ###############################################################################
-Project: "RTSched_Static"=.\RTSched_Static.dsp - Package Owner=<4>
+Project: "RTSched_Static"=".\RTSched_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -240,7 +252,7 @@ Package=<4> ###############################################################################
-Project: "SSLIOP_Static"=.\SSLIOP_Static.dsp - Package Owner=<4>
+Project: "SSLIOP_Static"=".\SSLIOP_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -252,7 +264,7 @@ Package=<4> ###############################################################################
-Project: "Security_Static"=.\Security_Static.dsp - Package Owner=<4>
+Project: "Security_Static"=".\Security_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -264,7 +276,7 @@ Package=<4> ###############################################################################
-Project: "Svc_Utils_Static"=.\Svc_Utils_Static.dsp - Package Owner=<4>
+Project: "Svc_Utils_Static"=".\Svc_Utils_Static.dsp" - Package Owner=<4>
Package=<5>
{{{
diff --git a/ace/Metrics_Cache_T.cpp b/ace/Metrics_Cache_T.cpp index 63fbe7117d7..20ac9a6dc57 100644 --- a/ace/Metrics_Cache_T.cpp +++ b/ace/Metrics_Cache_T.cpp @@ -3,7 +3,7 @@ #ifndef METRICS_CACHE_CPP #define METRICS_CACHE_CPP -#define ACE_BUILD_DLL +//#define ACE_BUILD_DLL #if defined (ACE_COMPILE_TIMEPROBES) diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp index 371c7080c6b..e9b794a83a2 100644 --- a/ace/ace_dll.dsp +++ b/ace/ace_dll.dsp @@ -107,8 +107,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../" /I "../PACE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ACE_BUILD_DLL" /D "ACE_OS_BUILD_DLL" /FD /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../" /I "../PACE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ACE_BUILD_DLL" /D "ACE_OS_BUILD_DLL" /FD /0b2 /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x407 /d "NDEBUG"
|