X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Ftime.c;h=27758dc7534e4b78a40871a6a699b96811cff852;hb=refs%2Fchanges%2F01%2F24801%2F2;hp=3b3acfa3d1b7afd5f75fa891015273acd4250ac8;hpb=a80f8f371733a73a0fa8351a66bd1e519f1b90cd;p=vpp.git

diff --git a/src/vppinfra/time.c b/src/vppinfra/time.c
index 3b3acfa3d1b..27758dc7534 100644
--- a/src/vppinfra/time.c
+++ b/src/vppinfra/time.c
@@ -208,6 +208,22 @@ clib_time_init (clib_time_t * c)
 {
   clib_memset (c, 0, sizeof (c[0]));
   c->clocks_per_second = os_cpu_clock_frequency ();
+  /*
+   * Sporadic reports of os_cpu_clock_frequency() returning 0.0
+   * in highly parallel container environments.
+   * To avoid immediate division by zero:
+   *   Step 1: try estimate_clock_frequency().
+   *   Step 2: give up. Pretend we have a 2gHz clock.
+   */
+  if (PREDICT_FALSE (c->clocks_per_second == 0.0))
+    {
+      c->clocks_per_second = estimate_clock_frequency (1e-3);
+      if (c->clocks_per_second == 0.0)
+	{
+	  clib_warning ("os_cpu_clock_frequency() returned 0.0, use 2e9...");
+	  c->clocks_per_second = 2e9;
+	}
+    }
   c->seconds_per_clock = 1 / c->clocks_per_second;
   c->log2_clocks_per_second = min_log2_u64 ((u64) c->clocks_per_second);