diff options
author | Simon Marchi <simon.marchi@polymtl.ca> | 2018-03-04 15:56:03 -0500 |
---|---|---|
committer | Simon Marchi <simon.marchi@ericsson.com> | 2018-03-05 16:57:36 -0500 |
commit | 9fd0d582c79c1dbc5b1dd3dcde2e6c6966c3a4ef (patch) | |
tree | b5821ddbe2a067c73008edc104ef014cb4dd5106 /gdb/record-btrace.c | |
parent | 0e70b27ba900581df8e23cbbd4612176f869d796 (diff) | |
download | gdb-9fd0d582c79c1dbc5b1dd3dcde2e6c6966c3a4ef.zip gdb-9fd0d582c79c1dbc5b1dd3dcde2e6c6966c3a4ef.tar.gz gdb-9fd0d582c79c1dbc5b1dd3dcde2e6c6966c3a4ef.tar.bz2 |
btrace: Remove btrace disable cleanup
This patch removes a cleanup that disables btrace on threads in case of
failure, so we don't leave it enabled for some the threads and disabled
for the rest.
gdb/ChangeLog:
* record-btrace.c (record_btrace_disable_callback): Remove.
(struct scoped_btrace_disable): New.
(record_btrace_open): Use scoped_btrace_disable.
Diffstat (limited to 'gdb/record-btrace.c')
-rw-r--r-- | gdb/record-btrace.c | 47 |
1 files changed, 33 insertions, 14 deletions
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 48eda54..0d24072 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -159,16 +159,6 @@ record_btrace_enable_warn (struct thread_info *tp) END_CATCH } -/* Callback function to disable branch tracing for one thread. */ - -static void -record_btrace_disable_callback (void *arg) -{ - struct thread_info *tp = (struct thread_info *) arg; - - btrace_disable (tp); -} - /* Enable automatic tracing of new threads. */ static void @@ -223,12 +213,42 @@ record_btrace_push_target (void) observer_notify_record_changed (current_inferior (), 1, "btrace", format); } +/* Disable btrace on a set of threads on scope exit. */ + +struct scoped_btrace_disable +{ + scoped_btrace_disable () = default; + + DISABLE_COPY_AND_ASSIGN (scoped_btrace_disable); + + ~scoped_btrace_disable () + { + for (thread_info *tp : m_threads) + btrace_disable (tp); + } + + void add_thread (thread_info *thread) + { + m_threads.push_front (thread); + } + + void discard () + { + m_threads.clear (); + } + +private: + std::forward_list<thread_info *> m_threads; +}; + /* The to_open method of target record-btrace. */ static void record_btrace_open (const char *args, int from_tty) { - struct cleanup *disable_chain; + /* If we fail to enable btrace for one thread, disable it for the threads for + which it was successfully enabled. */ + scoped_btrace_disable btrace_disable; struct thread_info *tp; DEBUG ("open"); @@ -240,18 +260,17 @@ record_btrace_open (const char *args, int from_tty) gdb_assert (record_btrace_thread_observer == NULL); - disable_chain = make_cleanup (null_cleanup, NULL); ALL_NON_EXITED_THREADS (tp) if (args == NULL || *args == 0 || number_is_in_list (args, tp->global_num)) { btrace_enable (tp, &record_btrace_conf); - make_cleanup (record_btrace_disable_callback, tp); + btrace_disable.add_thread (tp); } record_btrace_push_target (); - discard_cleanups (disable_chain); + btrace_disable.discard (); } /* The to_stop_recording method of target record-btrace. */ |