mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Issue #22043: Fix pymonotonic(), use tv_usec=-1 as a marker to skip

Browse source 
the monotonic test
This commit is contained in:
Victor Stinner 2014-09-03 09:43:48 +02:00
parent ae58649721
commit 5789cfbb56
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Python/pytime.c
View file

@ -121,7 +121,7 @@ static int
pymonotonic(_PyTime_timeval *tp, _Py_clock_info_t *info, int raise) pymonotonic(_PyTime_timeval *tp, _Py_clock_info_t *info, int raise)
{ {
#ifdef Py_DEBUG #ifdef Py_DEBUG
static _PyTime_timeval last = {-1, -1}; static _PyTime_timeval last = {0, -1};
#endif #endif
#if defined(MS_WINDOWS) #if defined(MS_WINDOWS)
static ULONGLONG (*GetTickCount64) (void) = NULL; static ULONGLONG (*GetTickCount64) (void) = NULL;
@ -247,7 +247,8 @@ pymonotonic(_PyTime_timeval *tp, _Py_clock_info_t *info, int raise)
assert(0 <= tp->tv_usec && tp->tv_usec < 1000 * 1000); assert(0 <= tp->tv_usec && tp->tv_usec < 1000 * 1000);
#ifdef Py_DEBUG #ifdef Py_DEBUG
/* monotonic clock cannot go backward */ /* monotonic clock cannot go backward */
assert(tp->tv_sec > last.tv_sec assert(last.tv_usec == -1
|| tp->tv_sec > last.tv_sec
|| (tp->tv_sec == last.tv_sec && tp->tv_usec >= last.tv_usec)); || (tp->tv_sec == last.tv_sec && tp->tv_usec >= last.tv_usec));
last = *tp; last = *tp;
#endif #endif