diff options
| author | Steve Huston <shuston@riverace.com> | 2001-09-14 21:20:33 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2001-09-14 21:20:33 +0000 |
| commit | e9be12e695907b3756795120fa1a46c145a5a69d (patch) | |
| tree | 0e96d3d3508ed4e05907d509b0cad0171c3cd0be | |
| parent | 3f4ac4de76111961bcc9826897e665b7c49af0ea (diff) | |
| download | ATCD-e9be12e695907b3756795120fa1a46c145a5a69d.tar.gz | |
ChangeLogTag:Fri Sep 14 17:18:37 2001 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 | ||||
| -rw-r--r-- | tests/High_Res_Timer_Test.cpp | 2 |
4 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 0f4c124f6a6..7b739a8bb16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 14 17:18:37 2001 Steve Huston <shuston@riverace.com> + + * tests/High_Res_Timer_Test.cpp (check_micro_nano): If the + nanointerval is 0, change it to 1 to prevent divide-by-zero. + Fri Sep 14 17:02:39 2001 Steve Huston <shuston@riverace.com> * tests/High_Res_Timer_Test.cpp: Replaced some (u_int) casts with diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 0f4c124f6a6..7b739a8bb16 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Fri Sep 14 17:18:37 2001 Steve Huston <shuston@riverace.com> + + * tests/High_Res_Timer_Test.cpp (check_micro_nano): If the + nanointerval is 0, change it to 1 to prevent divide-by-zero. + Fri Sep 14 17:02:39 2001 Steve Huston <shuston@riverace.com> * tests/High_Res_Timer_Test.cpp: Replaced some (u_int) casts with diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 0f4c124f6a6..7b739a8bb16 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Fri Sep 14 17:18:37 2001 Steve Huston <shuston@riverace.com> + + * tests/High_Res_Timer_Test.cpp (check_micro_nano): If the + nanointerval is 0, change it to 1 to prevent divide-by-zero. + Fri Sep 14 17:02:39 2001 Steve Huston <shuston@riverace.com> * tests/High_Res_Timer_Test.cpp: Replaced some (u_int) casts with diff --git a/tests/High_Res_Timer_Test.cpp b/tests/High_Res_Timer_Test.cpp index 2e794b2a3a0..b1c5c3dc0cc 100644 --- a/tests/High_Res_Timer_Test.cpp +++ b/tests/High_Res_Timer_Test.cpp @@ -58,6 +58,8 @@ check_micro_nano (ACE_hrtime_t microinterval, ACE_hrtime_t nanointerval) microinterval - nanointerval : nanointerval - microinterval ); const u_int difference = ACE_U64_TO_U32 (hr_difference); + if (nanointerval == 0) + nanointerval = 1; // Prevent divide-by-zero const u_int promille_difference = difference * 1000 / ACE_U64_TO_U32(nanointerval); |