btrace: Print "non-contiguous" for gaps.

So far we printed "disabled" for gaps, when we saw a ptev_enabled event that
doesn't have the resumed flag set.  This is wrong, as the actual disabling
happens with ptev_disabled.  So far this didn't matter, but once we have event
tracing, there can be events between a ptev_disabled and a ptev_enabled.
This patch is in preparation for that, and removes the disabled reason in
favour of a more accurate non-contiguous reason, and adjusts the string we
print accordingly.

Approved-By: Markus Metzger <markus.t.metzger@intel.com>

diff --git a/gdb/btrace.c b/gdb/btrace.c
index ff9612dd6649bf20e6314303480501cbe751a8d4..9dc0c5cc930b21f73a654c3736afd628f53cf76d 100644 (file)
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -1255,7 +1255,7 @@ handle_pt_insn_events (struct btrace_thread_info *btinfo,
                && !btinfo->functions.empty ())
              {
                struct btrace_function *bfun
-                 = ftrace_new_gap (btinfo, BDE_PT_DISABLED, gaps);
+                 = ftrace_new_gap (btinfo, BDE_PT_NON_CONTIGUOUS, gaps);
 
                pt_insn_get_offset (decoder, &offset);
 
@@ -1359,7 +1359,7 @@ handle_pt_insn_event_flags (struct btrace_thread_info *btinfo,
       struct btrace_function *bfun;
       uint64_t offset;
 
-      bfun = ftrace_new_gap (btinfo, BDE_PT_DISABLED, gaps);
+      bfun = ftrace_new_gap (btinfo, BDE_PT_NON_CONTIGUOUS, gaps);
 
       pt_insn_get_offset (decoder, &offset);
 
@@ -1966,8 +1966,8 @@ btrace_decode_error (enum btrace_format format, int errcode)
        case BDE_PT_USER_QUIT:
          return _("trace decode cancelled");
 
-       case BDE_PT_DISABLED:
-         return _("disabled");
+       case BDE_PT_NON_CONTIGUOUS:
+         return _("non-contiguous");
 
        case BDE_PT_OVERFLOW:
          return _("overflow");

diff --git a/gdb/btrace.h b/gdb/btrace.h
index 75bc4f81ee423e415eea563295b5c762bc84743e..8a81426b0825f334a073144f1888073106300201 100644 (file)
--- a/gdb/btrace.h
+++ b/gdb/btrace.h
@@ -131,7 +131,7 @@ enum btrace_pt_error
   BDE_PT_USER_QUIT = 1,
 
   /* Tracing was temporarily disabled.  */
-  BDE_PT_DISABLED,
+  BDE_PT_NON_CONTIGUOUS,
 
   /* Trace recording overflowed.  */
   BDE_PT_OVERFLOW