diff options
| author | mitza <mitza@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-03-31 15:19:47 +0000 |
|---|---|---|
| committer | mitza <mitza@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-03-31 15:19:47 +0000 |
| commit | 78a28cd9f8c03ca805f4a1a6a9f14c522ddb0e14 (patch) | |
| tree | fd344f626dd272cf2181536ffd838db241d4a07b /ACE | |
| parent | 43690d6ec9d91343b100b1ed3a536c7b5ced8494 (diff) | |
| download | ATCD-78a28cd9f8c03ca805f4a1a6a9f14c522ddb0e14.tar.gz | |
ChangeLogTag: Tue Mar 31 14:59:49 UTC 2009 Adam Mitz <mitza@ociweb.com>
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/ace/High_Res_Timer.cpp | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index efe063bb7a6..77a6291ea39 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Tue Mar 31 14:59:49 UTC 2009 Adam Mitz <mitza@ociweb.com> + + * ace/High_Res_Timer.cpp: + + Linux configured with "clock=pit" on the boot line (commonly used + for virtual machines) can report a 0 MHz CPU, in which case ACE + must run calibration for the High Res Timer to avoid a division by 0. + Mon Mar 30 14:32:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS_NS_Thread.cpp: diff --git a/ACE/ace/High_Res_Timer.cpp b/ACE/ace/High_Res_Timer.cpp index accab008d36..f4eee00cbbd 100644 --- a/ACE/ace/High_Res_Timer.cpp +++ b/ACE/ace/High_Res_Timer.cpp @@ -234,7 +234,7 @@ ACE_High_Res_Timer::global_scale_factor (void) # endif /* ! ACE_WIN32 && ! (linux && __alpha__) */ # if !defined (ACE_WIN32) - if (ACE_High_Res_Timer::global_scale_factor_ == 1u) + if (ACE_High_Res_Timer::global_scale_factor_ <= 1u) // Failed to retrieve CPU speed from system, so calculate it. ACE_High_Res_Timer::calibrate (); # endif // (ACE_WIN32) |