summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2001-09-12 19:18:30 +0000
committerSteve Huston <shuston@riverace.com>2001-09-12 19:18:30 +0000
commit65ae0b533e6e177a91f193c74a6f0b15d8218884 (patch)
treee26fec2faedc9a77b373f42c45a3b83b2fbbe2c9
parentf90211f8c807c2dc91adbdd494b55ae208796701 (diff)
downloadATCD-65ae0b533e6e177a91f193c74a6f0b15d8218884.tar.gz
ChangeLogTag:Wed Sep 12 15:10:41 2001 Steve Huston <shuston@riverace.com>
-rw-r--r--ChangeLog15
-rw-r--r--ChangeLogs/ChangeLog-02a15
-rw-r--r--ChangeLogs/ChangeLog-03a15
-rw-r--r--ace/High_Res_Timer.cpp4
4 files changed, 47 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index de27339f251..e7a96f8f924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Wed Sep 12 15:10:41 2001 Steve Huston <shuston@riverace.com>
+
+ * ace/High_Res_Timer.cpp (elapsed_time (ACE_hrtime_t&nanoseconds),
+ elapsed_time_incr (ACE_hrtime_t&nanoseconds): Changes to account
+ for very fast clocks (> 1GHz). Thank you to Derek Dominish
+ <derek.dominish@boeing.com> and Alain Decamps
+ <Alain.Decamps@PIDPA.be> for identifying the problem and coming
+ up with a good solution. This fixes Bugzilla #1024 (how
+ appropriate! ;-)
+
+ * ace/High_Res_Timer.i (elapsed_microseconds (ACE_hrtime_t &usecs):
+ More adjustment to the Win32 scale factor adjusting. Thanks (again!)
+ to Alain Decamps <Alain.Decamps@PIDPA.be> for identifying and
+ supplying a fix for this. This fixes Bugzilla #948 (again).
+
Wed Sep 12 14:33:29 2001 Steve Huston <shuston@riverace.com>
* tests/High_Res_Timer_Test.cpp: Incorporated some additional tests
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index de27339f251..e7a96f8f924 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,18 @@
+Wed Sep 12 15:10:41 2001 Steve Huston <shuston@riverace.com>
+
+ * ace/High_Res_Timer.cpp (elapsed_time (ACE_hrtime_t&nanoseconds),
+ elapsed_time_incr (ACE_hrtime_t&nanoseconds): Changes to account
+ for very fast clocks (> 1GHz). Thank you to Derek Dominish
+ <derek.dominish@boeing.com> and Alain Decamps
+ <Alain.Decamps@PIDPA.be> for identifying the problem and coming
+ up with a good solution. This fixes Bugzilla #1024 (how
+ appropriate! ;-)
+
+ * ace/High_Res_Timer.i (elapsed_microseconds (ACE_hrtime_t &usecs):
+ More adjustment to the Win32 scale factor adjusting. Thanks (again!)
+ to Alain Decamps <Alain.Decamps@PIDPA.be> for identifying and
+ supplying a fix for this. This fixes Bugzilla #948 (again).
+
Wed Sep 12 14:33:29 2001 Steve Huston <shuston@riverace.com>
* tests/High_Res_Timer_Test.cpp: Incorporated some additional tests
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index de27339f251..e7a96f8f924 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,18 @@
+Wed Sep 12 15:10:41 2001 Steve Huston <shuston@riverace.com>
+
+ * ace/High_Res_Timer.cpp (elapsed_time (ACE_hrtime_t&nanoseconds),
+ elapsed_time_incr (ACE_hrtime_t&nanoseconds): Changes to account
+ for very fast clocks (> 1GHz). Thank you to Derek Dominish
+ <derek.dominish@boeing.com> and Alain Decamps
+ <Alain.Decamps@PIDPA.be> for identifying the problem and coming
+ up with a good solution. This fixes Bugzilla #1024 (how
+ appropriate! ;-)
+
+ * ace/High_Res_Timer.i (elapsed_microseconds (ACE_hrtime_t &usecs):
+ More adjustment to the Win32 scale factor adjusting. Thanks (again!)
+ to Alain Decamps <Alain.Decamps@PIDPA.be> for identifying and
+ supplying a fix for this. This fixes Bugzilla #948 (again).
+
Wed Sep 12 14:33:29 2001 Steve Huston <shuston@riverace.com>
* tests/High_Res_Timer_Test.cpp: Incorporated some additional tests
diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp
index 89840f40cc1..d92c735b1dd 100644
--- a/ace/High_Res_Timer.cpp
+++ b/ace/High_Res_Timer.cpp
@@ -111,8 +111,8 @@ ACE_High_Res_Timer::get_cpuinfo (void)
// But if we don't have the right kind of Intel chip,
// just quit.
if (ACE_OS::strcmp (arg, "II") == 0
- || ACE_OS::strcmp (arg, "III") == 0
- || ACE_OS::strcmp (arg, "IV") == 0
+ || ACE_OS::strcmp (arg, "III") == 0
+ || ACE_OS::strcmp (arg, "IV") == 0
|| ACE_OS::strcmp (arg, "Pro") == 0)
{
supported = 1;