Convert break-catch-syscall.c to type-safe registry API

This changes break-catch-syscall.c to use the type-safe registry API.

gdb/ChangeLog
2019-05-08  Tom Tromey  <tom@tromey.com>

	* break-catch-syscall.c (catch_syscall_inferior_data): Move.
	Change type.
	(get_catch_syscall_inferior_data): Update.
	(catch_syscall_inferior_data_cleanup): Remove.
	(_initialize_break_catch_syscall): Update.
This commit is contained in:
Tom Tromey 2019-04-21 09:25:07 -06:00
parent 6509b8ebfb
commit 6ae614f66a
2 changed files with 13 additions and 20 deletions

View file

@ -1,3 +1,11 @@
2019-05-08 Tom Tromey <tom@tromey.com>
* break-catch-syscall.c (catch_syscall_inferior_data): Move.
Change type.
(get_catch_syscall_inferior_data): Update.
(catch_syscall_inferior_data_cleanup): Remove.
(_initialize_break_catch_syscall): Update.
2019-05-08 Tom Tromey <tom@tromey.com> 2019-05-08 Tom Tromey <tom@tromey.com>
* inflow.c (struct terminal_info): Add destructor and * inflow.c (struct terminal_info): Add destructor and

View file

@ -42,8 +42,6 @@ struct syscall_catchpoint : public breakpoint
std::vector<int> syscalls_to_be_caught; std::vector<int> syscalls_to_be_caught;
}; };
static const struct inferior_data *catch_syscall_inferior_data = NULL;
struct catch_syscall_inferior_data struct catch_syscall_inferior_data
{ {
/* We keep a count of the number of times the user has requested a /* We keep a count of the number of times the user has requested a
@ -61,31 +59,21 @@ struct catch_syscall_inferior_data
int total_syscalls_count; int total_syscalls_count;
}; };
static const struct inferior_key<struct catch_syscall_inferior_data>
catch_syscall_inferior_data;
static struct catch_syscall_inferior_data * static struct catch_syscall_inferior_data *
get_catch_syscall_inferior_data (struct inferior *inf) get_catch_syscall_inferior_data (struct inferior *inf)
{ {
struct catch_syscall_inferior_data *inf_data; struct catch_syscall_inferior_data *inf_data;
inf_data = ((struct catch_syscall_inferior_data *) inf_data = catch_syscall_inferior_data.get (inf);
inferior_data (inf, catch_syscall_inferior_data));
if (inf_data == NULL) if (inf_data == NULL)
{ inf_data = catch_syscall_inferior_data.emplace (inf);
inf_data = new struct catch_syscall_inferior_data ();
set_inferior_data (inf, catch_syscall_inferior_data, inf_data);
}
return inf_data; return inf_data;
} }
static void
catch_syscall_inferior_data_cleanup (struct inferior *inf, void *arg)
{
struct catch_syscall_inferior_data *inf_data
= (struct catch_syscall_inferior_data *) arg;
delete inf_data;
}
/* Implement the "insert" breakpoint_ops method for syscall /* Implement the "insert" breakpoint_ops method for syscall
catchpoints. */ catchpoints. */
@ -617,9 +605,6 @@ _initialize_break_catch_syscall (void)
initialize_syscall_catchpoint_ops (); initialize_syscall_catchpoint_ops ();
gdb::observers::inferior_exit.attach (clear_syscall_counts); gdb::observers::inferior_exit.attach (clear_syscall_counts);
catch_syscall_inferior_data
= register_inferior_data_with_cleanup (NULL,
catch_syscall_inferior_data_cleanup);
add_catch_command ("syscall", _("\ add_catch_command ("syscall", _("\
Catch system calls by their names, groups and/or numbers.\n\ Catch system calls by their names, groups and/or numbers.\n\