Replace the handful of uses of Vg_ExtraDebugMsg and VG_(emsg) with

Vg_DebugMsg and VG_(dmsg).

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

diff --git a/coregrind/m_libcprint.c b/coregrind/m_libcprint.c
index 41171267d44bddfb9518aa3541976e0a776e6d4f..389fd4c18c81a86b5036436377ce9d2b321604b0 100644 (file)
--- a/coregrind/m_libcprint.c
+++ b/coregrind/m_libcprint.c
@@ -425,7 +425,6 @@ static void add_to__vmessage_buf ( HChar c, void *p )
          switch (b->kind) {
             case Vg_UserMsg:       ch = '='; break;
             case Vg_DebugMsg:      ch = '-'; break;
-            case Vg_DebugExtraMsg: ch = '+'; break;
             case Vg_ClientMsg:     ch = '*'; break;
             default:               ch = '?'; break;
          }
@@ -567,16 +566,6 @@ UInt VG_(dmsg) ( const HChar* format, ... )
    return count;
 }
 
-UInt VG_(emsg) ( const HChar* format, ... )
-{
-   UInt count;
-   va_list vargs;
-   va_start(vargs,format);
-   count = VG_(vmessage) ( Vg_DebugExtraMsg, format, vargs );
-   va_end(vargs);
-   return count;
-}
-
 /* Flush any output that has accumulated in vmessage_buf as a 
    result of previous calls to VG_(message) et al. */
 void VG_(message_flush) ( void )

diff --git a/coregrind/m_signals.c b/coregrind/m_signals.c
index dd92d52010146831151e8127839fe8430af11b68..76c05df2c60a9999ff805946ccaf034ee8fb801b 100644 (file)
--- a/coregrind/m_signals.c
+++ b/coregrind/m_signals.c
@@ -973,7 +973,7 @@ SysRes VG_(do_sys_sigaltstack) ( ThreadId tid, vki_stack_t* ss, vki_stack_t* oss
    m_SP  = VG_(get_SP)(tid);
 
    if (VG_(clo_trace_signals))
-      VG_(emsg)("sys_sigaltstack: tid %d, "
+      VG_(dmsg)("sys_sigaltstack: tid %d, "
                 "ss %p{%p,sz=%llu,flags=0x%llx}, oss %p (current SP %p)\n",
                 tid, (void*)ss, 
                 ss ? ss->ss_sp : 0,
@@ -1018,7 +1018,7 @@ SysRes VG_(do_sys_sigaction) ( Int signo,
                                vki_sigaction_fromK_t* old_act )
 {
    if (VG_(clo_trace_signals))
-      VG_(emsg)("sys_sigaction: sigNo %d, "
+      VG_(dmsg)("sys_sigaction: sigNo %d, "
                 "new %#lx, old %#lx, new flags 0x%llx\n",
                 signo, (UWord)new_act, (UWord)old_act,
                 (ULong)(new_act ? new_act->sa_flags : 0));
@@ -1167,7 +1167,7 @@ void do_setmask ( ThreadId tid,
                  vki_sigset_t* oldset )
 {
    if (VG_(clo_trace_signals))
-      VG_(emsg)("do_setmask: tid = %d how = %d (%s), newset = %p (%s)\n", 
+      VG_(dmsg)("do_setmask: tid = %d how = %d (%s), newset = %p (%s)\n", 
                 tid, how,
                 how==VKI_SIG_BLOCK ? "SIG_BLOCK" : (
                    how==VKI_SIG_UNBLOCK ? "SIG_UNBLOCK" : (
@@ -1179,7 +1179,7 @@ void do_setmask ( ThreadId tid,
    if (oldset) {
       *oldset = VG_(threads)[tid].sig_mask;
       if (VG_(clo_trace_signals))
-         VG_(emsg)("\toldset=%p %s\n", oldset, format_sigset(oldset));
+         VG_(dmsg)("\toldset=%p %s\n", oldset, format_sigset(oldset));
    }
    if (newset) {
       do_sigprocmask_bitops (how, &VG_(threads)[tid].sig_mask, newset );

diff --git a/include/pub_tool_libcprint.h b/include/pub_tool_libcprint.h
index c9966265051101387dd5170f3fc82e56e04eaf67..1621851336d1253f475e20aa1960a1e552279b75 100644 (file)
--- a/include/pub_tool_libcprint.h
+++ b/include/pub_tool_libcprint.h
@@ -75,7 +75,6 @@ typedef
       Vg_FailMsg,         // "valgrind:"
       Vg_UserMsg,         // "==pid=="
       Vg_DebugMsg,        // "--pid--"
-      Vg_DebugExtraMsg,   // "++pid++"
       Vg_ClientMsg        // "**pid**"
    }
    VgMsgKind;
@@ -138,10 +137,6 @@ extern UInt VG_(umsg)( const HChar* format, ... ) PRINTF_CHECK(1, 2);
 // This is used for debugging messages that are only of use to developers.
 extern UInt VG_(dmsg)( const HChar* format, ... ) PRINTF_CHECK(1, 2);
 
-// This is used for additional debugging messages that are only of use to
-// developers.
-extern UInt VG_(emsg)( const HChar* format, ... ) PRINTF_CHECK(1, 2);
-
 /* Flush any output cached by previous calls to VG_(message) et al. */
 extern void VG_(message_flush) ( void );
 

diff --git a/tests/filter_stderr_basic b/tests/filter_stderr_basic
index 758695871328ad397bdad73021b3cc21d09b42fe..1537713eace47edb34644b68553a1866174bd4bb 100755 (executable)
--- a/tests/filter_stderr_basic
+++ b/tests/filter_stderr_basic
@@ -9,8 +9,8 @@
 
 dir=`dirname $0`
 
-# Remove ==pid== and --pid-- and ++pid++ and **pid** strings 
-perl -p -e 's/(==|--|\+\+|\*\*)[0-9]{1,7}\1 //' |
+# Remove ==pid== and --pid-- and **pid** strings 
+perl -p -e 's/(==|--|\*\*)[0-9]{1,7}\1 //' |
 
 # Remove any --pid:0: strings (debuglog level zero output)
 sed "/^--[0-9]\{1,7\}:0:*/d" |