From: Tom Hughes <tom@compton.nu>
Date: Mon, 18 Oct 2004 12:11:23 +0000 (+0000)
Subject: Add a couple of lines that were missed out in the long timeouts patch.
X-Git-Tag: svn/VALGRIND_3_0_0~1511
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5216fc7c7b49378e49c1799e9a3f72d33b557c8;p=thirdparty%2Fvalgrind.git

Add a couple of lines that were missed out in the long timeouts patch.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2783
---

diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c
index 2cbfe353cd..29ed6af7ab 100644
--- a/coregrind/vg_libpthread.c
+++ b/coregrind/vg_libpthread.c
@@ -1375,6 +1375,8 @@ int __pthread_mutex_timedlock(pthread_mutex_t *mutex,
         + ((unsigned long long int)(abstime->tv_nsec / 1000000));
    if (ull_ms_end_after_1970 < ull_ms_now_after_1970)
       ull_ms_end_after_1970 = ull_ms_now_after_1970;
+   ull_ms_now = ((unsigned long long int)(ms_now));
+   ull_ms_end = ull_ms_now + (ull_ms_end_after_1970 - ull_ms_now_after_1970);
    if (ull_ms_end >= (unsigned long long int)(0xFFFFFFFFUL)) {
       /* use 0xFFFFFFFEUL because 0xFFFFFFFFUL is reserved for no timeout
          (the fine difference between a long wait and a possible abort