gdb/doc:
2013-02-06 Yao Qi <yao@codesourcery.com> * gdb.texinfo (GDB/MI Async Records): Document new MI notification "=tsv-modified". Update the document of MI notification "=tsv-created". * observer.texi (GDB Observers): New observer tsv_modified. Update observer tsv_created and tsv_deleted. gdb: 2013-02-06 Yao Qi <yao@codesourcery.com> * mi/mi-interp.c: Include "tracepoint.h". (mi_tsv_modified): Declare. (mi_tsv_created, mi_tsv_deleted): Update declaration. (mi_interpreter_init): Call observer_attach_tsv_modified. (mi_tsv_modified): New. (mi_tsv_created, mi_tsv_deleted): Update. * tracepoint.c (trace_variable_command): Call observer_notify_tsv_modified if the initial value of tsv is changed. (delete_trace_state_variable): Call observer_notify_tsv_deleted earlier. (trace_variable_command): Caller update. (create_tsv_from_upload): Likewise. * observer.sh: Declare "struct trace_state_variable". * NEWS: Mention the new MI notification "=tsv-modified". gdb/testsuite: 2013-02-06 Yao Qi <yao@codesourcery.com> * gdb.trace/mi-tsv-changed.exp (test_create_delete_tsv): Rename to ... (test_create_delete_modify_tsv): ... here. New test on modifying the initial value of a tsv.
This commit is contained in:
Yao Qi
parent
8952bc699f
commit
134a206667
10 changed files with 181 additions and 29 deletions
|
|
@ -1,3 +1,22 @@
|
|||
2013-02-06 Yao Qi <yao@codesourcery.com>
|
||||
|
||||
* mi/mi-interp.c: Include "tracepoint.h".
|
||||
(mi_tsv_modified): Declare.
|
||||
(mi_tsv_created, mi_tsv_deleted): Update declaration.
|
||||
(mi_interpreter_init): Call observer_attach_tsv_modified.
|
||||
(mi_tsv_modified): New.
|
||||
(mi_tsv_created, mi_tsv_deleted): Update.
|
||||
* tracepoint.c (trace_variable_command): Call
|
||||
observer_notify_tsv_modified if the initial value of tsv is
|
||||
changed.
|
||||
(delete_trace_state_variable): Call
|
||||
observer_notify_tsv_deleted earlier.
|
||||
(trace_variable_command): Caller update.
|
||||
(create_tsv_from_upload): Likewise.
|
||||
* observer.sh: Declare "struct trace_state_variable".
|
||||
|
||||
* NEWS: Mention the new MI notification "=tsv-modified".
|
||||
|
||||
2013-02-05 Doug Evans <dje@google.com>
|
||||
|
||||
* completer.c (location_completer): Fix typo in comment.
|
||||
|
|
|
|||
5
gdb/NEWS
5
gdb/NEWS
|
|
@ -130,8 +130,9 @@ show filename-display
|
|||
"=cmd-param-changed".
|
||||
** Trace frame changes caused by command "tfind" are now notified using
|
||||
new async record "=traceframe-changed".
|
||||
** The creation and deletion of trace state variables are now notified
|
||||
using new async records "=tsv-created" and "=tsv-deleted".
|
||||
** The creation, deletion and modification of trace state variables
|
||||
are now notified using new async records "=tsv-created",
|
||||
"=tsv-deleted" and "=tsv-modified".
|
||||
** The start and stop of process record are now notified using new
|
||||
async record "=record-started" and "=record-stopped".
|
||||
** Memory changes are now notified using new async record
|
||||
|
|
|
|||
|
|
@ -1,3 +1,11 @@
|
|||
2013-02-06 Yao Qi <yao@codesourcery.com>
|
||||
|
||||
* gdb.texinfo (GDB/MI Async Records): Document new MI
|
||||
notification "=tsv-modified". Update the document of MI
|
||||
notification "=tsv-created".
|
||||
* observer.texi (GDB Observers): New observer tsv_modified.
|
||||
Update observer tsv_created and tsv_delete.
|
||||
|
||||
2013-02-05 Yufeng Zhang <yufeng.zhang@arm.com>
|
||||
|
||||
* gdb.texinfo (AArch64 Features): New section; document
|
||||
|
|
|
|||
|
|
@ -27988,15 +27988,21 @@ Reports that the trace frame was changed and its new number is
|
|||
@var{tfnum}. The number of the tracepoint associated with this trace
|
||||
frame is @var{tpnum}.
|
||||
|
||||
@item =tsv-created,name=@var{name},value=@var{value}
|
||||
@item =tsv-created,name=@var{name},initial=@var{initial}
|
||||
Reports that the new trace state variable @var{name} is created with
|
||||
value @var{value}.
|
||||
initial value @var{initial}.
|
||||
|
||||
@item =tsv-deleted,name=@var{name}
|
||||
@itemx =tsv-deleted
|
||||
Reports that the trace state variable @var{name} is deleted or all
|
||||
trace state variables are deleted.
|
||||
|
||||
@item =tsv-modified,name=@var{name},initial=@var{initial}[,current=@var{current}]
|
||||
Reports that the trace state variable @var{name} is modified with
|
||||
the initial value @var{initial}. The current value @var{current} of
|
||||
trace state variable is optional and is reported if the current
|
||||
value of trace state variable is known.
|
||||
|
||||
@item =breakpoint-created,bkpt=@{...@}
|
||||
@itemx =breakpoint-modified,bkpt=@{...@}
|
||||
@itemx =breakpoint-deleted,id=@var{number}
|
||||
|
|
|
|||
|
|
@ -236,16 +236,19 @@ method is called after a command @code{set @var{param} @var{value}}.
|
|||
is the value of changed parameter.
|
||||
@end deftypefun
|
||||
|
||||
@deftypefun void tsv_created (const char *@var{name}, LONGEST @var{value})
|
||||
The new trace state variable @var{name} is created with value
|
||||
@var{value}.
|
||||
@deftypefun void tsv_created (const struct trace_state_variable *@var{tsv})
|
||||
The new trace state variable @var{tsv} is created.
|
||||
@end deftypefun
|
||||
|
||||
@deftypefun void tsv_deleted (const char *@var{name})
|
||||
The trace state variable @var{name} is deleted. If @var{name} is
|
||||
@deftypefun void tsv_deleted (const struct trace_state_variable *@var{tsv})
|
||||
The trace state variable @var{tsv} is deleted. If @var{tsv} is
|
||||
@code{NULL}, all trace state variables are deleted.
|
||||
@end deftypefun
|
||||
|
||||
@deftypefun void tsv_modified (const struct trace_state_variable *@var{tsv})
|
||||
The trace state value @var{tsv} is modified.
|
||||
@end deftypefun
|
||||
|
||||
@deftypefun void test_notification (int @var{somearg})
|
||||
This observer is used for internal testing. Do not use.
|
||||
See testsuite/gdb.gdb/observer.exp.
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@
|
|||
#include "solist.h"
|
||||
#include "gdb.h"
|
||||
#include "objfiles.h"
|
||||
#include "tracepoint.h"
|
||||
|
||||
/* These are the interpreter setup, etc. functions for the MI
|
||||
interpreter. */
|
||||
|
|
@ -71,8 +72,9 @@ static void mi_solib_loaded (struct so_list *solib);
|
|||
static void mi_solib_unloaded (struct so_list *solib);
|
||||
static void mi_about_to_proceed (void);
|
||||
static void mi_traceframe_changed (int tfnum, int tpnum);
|
||||
static void mi_tsv_created (const char *name, LONGEST value);
|
||||
static void mi_tsv_deleted (const char *name);
|
||||
static void mi_tsv_created (const struct trace_state_variable *tsv);
|
||||
static void mi_tsv_deleted (const struct trace_state_variable *tsv);
|
||||
static void mi_tsv_modified (const struct trace_state_variable *tsv);
|
||||
static void mi_breakpoint_created (struct breakpoint *b);
|
||||
static void mi_breakpoint_deleted (struct breakpoint *b);
|
||||
static void mi_breakpoint_modified (struct breakpoint *b);
|
||||
|
|
@ -137,6 +139,7 @@ mi_interpreter_init (struct interp *interp, int top_level)
|
|||
observer_attach_traceframe_changed (mi_traceframe_changed);
|
||||
observer_attach_tsv_created (mi_tsv_created);
|
||||
observer_attach_tsv_deleted (mi_tsv_deleted);
|
||||
observer_attach_tsv_modified (mi_tsv_modified);
|
||||
observer_attach_breakpoint_created (mi_breakpoint_created);
|
||||
observer_attach_breakpoint_deleted (mi_breakpoint_deleted);
|
||||
observer_attach_breakpoint_modified (mi_breakpoint_modified);
|
||||
|
|
@ -563,15 +566,15 @@ mi_traceframe_changed (int tfnum, int tpnum)
|
|||
/* Emit notification on creating a trace state variable. */
|
||||
|
||||
static void
|
||||
mi_tsv_created (const char *name, LONGEST value)
|
||||
mi_tsv_created (const struct trace_state_variable *tsv)
|
||||
{
|
||||
struct mi_interp *mi = top_level_interpreter_data ();
|
||||
|
||||
target_terminal_ours ();
|
||||
|
||||
fprintf_unfiltered (mi->event_channel, "tsv-created,"
|
||||
"name=\"%s\",value=\"%s\"\n",
|
||||
name, plongest (value));
|
||||
"name=\"%s\",initial=\"%s\"\n",
|
||||
tsv->name, plongest (tsv->initial_value));
|
||||
|
||||
gdb_flush (mi->event_channel);
|
||||
}
|
||||
|
|
@ -579,21 +582,47 @@ mi_tsv_created (const char *name, LONGEST value)
|
|||
/* Emit notification on deleting a trace state variable. */
|
||||
|
||||
static void
|
||||
mi_tsv_deleted (const char *name)
|
||||
mi_tsv_deleted (const struct trace_state_variable *tsv)
|
||||
{
|
||||
struct mi_interp *mi = top_level_interpreter_data ();
|
||||
|
||||
target_terminal_ours ();
|
||||
|
||||
if (name != NULL)
|
||||
if (tsv != NULL)
|
||||
fprintf_unfiltered (mi->event_channel, "tsv-deleted,"
|
||||
"name=\"%s\"\n", name);
|
||||
"name=\"%s\"\n", tsv->name);
|
||||
else
|
||||
fprintf_unfiltered (mi->event_channel, "tsv-deleted\n");
|
||||
|
||||
gdb_flush (mi->event_channel);
|
||||
}
|
||||
|
||||
/* Emit notification on modifying a trace state variable. */
|
||||
|
||||
static void
|
||||
mi_tsv_modified (const struct trace_state_variable *tsv)
|
||||
{
|
||||
struct mi_interp *mi = top_level_interpreter_data ();
|
||||
struct ui_out *mi_uiout = interp_ui_out (top_level_interpreter ());
|
||||
|
||||
target_terminal_ours ();
|
||||
|
||||
fprintf_unfiltered (mi->event_channel,
|
||||
"tsv-modified");
|
||||
|
||||
ui_out_redirect (mi_uiout, mi->event_channel);
|
||||
|
||||
ui_out_field_string (mi_uiout, "name", tsv->name);
|
||||
ui_out_field_string (mi_uiout, "initial",
|
||||
plongest (tsv->initial_value));
|
||||
if (tsv->value_known)
|
||||
ui_out_field_string (mi_uiout, "current", plongest (tsv->value));
|
||||
|
||||
ui_out_redirect (mi_uiout, NULL);
|
||||
|
||||
gdb_flush (mi->event_channel);
|
||||
}
|
||||
|
||||
/* Emit notification about a created breakpoint. */
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@ struct so_list;
|
|||
struct objfile;
|
||||
struct thread_info;
|
||||
struct inferior;
|
||||
struct trace_state_variable;
|
||||
EOF
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
2013-02-06 Yao Qi <yao@codesourcery.com>
|
||||
|
||||
* gdb.trace/mi-tsv-changed.exp (test_create_delete_tsv): Rename
|
||||
to ...
|
||||
(test_create_delete_modify_tsv): ... here. New test on modifying
|
||||
the initial value of a tsv.
|
||||
|
||||
2013-02-05 Jan Kratochvil <jan.kratochvil@redhat.com>
|
||||
|
||||
* gdb.dwarf2/dw2-dir-file-name.exp (cd ${srcabsdir}/rdir): Rename to ...
|
||||
|
|
|
|||
|
|
@ -23,11 +23,14 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
|
|||
return -1
|
||||
}
|
||||
|
||||
# Test notifications on creating and deleting TSV.
|
||||
# Test notifications on creating, deleting and modifying TSV.
|
||||
|
||||
proc test_create_delete_tsv { } {with_test_prefix "create delete" {
|
||||
proc test_create_delete_modify_tsv { } {with_test_prefix "create delete modify" {
|
||||
global binfile
|
||||
global decimal
|
||||
global testfile
|
||||
global srcdir subdir
|
||||
global mi_gdb_prompt
|
||||
|
||||
if [mi_gdb_start] {
|
||||
return
|
||||
|
|
@ -35,10 +38,18 @@ proc test_create_delete_tsv { } {with_test_prefix "create delete" {
|
|||
mi_gdb_load ${binfile}
|
||||
|
||||
mi_gdb_test "tvariable \$tvar1" \
|
||||
".*=tsv-created,name=\"tvar1\",value=\"0\"\\\\n.*\\^done" \
|
||||
".*=tsv-created,name=\"tvar1\",initial=\"0\"\\\\n.*\\^done" \
|
||||
"tvariable \$tvar1"
|
||||
mi_gdb_test "tvariable \$tvar1 = 1" \
|
||||
".*=tsv-modified,name=\"tvar1\",initial=\"1\".*\\^done" \
|
||||
"tvariable \$tvar1 modified"
|
||||
# No "=tsv-modified" notification is emitted, because the initial
|
||||
# value is not changed.
|
||||
mi_gdb_test "tvariable \$tvar1 = 1" \
|
||||
".*\\\$tvar1 = 1\\\\n\"\r\n~\"Trace state .*\\\\n.*\\^done" \
|
||||
"tvariable \$tvar1 modified without notification"
|
||||
mi_gdb_test "tvariable \$tvar2 = 45" \
|
||||
".*=tsv-created,name=\"tvar2\",value=\"45\"\\\\n.*\\^done" \
|
||||
".*=tsv-created,name=\"tvar2\",initial=\"45\"\\\\n.*\\^done" \
|
||||
"tvariable \$tvar2"
|
||||
|
||||
mi_gdb_test "delete tvariable \$tvar2" \
|
||||
|
|
@ -49,6 +60,69 @@ proc test_create_delete_tsv { } {with_test_prefix "create delete" {
|
|||
".*=tsv-deleted\\\\n.*\\^done" \
|
||||
"delete all tvariables"
|
||||
|
||||
# Test target supports tracepoints or not.
|
||||
clean_restart $testfile
|
||||
|
||||
if ![runto_main] {
|
||||
fail "Can't run to main to check for trace support"
|
||||
return -1
|
||||
}
|
||||
|
||||
if ![gdb_target_supports_trace] {
|
||||
unsupported "Current target does not support trace"
|
||||
return -1;
|
||||
}
|
||||
gdb_exit
|
||||
if [mi_gdb_start] {
|
||||
continue
|
||||
}
|
||||
|
||||
mi_gdb_reinitialize_dir $srcdir/$subdir
|
||||
mi_gdb_load ${binfile}
|
||||
|
||||
mi_gdb_test "tvariable \$tvar3 = 3" \
|
||||
".*=tsv-created,name=\"tvar3\",initial=\"3\".*\\^done" \
|
||||
"tvariable \$tvar3 modified"
|
||||
mi_gdb_test "-break-insert -a gdb_c_test" \
|
||||
{.*\^done,bkpt=.*} \
|
||||
"insert tracepoint on gdb_c_test"
|
||||
# Define an action that increases $tvar3
|
||||
send_gdb "actions\n"
|
||||
gdb_expect {
|
||||
-re "End with" {
|
||||
}
|
||||
}
|
||||
send_gdb "collect \$tvar3 += 3\nend\n"
|
||||
set test "define actions"
|
||||
gdb_expect {
|
||||
-re ".*${mi_gdb_prompt}$" {
|
||||
pass $test
|
||||
}
|
||||
timeout {
|
||||
fail "$test (timeout)"
|
||||
}
|
||||
}
|
||||
|
||||
mi_gdb_test "-break-insert begin" \
|
||||
{.*\^done,bkpt=.*} \
|
||||
"insert tracepoint on begin"
|
||||
mi_gdb_test "-break-insert end" \
|
||||
{.*\^done,bkpt=.*} \
|
||||
"insert tracepoint on end"
|
||||
mi_run_cmd
|
||||
|
||||
mi_expect_stop "breakpoint-hit" "begin" ""\
|
||||
".*" ".*" {"" "disp=\"keep\""} \
|
||||
"continue to begin breakpoint"
|
||||
mi_gdb_test "-trace-start" {.*\^done} "trace start"
|
||||
mi_send_resuming_command "exec-continue" "continuing to end"
|
||||
mi_gdb_test "-trace-stop" {.*} "trace stop"
|
||||
# Force GDB to get the current value of trace state variable.
|
||||
mi_gdb_test "-trace-list-variables" ".*" "list trace variables"
|
||||
mi_gdb_test "tvariable \$tvar3 = 2" \
|
||||
".*=tsv-modified,name=\"tvar3\",initial=\"2\",current=\"6\".*\\^done" \
|
||||
"tvariable \$tvar3 modified"
|
||||
|
||||
}}
|
||||
|
||||
|
||||
|
|
@ -121,11 +195,11 @@ proc test_upload_tsv { } { with_test_prefix "upload" {
|
|||
set tsv1_created 0
|
||||
set tsv2_created 0
|
||||
gdb_expect {
|
||||
-re "=tsv-created,name=\"tvar1\",value=\"0\"" {
|
||||
-re "=tsv-created,name=\"tvar1\",initial=\"0\"" {
|
||||
set tsv1_created 1
|
||||
exp_continue
|
||||
}
|
||||
-re "=tsv-created,name=\"tvar2\",value=\"45\"" {
|
||||
-re "=tsv-created,name=\"tvar2\",initial=\"45\"" {
|
||||
set tsv2_created 1
|
||||
exp_continue
|
||||
}
|
||||
|
|
@ -148,7 +222,7 @@ proc test_upload_tsv { } { with_test_prefix "upload" {
|
|||
set gdbserver_reconnect_p 0
|
||||
}}
|
||||
|
||||
test_create_delete_tsv
|
||||
test_create_delete_modify_tsv
|
||||
|
||||
# Test target supports tracepoints or not.
|
||||
|
||||
|
|
|
|||
|
|
@ -351,11 +351,11 @@ delete_trace_state_variable (const char *name)
|
|||
for (ix = 0; VEC_iterate (tsv_s, tvariables, ix, tsv); ++ix)
|
||||
if (strcmp (name, tsv->name) == 0)
|
||||
{
|
||||
observer_notify_tsv_deleted (tsv);
|
||||
|
||||
xfree ((void *)tsv->name);
|
||||
VEC_unordered_remove (tsv_s, tvariables, ix);
|
||||
|
||||
observer_notify_tsv_deleted (name);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -408,7 +408,11 @@ trace_variable_command (char *args, int from_tty)
|
|||
tsv = find_trace_state_variable (internalvar_name (intvar));
|
||||
if (tsv)
|
||||
{
|
||||
tsv->initial_value = initval;
|
||||
if (tsv->initial_value != initval)
|
||||
{
|
||||
tsv->initial_value = initval;
|
||||
observer_notify_tsv_modified (tsv);
|
||||
}
|
||||
printf_filtered (_("Trace state variable $%s "
|
||||
"now has initial value %s.\n"),
|
||||
tsv->name, plongest (tsv->initial_value));
|
||||
|
|
@ -420,7 +424,7 @@ trace_variable_command (char *args, int from_tty)
|
|||
tsv = create_trace_state_variable (internalvar_name (intvar));
|
||||
tsv->initial_value = initval;
|
||||
|
||||
observer_notify_tsv_created (tsv->name, initval);
|
||||
observer_notify_tsv_created (tsv);
|
||||
|
||||
printf_filtered (_("Trace state variable $%s "
|
||||
"created, with initial value %s.\n"),
|
||||
|
|
@ -3587,7 +3591,7 @@ create_tsv_from_upload (struct uploaded_tsv *utsv)
|
|||
tsv->initial_value = utsv->initial_value;
|
||||
tsv->builtin = utsv->builtin;
|
||||
|
||||
observer_notify_tsv_created (tsv->name, tsv->initial_value);
|
||||
observer_notify_tsv_created (tsv);
|
||||
|
||||
do_cleanups (old_chain);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue