From: Simon Marchi <simon.marchi@polymtl.ca>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@polymtl.ca>
Subject: [PATCH 08/22] Use new/delete instead of malloc/free-based functions
Date: Thu, 24 Nov 2016 15:24:00 -0000 [thread overview]
Message-ID: <20161124152428.24725-9-simon.marchi@polymtl.ca> (raw)
In-Reply-To: <20161124152428.24725-1-simon.marchi@polymtl.ca>
The following patches introduce C++ vectors and strings as fields of the
various ui_out structures. We therefore need to use new/delete so that
their contructor/destructor is called. I find it simpler to change all
the allocations in a separate preliminary patch, rather than in each
individual patch.
gdb/ChangeLog:
* cli-out.c (cli_uiout_dtor): Use delete instead of xfree.
(cli_out_new): Use new instead of XNEW.
* mi/mi-out.c (mi_out_data_dtor): Use delete instead of xfree.
(mi_out_new): Use new instead of XNEW.
* tui/tui-out.c (tui_out_new): Likewise.
* ui-out.c (push_level): Likewise.
(pop_level): Use delete instead of xfree.
(clear_header_list): Use delete instead of xfree.
(append_header_to_list): Use new instead of XNEW.
(ui_out_new): Likewise.
---
gdb/cli-out.c | 4 ++--
gdb/mi/mi-out.c | 4 ++--
gdb/tui/tui-out.c | 2 +-
gdb/ui-out.c | 13 +++++++------
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/gdb/cli-out.c b/gdb/cli-out.c
index e882756..b98af4a 100644
--- a/gdb/cli-out.c
+++ b/gdb/cli-out.c
@@ -47,7 +47,7 @@ cli_uiout_dtor (struct ui_out *ui_out)
cli_out_data *data = (cli_out_data *) ui_out_data (ui_out);
VEC_free (ui_filep, data->streams);
- xfree (data);
+ delete data;
}
/* These are the CLI output functions */
@@ -395,7 +395,7 @@ struct ui_out *
cli_out_new (struct ui_file *stream)
{
int flags = ui_source_list;
- cli_out_data *data = XNEW (cli_out_data);
+ cli_out_data *data = new cli_out_data ();
cli_out_data_ctor (data, stream);
return ui_out_new (&cli_ui_out_impl, data, flags);
diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c
index 44e28b1..2561f16 100644
--- a/gdb/mi/mi-out.c
+++ b/gdb/mi/mi-out.c
@@ -413,7 +413,7 @@ mi_out_data_dtor (struct ui_out *ui_out)
mi_out_data *data = (mi_out_data *) ui_out_data (ui_out);
VEC_free (ui_filep, data->streams);
- xfree (data);
+ delete data;
}
/* Initialize private members at startup. */
@@ -422,7 +422,7 @@ struct ui_out *
mi_out_new (int mi_version)
{
int flags = 0;
- mi_out_data *data = XNEW (mi_out_data);
+ mi_out_data *data = new mi_out_data ();
struct ui_file *stream = mem_fileopen ();
mi_out_data_ctor (data, mi_version, stream);
diff --git a/gdb/tui/tui-out.c b/gdb/tui/tui-out.c
index 0232370..4856562 100644
--- a/gdb/tui/tui-out.c
+++ b/gdb/tui/tui-out.c
@@ -147,7 +147,7 @@ tui_out_new (struct ui_file *stream)
{
int flags = 0;
- tui_out_data *data = XNEW (tui_out_data);
+ tui_out_data *data = new tui_out_data ();
/* Initialize base "class". */
cli_out_data_ctor (&data->base, stream);
diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index b8253c9..bb37ece 100644
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -120,7 +120,7 @@ push_level (struct ui_out *uiout,
struct ui_out_level *current;
uiout->level++;
- current = XNEW (struct ui_out_level);
+ current = new ui_out_level ();
current->field_count = 0;
current->type = type;
VEC_safe_push (ui_out_level_p, uiout->levels, current);
@@ -139,7 +139,7 @@ pop_level (struct ui_out *uiout,
gdb_assert (uiout->level > 0);
gdb_assert (current_level (uiout)->type == type);
current = VEC_pop (ui_out_level_p, uiout->levels);
- xfree (current);
+ delete current;
uiout->level--;
return uiout->level + 1;
}
@@ -708,8 +708,9 @@ clear_header_list (struct ui_out *uiout)
uiout->table.header_first = uiout->table.header_first->next;
xfree (uiout->table.header_next->colhdr);
xfree (uiout->table.header_next->col_name);
- xfree (uiout->table.header_next);
+ delete uiout->table.header_next;
}
+
gdb_assert (uiout->table.header_first == NULL);
uiout->table.header_last = NULL;
uiout->table.header_next = NULL;
@@ -724,7 +725,7 @@ append_header_to_list (struct ui_out *uiout,
{
struct ui_out_hdr *temphdr;
- temphdr = XNEW (struct ui_out_hdr);
+ temphdr = new ui_out_hdr ();
temphdr->width = width;
temphdr->alignment = alignment;
/* We have to copy the column title as the original may be an
@@ -859,8 +860,8 @@ struct ui_out *
ui_out_new (const struct ui_out_impl *impl, void *data,
int flags)
{
- struct ui_out *uiout = XNEW (struct ui_out);
- struct ui_out_level *current = XNEW (struct ui_out_level);
+ struct ui_out *uiout = new ui_out ();
+ struct ui_out_level *current = new ui_out_level ();
uiout->data = data;
uiout->impl = impl;
--
2.10.0
next prev parent reply other threads:[~2016-11-24 15:24 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-24 15:24 [PATCH 00/22] Convert ui-out subsystem to C++ Simon Marchi
2016-11-24 15:24 ` [PATCH 01/22] Remove unused functions and declarations Simon Marchi
2016-11-24 15:24 ` [PATCH 02/22] Rename ui_out_data to mi_ui_out_data Simon Marchi
2016-11-24 15:24 ` [PATCH 06/22] Remove verbosity from ui_out_message and friends Simon Marchi
2016-11-24 15:24 ` [PATCH 03/22] Remove ui_out_destroy Simon Marchi
2016-11-24 15:24 ` Simon Marchi [this message]
2016-11-24 15:24 ` [PATCH 09/22] Use std::vector for ui_out::levels Simon Marchi
2016-11-24 15:24 ` [PATCH 07/22] Remove stale comments Simon Marchi
2016-11-24 18:38 ` Pedro Alves
2016-11-26 15:29 ` Simon Marchi
2016-11-24 15:27 ` [PATCH 10/22] Use std::vector for mi_ui_out_data::streams Simon Marchi
2016-11-24 18:38 ` Pedro Alves
2016-11-26 15:48 ` Simon Marchi
2016-11-24 15:28 ` [PATCH 16/22] Class-ify ui_out_level Simon Marchi
2016-11-24 18:41 ` Pedro Alves
2016-11-26 16:22 ` Simon Marchi
2016-11-30 12:07 ` Pedro Alves
2016-11-30 12:41 ` Antoine Tremblay
2016-11-30 13:27 ` Pedro Alves
2016-11-30 13:47 ` Antoine Tremblay
2016-11-30 14:17 ` Pedro Alves
2016-11-30 14:21 ` Antoine Tremblay
2016-11-30 20:40 ` Simon Marchi
2016-11-24 15:28 ` [PATCH 15/22] Class-ify ui_out_hdr Simon Marchi
2016-11-24 15:28 ` [PATCH 13/22] Replace hand-made linked list of ui_out_hdr by vector and iterator Simon Marchi
2016-11-24 18:41 ` Pedro Alves
2016-11-26 16:13 ` Simon Marchi
2016-12-01 20:22 ` Simon Marchi
2016-12-01 20:23 ` Pedro Alves
2016-11-24 15:28 ` [PATCH 12/22] Use std::string in ui_out_table Simon Marchi
2016-11-24 15:28 ` [PATCH 17/22] Simplify ui-out level code Simon Marchi
2016-11-24 18:42 ` Pedro Alves
2016-11-26 16:39 ` Simon Marchi
2016-11-30 12:08 ` Pedro Alves
2016-11-24 15:28 ` [PATCH 18/22] ui_out_table: Replace boolean flag with enum Simon Marchi
2016-11-24 18:42 ` Pedro Alves
2016-11-26 16:47 ` Simon Marchi
2016-11-30 12:10 ` Pedro Alves
2016-11-24 15:28 ` [PATCH 11/22] Use std::vector for cli_ui_out_data::streams Simon Marchi
2016-11-24 18:41 ` Pedro Alves
2016-11-26 15:51 ` Simon Marchi
2016-11-24 15:28 ` [PATCH 14/22] Use std::string for ui_out_hdr's text fields Simon Marchi
2016-11-24 15:32 ` [PATCH 22/22] Introduce enum_flag type for ui_out flags Simon Marchi
2016-11-30 13:34 ` Pedro Alves
2016-11-30 21:32 ` Simon Marchi
2016-12-02 22:22 ` [pushed] " Simon Marchi
2016-11-24 15:36 ` [PATCH 05/22] Constify wrap_here/wrap_hint code path Simon Marchi
2016-11-24 15:36 ` [PATCH 04/22] Fix return value of uo_redirect Simon Marchi
2016-11-24 16:08 ` [PATCH 00/22] Convert ui-out subsystem to C++ Simon Marchi
2016-11-24 18:46 ` Pedro Alves
2016-11-24 19:15 ` Simon Marchi
2016-11-24 20:33 ` Simon Marchi
2016-11-24 18:47 ` Pedro Alves
2016-11-27 3:14 ` Simon Marchi
2016-12-01 2:51 ` Simon Marchi
2016-12-01 21:24 ` Simon Marchi
2016-11-24 19:11 ` [PATCH 20/22] Class-ify ui_out_table Simon Marchi
2016-11-30 12:29 ` Pedro Alves
2016-11-24 19:19 ` [PATCH 21/22] Class-ify ui_out Simon Marchi
2016-11-30 12:46 ` Pedro Alves
2016-11-30 21:47 ` Simon Marchi
2016-11-26 15:20 ` [PATCH 19/22] Class-ify ui_out_impl simon.marchi
2016-11-30 13:09 ` Pedro Alves
2016-11-30 22:38 ` Simon Marchi
2016-11-30 22:58 ` Pedro Alves
2016-12-01 19:04 ` Simon Marchi
2016-12-01 19:30 ` Pedro Alves
[not found] ` <20161124153228.25177-20-simon.marchi@polymtl.ca>
2016-11-26 17:18 ` [PATCH 20/22] Class-ify ui_out_table Simon Marchi
2016-11-30 12:30 ` Pedro Alves
2016-11-30 21:48 ` [PATCH v2] " Simon Marchi
2016-11-30 23:01 ` Pedro Alves
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161124152428.24725-9-simon.marchi@polymtl.ca \
--to=simon.marchi@polymtl.ca \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).