diff options
Diffstat (limited to 'ACE/ace/High_Res_Timer.cpp')
| -rw-r--r-- | ACE/ace/High_Res_Timer.cpp | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/ACE/ace/High_Res_Timer.cpp b/ACE/ace/High_Res_Timer.cpp index a803982ef0f..556eb62bf7e 100644 --- a/ACE/ace/High_Res_Timer.cpp +++ b/ACE/ace/High_Res_Timer.cpp @@ -30,7 +30,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL // ACE_OS::gethrtime. We'll still set this to one to prevent division // by zero errors. #if (defined (ACE_WIN32) || defined (ACE_HAS_POWERPC_TIMER) || \ - defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_ALPHA_TIMER)) && \ + defined (ACE_HAS_PENTIUM)) && \ !defined (ACE_HAS_HI_RES_TIMER) # include "ace/Guard_T.h" @@ -48,7 +48,7 @@ ACE_High_Res_Timer::global_scale_factor_type ACE_High_Res_Timer::global_scale_fa ACE_END_VERSIONED_NAMESPACE_DECL #else /* ! (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \ - ACE_HAS_PENTIUM || ACE_HAS_ALPHA_TIMER) || + ACE_HAS_PENTIUM) || ACE_HAS_HI_RES_TIMER */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -60,7 +60,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ! (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \ - ACE_HAS_PENTIUM || ACE_HAS_ALPHA_TIMER) || + ACE_HAS_PENTIUM) || ACE_HAS_HI_RES_TIMER */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -82,9 +82,7 @@ ACE_High_Res_Timer::get_cpuinfo () // the BogoMips, as described in the BogoMips mini-HOWTO. Note that // this code assumes an order to the /proc/cpuinfo contents. The // BogoMips rating had better come after CPU type and model info. -#if !defined (__alpha__) bool supported = false; -#endif /* __alpha__ */ FILE *cpuinfo = ACE_OS::fopen (ACE_TEXT ("/proc/cpuinfo"), ACE_TEXT ("r")); @@ -97,22 +95,6 @@ ACE_High_Res_Timer::get_cpuinfo () while (ACE_OS::fgets (buf, sizeof buf, cpuinfo)) { -#if defined (__alpha__) - ACE_UINT32 whole; - ACE_UINT32 fractional; - if (::sscanf (buf, - "BogoMIPS : %d.%d\n", - &whole, - &fractional) == 2 - || ::sscanf (buf, - "bogomips : %d.%d\n", - &whole, - &fractional) == 2) - { - scale_factor = whole; - break; - } -#else double mhertz = 1; double bmips = 1; char arg[128]; @@ -173,7 +155,6 @@ ACE_High_Res_Timer::get_cpuinfo () #endif /* 0 */ break; } -#endif /* __alpha__ */ } // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (done)\n"))); @@ -189,7 +170,7 @@ ACE_High_Res_Timer::global_scale_factor_type ACE_High_Res_Timer::global_scale_factor () { #if (defined (ACE_WIN32) || defined (ACE_HAS_POWERPC_TIMER) || \ - defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_ALPHA_TIMER)) && \ + defined (ACE_HAS_PENTIUM)) && \ !defined (ACE_HAS_HI_RES_TIMER) && \ (defined (ACE_WIN32) || \ defined (ghs) || defined (__GNUG__) || \ @@ -226,7 +207,7 @@ ACE_High_Res_Timer::global_scale_factor () # else ACE_High_Res_Timer::global_scale_factor (ACE_High_Res_Timer::get_cpuinfo ()); # endif /* ACE_LACKS_SSCANF */ -# endif /* ! ACE_WIN32 && ! (ACE_LINUX && __alpha__) */ +# endif /* !ACE_WIN32 && !ACE_LINUX */ # if !defined (ACE_WIN32) if (ACE_High_Res_Timer::global_scale_factor_ <= 1u) @@ -244,7 +225,7 @@ ACE_High_Res_Timer::global_scale_factor () } #endif /* (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \ - ACE_HAS_PENTIUM || ACE_HAS_ALPHA_TIMER) && \ + ACE_HAS_PENTIUM) && \ ! ACE_HAS_HI_RES_TIMER && ((WIN32 && ! WINCE) || ghs || __GNUG__) */ |