From ee97f592f2d9edf4ae720a68893af5cbaedd1be9 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 19 Dec 2013 08:21:20 -0700 Subject: [PATCH] convert to_stop_recording 2014-02-19 Tom Tromey * record.c (record_stop): Unconditionally delegate. * target-delegates.c: Rebuild. * target.c (target_stop_recording): Unconditionally delegate. * target.h (struct target_ops) : Use TARGET_DEFAULT_IGNORE. --- gdb/ChangeLog | 8 ++++++++ gdb/record.c | 3 +-- gdb/target-delegates.c | 15 +++++++++++++++ gdb/target.c | 11 +---------- gdb/target.h | 3 ++- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 644ebfd7eb..aa699ba935 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2014-02-19 Tom Tromey + + * record.c (record_stop): Unconditionally delegate. + * target-delegates.c: Rebuild. + * target.c (target_stop_recording): Unconditionally delegate. + * target.h (struct target_ops) : Use + TARGET_DEFAULT_IGNORE. + 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. diff --git a/gdb/record.c b/gdb/record.c index 9dd02e8eae..5a7a88c347 100644 --- a/gdb/record.c +++ b/gdb/record.c @@ -114,8 +114,7 @@ record_stop (struct target_ops *t) { DEBUG ("stop %s", t->to_shortname); - if (t->to_stop_recording != NULL) - t->to_stop_recording (t); + t->to_stop_recording (t); } /* Unpush the record target. */ diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index df17c7b62b..4b90a2f2ba 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -1352,6 +1352,18 @@ tdefault_read_btrace (struct target_ops *self, VEC (btrace_block_s) **arg1, stru tcomplain (); } +static void +delegate_stop_recording (struct target_ops *self) +{ + self = self->beneath; + self->to_stop_recording (self); +} + +static void +tdefault_stop_recording (struct target_ops *self) +{ +} + static void delegate_save_record (struct target_ops *self, const char *arg1) { @@ -1752,6 +1764,8 @@ install_delegators (struct target_ops *ops) ops->to_teardown_btrace = delegate_teardown_btrace; if (ops->to_read_btrace == NULL) ops->to_read_btrace = delegate_read_btrace; + if (ops->to_stop_recording == NULL) + ops->to_stop_recording = delegate_stop_recording; if (ops->to_save_record == NULL) ops->to_save_record = delegate_save_record; if (ops->to_delete_record == NULL) @@ -1897,6 +1911,7 @@ install_dummy_methods (struct target_ops *ops) ops->to_disable_btrace = tdefault_disable_btrace; ops->to_teardown_btrace = tdefault_teardown_btrace; ops->to_read_btrace = tdefault_read_btrace; + ops->to_stop_recording = tdefault_stop_recording; ops->to_save_record = tdefault_save_record; ops->to_delete_record = tdefault_delete_record; ops->to_record_is_replaying = tdefault_record_is_replaying; diff --git a/gdb/target.c b/gdb/target.c index 547afcc8e2..ef7374e1b9 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -3818,16 +3818,7 @@ target_read_btrace (VEC (btrace_block_s) **btrace, void target_stop_recording (void) { - struct target_ops *t; - - for (t = current_target.beneath; t != NULL; t = t->beneath) - if (t->to_stop_recording != NULL) - { - t->to_stop_recording (t); - return; - } - - /* This is optional. */ + current_target.to_stop_recording (¤t_target); } /* See target.h. */ diff --git a/gdb/target.h b/gdb/target.h index bbc0ecd528..1437cc4c91 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1028,7 +1028,8 @@ struct target_ops TARGET_DEFAULT_NORETURN (tcomplain ()); /* Stop trace recording. */ - void (*to_stop_recording) (struct target_ops *); + void (*to_stop_recording) (struct target_ops *) + TARGET_DEFAULT_IGNORE (); /* Print information about the recording. */ void (*to_info_record) (struct target_ops *); -- 2.34.1