mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-01-30 12:44:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace start_rbreak_breakpoints and end_rbreak_breakpoints

Browse Source 
This replaces start_rbreak_breakpoints and end_rbreak_breakpoints with
a new scoped class.  This allows the removal of a cleanup.

This also fixes an earlier memory leak regression, by changing
"string" to be a std::string.

gdb/ChangeLog
2017-11-04  Tom Tromey  <tom@tromey.com>

	* breakpoint.c
	(scoped_rbreak_breakpoints::scoped_rbreak_breakpoints): Rename
	from start_rbreak_breakpoints.
	(scoped_rbreak_breakpoints): Rename from end_rbreak_breakpoints.
	* breakpoint.h (class scoped_rbreak_breakpoints): New.
	(start_rbreak_breakpoints, end_rbreak_breakpoints): Remove.
	* symtab.c (do_end_rbreak_breakpoints): Remove.
	(rbreak_command): Use scoped_rbreak_breakpoints, std::string.
This commit is contained in:
Tom Tromey 2017-11-01 09:00:09 -06:00
parent 167b0be1b5
commit c80049d3b6
4 changed files with 33 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdb/ChangeLog
View File

@ -1,3 +1,14 @@
2017-11-04 Tom Tromey <tom@tromey.com>
* breakpoint.c
(scoped_rbreak_breakpoints::scoped_rbreak_breakpoints): Rename
from start_rbreak_breakpoints.
(scoped_rbreak_breakpoints): Rename from end_rbreak_breakpoints.
* breakpoint.h (class scoped_rbreak_breakpoints): New.
(start_rbreak_breakpoints, end_rbreak_breakpoints): Remove.
* symtab.c (do_end_rbreak_breakpoints): Remove.
(rbreak_command): Use scoped_rbreak_breakpoints, std::string.
2017-11-04 Tom Tromey <tom@tromey.com>
* cp-namespace.c (reset_directive_searched): Remove.

6
gdb/breakpoint.c
View File

@ -644,8 +644,7 @@ static int rbreak_start_breakpoint_count;
/* Called at the start an "rbreak" command to record the first
breakpoint made. */
void
start_rbreak_breakpoints (void)
scoped_rbreak_breakpoints::scoped_rbreak_breakpoints ()
{
rbreak_start_breakpoint_count = breakpoint_count;
}
@ -653,8 +652,7 @@ start_rbreak_breakpoints (void)
/* Called at the end of an "rbreak" command to record the last
breakpoint made. */
void
end_rbreak_breakpoints (void)
scoped_rbreak_breakpoints::~scoped_rbreak_breakpoints ()
{
prev_breakpoint_count = rbreak_start_breakpoint_count;
}

16
gdb/breakpoint.h
View File

@ -1601,10 +1601,18 @@ extern VEC(breakpoint_p) *static_tracepoints_here (CORE_ADDR addr);
that each command is suitable for tracepoint command list. */
extern void check_tracepoint_command (char *line, void *closure);
/* Call at the start and end of an "rbreak" command to register
breakpoint numbers for a later "commands" command. */
extern void start_rbreak_breakpoints (void);
extern void end_rbreak_breakpoints (void);
/* Create an instance of this to start registering breakpoint numbers
for a later "commands" command. */
class scoped_rbreak_breakpoints
{
public:
scoped_rbreak_breakpoints ();
~scoped_rbreak_breakpoints ();
DISABLE_COPY_AND_ASSIGN (scoped_rbreak_breakpoints);
};
/* Breakpoint iterator function.

48
gdb/symtab.c
View File

@ -4506,20 +4506,10 @@ rbreak_command_wrapper (char *regexp, int from_tty)
rbreak_command (regexp, from_tty);
}
/* A cleanup function that calls end_rbreak_breakpoints. */
static void
do_end_rbreak_breakpoints (void *ignore)
{
end_rbreak_breakpoints ();
}
static void
rbreak_command (char *regexp, int from_tty)
{
struct cleanup *old_chain;
char *string = NULL;
int len = 0;
std::string string;
const char **files = NULL;
const char *file_name;
int nfiles = 0;
@ -4550,8 +4540,7 @@ rbreak_command (char *regexp, int from_tty)
FUNCTIONS_DOMAIN,
nfiles, files);
start_rbreak_breakpoints ();
old_chain = make_cleanup (do_end_rbreak_breakpoints, NULL);
scoped_rbreak_breakpoints finalize;
for (const symbol_search &p : symbols)
{
if (p.msymbol.minsym == NULL)
@ -4559,20 +4548,9 @@ rbreak_command (char *regexp, int from_tty)
struct symtab *symtab = symbol_symtab (p.symbol);
const char *fullname = symtab_to_fullname (symtab);
int newlen = (strlen (fullname)
+ strlen (SYMBOL_LINKAGE_NAME (p.symbol))
+ 4);
if (newlen > len)
{
string = (char *) xrealloc (string, newlen);
len = newlen;
}
strcpy (string, fullname);
strcat (string, ":'");
strcat (string, SYMBOL_LINKAGE_NAME (p.symbol));
strcat (string, "'");
break_command (string, from_tty);
string = string_printf ("%s:'%s'", fullname,
SYMBOL_LINKAGE_NAME (p.symbol));
break_command (&string[0], from_tty);
print_symbol_info (FUNCTIONS_DOMAIN,
p.symbol,
p.block,
@ -4580,24 +4558,14 @@ rbreak_command (char *regexp, int from_tty)
}
else
{
int newlen = (strlen (MSYMBOL_LINKAGE_NAME (p.msymbol.minsym)) + 3);
string = string_printf ("'%s'",
MSYMBOL_LINKAGE_NAME (p.msymbol.minsym));
if (newlen > len)
{
string = (char *) xrealloc (string, newlen);
len = newlen;
}
strcpy (string, "'");
strcat (string, MSYMBOL_LINKAGE_NAME (p.msymbol.minsym));
strcat (string, "'");
break_command (string, from_tty);
break_command (&string[0], from_tty);
printf_filtered ("<function, no debug info> %s;\n",
MSYMBOL_PRINT_NAME (p.msymbol.minsym));
}
}
do_cleanups (old_chain);
}