* [PATCH 3/6] Use unique_xmalloc_ptr in watchpoint
2021-10-05 0:14 [PATCH 0/6] Remove some uses of xfree Tom Tromey
2021-10-05 0:14 ` [PATCH 1/6] Use unique_xmalloc_ptr in solib_catchpoint Tom Tromey
2021-10-05 0:14 ` [PATCH 2/6] Use unique_xmalloc_ptr in exec_catchpoint Tom Tromey
@ 2021-10-05 0:14 ` Tom Tromey
2021-10-05 0:14 ` [PATCH 4/6] Use unique_xmalloc_ptr in bp_location Tom Tromey
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Tom Tromey @ 2021-10-05 0:14 UTC (permalink / raw)
To: gdb-patches; +Cc: Tom Tromey
This changes struct watchpoint to use unique_xmalloc_ptr in a couple
of places, removing a bit of manual memory management.
---
gdb/breakpoint.c | 33 ++++++++++++++-------------------
gdb/breakpoint.h | 6 ++----
gdb/guile/scm-breakpoint.c | 2 +-
gdb/python/py-breakpoint.c | 2 +-
4 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 8016dd3b83f..477c03b7de3 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -1844,7 +1844,9 @@ update_watchpoint (struct watchpoint *b, int reparse)
const char *s;
b->exp.reset ();
- s = b->exp_string_reparse ? b->exp_string_reparse : b->exp_string;
+ s = (b->exp_string_reparse
+ ? b->exp_string_reparse.get ()
+ : b->exp_string.get ());
b->exp = parse_exp_1 (&s, 0, b->exp_valid_block, 0);
/* If the meaning of expression itself changed, the old value is
no longer relevant. We don't want to report a watchpoint hit
@@ -6131,7 +6133,7 @@ print_one_breakpoint_location (struct breakpoint *b,
if (opts.addressprint)
uiout->field_skip ("addr");
annotate_field (5);
- uiout->field_string ("what", w->exp_string);
+ uiout->field_string ("what", w->exp_string.get ());
}
else if (!is_catchpoint (b) || is_exception_catchpoint (b)
|| is_ada_exception_catchpoint (b))
@@ -6358,7 +6360,7 @@ print_one_breakpoint_location (struct breakpoint *b,
{
struct watchpoint *w = (struct watchpoint *) b;
- uiout->field_string ("original-location", w->exp_string);
+ uiout->field_string ("original-location", w->exp_string.get ());
}
else if (b->location != NULL
&& event_location_to_string (b->location.get ()) != NULL)
@@ -10053,14 +10055,6 @@ watchpoint_exp_is_const (const struct expression *exp)
return exp->op->constant_p ();
}
-/* Watchpoint destructor. */
-
-watchpoint::~watchpoint ()
-{
- xfree (this->exp_string);
- xfree (this->exp_string_reparse);
-}
-
/* Implement the "re_set" breakpoint_ops method for watchpoints. */
static void
@@ -10295,7 +10289,7 @@ print_mention_watchpoint (struct breakpoint *b)
ui_out_emit_tuple tuple_emitter (uiout, tuple_name);
uiout->field_signed ("number", b->number);
uiout->text (": ");
- uiout->field_string ("exp", w->exp_string);
+ uiout->field_string ("exp", w->exp_string.get ());
}
/* Implement the "print_recreate" breakpoint_ops method for
@@ -10323,7 +10317,7 @@ print_recreate_watchpoint (struct breakpoint *b, struct ui_file *fp)
_("Invalid watchpoint type."));
}
- fprintf_unfiltered (fp, " %s", w->exp_string);
+ fprintf_unfiltered (fp, " %s", w->exp_string.get ());
print_recreate_thread (b, fp);
}
@@ -10488,7 +10482,7 @@ print_mention_masked_watchpoint (struct breakpoint *b)
ui_out_emit_tuple tuple_emitter (uiout, tuple_name);
uiout->field_signed ("number", b->number);
uiout->text (": ");
- uiout->field_string ("exp", w->exp_string);
+ uiout->field_string ("exp", w->exp_string.get ());
}
/* Implement the "print_recreate" breakpoint_ops method for
@@ -10515,7 +10509,7 @@ print_recreate_masked_watchpoint (struct breakpoint *b, struct ui_file *fp)
_("Invalid hardware watchpoint type."));
}
- fprintf_unfiltered (fp, " %s mask 0x%s", w->exp_string,
+ fprintf_unfiltered (fp, " %s mask 0x%s", w->exp_string.get (),
phex (w->hw_wp_mask, sizeof (CORE_ADDR)));
print_recreate_thread (b, fp);
}
@@ -10794,13 +10788,14 @@ watch_command_1 (const char *arg, int accessflag, int from_tty,
CORE_ADDR addr = value_as_address (val.get ());
w->exp_string_reparse
- = current_language->watch_location_expression (t, addr).release ();
+ = current_language->watch_location_expression (t, addr);
- w->exp_string = xstrprintf ("-location %.*s",
- (int) (exp_end - exp_start), exp_start);
+ w->exp_string.reset (xstrprintf ("-location %.*s",
+ (int) (exp_end - exp_start),
+ exp_start));
}
else
- w->exp_string = savestring (exp_start, exp_end - exp_start);
+ w->exp_string.reset (savestring (exp_start, exp_end - exp_start));
if (use_mask)
{
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 2b15622f98d..ad64f8320e9 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -831,13 +831,11 @@ struct breakpoint
struct watchpoint : public breakpoint
{
- ~watchpoint () override;
-
/* String form of exp to use for displaying to the user (malloc'd),
or NULL if none. */
- char *exp_string;
+ gdb::unique_xmalloc_ptr<char> exp_string;
/* String form to use for reparsing of EXP (malloc'd) or NULL. */
- char *exp_string_reparse;
+ gdb::unique_xmalloc_ptr<char> exp_string_reparse;
/* The expression we are watching, or NULL if not a watchpoint. */
expression_up exp;
diff --git a/gdb/guile/scm-breakpoint.c b/gdb/guile/scm-breakpoint.c
index 67484e440f5..f48671f0ea9 100644
--- a/gdb/guile/scm-breakpoint.c
+++ b/gdb/guile/scm-breakpoint.c
@@ -883,7 +883,7 @@ gdbscm_breakpoint_expression (SCM self)
wp = (struct watchpoint *) bp_smob->bp;
- const char *str = wp->exp_string;
+ const char *str = wp->exp_string.get ();
if (! str)
str = "";
diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c
index edff03282a1..7ec73af016b 100644
--- a/gdb/python/py-breakpoint.c
+++ b/gdb/python/py-breakpoint.c
@@ -433,7 +433,7 @@ bppy_get_expression (PyObject *self, void *closure)
wp = (struct watchpoint *) obj->bp;
- str = wp->exp_string;
+ str = wp->exp_string.get ();
if (! str)
str = "";
--
2.31.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 5/6] Use unique_xmalloc_ptr in breakpoing
2021-10-05 0:14 [PATCH 0/6] Remove some uses of xfree Tom Tromey
` (3 preceding siblings ...)
2021-10-05 0:14 ` [PATCH 4/6] Use unique_xmalloc_ptr in bp_location Tom Tromey
@ 2021-10-05 0:14 ` Tom Tromey
2021-10-05 0:14 ` [PATCH 6/6] Use std::string in print_one_catch_syscall Tom Tromey
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Tom Tromey @ 2021-10-05 0:14 UTC (permalink / raw)
To: gdb-patches; +Cc: Tom Tromey
This changes struct breakpoint to use unique_xmalloc_ptr in a couple
of spots, removing a bit of manual memory management.
---
gdb/breakpoint.c | 109 ++++++++++++++++++-------------------
gdb/breakpoint.h | 6 +-
gdb/guile/scm-breakpoint.c | 2 +-
gdb/python/py-breakpoint.c | 2 +-
gdb/remote.c | 2 +-
gdb/tracepoint.c | 2 +-
6 files changed, 60 insertions(+), 63 deletions(-)
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 5c3a6c6e4aa..4a5b160f760 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -864,8 +864,7 @@ set_breakpoint_condition (struct breakpoint *b, const char *exp,
{
if (*exp == 0)
{
- xfree (b->cond_string);
- b->cond_string = nullptr;
+ b->cond_string.reset ();
if (is_watchpoint (b))
static_cast<watchpoint *> (b)->cond_exp.reset ();
@@ -946,8 +945,7 @@ set_breakpoint_condition (struct breakpoint *b, const char *exp,
/* We know that the new condition parsed successfully. The
condition string of the breakpoint can be safely updated. */
- xfree (b->cond_string);
- b->cond_string = xstrdup (exp);
+ b->cond_string = make_unique_xstrdup (exp);
b->condition_not_parsed = 0;
}
mark_breakpoint_modified (b);
@@ -1862,7 +1860,7 @@ update_watchpoint (struct watchpoint *b, int reparse)
{
b->cond_exp.reset ();
- s = b->cond_string;
+ s = b->cond_string.get ();
b->cond_exp = parse_exp_1 (&s, 0, b->cond_exp_valid_block, 0);
}
}
@@ -2442,7 +2440,7 @@ build_target_command_list (struct bp_location *bl)
need to parse the command to bytecodes again. */
loc->cmd_bytecode
= parse_cmd_to_aexpr (bl->address,
- loc->owner->extra_string);
+ loc->owner->extra_string.get ());
}
/* If we have a NULL bytecode expression, it means something
@@ -5940,7 +5938,7 @@ print_breakpoint_location (struct breakpoint *b,
uiout->text (",");
else
uiout->text (" ");
- uiout->text (b->extra_string);
+ uiout->text (b->extra_string.get ());
}
}
@@ -6222,7 +6220,7 @@ print_one_breakpoint_location (struct breakpoint *b,
uiout->text ("\ttrace only if ");
else
uiout->text ("\tstop only if ");
- uiout->field_string ("cond", b->cond_string);
+ uiout->field_string ("cond", b->cond_string.get ());
/* Print whether the target is doing the breakpoint's condition
evaluation. If GDB is doing the evaluation, don't print anything. */
@@ -8211,7 +8209,10 @@ init_catchpoint (struct breakpoint *b,
init_raw_breakpoint (b, gdbarch, sal, bp_catchpoint, ops);
- b->cond_string = (cond_string == NULL) ? NULL : xstrdup (cond_string);
+ if (cond_string == nullptr)
+ b->cond_string.reset ();
+ else
+ b->cond_string = make_unique_xstrdup (cond_string);
b->disposition = temp ? disp_del : disp_donttouch;
}
@@ -8726,7 +8727,7 @@ bp_loc_is_permanent (struct bp_location *loc)
static void
update_dprintf_command_list (struct breakpoint *b)
{
- char *dprintf_args = b->extra_string;
+ const char *dprintf_args = b->extra_string.get ();
char *printf_line = NULL;
if (!dprintf_args)
@@ -8851,8 +8852,8 @@ init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch,
b->thread = thread;
b->task = task;
- b->cond_string = cond_string.release ();
- b->extra_string = extra_string.release ();
+ b->cond_string = std::move (cond_string);
+ b->extra_string = std::move (extra_string);
b->ignore_count = ignore_count;
b->enable_state = enabled ? bp_enabled : bp_disabled;
b->disposition = disposition;
@@ -8919,7 +8920,7 @@ init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch,
error (_("Format string required"));
}
else if (b->extra_string)
- error (_("Garbage '%s' at end of command"), b->extra_string);
+ error (_("Garbage '%s' at end of command"), b->extra_string.get ());
}
@@ -8929,8 +8930,8 @@ init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch,
for (bp_location *loc : b->locations ())
{
if (b->cond_string != nullptr)
- set_breakpoint_location_condition (b->cond_string, loc, b->number,
- loc_num);
+ set_breakpoint_location_condition (b->cond_string.get (), loc,
+ b->number, loc_num);
++loc_num;
}
@@ -9155,13 +9156,14 @@ check_fast_tracepoint_sals (struct gdbarch *gdbarch,
static void
find_condition_and_thread (const char *tok, CORE_ADDR pc,
- char **cond_string, int *thread, int *task,
- char **rest)
+ gdb::unique_xmalloc_ptr<char> *cond_string,
+ int *thread, int *task,
+ gdb::unique_xmalloc_ptr<char> *rest)
{
- *cond_string = NULL;
+ cond_string->reset ();
*thread = -1;
*task = 0;
- *rest = NULL;
+ rest->reset ();
bool force = false;
while (tok && *tok)
@@ -9175,7 +9177,7 @@ find_condition_and_thread (const char *tok, CORE_ADDR pc,
if ((*tok == '"' || *tok == ',') && rest)
{
- *rest = savestring (tok, strlen (tok));
+ rest->reset (savestring (tok, strlen (tok)));
return;
}
@@ -9198,7 +9200,7 @@ find_condition_and_thread (const char *tok, CORE_ADDR pc,
tok = tok + strlen (tok);
}
cond_end = tok;
- *cond_string = savestring (cond_start, cond_end - cond_start);
+ cond_string->reset (savestring (cond_start, cond_end - cond_start));
}
else if (toklen >= 1 && strncmp (tok, "-force-condition", toklen) == 0)
{
@@ -9231,7 +9233,7 @@ find_condition_and_thread (const char *tok, CORE_ADDR pc,
}
else if (rest)
{
- *rest = savestring (tok, strlen (tok));
+ rest->reset (savestring (tok, strlen (tok)));
return;
}
else
@@ -9246,16 +9248,18 @@ find_condition_and_thread (const char *tok, CORE_ADDR pc,
static void
find_condition_and_thread_for_sals (const std::vector<symtab_and_line> &sals,
- const char *input, char **cond_string,
- int *thread, int *task, char **rest)
+ const char *input,
+ gdb::unique_xmalloc_ptr<char> *cond_string,
+ int *thread, int *task,
+ gdb::unique_xmalloc_ptr<char> *rest)
{
int num_failures = 0;
for (auto &sal : sals)
{
- char *cond = nullptr;
+ gdb::unique_xmalloc_ptr<char> cond;
int thread_id = 0;
int task_id = 0;
- char *remaining = nullptr;
+ gdb::unique_xmalloc_ptr<char> remaining;
/* Here we want to parse 'arg' to separate condition from thread
number. But because parsing happens in a context and the
@@ -9267,10 +9271,10 @@ find_condition_and_thread_for_sals (const std::vector<symtab_and_line> &sals,
{
find_condition_and_thread (input, sal.pc, &cond, &thread_id,
&task_id, &remaining);
- *cond_string = cond;
+ *cond_string = std::move (cond);
*thread = thread_id;
*task = task_id;
- *rest = remaining;
+ *rest = std::move (remaining);
break;
}
catch (const gdb_exception_error &e)
@@ -9441,15 +9445,15 @@ create_breakpoint (struct gdbarch *gdbarch,
if (parse_extra)
{
- char *rest;
- char *cond;
+ gdb::unique_xmalloc_ptr<char> rest;
+ gdb::unique_xmalloc_ptr<char> cond;
const linespec_sals &lsal = canonical.lsals[0];
find_condition_and_thread_for_sals (lsal.sals, extra_string,
&cond, &thread, &task, &rest);
- cond_string_copy.reset (cond);
- extra_string_copy.reset (rest);
+ cond_string_copy = std::move (cond);
+ extra_string_copy = std::move (rest);
}
else
{
@@ -9512,12 +9516,16 @@ create_breakpoint (struct gdbarch *gdbarch,
else
{
/* Create a private copy of condition string. */
- b->cond_string = cond_string != NULL ? xstrdup (cond_string) : NULL;
+ b->cond_string.reset (cond_string != NULL
+ ? xstrdup (cond_string)
+ : NULL);
b->thread = thread;
}
/* Create a private copy of any extra string. */
- b->extra_string = extra_string != NULL ? xstrdup (extra_string) : NULL;
+ b->extra_string.reset (extra_string != NULL
+ ? xstrdup (extra_string)
+ : NULL);
b->ignore_count = ignore_count;
b->disposition = tempflag ? disp_del : disp_donttouch;
b->condition_not_parsed = 1;
@@ -10810,7 +10818,7 @@ watch_command_1 (const char *arg, int accessflag, int from_tty,
}
if (cond_start)
- w->cond_string = savestring (cond_start, cond_end - cond_start);
+ w->cond_string.reset (savestring (cond_start, cond_end - cond_start));
else
w->cond_string = 0;
@@ -12186,13 +12194,13 @@ say_where (struct breakpoint *b)
{
printf_filtered (_(" (%s,%s) pending."),
event_location_to_string (b->location.get ()),
- b->extra_string);
+ b->extra_string.get ());
}
else
{
printf_filtered (_(" (%s %s) pending."),
event_location_to_string (b->location.get ()),
- b->extra_string);
+ b->extra_string.get ());
}
}
else
@@ -12234,14 +12242,6 @@ say_where (struct breakpoint *b)
}
}
-/* Destructor for the breakpoint base class. */
-
-breakpoint::~breakpoint ()
-{
- xfree (this->cond_string);
- xfree (this->extra_string);
-}
-
/* See breakpoint.h. */
bp_location_range breakpoint::locations ()
@@ -12579,7 +12579,7 @@ bkpt_print_recreate (struct breakpoint *tp, struct ui_file *fp)
/* Print out extra_string if this breakpoint is pending. It might
contain, for example, conditions that were set by the user. */
if (tp->loc == NULL && tp->extra_string != NULL)
- fprintf_unfiltered (fp, " %s", tp->extra_string);
+ fprintf_unfiltered (fp, " %s", tp->extra_string.get ());
print_recreate_thread (tp, fp);
}
@@ -12988,7 +12988,7 @@ dprintf_print_recreate (struct breakpoint *tp, struct ui_file *fp)
{
fprintf_unfiltered (fp, "dprintf %s,%s",
event_location_to_string (tp->location.get ()),
- tp->extra_string);
+ tp->extra_string.get ());
print_recreate_thread (tp, fp);
}
@@ -13578,7 +13578,7 @@ update_breakpoint_locations (struct breakpoint *b,
{
const char *s;
- s = b->cond_string;
+ s = b->cond_string.get ();
try
{
new_loc->cond = parse_exp_1 (&s, sal.pc,
@@ -13712,22 +13712,19 @@ location_to_sals (struct breakpoint *b, struct event_location *location,
resolve_sal_pc (&sal);
if (b->condition_not_parsed && b->extra_string != NULL)
{
- char *cond_string, *extra_string;
+ gdb::unique_xmalloc_ptr<char> cond_string, extra_string;
int thread, task;
- find_condition_and_thread_for_sals (sals, b->extra_string,
+ find_condition_and_thread_for_sals (sals, b->extra_string.get (),
&cond_string, &thread,
&task, &extra_string);
gdb_assert (b->cond_string == NULL);
if (cond_string)
- b->cond_string = cond_string;
+ b->cond_string = std::move (cond_string);
b->thread = thread;
b->task = task;
if (extra_string)
- {
- xfree (b->extra_string);
- b->extra_string = extra_string;
- }
+ b->extra_string = std::move (extra_string);
b->condition_not_parsed = 0;
}
@@ -15035,7 +15032,7 @@ save_breakpoints (const char *filename, int from_tty,
instead. */
if (tp->cond_string)
- fp.printf (" condition $bpnum %s\n", tp->cond_string);
+ fp.printf (" condition $bpnum %s\n", tp->cond_string.get ());
if (tp->ignore_count)
fp.printf (" ignore $bpnum %d\n", tp->ignore_count);
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 304e2c1fca4..f19f11eb479 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -720,7 +720,7 @@ using bp_location_range = next_range<bp_location>;
struct breakpoint
{
- virtual ~breakpoint ();
+ virtual ~breakpoint () = default;
/* Return a range of this breakpoint's locations. */
bp_location_range locations ();
@@ -785,11 +785,11 @@ struct breakpoint
int input_radix = 0;
/* String form of the breakpoint condition (malloc'd), or NULL if
there is no condition. */
- char *cond_string = NULL;
+ gdb::unique_xmalloc_ptr<char> cond_string;
/* String form of extra parameters, or NULL if there are none.
Malloc'd. */
- char *extra_string = NULL;
+ gdb::unique_xmalloc_ptr<char> extra_string;
/* Holds the address of the related watchpoint_scope breakpoint when
using watchpoints on local variables (might the concept of a
diff --git a/gdb/guile/scm-breakpoint.c b/gdb/guile/scm-breakpoint.c
index f48671f0ea9..ab1ddb1bae0 100644
--- a/gdb/guile/scm-breakpoint.c
+++ b/gdb/guile/scm-breakpoint.c
@@ -899,7 +899,7 @@ gdbscm_breakpoint_condition (SCM self)
= bpscm_get_valid_breakpoint_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
char *str;
- str = bp_smob->bp->cond_string;
+ str = bp_smob->bp->cond_string.get ();
if (! str)
return SCM_BOOL_F;
diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c
index 7ec73af016b..d99d9b18b49 100644
--- a/gdb/python/py-breakpoint.c
+++ b/gdb/python/py-breakpoint.c
@@ -449,7 +449,7 @@ bppy_get_condition (PyObject *self, void *closure)
BPPY_REQUIRE_VALID (obj);
- str = obj->bp->cond_string;
+ str = obj->bp->cond_string.get ();
if (! str)
Py_RETURN_NONE;
diff --git a/gdb/remote.c b/gdb/remote.c
index d5eb40ce578..7f530534fe6 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -13344,7 +13344,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
error ("%s", err_msg);
encode_source_string (b->number, loc->address,
- "cond", b->cond_string,
+ "cond", b->cond_string.get (),
buf.data () + strlen (buf.data ()),
buf.size () - strlen (buf.data ()));
putpkt (buf.data ());
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 3997d211182..df5013e45ae 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -3094,7 +3094,7 @@ find_matching_tracepoint_location (struct uploaded_tp *utp)
if (b->type == utp->type
&& t->step_count == utp->step
&& t->pass_count == utp->pass
- && cond_string_is_same (t->cond_string,
+ && cond_string_is_same (t->cond_string.get (),
utp->cond_string.get ())
/* FIXME also test actions. */
)
--
2.31.1
^ permalink raw reply [flat|nested] 9+ messages in thread