changeset: 92264:8e13ad4e5ae6 user: Victor Stinner date: Fri Aug 29 15:41:08 2014 +0200 files: Misc/NEWS Modules/timemodule.c Python/pytime.c configure configure.ac description: Issue #22287: On UNIX, _PyTime_gettimeofday() now uses clock_gettime(CLOCK_REALTIME) if available. As a side effect, Python now depends on the librt library on Solaris and on Linux (only with glibc older than 2.17). diff -r f01413758114 -r 8e13ad4e5ae6 Misc/NEWS --- a/Misc/NEWS Fri Aug 29 07:09:25 2014 +0300 +++ b/Misc/NEWS Fri Aug 29 15:41:08 2014 +0200 @@ -124,6 +124,11 @@ Library ------- +- Issue #22287: On UNIX, _PyTime_gettimeofday() now uses + clock_gettime(CLOCK_REALTIME) if available. As a side effect, Python now + depends on the librt library on Solaris and on Linux (only with glibc older + than 2.17). + - Issue #22182: Use e.args to unpack exceptions correctly in distutils.file_util.move_file. Patch by Claudiu Popa. diff -r f01413758114 -r 8e13ad4e5ae6 Modules/timemodule.c --- a/Modules/timemodule.c Fri Aug 29 07:09:25 2014 +0300 +++ b/Modules/timemodule.c Fri Aug 29 15:41:08 2014 +0200 @@ -1535,28 +1535,6 @@ floattime(_Py_clock_info_t *info) { _PyTime_timeval t; -#ifdef HAVE_CLOCK_GETTIME - struct timespec tp; - int ret; - - /* _PyTime_gettimeofday() does not use clock_gettime() - because it would require to link Python to the rt (real-time) - library, at least on Linux */ - ret = clock_gettime(CLOCK_REALTIME, &tp); - if (ret == 0) { - if (info) { - struct timespec res; - info->implementation = "clock_gettime(CLOCK_REALTIME)"; - info->monotonic = 0; - info->adjustable = 1; - if (clock_getres(CLOCK_REALTIME, &res) == 0) - info->resolution = res.tv_sec + res.tv_nsec * 1e-9; - else - info->resolution = 1e-9; - } - return PyFloat_FromDouble(tp.tv_sec + tp.tv_nsec * 1e-9); - } -#endif _PyTime_gettimeofday_info(&t, info); return PyFloat_FromDouble((double)t.tv_sec + t.tv_usec * 1e-6); } diff -r f01413758114 -r 8e13ad4e5ae6 Python/pytime.c --- a/Python/pytime.c Fri Aug 29 07:09:25 2014 +0300 +++ b/Python/pytime.c Fri Aug 29 15:41:08 2014 +0200 @@ -56,8 +56,39 @@ fail, so we fall back on ftime() or time(). Note: clock resolution does not imply clock accuracy! */ +#if (defined(HAVE_CLOCK_GETTIME) || defined(HAVE_GETTIMEOFDAY) \ + || defined(HAVE_FTIME)) + int err; +#endif +#ifdef HAVE_CLOCK_GETTIME + struct timespec ts; +#endif +#ifdef HAVE_FTIME + struct timeb t; +#endif + + /* test clock_gettime(CLOCK_REALTIME) */ +#ifdef HAVE_CLOCK_GETTIME + err = clock_gettime(CLOCK_REALTIME, &ts); + if (err == 0) { + if (info) { + struct timespec res; + info->implementation = "clock_gettime(CLOCK_REALTIME)"; + info->monotonic = 0; + info->adjustable = 1; + if (clock_getres(CLOCK_REALTIME, &res) == 0) + info->resolution = res.tv_sec + res.tv_nsec * 1e-9; + else + info->resolution = 1e-9; + } + tp->tv_sec = ts.tv_sec; + tp->tv_usec = ts.tv_nsec / 1000; + return; + } +#endif + + /* test gettimeofday() */ #ifdef HAVE_GETTIMEOFDAY - int err; #ifdef GETTIMEOFDAY_NO_TZ err = gettimeofday(tp); #else @@ -74,18 +105,15 @@ } #endif /* HAVE_GETTIMEOFDAY */ -#if defined(HAVE_FTIME) - { - struct timeb t; - ftime(&t); - tp->tv_sec = t.time; - tp->tv_usec = t.millitm * 1000; - if (info) { - info->implementation = "ftime()"; - info->resolution = 1e-3; - info->monotonic = 0; - info->adjustable = 1; - } +#ifdef HAVE_FTIME + ftime(&t); + tp->tv_sec = t.time; + tp->tv_usec = t.millitm * 1000; + if (info) { + info->implementation = "ftime()"; + info->resolution = 1e-3; + info->monotonic = 0; + info->adjustable = 1; } #else /* !HAVE_FTIME */ tp->tv_sec = time(NULL); diff -r f01413758114 -r 8e13ad4e5ae6 configure --- a/configure Fri Aug 29 07:09:25 2014 +0300 +++ b/configure Fri Aug 29 15:41:08 2014 +0200 @@ -11904,6 +11904,7 @@ $as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then : + LIBS="$LIBS -lrt" $as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h diff -r f01413758114 -r 8e13ad4e5ae6 configure.ac --- a/configure.ac Fri Aug 29 07:09:25 2014 +0300 +++ b/configure.ac Fri Aug 29 15:41:08 2014 +0200 @@ -3319,6 +3319,7 @@ AC_CHECK_FUNCS(clock_gettime, [], [ AC_CHECK_LIB(rt, clock_gettime, [ + LIBS="$LIBS -lrt" AC_DEFINE(HAVE_CLOCK_GETTIME, 1) AC_DEFINE(TIMEMODULE_LIB, [rt], [Library needed by timemodule.c: librt may be needed for clock_gettime()])