Fix really stupid error in computation of timeout point in nonblocking

poll().  After this change, Mozilla-0.9.2.1 and Galeon 0.11.3 finally
behave reasonably on my box.

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

diff --git a/coregrind/arch/x86-linux/vg_libpthread.c b/coregrind/arch/x86-linux/vg_libpthread.c
index bc9a0e8f3ff0b3fd1e58de299b388db3b4f8ac84..171e2836dcf7b9b5a07ac7cb1386e0203a9657d6 100644 (file)
--- a/coregrind/arch/x86-linux/vg_libpthread.c
+++ b/coregrind/arch/x86-linux/vg_libpthread.c
@@ -1295,7 +1295,7 @@ int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout)
    /* If a timeout was specified, set ms_end to be the end wallclock
       time.  Easy considering that __timeout is in milliseconds. */
    if (__timeout > 0) {
-      ms_end += (unsigned int)__timeout;
+      ms_end = ms_now + (unsigned int)__timeout;
    }
 
    /* fprintf(stderr, "MY_POLL: before loop\n"); */

diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c
index bc9a0e8f3ff0b3fd1e58de299b388db3b4f8ac84..171e2836dcf7b9b5a07ac7cb1386e0203a9657d6 100644 (file)
--- a/coregrind/vg_libpthread.c
+++ b/coregrind/vg_libpthread.c
@@ -1295,7 +1295,7 @@ int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout)
    /* If a timeout was specified, set ms_end to be the end wallclock
       time.  Easy considering that __timeout is in milliseconds. */
    if (__timeout > 0) {
-      ms_end += (unsigned int)__timeout;
+      ms_end = ms_now + (unsigned int)__timeout;
    }
 
    /* fprintf(stderr, "MY_POLL: before loop\n"); */

diff --git a/vg_libpthread.c b/vg_libpthread.c
index bc9a0e8f3ff0b3fd1e58de299b388db3b4f8ac84..171e2836dcf7b9b5a07ac7cb1386e0203a9657d6 100644 (file)
--- a/vg_libpthread.c
+++ b/vg_libpthread.c
@@ -1295,7 +1295,7 @@ int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout)
    /* If a timeout was specified, set ms_end to be the end wallclock
       time.  Easy considering that __timeout is in milliseconds. */
    if (__timeout > 0) {
-      ms_end += (unsigned int)__timeout;
+      ms_end = ms_now + (unsigned int)__timeout;
    }
 
    /* fprintf(stderr, "MY_POLL: before loop\n"); */