diff options
| author |   Simon Marchi <simon.marchi@polymtl.ca> | 2017-10-14 08:47:44 -0400 |
|---|---|---|
| committer |   Simon Marchi <simon.marchi@ericsson.com> | 2017-10-14 08:47:44 -0400 |
| commit | 2098b39391a5ade9ed308d76f2dfc7ceedd2d9a3 (patch) | |
| tree | a6be020ecea33167c825e9898e81d2f32b8066c6 /gdb/remote.c | |
| parent | Use std::vector for traceframe_info::memory (diff) | |
| download | binutils-gdb-2098b39391a5ade9ed308d76f2dfc7ceedd2d9a3.tar.gz binutils-gdb-2098b39391a5ade9ed308d76f2dfc7ceedd2d9a3.tar.bz2 binutils-gdb-2098b39391a5ade9ed308d76f2dfc7ceedd2d9a3.zip | |
Make to_traceframe_info return a unique_ptr
Since this target method returns an allocated object, return a
unique_ptr. It allows getting rid a some cleanups here and there.
I had to shuffle the includes around. First, target.h now needs to
include tracepoint.h, to get the definition of traceframe_info_up.
However, the definition of enum trace_find_type was later in target, so
I had to move it to tracepoint.h, so that the declaration of tfind_1
could know about it. I then had to remove the include of target.h from
tracepoint.h, which caused a circular dependency (it was probably
included to get enum trace_find_type in the first place anyway).
Regression tested on the buildbot.
gdb/ChangeLog:
* target.h: Include tracepoint.h.
(enum trace_find_type): Move to tracepoint.h.
(struct target_ops) <to_traceframe_info>: Return a unique ptr.
* tracepoint.h: Don't include target.h
(enum trace_find_type): Move from target.h.
(parse_traceframe_info): Return a unique ptr.
* tracepoint.c (current_traceframe_info): Change type to unique
ptr.
(free_traceframe_info): Remove.
(clear_traceframe_info): Don't manually free
current_traceframe_info.
(free_result): Remove.
(parse_traceframe_info): Return a unique ptr.
(get_traceframe_info): Adjust to unique ptr.
* ctf.c (ctf_traceframe_info): Return a unique ptr.
* remote.c (remote_traceframe_info): Return a unique ptr.
* tracefile-tfile.c (tfile_traceframe_info): Return a unique
ptr.
* target-debug.h (target_debug_print_traceframe_info_up): New
macro.
* target-delegates.c: Regenerate.
Diffstat (limited to 'gdb/remote.c')
| -rw-r--r-- | gdb/remote.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gdb/remote.c b/gdb/remote.c index e06e8077129..e2bdd115f91 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -13061,7 +13061,7 @@ remote_set_circular_trace_buffer (struct target_ops *self, int val) error (_("Bogus reply from target: %s"), reply); } -static struct traceframe_info * +static traceframe_info_up remote_traceframe_info (struct target_ops *self) { char *text; @@ -13070,10 +13070,9 @@ remote_traceframe_info (struct target_ops *self) TARGET_OBJECT_TRACEFRAME_INFO, NULL); if (text != NULL) { - struct traceframe_info *info; struct cleanup *back_to = make_cleanup (xfree, text); + traceframe_info_up info = parse_traceframe_info (text); - info = parse_traceframe_info (text); do_cleanups (back_to); return info; } |