commit d8e919ef7352c915395e4f7fc1850458315e849a
author sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Wed May 29 20:13:53 2002 +0000
committer sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Wed May 29 20:13:53 2002 +0000
tree c6ace4c2ce4329e74e1530a0bdcfc76b5db0e392
parent ccef2e63ab50d66f1f8f401f845805fb62e630a1

pthread_cond_timedwait: be robust to timeout points in the past


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@334 a5019735-40e9-0310-863c-91ae7b9d1cf9

coregrind/arch/x86-linux/vg_libpthread.c

diff --git a/coregrind/arch/x86-linux/vg_libpthread.c b/coregrind/arch/x86-linux/vg_libpthread.c
index 8d5ef2f..2cdc5ce 100644
--- a/coregrind/arch/x86-linux/vg_libpthread.c
+++ b/coregrind/arch/x86-linux/vg_libpthread.c
@@ -798,7 +798,8 @@
    ull_ms_end_after_1970
       = 1000ULL * ((unsigned long long int)(abstime->tv_sec))
         + ((unsigned long long int)(abstime->tv_nsec / 1000000));
-   assert(ull_ms_end_after_1970 >= ull_ms_now_after_1970);
+   if (ull_ms_end_after_1970 < ull_ms_now_after_1970)
+      ull_ms_end_after_1970 = ull_ms_now_after_1970;
    ms_end 
       = ms_now + (unsigned int)(ull_ms_end_after_1970 - ull_ms_now_after_1970);
    VALGRIND_MAGIC_SEQUENCE(res, 0 /* default */,

coregrind/vg_libpthread.c

diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c
index 8d5ef2f..2cdc5ce 100644
--- a/coregrind/vg_libpthread.c
+++ b/coregrind/vg_libpthread.c
@@ -798,7 +798,8 @@
    ull_ms_end_after_1970
       = 1000ULL * ((unsigned long long int)(abstime->tv_sec))
         + ((unsigned long long int)(abstime->tv_nsec / 1000000));
-   assert(ull_ms_end_after_1970 >= ull_ms_now_after_1970);
+   if (ull_ms_end_after_1970 < ull_ms_now_after_1970)
+      ull_ms_end_after_1970 = ull_ms_now_after_1970;
    ms_end 
       = ms_now + (unsigned int)(ull_ms_end_after_1970 - ull_ms_now_after_1970);
    VALGRIND_MAGIC_SEQUENCE(res, 0 /* default */,

vg_libpthread.c

diff --git a/vg_libpthread.c b/vg_libpthread.c
index 8d5ef2f..2cdc5ce 100644
--- a/vg_libpthread.c
+++ b/vg_libpthread.c
@@ -798,7 +798,8 @@
    ull_ms_end_after_1970
       = 1000ULL * ((unsigned long long int)(abstime->tv_sec))
         + ((unsigned long long int)(abstime->tv_nsec / 1000000));
-   assert(ull_ms_end_after_1970 >= ull_ms_now_after_1970);
+   if (ull_ms_end_after_1970 < ull_ms_now_after_1970)
+      ull_ms_end_after_1970 = ull_ms_now_after_1970;
    ms_end 
       = ms_now + (unsigned int)(ull_ms_end_after_1970 - ull_ms_now_after_1970);
    VALGRIND_MAGIC_SEQUENCE(res, 0 /* default */,