From 76a2b9588c3dd301f12d5e7d071c3a0dc11047c0 Mon Sep 17 00:00:00 2001 From: Stan Shebs Date: Mon, 29 Mar 2010 17:41:38 +0000 Subject: [PATCH] 2010-03-29 Stan Shebs * tracepoint.c (start_tracing): Check tracepoints before sending commands to target, don't start if all tracepoints disabled. --- gdb/ChangeLog | 5 +++++ gdb/tracepoint.c | 37 ++++++++++++++++++++++++++++--------- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f05c0d61dda..528b8d94949 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2010-03-29 Stan Shebs + + * tracepoint.c (start_tracing): Check tracepoints before sending + commands to target, don't start if all tracepoints disabled. + 2010-03-28 Pedro Alves * cli/cli-script.c (process_next_line): Handle 'stepping'. diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index daa2161703c..498c18e791c 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -1449,24 +1449,43 @@ start_tracing (void) int ix; struct breakpoint *t; struct trace_state_variable *tsv; - int any_downloaded = 0; - - target_trace_init (); + int any_enabled = 0; tp_vec = all_tracepoints (); + + /* No point in tracing without any tracepoints... */ + if (VEC_length (breakpoint_p, tp_vec) == 0) + { + VEC_free (breakpoint_p, tp_vec); + error (_("No tracepoints defined, not starting trace")); + } + + for (ix = 0; VEC_iterate (breakpoint_p, tp_vec, ix, t); ix++) + { + if (t->enable_state == bp_enabled) + { + any_enabled = 1; + break; + } + } + + /* No point in tracing with only disabled tracepoints. */ + if (!any_enabled) + { + VEC_free (breakpoint_p, tp_vec); + error (_("No tracepoints enabled, not starting trace")); + } + + target_trace_init (); + for (ix = 0; VEC_iterate (breakpoint_p, tp_vec, ix, t); ix++) { t->number_on_target = 0; target_download_tracepoint (t); t->number_on_target = t->number; - any_downloaded = 1; } VEC_free (breakpoint_p, tp_vec); - - /* No point in tracing without any tracepoints... */ - if (!any_downloaded) - error ("No tracepoints downloaded, not starting trace"); - + /* Send down all the trace state variables too. */ for (ix = 0; VEC_iterate (tsv_s, tvariables, ix, tsv); ++ix) { -- 2.30.2