Make recv block only the calling thread, not the entire process.

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

diff --git a/coregrind/arch/x86-linux/vg_libpthread.c b/coregrind/arch/x86-linux/vg_libpthread.c
index b373e10ee236839b3845069bc657a7682df4cf86..3220cca1a7eba70dde6baf3c52fa40589c0945cb 100644 (file)
--- a/coregrind/arch/x86-linux/vg_libpthread.c
+++ b/coregrind/arch/x86-linux/vg_libpthread.c
@@ -1689,6 +1689,8 @@ int __libc_recv(int s, void *buf, size_t len, int flags);
 __attribute__((weak))
 int recv(int s, void *buf, size_t len, int flags)
 {
+   __my_pthread_testcancel();
+   wait_for_fd_to_be_readable_or_erring(s);
    __my_pthread_testcancel();
    return __libc_recv(s, buf, len, flags);
 }

diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c
index b373e10ee236839b3845069bc657a7682df4cf86..3220cca1a7eba70dde6baf3c52fa40589c0945cb 100644 (file)
--- a/coregrind/vg_libpthread.c
+++ b/coregrind/vg_libpthread.c
@@ -1689,6 +1689,8 @@ int __libc_recv(int s, void *buf, size_t len, int flags);
 __attribute__((weak))
 int recv(int s, void *buf, size_t len, int flags)
 {
+   __my_pthread_testcancel();
+   wait_for_fd_to_be_readable_or_erring(s);
    __my_pthread_testcancel();
    return __libc_recv(s, buf, len, flags);
 }

diff --git a/vg_libpthread.c b/vg_libpthread.c
index b373e10ee236839b3845069bc657a7682df4cf86..3220cca1a7eba70dde6baf3c52fa40589c0945cb 100644 (file)
--- a/vg_libpthread.c
+++ b/vg_libpthread.c
@@ -1689,6 +1689,8 @@ int __libc_recv(int s, void *buf, size_t len, int flags);
 __attribute__((weak))
 int recv(int s, void *buf, size_t len, int flags)
 {
+   __my_pthread_testcancel();
+   wait_for_fd_to_be_readable_or_erring(s);
    __my_pthread_testcancel();
    return __libc_recv(s, buf, len, flags);
 }