add some more wallpaper protection against cpu frequency = 0 in gettimeofday_* internals

diff --git a/runtime/ChangeLog b/runtime/ChangeLog
index b583b4aac1bc588db7044e26ba199238607b84f4..3f88bae2bbe82abcd26245f44c718462a17ca581 100644 (file)
--- a/runtime/ChangeLog
+++ b/runtime/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-09  Frank Ch. Eigler  <fche@elastic.org>
+
+       * time.c (_stp_gettimeofday_ns): Protect some more against freq=0.
+
 2008-12-08  Wenji Huang  <wenji.huang@oracle.com>
 
        * uprobes2/uprobes_x86.c (handle_riprel_insn): Fix the warning. 

diff --git a/runtime/time.c b/runtime/time.c
index 6b01cebeea51e81775442f5194bdcf232d675003..15e205ddbdda2b532ee23a999a55f0081c178776 100644 (file)
--- a/runtime/time.c
+++ b/runtime/time.c
@@ -296,7 +296,6 @@ _stp_gettimeofday_ns(void)
     }
 
     delta = get_cycles() - last;
-
     preempt_enable_no_resched();
 
 #if defined (__s390__) || defined (__s390x__)
@@ -317,6 +316,8 @@ _stp_gettimeofday_ns(void)
     // Verify units:
     //   (D cycles) * (1E6 ns/ms) / (F cycles/ms [kHz]) = ns
     delta *= NSEC_PER_MSEC;
+    if (freq == 0)
+      return 0;
     do_div(delta, freq);
 #endif