Cancellation wrapper for recvmsg.

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

diff --git a/coregrind/arch/x86-linux/vg_libpthread.c b/coregrind/arch/x86-linux/vg_libpthread.c
index e575e0a8b358acfdb10ca742d631a937d5dcbbe3..5a76219fecec24e262f949bc318ca16f70763469 100644 (file)
--- a/coregrind/arch/x86-linux/vg_libpthread.c
+++ b/coregrind/arch/x86-linux/vg_libpthread.c
@@ -1642,6 +1642,16 @@ int sendmsg(int s, const struct msghdr *msg, int flags)
 }
 
 
+extern
+int __libc_recvmsg(int s, struct msghdr *msg, int flags);
+__attribute__((weak))
+int recvmsg(int s, struct msghdr *msg, int flags)
+{
+   __my_pthread_testcancel();
+   return __libc_recvmsg(s, msg, flags);
+}
+
+
 extern
 int __libc_recvfrom(int s, void *buf, size_t len, int flags,
                     struct sockaddr *from, socklen_t *fromlen);

diff --git a/coregrind/arch/x86-linux/vg_libpthread_unimp.c b/coregrind/arch/x86-linux/vg_libpthread_unimp.c
index d36aafdf2744eccaa131ede9cea92927f490bd2b..dec5761ddac43fc35628bc4c2876257597356d5e 100644 (file)
--- a/coregrind/arch/x86-linux/vg_libpthread_unimp.c
+++ b/coregrind/arch/x86-linux/vg_libpthread_unimp.c
@@ -207,8 +207,8 @@ weak_alias(_IO_ftrylockfile, ftrylockfile)
 //__attribute__((weak)) void pwrite ( void ) { vgPlain_unimp("pwrite"); }
 //__attribute__((weak)) void msync ( void ) { vgPlain_unimp("msync"); }
 __attribute__((weak)) void pause ( void ) { vgPlain_unimp("pause"); }
-__attribute__((weak)) void recvfrom ( void ) { vgPlain_unimp("recvfrom"); }
-__attribute__((weak)) void recvmsg ( void ) { vgPlain_unimp("recvmsg"); }
+//__attribute__((weak)) void recvfrom ( void ) { vgPlain_unimp("recvfrom"); }
+//__attribute__((weak)) void recvmsg ( void ) { vgPlain_unimp("recvmsg"); }
 //__attribute__((weak)) void sendmsg ( void ) { vgPlain_unimp("sendmsg"); }
 __attribute__((weak)) void tcdrain ( void ) { vgPlain_unimp("tcdrain"); }
 //--//__attribute__((weak)) void vfork ( void ) { vgPlain_unimp("vfork"); }

diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c
index e575e0a8b358acfdb10ca742d631a937d5dcbbe3..5a76219fecec24e262f949bc318ca16f70763469 100644 (file)
--- a/coregrind/vg_libpthread.c
+++ b/coregrind/vg_libpthread.c
@@ -1642,6 +1642,16 @@ int sendmsg(int s, const struct msghdr *msg, int flags)
 }
 
 
+extern
+int __libc_recvmsg(int s, struct msghdr *msg, int flags);
+__attribute__((weak))
+int recvmsg(int s, struct msghdr *msg, int flags)
+{
+   __my_pthread_testcancel();
+   return __libc_recvmsg(s, msg, flags);
+}
+
+
 extern
 int __libc_recvfrom(int s, void *buf, size_t len, int flags,
                     struct sockaddr *from, socklen_t *fromlen);

diff --git a/coregrind/vg_libpthread_unimp.c b/coregrind/vg_libpthread_unimp.c
index d36aafdf2744eccaa131ede9cea92927f490bd2b..dec5761ddac43fc35628bc4c2876257597356d5e 100644 (file)
--- a/coregrind/vg_libpthread_unimp.c
+++ b/coregrind/vg_libpthread_unimp.c
@@ -207,8 +207,8 @@ weak_alias(_IO_ftrylockfile, ftrylockfile)
 //__attribute__((weak)) void pwrite ( void ) { vgPlain_unimp("pwrite"); }
 //__attribute__((weak)) void msync ( void ) { vgPlain_unimp("msync"); }
 __attribute__((weak)) void pause ( void ) { vgPlain_unimp("pause"); }
-__attribute__((weak)) void recvfrom ( void ) { vgPlain_unimp("recvfrom"); }
-__attribute__((weak)) void recvmsg ( void ) { vgPlain_unimp("recvmsg"); }
+//__attribute__((weak)) void recvfrom ( void ) { vgPlain_unimp("recvfrom"); }
+//__attribute__((weak)) void recvmsg ( void ) { vgPlain_unimp("recvmsg"); }
 //__attribute__((weak)) void sendmsg ( void ) { vgPlain_unimp("sendmsg"); }
 __attribute__((weak)) void tcdrain ( void ) { vgPlain_unimp("tcdrain"); }
 //--//__attribute__((weak)) void vfork ( void ) { vgPlain_unimp("vfork"); }

diff --git a/vg_libpthread.c b/vg_libpthread.c
index e575e0a8b358acfdb10ca742d631a937d5dcbbe3..5a76219fecec24e262f949bc318ca16f70763469 100644 (file)
--- a/vg_libpthread.c
+++ b/vg_libpthread.c
@@ -1642,6 +1642,16 @@ int sendmsg(int s, const struct msghdr *msg, int flags)
 }
 
 
+extern
+int __libc_recvmsg(int s, struct msghdr *msg, int flags);
+__attribute__((weak))
+int recvmsg(int s, struct msghdr *msg, int flags)
+{
+   __my_pthread_testcancel();
+   return __libc_recvmsg(s, msg, flags);
+}
+
+
 extern
 int __libc_recvfrom(int s, void *buf, size_t len, int flags,
                     struct sockaddr *from, socklen_t *fromlen);

diff --git a/vg_libpthread_unimp.c b/vg_libpthread_unimp.c
index d36aafdf2744eccaa131ede9cea92927f490bd2b..dec5761ddac43fc35628bc4c2876257597356d5e 100644 (file)
--- a/vg_libpthread_unimp.c
+++ b/vg_libpthread_unimp.c
@@ -207,8 +207,8 @@ weak_alias(_IO_ftrylockfile, ftrylockfile)
 //__attribute__((weak)) void pwrite ( void ) { vgPlain_unimp("pwrite"); }
 //__attribute__((weak)) void msync ( void ) { vgPlain_unimp("msync"); }
 __attribute__((weak)) void pause ( void ) { vgPlain_unimp("pause"); }
-__attribute__((weak)) void recvfrom ( void ) { vgPlain_unimp("recvfrom"); }
-__attribute__((weak)) void recvmsg ( void ) { vgPlain_unimp("recvmsg"); }
+//__attribute__((weak)) void recvfrom ( void ) { vgPlain_unimp("recvfrom"); }
+//__attribute__((weak)) void recvmsg ( void ) { vgPlain_unimp("recvmsg"); }
 //__attribute__((weak)) void sendmsg ( void ) { vgPlain_unimp("sendmsg"); }
 __attribute__((weak)) void tcdrain ( void ) { vgPlain_unimp("tcdrain"); }
 //--//__attribute__((weak)) void vfork ( void ) { vgPlain_unimp("vfork"); }