When ignoring memcheck-style client requests for block permissions

changes, print a message the first 3 times so the user at least knows
these requests are getting ignored.  If I was less lazy I would make
these requests -- at least those pertaining to memory addressibility
-- be done properly.  But I'm too lazy.

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

diff --git a/addrcheck/ac_main.c b/addrcheck/ac_main.c
index 1ce66d3aee8b3a6bf7fbbde608349519ea0c4963..869d6e4b3d5fe0b5c7716244551253daa76b9ba1 100644 (file)
--- a/addrcheck/ac_main.c
+++ b/addrcheck/ac_main.c
@@ -1195,7 +1195,18 @@ Bool SK_(expensive_sanity_check) ( void )
  */
 Bool SK_(handle_client_request) ( ThreadState* tst, UInt* arg_block, UInt *ret )
 {
+#define IGNORE(what)                                                    \
+   do {                                                                 \
+      if (moans-- > 0) {                                                \
+         VG_(message)(Vg_UserMsg,                                       \
+            "Warning: Addrcheck: ignoring `%s' request.", what);     \
+         VG_(message)(Vg_UserMsg,                                       \
+            "   To honour this request, rerun with --skin=memcheck.");  \
+      }                                                                 \
+   } while (0)
+
    UInt* arg = arg_block;
+   static Int moans = 3;
 
    /* Overload memcheck client reqs */
    if (!VG_IS_SKIN_USERREQ('M','C',arg[0]))
@@ -1207,14 +1218,25 @@ Bool SK_(handle_client_request) ( ThreadState* tst, UInt* arg_block, UInt *ret )
         *ret = 0; /* return value is meaningless */
         break;
 
-        /* Ignore these quietly */
+      /* Ignore these */
       case VG_USERREQ__CHECK_WRITABLE: /* check writable */
+         IGNORE("VALGRIND_CHECK_WRITABLE");
+         return False;
       case VG_USERREQ__CHECK_READABLE: /* check readable */
+         IGNORE("VALGRIND_CHECK_READABLE");
+         return False;
       case VG_USERREQ__MAKE_NOACCESS: /* make no access */
+         IGNORE("VALGRIND_MAKE_NOACCESS");
+         return False;
       case VG_USERREQ__MAKE_WRITABLE: /* make writable */
+         IGNORE("VALGRIND_MAKE_WRITABLE");
+         return False;
       case VG_USERREQ__MAKE_READABLE: /* make readable */
+         IGNORE("VALGRIND_MAKE_READABLE");
+         return False;
       case VG_USERREQ__DISCARD: /* discard */
-        return False;
+         IGNORE("VALGRIND_CHECK_DISCARD");
+         return False;
 
       default:
          VG_(message)(Vg_UserMsg, 
@@ -1223,6 +1245,8 @@ Bool SK_(handle_client_request) ( ThreadState* tst, UInt* arg_block, UInt *ret )
          return False;
    }
    return True;
+
+#undef IGNORE
 }
 
 /*------------------------------------------------------------*/