[RFA,v2,4/4] Use std::vector in struct catch_syscall_inferior_data
Commit Message
This changes struct catch_syscall_inferior_data to use a std::vector
rather than a VEC. It also changes it to be allocated with new and
destroyed with delete.
2017-07-18 Tom Tromey <tom@tromey.com>
* break-catch-syscall.c (struct catch_syscall_inferior_data)
<syscalls_counts>: Now a std::vector.
(get_catch_syscall_inferior_data): Use "new".
(catch_syscall_inferior_data_cleanup): Use "delete".
(insert_catch_syscall, remove_catch_syscall)
(clear_syscall_counts): Update.
---
gdb/ChangeLog | 9 +++++++++
gdb/break-catch-syscall.c | 47 ++++++++++++++++-------------------------------
2 files changed, 25 insertions(+), 31 deletions(-)
Comments
On Wednesday, July 19 2017, Tom Tromey wrote:
> This changes struct catch_syscall_inferior_data to use a std::vector
> rather than a VEC. It also changes it to be allocated with new and
> destroyed with delete.
Thanks for the patch, Tom :-).
> 2017-07-18 Tom Tromey <tom@tromey.com>
>
> * break-catch-syscall.c (struct catch_syscall_inferior_data)
> <syscalls_counts>: Now a std::vector.
> (get_catch_syscall_inferior_data): Use "new".
> (catch_syscall_inferior_data_cleanup): Use "delete".
> (insert_catch_syscall, remove_catch_syscall)
> (clear_syscall_counts): Update.
> ---
> gdb/ChangeLog | 9 +++++++++
> gdb/break-catch-syscall.c | 47 ++++++++++++++++-------------------------------
> 2 files changed, 25 insertions(+), 31 deletions(-)
>
> diff --git a/gdb/ChangeLog b/gdb/ChangeLog
> index fb953ed..4372853 100644
> --- a/gdb/ChangeLog
> +++ b/gdb/ChangeLog
> @@ -1,3 +1,12 @@
> +2017-07-18 Tom Tromey <tom@tromey.com>
> +
> + * break-catch-syscall.c (struct catch_syscall_inferior_data)
> + <syscalls_counts>: Now a std::vector.
> + (get_catch_syscall_inferior_data): Use "new".
> + (catch_syscall_inferior_data_cleanup): Use "delete".
> + (insert_catch_syscall, remove_catch_syscall)
> + (clear_syscall_counts): Update.
> +
> 2017-07-17 Tom Tromey <tom@tromey.com>
>
> * break-catch-syscall.c (syscall_catchpoint)
> diff --git a/gdb/break-catch-syscall.c b/gdb/break-catch-syscall.c
> index ff0cb69..3df358b 100644
> --- a/gdb/break-catch-syscall.c
> +++ b/gdb/break-catch-syscall.c
> @@ -54,14 +54,14 @@ struct catch_syscall_inferior_data
> int any_syscall_count;
>
> /* Count of each system call. */
> - VEC(int) *syscalls_counts;
> + std::vector<int> syscalls_counts;
>
> /* This counts all syscall catch requests, so we can readily determine
> if any catching is necessary. */
> int total_syscalls_count;
> };
>
> -static struct catch_syscall_inferior_data*
> +static struct catch_syscall_inferior_data *
> get_catch_syscall_inferior_data (struct inferior *inf)
> {
> struct catch_syscall_inferior_data *inf_data;
> @@ -70,7 +70,7 @@ get_catch_syscall_inferior_data (struct inferior *inf)
> inferior_data (inf, catch_syscall_inferior_data));
> if (inf_data == NULL)
> {
> - inf_data = XCNEW (struct catch_syscall_inferior_data);
> + inf_data = new struct catch_syscall_inferior_data ();
> set_inferior_data (inf, catch_syscall_inferior_data, inf_data);
> }
>
> @@ -80,7 +80,9 @@ get_catch_syscall_inferior_data (struct inferior *inf)
> static void
> catch_syscall_inferior_data_cleanup (struct inferior *inf, void *arg)
> {
> - xfree (arg);
> + struct catch_syscall_inferior_data *inf_data
> + = (struct catch_syscall_inferior_data *) arg;
> + delete inf_data;
Are we still using the "newline between variable declaration and code"
rule?
> }
>
>
> @@ -104,31 +106,17 @@ insert_catch_syscall (struct bp_location *bl)
> {
> int elem;
>
> - if (iter >= VEC_length (int, inf_data->syscalls_counts))
> - {
> - int old_size = VEC_length (int, inf_data->syscalls_counts);
> - uintptr_t vec_addr_offset
> - = old_size * ((uintptr_t) sizeof (int));
> - uintptr_t vec_addr;
> - VEC_safe_grow (int, inf_data->syscalls_counts, iter + 1);
> - vec_addr = ((uintptr_t) VEC_address (int,
> - inf_data->syscalls_counts)
> - + vec_addr_offset);
> - memset ((void *) vec_addr, 0,
> - (iter + 1 - old_size) * sizeof (int));
> - }
> - elem = VEC_index (int, inf_data->syscalls_counts, iter);
> - VEC_replace (int, inf_data->syscalls_counts, iter, ++elem);
> + if (iter >= inf_data->syscalls_counts.size ())
> + inf_data->syscalls_counts.resize (iter + 1);
> + ++inf_data->syscalls_counts[iter];
Great simplification.
> }
> }
>
> return target_set_syscall_catchpoint (ptid_get_pid (inferior_ptid),
> inf_data->total_syscalls_count != 0,
> inf_data->any_syscall_count,
> - VEC_length (int,
> - inf_data->syscalls_counts),
> - VEC_address (int,
> - inf_data->syscalls_counts));
> + inf_data->syscalls_counts.size (),
> + inf_data->syscalls_counts.data ());
> }
>
> /* Implement the "remove" breakpoint_ops method for syscall
> @@ -150,21 +138,18 @@ remove_catch_syscall (struct bp_location *bl, enum remove_bp_reason reason)
> for (int iter : c->syscalls_to_be_caught)
> {
> int elem;
> - if (iter >= VEC_length (int, inf_data->syscalls_counts))
> + if (iter >= inf_data->syscalls_counts.size ())
> /* Shouldn't happen. */
> continue;
> - elem = VEC_index (int, inf_data->syscalls_counts, iter);
> - VEC_replace (int, inf_data->syscalls_counts, iter, --elem);
> + --inf_data->syscalls_counts[iter];
> }
> }
>
> return target_set_syscall_catchpoint (ptid_get_pid (inferior_ptid),
> inf_data->total_syscalls_count != 0,
> inf_data->any_syscall_count,
> - VEC_length (int,
> - inf_data->syscalls_counts),
> - VEC_address (int,
> - inf_data->syscalls_counts));
> + inf_data->syscalls_counts.size (),
> + inf_data->syscalls_counts.data ());
> }
>
> /* Implement the "breakpoint_hit" breakpoint_ops method for syscall
> @@ -628,7 +613,7 @@ clear_syscall_counts (struct inferior *inf)
>
> inf_data->total_syscalls_count = 0;
> inf_data->any_syscall_count = 0;
> - VEC_free (int, inf_data->syscalls_counts);
> + inf_data->syscalls_counts.clear ();
> }
>
> static void
> --
> 2.9.3
LGTM.
Thanks,
On 2017-07-19 22:32, Tom Tromey wrote:
> @@ -104,31 +106,17 @@ insert_catch_syscall (struct bp_location *bl)
> {
> int elem;
>
> - if (iter >= VEC_length (int, inf_data->syscalls_counts))
> - {
> - int old_size = VEC_length (int,
> inf_data->syscalls_counts);
> - uintptr_t vec_addr_offset
> - = old_size * ((uintptr_t) sizeof (int));
> - uintptr_t vec_addr;
> - VEC_safe_grow (int, inf_data->syscalls_counts, iter +
> 1);
> - vec_addr = ((uintptr_t) VEC_address (int,
> - inf_data->syscalls_counts)
> - + vec_addr_offset);
> - memset ((void *) vec_addr, 0,
> - (iter + 1 - old_size) * sizeof (int));
> - }
> - elem = VEC_index (int, inf_data->syscalls_counts, iter);
> - VEC_replace (int, inf_data->syscalls_counts, iter, ++elem);
> + if (iter >= inf_data->syscalls_counts.size ())
> + inf_data->syscalls_counts.resize (iter + 1);
I wasn't sure at first if this would insert zeros, but after some
searching it seems like the new elements are value-initialized, so it's
fine.
LGTM too.
Simon
>>>>> "Sergio" == Sergio Durigan Junior <sergiodj@redhat.com> writes:
Sergio> Are we still using the "newline between variable declaration and code"
Sergio> rule?
No idea.
Tom
@@ -1,3 +1,12 @@
+2017-07-18 Tom Tromey <tom@tromey.com>
+
+ * break-catch-syscall.c (struct catch_syscall_inferior_data)
+ <syscalls_counts>: Now a std::vector.
+ (get_catch_syscall_inferior_data): Use "new".
+ (catch_syscall_inferior_data_cleanup): Use "delete".
+ (insert_catch_syscall, remove_catch_syscall)
+ (clear_syscall_counts): Update.
+
2017-07-17 Tom Tromey <tom@tromey.com>
* break-catch-syscall.c (syscall_catchpoint)
@@ -54,14 +54,14 @@ struct catch_syscall_inferior_data
int any_syscall_count;
/* Count of each system call. */
- VEC(int) *syscalls_counts;
+ std::vector<int> syscalls_counts;
/* This counts all syscall catch requests, so we can readily determine
if any catching is necessary. */
int total_syscalls_count;
};
-static struct catch_syscall_inferior_data*
+static struct catch_syscall_inferior_data *
get_catch_syscall_inferior_data (struct inferior *inf)
{
struct catch_syscall_inferior_data *inf_data;
@@ -70,7 +70,7 @@ get_catch_syscall_inferior_data (struct inferior *inf)
inferior_data (inf, catch_syscall_inferior_data));
if (inf_data == NULL)
{
- inf_data = XCNEW (struct catch_syscall_inferior_data);
+ inf_data = new struct catch_syscall_inferior_data ();
set_inferior_data (inf, catch_syscall_inferior_data, inf_data);
}
@@ -80,7 +80,9 @@ get_catch_syscall_inferior_data (struct inferior *inf)
static void
catch_syscall_inferior_data_cleanup (struct inferior *inf, void *arg)
{
- xfree (arg);
+ struct catch_syscall_inferior_data *inf_data
+ = (struct catch_syscall_inferior_data *) arg;
+ delete inf_data;
}
@@ -104,31 +106,17 @@ insert_catch_syscall (struct bp_location *bl)
{
int elem;
- if (iter >= VEC_length (int, inf_data->syscalls_counts))
- {
- int old_size = VEC_length (int, inf_data->syscalls_counts);
- uintptr_t vec_addr_offset
- = old_size * ((uintptr_t) sizeof (int));
- uintptr_t vec_addr;
- VEC_safe_grow (int, inf_data->syscalls_counts, iter + 1);
- vec_addr = ((uintptr_t) VEC_address (int,
- inf_data->syscalls_counts)
- + vec_addr_offset);
- memset ((void *) vec_addr, 0,
- (iter + 1 - old_size) * sizeof (int));
- }
- elem = VEC_index (int, inf_data->syscalls_counts, iter);
- VEC_replace (int, inf_data->syscalls_counts, iter, ++elem);
+ if (iter >= inf_data->syscalls_counts.size ())
+ inf_data->syscalls_counts.resize (iter + 1);
+ ++inf_data->syscalls_counts[iter];
}
}
return target_set_syscall_catchpoint (ptid_get_pid (inferior_ptid),
inf_data->total_syscalls_count != 0,
inf_data->any_syscall_count,
- VEC_length (int,
- inf_data->syscalls_counts),
- VEC_address (int,
- inf_data->syscalls_counts));
+ inf_data->syscalls_counts.size (),
+ inf_data->syscalls_counts.data ());
}
/* Implement the "remove" breakpoint_ops method for syscall
@@ -150,21 +138,18 @@ remove_catch_syscall (struct bp_location *bl, enum remove_bp_reason reason)
for (int iter : c->syscalls_to_be_caught)
{
int elem;
- if (iter >= VEC_length (int, inf_data->syscalls_counts))
+ if (iter >= inf_data->syscalls_counts.size ())
/* Shouldn't happen. */
continue;
- elem = VEC_index (int, inf_data->syscalls_counts, iter);
- VEC_replace (int, inf_data->syscalls_counts, iter, --elem);
+ --inf_data->syscalls_counts[iter];
}
}
return target_set_syscall_catchpoint (ptid_get_pid (inferior_ptid),
inf_data->total_syscalls_count != 0,
inf_data->any_syscall_count,
- VEC_length (int,
- inf_data->syscalls_counts),
- VEC_address (int,
- inf_data->syscalls_counts));
+ inf_data->syscalls_counts.size (),
+ inf_data->syscalls_counts.data ());
}
/* Implement the "breakpoint_hit" breakpoint_ops method for syscall
@@ -628,7 +613,7 @@ clear_syscall_counts (struct inferior *inf)
inf_data->total_syscalls_count = 0;
inf_data->any_syscall_count = 0;
- VEC_free (int, inf_data->syscalls_counts);
+ inf_data->syscalls_counts.clear ();
}
static void