diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-09-02 21:01:40 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-09-02 21:01:40 (GMT) |
| commit | 9bb758cee7f1694807ebe600b6230fb8e565d3ea (patch) | |
| tree | fdce260dfd2eeb0fb512332105475c6286eeba04 | |
| parent | 5791a5403b130323db98b8d8dd36e31adb37a1e9 (diff) | |
| download | cpython-9bb758cee7f1694807ebe600b6230fb8e565d3ea.zip cpython-9bb758cee7f1694807ebe600b6230fb8e565d3ea.tar.gz cpython-9bb758cee7f1694807ebe600b6230fb8e565d3ea.tar.bz2 | |
Issue #22043: Fix _PyTime_gettimeofday() if HAVE_GETTIMEOFDAY
Ensure also that the tv_usec field is consistent: in range [0; 999999].
| -rw-r--r-- | Python/pytime.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Python/pytime.c b/Python/pytime.c index 31c8f66..395a432 100644 --- a/Python/pytime.c +++ b/Python/pytime.c @@ -37,7 +37,6 @@ pygettimeofday(_PyTime_timeval *tp, _Py_clock_info_t *info, int raise) info->resolution = timeIncrement * 1e-7; info->adjustable = 1; } - return 0; #else /* MS_WINDOWS */ int err; @@ -67,11 +66,9 @@ pygettimeofday(_PyTime_timeval *tp, _Py_clock_info_t *info, int raise) else info->resolution = 1e-9; } - return 0; #else /* HAVE_CLOCK_GETTIME */ /* test gettimeofday() */ -#ifdef HAVE_GETTIMEOFDAY #ifdef GETTIMEOFDAY_NO_TZ err = gettimeofday(tp); #else @@ -89,10 +86,10 @@ pygettimeofday(_PyTime_timeval *tp, _Py_clock_info_t *info, int raise) info->monotonic = 0; info->adjustable = 1; } - return 0; -#endif /* HAVE_GETTIMEOFDAY */ #endif /* !HAVE_CLOCK_GETTIME */ #endif /* !MS_WINDOWS */ + assert(0 <= tp->tv_usec && tp->tv_usec < 1000 * 1000); + return 0; } void |