Do ensure_valgrind() inside __my_pthread_testcancel(). This avoids

   vg_libpthread.c:1056 (__my_pthread_testcancel):
   Assertion `res == 0' failed.
when running profiled, threaded programs.

MERGE TO HEAD

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_1_0_BRANCH@629

diff --git a/vg_libpthread.c b/vg_libpthread.c
index 6da71873c8ef3c3b891643ec972093b8cd7ce9b2..9e03e82760463cd5e8ed8f53a4580790ea176dfb 100644 (file)
--- a/vg_libpthread.c
+++ b/vg_libpthread.c
@@ -1050,6 +1050,7 @@ static __inline__
 void __my_pthread_testcancel(void)
 {
    int res;
+   ensure_valgrind("__my_pthread_testcancel");
    VALGRIND_MAGIC_SEQUENCE(res, (-1) /* default */,
                            VG_USERREQ__TESTCANCEL,
                            0, 0, 0, 0);