changeset:   92307:9deef14393d5
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Wed Sep 03 09:43:48 2014 +0200
files:       Python/pytime.c
description:
Issue #22043: Fix pymonotonic(), use tv_usec=-1 as a marker to skip
the monotonic test


diff -r b12857782041 -r 9deef14393d5 Python/pytime.c
--- a/Python/pytime.c	Tue Sep 02 23:18:25 2014 +0200
+++ b/Python/pytime.c	Wed Sep 03 09:43:48 2014 +0200
@@ -121,7 +121,7 @@
 pymonotonic(_PyTime_timeval *tp, _Py_clock_info_t *info, int raise)
 {
 #ifdef Py_DEBUG
-    static _PyTime_timeval last = {-1, -1};
+    static _PyTime_timeval last = {0, -1};
 #endif
 #if defined(MS_WINDOWS)
     static ULONGLONG (*GetTickCount64) (void) = NULL;
@@ -247,7 +247,8 @@
     assert(0 <= tp->tv_usec && tp->tv_usec < 1000 * 1000);
 #ifdef Py_DEBUG
     /* 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));
     last = *tp;
 #endif