diff options
| -rw-r--r-- | gdb/ChangeLog | 22 | ||||
| -rw-r--r-- | gdb/NEWS | 3 | ||||
| -rw-r--r-- | gdb/doc/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/doc/gdb.texinfo | 4 | ||||
| -rw-r--r-- | gdb/remote.c | 2 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.trace/tfile.exp | 4 | ||||
| -rw-r--r-- | gdb/tracepoint.c | 34 | ||||
| -rw-r--r-- | gdb/tracepoint.h | 6 |
9 files changed, 69 insertions, 17 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cc579088b6..2bdab56de1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,25 @@ +2013-02-15 Pedro Alves <pedro@codesourcery.com> + Hafiz Abid Qadeer <abidh@codesourcery.com> + + * NEWS: Mention new field "trace-file". + * tracepoint.c (trace_status_mi): Output "trace-file" field. + (tfile_open): Record the trace file's filename in the trace + status. + (tfile_files_info): Mention the name of the trace file. + Check the "filename" field explicitely. + (trace_status_command): Explicitely check "filename" field. + (trace_find_command): Ditto. + (trace_find_pc_command): Ditto. + (trace_find_tracepoint_command): Ditto. + (trace_find_line_command): Ditto. + (trace_find_range_command): Ditto. + (trace_find_outside_command): Ditto. + * tracepoint.h (struct trace_status) <from_file>: Rename it + to "filename" and make it hold the trace file's filename + instead of a boolean. + * remote.c (remote_get_trace_status): Initialize "filename" + field with NULL instead of 0. + 2013-02-15 Yao Qi <yao@codesourcery.com> * remote.c: Fix a typo. @@ -150,6 +150,9 @@ show filename-display ** The response to breakpoint commands and breakpoint async records includes an "installed" field containing a boolean state about each non-pending tracepoint location is whether installed on target or not. + ** Output of the "-trace-status" command includes a "trace-file" field + containing the name of the trace file being examined. This field is + optional, and only present when examining a trace file. * GDB now supports the "mini debuginfo" section, .gnu_debugdata. You must have the LZMA library available when configuring GDB for this diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 7c163116e5..6a16958c04 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,9 @@ +2013-02-15 Pedro Alves <pedro@codesourcery.com> + Hafiz Abid Qadeer <abidh@codesourcery.com> + + * gdb.texinfo (GDB/MI Tracepoint Commands) <-trace-status>: + Document the "trace-file" field. + 2013-02-07 Doug Evans <dje@google.com> * gdb.texinfo (Machine Code): Clarify argument to disassemble diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index e3f336ea7e..e8ac8c5987 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -32094,6 +32094,10 @@ The value of the disconnected tracing flag. @code{1} means that tracing will continue after @value{GDBN} disconnects, @code{0} means that the trace run will stop. +@item trace-file +The filename of the trace file being examined. This field is +optional, and only present when examining a trace file. + @end table @subsubheading @value{GDBN} Command diff --git a/gdb/remote.c b/gdb/remote.c index 608f6be85b..88a57c864c 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -10701,7 +10701,7 @@ remote_get_trace_status (struct trace_status *ts) return -1; /* We're working with a live target. */ - ts->from_file = 0; + ts->filename = NULL; if (*p++ != 'T') error (_("Bogus trace status reply from target: %s"), target_buf); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f67736cd3b..77573b0d54 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-02-15 Pedro Alves <pedro@codesourcery.com> + Hafiz Abid Qadeer <abidh@codesourcery.com> + + * gdb.trace/tfile.exp: Add test for -trace-status command. + 2013-02-14 Jan Kratochvil <jan.kratochvil@redhat.com> * gdb.threads/pthread_cond_wait.c (main): Remove variable ts. Replace diff --git a/gdb/testsuite/gdb.trace/tfile.exp b/gdb/testsuite/gdb.trace/tfile.exp index b07be75bc6..2bdde372fa 100644 --- a/gdb/testsuite/gdb.trace/tfile.exp +++ b/gdb/testsuite/gdb.trace/tfile.exp @@ -106,3 +106,7 @@ Not looking at any trace frame.*" \ gdb_test \ "interpreter-exec mi \"-target-select tfile basic.tf\"" \ "\\^connected.*" + +gdb_test "interpreter-exec mi \"-trace-status\"" \ + "\\^done,supported=\"file\",trace-file=\".*basic.tf\",running=\"0\",stop-reason=\"request\",frames=\"${decimal}\",frames-created=\"${decimal}\",buffer-size=\"${decimal}\",buffer-free=\"${decimal}\",disconnected=\".*\",circular=\".*\",user-name=\"\",notes=\"\",start-time=\".*\",stop-time=\".*\"" \ + "-trace-status" diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 2e50164a1c..ca104aa7b2 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -1940,7 +1940,7 @@ trace_status_command (char *args, int from_tty) if (status == -1) { - if (ts->from_file) + if (ts->filename != NULL) printf_filtered (_("Using a trace file.\n")); else { @@ -2100,17 +2100,20 @@ trace_status_mi (int on_stop) status = target_get_trace_status (ts); - if (status == -1 && !ts->from_file) + if (status == -1 && ts->filename == NULL) { ui_out_field_string (uiout, "supported", "0"); return; } - if (ts->from_file) + if (ts->filename != NULL) ui_out_field_string (uiout, "supported", "file"); else if (!on_stop) ui_out_field_string (uiout, "supported", "1"); + if (ts->filename != NULL) + ui_out_field_string (uiout, "trace-file", ts->filename); + gdb_assert (ts->running_known); if (ts->running) @@ -2399,7 +2402,8 @@ trace_find_command (char *args, int from_tty) { /* This should only be called with a numeric argument. */ int frameno = -1; - if (current_trace_status ()->running && !current_trace_status ()->from_file) + if (current_trace_status ()->running + && current_trace_status ()->filename == NULL) error (_("May not look at trace frames while trace is running.")); if (args == 0 || *args == 0) @@ -2450,7 +2454,8 @@ trace_find_pc_command (char *args, int from_tty) { CORE_ADDR pc; - if (current_trace_status ()->running && !current_trace_status ()->from_file) + if (current_trace_status ()->running + && current_trace_status ()->filename == NULL) error (_("May not look at trace frames while trace is running.")); if (args == 0 || *args == 0) @@ -2468,7 +2473,8 @@ trace_find_tracepoint_command (char *args, int from_tty) int tdp; struct tracepoint *tp; - if (current_trace_status ()->running && !current_trace_status ()->from_file) + if (current_trace_status ()->running + && current_trace_status ()->filename == NULL) error (_("May not look at trace frames while trace is running.")); if (args == 0 || *args == 0) @@ -2507,7 +2513,8 @@ trace_find_line_command (char *args, int from_tty) struct symtab_and_line sal; struct cleanup *old_chain; - if (current_trace_status ()->running && !current_trace_status ()->from_file) + if (current_trace_status ()->running + && current_trace_status ()->filename == NULL) error (_("May not look at trace frames while trace is running.")); if (args == 0 || *args == 0) @@ -2572,7 +2579,8 @@ trace_find_range_command (char *args, int from_tty) static CORE_ADDR start, stop; char *tmp; - if (current_trace_status ()->running && !current_trace_status ()->from_file) + if (current_trace_status ()->running + && current_trace_status ()->filename == NULL) error (_("May not look at trace frames while trace is running.")); if (args == 0 || *args == 0) @@ -2605,7 +2613,8 @@ trace_find_outside_command (char *args, int from_tty) CORE_ADDR start, stop; char *tmp; - if (current_trace_status ()->running && !current_trace_status ()->from_file) + if (current_trace_status ()->running + && current_trace_status ()->filename == NULL) error (_("May not look at trace frames while trace is running.")); if (args == 0 || *args == 0) @@ -3762,8 +3771,8 @@ tfile_open (char *filename, int from_tty) trace_regblock_size = 0; ts = current_trace_status (); - /* We know we're working with a file. */ - ts->from_file = 1; + /* We know we're working with a file. Record its name. */ + ts->filename = trace_filename; /* Set defaults in case there is no status line. */ ts->running_known = 0; ts->stop_reason = trace_stop_reason_unknown; @@ -4213,8 +4222,7 @@ tfile_close (int quitting) static void tfile_files_info (struct target_ops *t) { - /* (it would be useful to mention the name of the file). */ - printf_filtered ("Looking at a trace file.\n"); + printf_filtered ("\t`%s'\n", trace_filename); } /* The trace status for a file is that tracing can never be run. */ diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h index 4a3df39e30..b2b9d7c9ce 100644 --- a/gdb/tracepoint.h +++ b/gdb/tracepoint.h @@ -72,9 +72,9 @@ enum trace_stop_reason struct trace_status { - /* This is true if the status is coming from a file rather - than a live target. */ - int from_file; + /* If the status is coming from a file rather than a live target, + this points at the file's filename. Otherwise, this is NULL. */ + const char *filename; /* This is true if the value of the running field is known. */ int running_known; |
