From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Date: Thu, 26 Mar 2015 21:32:03 +0000 (+0000)
Subject: Have the very detailed gdbsrv debuglog (e.g. exchange of packets
X-Git-Tag: svn/VALGRIND_3_11_0~553
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69088f9df35a17a6f6d2f7336f001bbb3b31a0b1;p=thirdparty%2Fvalgrind.git

Have the very detailed gdbsrv debuglog (e.g. exchange of packets
between GDB and V gdbsrv, fetching/setting registers, ...) done
at debuglog level 3 instead of 1.
This allows to do gdbsrv commands at debuglog level 2
without seeing too much trace.



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

diff --git a/coregrind/m_gdbserver/remote-utils.c b/coregrind/m_gdbserver/remote-utils.c
index f79c923f21..b71220ce6a 100644
--- a/coregrind/m_gdbserver/remote-utils.c
+++ b/coregrind/m_gdbserver/remote-utils.c
@@ -852,16 +852,16 @@ int putpkt_binary (char *buf, int cnt)
       }
 
       if (noack_mode)
-         dlog(1, "putpkt (\"%s\"); [no ack]\n", buf2);
+         dlog(3, "putpkt (\"%s\"); [no ack]\n", buf2);
       else
-         dlog(1,"putpkt (\"%s\"); [looking for ack]\n", buf2);
+         dlog(3,"putpkt (\"%s\"); [looking for ack]\n", buf2);
 
       if (noack_mode)
          break;
 
       cc = readchar (1);
       if (cc > 0)
-         dlog(1, "[received '%c' (0x%x)]\n", cc, cc);
+         dlog(3, "[received '%c' (0x%x)]\n", cc, cc);
 
       if (cc <= 0) {
          if (cc == 0)
@@ -997,7 +997,7 @@ int getpkt (char *buf)
          c = readchar (0);
          if (c == '$')
 	    break;
-         dlog(1, "[getpkt: discarding char '%c']\n", c);
+         dlog(3, "[getpkt: discarding char '%c']\n", c);
          if (c < 0)
 	    return -1;
       }
@@ -1029,16 +1029,16 @@ int getpkt (char *buf)
    }
 
    if (noack_mode)
-      dlog(1, "getpkt (\"%s\");  [no ack] \n", buf);
+      dlog(3, "getpkt (\"%s\");  [no ack] \n", buf);
    else
-      dlog(1, "getpkt (\"%s\");  [sending ack] \n", buf);
+      dlog(3, "getpkt (\"%s\");  [sending ack] \n", buf);
 
    if (!noack_mode) {
       if (!ensure_write_remote_desc()) {
          dlog(1, "getpkt(write ack) no write_remote_desc");
       }
       VG_(write) (write_remote_desc, "+", 1);
-      dlog(1, "[sent ack]\n");
+      dlog(3, "[sent ack]\n");
    }
 
    return bp - buf;
diff --git a/coregrind/m_gdbserver/server.c b/coregrind/m_gdbserver/server.c
index 7de641f7c9..ecf3b42728 100644
--- a/coregrind/m_gdbserver/server.c
+++ b/coregrind/m_gdbserver/server.c
@@ -618,7 +618,7 @@ void handle_set (char *arg_own_buf, int *new_packet_len_p)
          if (to == NULL) to = end;
          decode_address (&sig, from, to - from);
          pass_signals[(int)sig] = 1;
-         dlog(1, "pass_signal gdb_nr %d %s\n",
+         dlog(3, "pass_signal gdb_nr %d %s\n",
               (int)sig, target_signal_to_name(sig));
          from = to;
          if (*from == ';') from++;
diff --git a/coregrind/m_gdbserver/target.c b/coregrind/m_gdbserver/target.c
index 68a450c53c..c23581a484 100644
--- a/coregrind/m_gdbserver/target.c
+++ b/coregrind/m_gdbserver/target.c
@@ -339,7 +339,7 @@ void fetch_register (int regno)
       if (mod && VG_(debugLog_getLevel)() > 1) {
          char bufimage [2*size + 1];
          heximage (bufimage, buf, size);
-         dlog(2, "fetched register %d size %d name %s value %s tid %d status %s\n", 
+         dlog(3, "fetched register %d size %d name %s value %s tid %d status %s\n", 
               regno, size, the_low_target.reg_defs[regno].name, bufimage, 
               tid, VG_(name_of_ThreadStatus) (tst->status));
       }
@@ -449,7 +449,7 @@ Bool hostvisibility = False;
 int valgrind_read_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len)
 {
    const void *sourceaddr = C2v (memaddr);
-   dlog(2, "reading memory %p size %d\n", sourceaddr, len);
+   dlog(3, "reading memory %p size %d\n", sourceaddr, len);
    if (VG_(am_is_valid_for_client) ((Addr) sourceaddr, 
                                     len, VKI_PROT_READ)
        || (hostvisibility 
@@ -463,11 +463,12 @@ int valgrind_read_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len)
    }
 }
 
-int valgrind_write_memory (CORE_ADDR memaddr, const unsigned char *myaddr, int len)
+int valgrind_write_memory (CORE_ADDR memaddr, 
+                           const unsigned char *myaddr, int len)
 {
    Bool is_valid_client_memory;
    void *targetaddr = C2v (memaddr);
-   dlog(2, "writing memory %p size %d\n", targetaddr, len);
+   dlog(3, "writing memory %p size %d\n", targetaddr, len);
    is_valid_client_memory 
       = VG_(am_is_valid_for_client) ((Addr)targetaddr, len, VKI_PROT_WRITE);
    if (is_valid_client_memory