diff mbox

[2/2] Fix internal error when saving fast tracepoint definitions

Message ID 1447699465-28821-2-git-send-email-simon.marchi@ericsson.com
State New, archived
Headers

Commit Message

Simon Marchi Nov. 16, 2015, 6:44 p.m. UTC 
  When trying to save fast tracepoints to file, gdb returns internal failure:

  gdb/breakpoint.c:13446: internal-error: unhandled tracepoint type 27
  A problem internal to GDB has been detected, further debugging may prove unreliable.

And no file including the fast tracepoints definition is created.

The patch also extends save-trace.exp to test saving tracepoint with a
fast tracepoint in there.  Note that because this test doesn't actually
inserts the tracepoints in the program, we can run it with targets that
don't actually support fast tracepoints (or tracepoints at all).

gdb/ChangeLog:

	* breakpoint.c (tracepoint_print_recreate): Fix logic error
	if -> else if.

gdb/testsuite/ChangeLog:

	* gdb.trace/actions.c: Include trace-common.h.
	(main): Add a location for a fast tracepoint.
	* gdb.trace/save-trace.exp: Set a fast tracepoint in addition to
	the normal tracepoints.
	(gdb_verify_tracepoints): Adjust number of expected tracepoints.
---
 gdb/breakpoint.c                       | 2 +-
 gdb/testsuite/gdb.trace/actions.c      | 4 ++++
 gdb/testsuite/gdb.trace/save-trace.exp | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

Comments

Pedro Alves Nov. 18, 2015, 5:45 p.m. UTC | #1 
Hi Simon,

OK with nit below addressed.  (Sorry!)

On 11/16/2015 06:44 PM, Simon Marchi wrote:

> index 31a4097..659b0c7 100644
> --- a/gdb/testsuite/gdb.trace/save-trace.exp
> +++ b/gdb/testsuite/gdb.trace/save-trace.exp
> @@ -76,6 +76,8 @@ foreach x { 1 2 3 4 5 6 } {
>  	    "end" "^$"
>  }
>  
> +gdb_test "ftrace fast_tracepoint_loc" "Fast tracepoint $decimal at $hex: file .*$srcfile, line $decimal.*" "Set a fast tracepoint"
> +

Break overly long line.  Also, usually test messages are all lowercase ("set a fast ...").

Thanks,
Pedro Alves
Simon Marchi Nov. 23, 2015, 11:54 p.m. UTC | #2 
On 15-11-18 12:45 PM, Pedro Alves wrote:
>> +gdb_test "ftrace fast_tracepoint_loc" "Fast tracepoint $decimal at $hex: file .*$srcfile, line $decimal.*" "Set a fast tracepoint"
>> +
> 
> Break overly long line.  Also, usually test messages are all lowercase ("set a fast ...").

Done and pushed, thanks!
diff mbox

Patch

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 5863573..a290acb 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -13483,7 +13483,7 @@  tracepoint_print_recreate (struct breakpoint *self, struct ui_file *fp)
 
   if (self->type == bp_fast_tracepoint)
     fprintf_unfiltered (fp, "ftrace");
-  if (self->type == bp_static_tracepoint)
+  else if (self->type == bp_static_tracepoint)
     fprintf_unfiltered (fp, "strace");
   else if (self->type == bp_tracepoint)
     fprintf_unfiltered (fp, "trace");
diff --git a/gdb/testsuite/gdb.trace/actions.c b/gdb/testsuite/gdb.trace/actions.c
index 4b7b887..e728635 100644
--- a/gdb/testsuite/gdb.trace/actions.c
+++ b/gdb/testsuite/gdb.trace/actions.c
@@ -21,6 +21,8 @@ 
 
 #include <string.h>
 
+#include "trace-common.h"
+
 static char   gdb_char_test;
 static short  gdb_short_test;
 static long   gdb_long_test;
@@ -136,6 +138,8 @@  main (argc, argv, envp)
   int i;
   unsigned long myparms[10];
 
+  FAST_TRACEPOINT_LABEL (fast_tracepoint_loc);
+
   begin ();
   for (i = 0; i < sizeof (myparms) / sizeof (myparms[0]); i++)
     myparms[i] = i;
diff --git a/gdb/testsuite/gdb.trace/save-trace.exp b/gdb/testsuite/gdb.trace/save-trace.exp
index 31a4097..659b0c7 100644
--- a/gdb/testsuite/gdb.trace/save-trace.exp
+++ b/gdb/testsuite/gdb.trace/save-trace.exp
@@ -76,6 +76,8 @@  foreach x { 1 2 3 4 5 6 } {
 	    "end" "^$"
 }
 
+gdb_test "ftrace fast_tracepoint_loc" "Fast tracepoint $decimal at $hex: file .*$srcfile, line $decimal.*" "Set a fast tracepoint"
+
 gdb_test_no_output "set default-collect gdb_char_test, gdb_long_test - 100" \
     "set default-collect"
 
@@ -112,7 +114,7 @@  proc gdb_verify_tracepoints { testname } {
 	    exp_continue
 	}
 	-re "$gdb_prompt $" {
-	    if { $ourstate >= 6 } {
+	    if { $ourstate >= 7 } {
 		set result "pass"
 	    } else {
 		set result "fail"