aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2010-02-11 21:00:12 +0000
committerPedro Alves <palves@redhat.com>2010-02-11 21:00:12 +0000
commit10ef8d6a8dfca5731b2f4eb4dec945a299050e3c (patch)
tree2bd19c6abdd3baefca6dfce6c1a962030efa0a00 /gdb
parent00c5099111744132fa72c773faf4df4a6dad1fb9 (diff)
downloadgdb-10ef8d6a8dfca5731b2f4eb4dec945a299050e3c.zip
gdb-10ef8d6a8dfca5731b2f4eb4dec945a299050e3c.tar.gz
gdb-10ef8d6a8dfca5731b2f4eb4dec945a299050e3c.tar.bz2
* tracepoint.c (tfile_open): Remove spurious discard_cleanups.
Merge uploaded TSVs before merging uploaded tracepoints.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/tracepoint.c7
2 files changed, 9 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ddf6615..a679110 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2010-02-11 Pedro Alves <pedro@codesourcery.com>
+ * tracepoint.c (tfile_open): Remove spurious discard_cleanups.
+ Merge uploaded TSVs before merging uploaded tracepoints.
+
+2010-02-11 Pedro Alves <pedro@codesourcery.com>
+
* ax-gdb.c (gen_deref): Don't allow dereferencing void pointers.
2010-02-11 Vladimir Prus <vladimir@codesourcery.com>
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 73fd547..e27b690 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -2824,7 +2824,6 @@ tfile_open (char *filename, int from_tty)
unpush_target (&tfile_ops);
push_target (&tfile_ops);
- discard_cleanups (old_chain);
trace_filename = xstrdup (filename);
trace_fd = scratch_chan;
@@ -2881,10 +2880,12 @@ tfile_open (char *filename, int from_tty)
/* Add the file's tracepoints and variables into the current mix. */
- merge_uploaded_tracepoints (&uploaded_tps);
-
+ /* Get trace state variables first, they may be checked when parsing
+ uploaded commands. */
merge_uploaded_trace_state_variables (&uploaded_tsvs);
+ merge_uploaded_tracepoints (&uploaded_tps);
+
/* Record the starting offset of the binary trace data. */
trace_frames_offset = bytes;