Commit d8f10917 authored by Yang Tse's avatar Yang Tse
Browse files

fallback to gettimeofday when monotonic clock is unavailable at run-time

parent bbb1b99c

src/curlutil.c

+18 −3
Original line number Diff line number Diff line
@@ -54,9 +54,24 @@ struct timeval cutil_tvnow(void) 
  */

  struct timeval now;

  struct timespec tsnow;

  (void)clock_gettime(CLOCK_MONOTONIC, &tsnow);

  if(0 == clock_gettime(CLOCK_MONOTONIC, &tsnow)) {

    now.tv_sec = tsnow.tv_sec;

    now.tv_usec = tsnow.tv_nsec / 1000;

  }

  /*

  ** Even when the configure process has truly detected monotonic clock

  ** availability, it might happen that it is not actually available at

  ** run-time. When this occurs simply fallback to other time source.

  */

#ifdef HAVE_GETTIMEOFDAY

  else

    (void)gettimeofday(&now, NULL);

#else

  else {

    now.tv_sec = (long)time(NULL);

    now.tv_usec = 0;

  }

#endif

  return now;

}

tests/libtest/testutil.c

+18 −3
Original line number Diff line number Diff line
@@ -54,9 +54,24 @@ struct timeval tutil_tvnow(void) 
  */

  struct timeval now;

  struct timespec tsnow;

  (void)clock_gettime(CLOCK_MONOTONIC, &tsnow);

  if(0 == clock_gettime(CLOCK_MONOTONIC, &tsnow)) {

    now.tv_sec = tsnow.tv_sec;

    now.tv_usec = tsnow.tv_nsec / 1000;

  }

  /*

  ** Even when the configure process has truly detected monotonic clock

  ** availability, it might happen that it is not actually available at

  ** run-time. When this occurs simply fallback to other time source.

  */

#ifdef HAVE_GETTIMEOFDAY

  else

    (void)gettimeofday(&now, NULL);

#else

  else {

    now.tv_sec = (long)time(NULL);

    now.tv_usec = 0;

  }

#endif

  return now;

}