From 80dc87ec7d0d00f819093b34796e1b0e39817fd8 Mon Sep 17 00:00:00 2001 From: storri Date: Thu, 1 May 2003 21:02:21 +0000 Subject: *** empty log message *** --- ace/Metrics_Cache.cpp | 2 +- ace/Metrics_Cache.h | 5 ----- ace/Metrics_Cache_T.cpp | 6 ----- ace/Timeprobe.h | 29 +++++++++---------------- ace/ace_dll.dsp | 58 +++++++++++++++++++++++++++++++++++++++++++++++++ ace/config-all.h | 8 +++++++ 6 files changed, 77 insertions(+), 31 deletions(-) diff --git a/ace/Metrics_Cache.cpp b/ace/Metrics_Cache.cpp index 20766c98704..6ea24ce19e0 100644 --- a/ace/Metrics_Cache.cpp +++ b/ace/Metrics_Cache.cpp @@ -2,7 +2,7 @@ * $Id$ */ -#define ACE_BUILD_DLL +//#define ACE_BUILD_DLL #include "ace/OS.h" diff --git a/ace/Metrics_Cache.h b/ace/Metrics_Cache.h index f2ada900a6b..8589350a59c 100644 --- a/ace/Metrics_Cache.h +++ b/ace/Metrics_Cache.h @@ -24,11 +24,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_METRICS_COLLECTION) -#if defined (ACE_ENABLE_TIMEPROBES) - #if !defined (ACE_COMPILE_TIMEPROBES) - #define ACE_COMPILE_TIMEPROBES - #endif /* ACE_COMPILE_TIMEPROBES */ -#endif /* ACE_ENABLE_TIMEPROBES */ #if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES) # define REGISTER_METRICS_PROBE_RETURN(METRICS_PTR,METRICS_REGION,PROBE_NAME,PROBE_TYPE,METRICS_HANDLE) \ diff --git a/ace/Metrics_Cache_T.cpp b/ace/Metrics_Cache_T.cpp index e442617a853..63fbe7117d7 100644 --- a/ace/Metrics_Cache_T.cpp +++ b/ace/Metrics_Cache_T.cpp @@ -5,12 +5,6 @@ #define ACE_BUILD_DLL -#if defined (ACE_ENABLE_TIMEPROBES) - #if !defined (ACE_COMPILE_TIMEPROBES) - #define ACE_COMPILE_TIMEPROBES - #endif /* ACE_COMPILE_TIMEPROBES */ -#endif /* ACE_ENABLE_TIMEPROBES */ - #if defined (ACE_COMPILE_TIMEPROBES) #include "ace/Metrics_Cache.h" diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h index 0f7da17decd..494f67d2979 100644 --- a/ace/Timeprobe.h +++ b/ace/Timeprobe.h @@ -38,7 +38,7 @@ #ifndef ACE_TIMEPROBE_H #define ACE_TIMEPROBE_H #include "ace/pre.h" - +#include "ace/ACE_export.h" #include "ace/OS.h" #include "ace/Malloc_Allocator.h" @@ -46,12 +46,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_ENABLE_TIMEPROBES) - #if !defined (ACE_COMPILE_TIMEPROBES) - #define ACE_COMPILE_TIMEPROBES - #endif /* ACE_COMPILE_TIMEPROBES */ -#endif /* ACE_ENABLE_TIMEPROBES */ - #if defined (ACE_COMPILE_TIMEPROBES) /** @@ -133,24 +127,21 @@ typedef ACE_Timeprobe_Ex // in thread specific storage. This allows multiple threads to use // their own instance of ACE_Timerprobe, without interfering with each // other. + # if defined (ACE_TSS_TIMEPROBES) -#define ACE_TIMEPROBE_SINGLETON_DEFINE \ - ACE_TSS_Singleton; -typedef ACE_TSS_Singleton - ACE_TIMEPROBE_SINGLETON; +# define ACE_TIMEPROBE_SINGLETON_TYPE ACE_TSS_Singleton +# define ACE_TIMEPROBE_SINGLETON_LOCK_TYPE ACE_SYNCH_NULL_MUTEX # else /* ACE_TSS_TIMEPROBES */ -#define ACE_TIMEPROBE_SINGLETON_DEFINE \ - ACE_Singleton; -typedef ACE_Singleton - ACE_TIMEPROBE_SINGLETON; +# define ACE_TIMEPROBE_SINGLETON_TYPE ACE_Singleton +# define ACE_TIMEPROBE_SINGLETON_LOCK_TYPE ACE_SYNCH_MUTEX # endif /* ACE_TSS_TIMEPROBES */ -//typedef ACE_TIMEPROBE_SINGLETON_TYPE -// ACE_TIMEPROBE_SINGLETON; +typedef ACE_TIMEPROBE_SINGLETON_TYPE + ACE_TIMEPROBE_SINGLETON; ACE_SINGLETON_DECLARE (ACE_TIMEPROBE_SINGLETON_TYPE, \ - ACE_TIMEPROBE_WITH_LOCKING, \ - ACE_TIMEPROBE_SINGLETON_LOCK_TYPE); + ACE_TIMEPROBE_WITH_LOCKING, \ + ACE_TIMEPROBE_SINGLETON_LOCK_TYPE); #endif /* ACE_COMPILE_TIMEPROBES */ diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp index 176d632c23f..371c7080c6b 100644 --- a/ace/ace_dll.dsp +++ b/ace/ace_dll.dsp @@ -582,6 +582,35 @@ SOURCE=.\Method_Request.cpp # End Source File # Begin Source File +SOURCE=.\Metrics_Cache.cpp +# End Source File +# Begin Source File + +SOURCE=.\Metrics_Cache.i +# End Source File +# Begin Source File + +SOURCE=.\Metrics_Cache_T.cpp + +!IF "$(CFG)" == "ACE DLL - Win32 MFC Release" + +!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Debug" + +!ELSEIF "$(CFG)" == "ACE DLL - Win32 Release" + +!ELSEIF "$(CFG)" == "ACE DLL - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\Metrics_Cache_T.i +# End Source File +# Begin Source File + SOURCE=.\Msg_WFMO_Reactor.cpp # End Source File # Begin Source File @@ -978,6 +1007,23 @@ SOURCE=.\Timeprobe.cpp # End Source File # Begin Source File +SOURCE=.\Timeprobe_T.cpp + +!IF "$(CFG)" == "ACE DLL - Win32 MFC Release" + +!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Debug" + +!ELSEIF "$(CFG)" == "ACE DLL - Win32 Release" + +!ELSEIF "$(CFG)" == "ACE DLL - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\Timer_Hash.cpp # End Source File # Begin Source File @@ -1678,6 +1724,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 @@ -2178,6 +2232,10 @@ SOURCE=.\Timeprobe.h # End Source File # Begin Source File +SOURCE=.\Timeprobe_T.h +# End Source File +# Begin Source File + SOURCE=.\Timer_Hash.h # End Source File # Begin Source File diff --git a/ace/config-all.h b/ace/config-all.h index 3026090db47..72815dc1de6 100644 --- a/ace/config-all.h +++ b/ace/config-all.h @@ -621,5 +621,13 @@ extern "C" u_long CLS##_Export _get_dll_unload_policy (void) \ # define ACE_NOTSUP do { errno = ENOTSUP; return; } while (0) #endif /* ! ACE_HAS_VERBOSE_NOTSUP */ + +// Enable ACE Timeprobes +#if defined (ACE_ENABLE_TIMEPROBES) + #if !defined (ACE_COMPILE_TIMEPROBES) + #define ACE_COMPILE_TIMEPROBES + #endif /* ACE_COMPILE_TIMEPROBES */ +#endif /* ACE_ENABLE_TIMEPROBES */ + #include "ace/post.h" #endif /* ACE_CONFIG_ALL_H */ -- cgit v1.2.1