RE: [PATCH v2 0/7] improve btrace enable error reporting

["Metzger, Markus T" <markus.t.metzger@intel.com>]

Hello Pedro, Eli,

Here's the follow-up patch to change a few existing error messages.

> > So you're suggesting to change
> >
> >     "GDB does not support Intel Processor Trace."
> >
> > into
> >
> >     "Intel Processor Trace support was disabled at compile time."
> >
> > Correct?
> 
> Correct.
> 
> >
> > We're already using the above in a warning in remote.c.  I'd change
> > that, as well, to be consistent with the new wording.
> >

commit d635c0d842f95f9f76562a132dcabd9330ff6455
Author: Markus Metzger <markus.t.metzger@intel.com>
Date:   Thu Feb 8 14:35:44 2018 +0100

    btrace: reword error messages
    
    Reword some btrace error messages to align with the format discussed in
    https://sourceware.org/ml/gdb-patches/2018-02/msg00135.html.
    
    2018-02-08  Markus Metzger  <markus.t.metzger@intel.com>
    
    gdb/
        * remote.c (remote_btrace_maybe_reopen): Change error message.
        * btrace.c (btrace_enable): Likewise.
        (parse_xml_btrace): Likewise.
        (parse_xml_btrace_conf): Likewise.
    
diff --git a/gdb/btrace.c b/gdb/btrace.c
index 2b031a4..158d03c 100644
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -1579,7 +1579,7 @@ btrace_enable (struct thread_info *tp, const struct btrace_config *conf)
 
 #if !defined (HAVE_LIBIPT)
   if (conf->format == BTRACE_FORMAT_PT)
-    error (_("GDB does not support Intel Processor Trace."));
+    error (_("Intel Processor Trace support was disabled at compile time."));
 #endif /* !defined (HAVE_LIBIPT) */
 
   DEBUG ("enable thread %s (%s)", print_thread_id (tp),
@@ -2218,7 +2218,8 @@ parse_xml_btrace (struct btrace_data *btrace, const char *buffer)
 
 #else  /* !defined (HAVE_LIBEXPAT) */
 
-  error (_("Cannot process branch trace.  XML parsing is not supported."));
+  error (_("Cannot process branch trace.  XML support was disabled at "
+          "compile time."));
 
 #endif  /* !defined (HAVE_LIBEXPAT) */
 }
@@ -2312,7 +2313,8 @@ parse_xml_btrace_conf (struct btrace_config *conf, const char *xml)
 
 #else  /* !defined (HAVE_LIBEXPAT) */
 
-  error (_("XML parsing is not supported."));
+  error (_("Cannot process the branch trace configuration.  XML support "
+          "was disabled at compile time."));
 
 #endif  /* !defined (HAVE_LIBEXPAT) */
 }
diff --git a/gdb/remote.c b/gdb/remote.c
index e5680f0..15d6c5b 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -13193,8 +13193,8 @@ remote_btrace_maybe_reopen (void)
          if (!warned)
            {
              warned = 1;
-             warning (_("GDB does not support Intel Processor Trace. "
-                        "\"record\" will not work in this session."));
+             warning (_("Target is recording using Intel Processor Trace "
+                        "but support was disabled at compile time."));
            }
 
          continue;

Intel Deutschland GmbH
Registered Address: Am Campeon 10-12, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de
Managing Directors: Christin Eisenschmid, Christian Lamprechter
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928