diff options
| author | Steve Huston <shuston@riverace.com> | 2007-02-22 16:03:48 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2007-02-22 16:03:48 +0000 |
| commit | 9c3579fa02a0b9ea98df6a01ba74a9072847a8cc (patch) | |
| tree | b5103e509d799eaaf14854062e821ea2d1124276 | |
| parent | e730aeeb8df50fbe3f5ddcdda74d5c0642a36752 (diff) | |
| download | ATCD-9c3579fa02a0b9ea98df6a01ba74a9072847a8cc.tar.gz | |
ChangeLogTag:Thu Feb 22 15:59:12 UTC 2007 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 13 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_time.inl | 3 | ||||
| -rw-r--r-- | ACE/ace/config-win32-common.h | 7 | ||||
| -rw-r--r-- | ACE/ace/gethrtime.cpp | 3 |
4 files changed, 17 insertions, 9 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index d35d718dd55..ce697e59013 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,16 @@ +Thu Feb 22 15:59:12 UTC 2007 Steve Huston <shuston@riverace.com> + + * ace/config-win32-common.h: Change the comments around ACE_HAS_PENTIUM + to more accurately reflect its use and setting. With the switch to + QueryPerformanceCounter() for high-res timers on Windows, this + setting doesn't have any affect on timers, but it is used in + some CDR operations. This resolves Bugzilla #1410. + + * ace/OS_NS_time.inl (gethrtime): + * ace/gethrtime.cpp: Remove the comments directing the reader to a + description of using RDTSC on Windows. The comment is long gone, and + RDTSC isn't used on Windows/VC any longer anyway. + Thu Feb 22 15:07:22 UTC 2007 Ciju John <johnc@ociweb.com> * bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm: diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl index 2e7613cbced..f8a8af92b86 100644 --- a/ACE/ace/OS_NS_time.inl +++ b/ACE/ace/OS_NS_time.inl @@ -229,9 +229,6 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op) ACE_hrtime_t now; # endif /* ! ACE_LACKS_LONGLONG_T */ - // See comments about the RDTSC Pentium instruction for the ACE_WIN32 - // version of ACE_OS::gethrtime (), below. - // // Read the high-res tick counter directly into memory variable "now". // The A constraint signifies a 64-bit int. asm volatile ("rdtsc" : "=A" (now) : : "memory"); diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index ff7a1979f80..5a8e52d44bc 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -342,9 +342,10 @@ // No system support for replacing any previous mappings. #define ACE_LACKS_AUTO_MMAP_REPLACEMENT -// If you want to use highres timers, ensure that -// Build.Settings.C++.CodeGeneration.Processor is -// set to Pentium ! +// ACE_HAS_PENTIUM is used to optimize some CDR operations; it's used for +// some other time-related things using g++, but not for VC. Current VC +// compilers set _M_IX86 > 400 by default so if you're not using a Pentium +// class CPU, set the project code generation options appropriately. #if !defined(ACE_HAS_PENTIUM) && (_M_IX86 > 400) # define ACE_HAS_PENTIUM #endif diff --git a/ACE/ace/gethrtime.cpp b/ACE/ace/gethrtime.cpp index 74dbb62b689..9fa33423aff 100644 --- a/ACE/ace/gethrtime.cpp +++ b/ACE/ace/gethrtime.cpp @@ -26,9 +26,6 @@ ACE_GETHRTIME_NAME (void) ACE_hrtime_t now; #endif /* ! ACE_LACKS_LONGLONG_T */ - // See comments about the RDTSC Pentium instruction for the - // ACE_WIN32 version of ACE_OS::gethrtime () in ace/OS.i. - // // Read the high-res tick counter directly into memory variable // "now". The A constraint signifies a 64-bit int. #if defined (__GNUG__) |