[PATCH v2 1/6] btrace: Print "non-contiguous" for gaps.

[Felix Willgerodt]

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.
---
 gdb/btrace.c | 8 ++++----
 gdb/btrace.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gdb/btrace.c b/gdb/btrace.c
index ff9612dd664..9dc0c5cc930 100644
--- 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 75bc4f81ee4..8a81426b082 100644
--- 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
-- 
2.34.1

Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de
Managing Directors: Sean Fennelly, Jeffrey Schneiderman, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928