From: Simon Marchi <simark@simark.ca>
To: Lancelot SIX <lsix@lancelotsix.com>, Tom Tromey <tom@tromey.com>
Cc: gdb-patches@sourceware.org
Subject: Re: [PATCH 2/6] Use vector in remote-fileio.c
Date: Mon, 1 Jan 2024 13:39:19 -0500 [thread overview]
Message-ID: <41eff013-1d3c-4345-b8a1-9e4ed41ec05a@simark.ca> (raw)
In-Reply-To: <20240101142041.dndg63bv42hs7lpo@octopus>
On 2024-01-01 09:20, Lancelot SIX wrote:
> Hi Tom,
>
> I have a couple of comments below.
>
> On Sun, Dec 31, 2023 at 01:25:39PM -0700, Tom Tromey wrote:
>> This changes remote_fio_data to be an object holding a vector. This
>> simplifies the code somewhat.
>> ---
>> gdb/remote-fileio.c | 51 +++++++++++++++++----------------------------------
>> 1 file changed, 17 insertions(+), 34 deletions(-)
>>
>> diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c
>> index 367edb54f74..4891b0c5b92 100644
>> --- a/gdb/remote-fileio.c
>> +++ b/gdb/remote-fileio.c
>> @@ -37,9 +37,9 @@
>> #endif
>> #include <signal.h>
>>
>> -static struct {
>> - int *fd_map;
>> - int fd_map_size;
>> +static struct
>> +{
>> + std::vector<int> fd_map;
>> } remote_fio_data;
>>
>> #define FIO_FD_INVALID -1
>> @@ -51,16 +51,13 @@ static int remote_fio_system_call_allowed = 0;
>> static int
>> remote_fileio_init_fd_map (void)
>> {
>> - int i;
>> -
>> - if (!remote_fio_data.fd_map)
>> + if (remote_fio_data.fd_map.empty ())
>> {
>> - remote_fio_data.fd_map = XNEWVEC (int, 10);
>> - remote_fio_data.fd_map_size = 10;
>> + remote_fio_data.fd_map.resize (10);
>> remote_fio_data.fd_map[0] = FIO_FD_CONSOLE_IN;
>> remote_fio_data.fd_map[1] = FIO_FD_CONSOLE_OUT;
>> remote_fio_data.fd_map[2] = FIO_FD_CONSOLE_OUT;
>> - for (i = 3; i < 10; ++i)
>> + for (int i = 3; i < 10; ++i)
>> remote_fio_data.fd_map[i] = FIO_FD_INVALID;
>
> std::vector<T, Alloc>::resize has an overload which takes a value to use
> for new elements of the vector. This could be simplified as
>
> remote_fio_data.fd_map.resize (10, FIO_FD_INVALID);
> remote_fio_data.fd_map[0] = FIO_FD_CONSOLE_IN;
> remote_fio_data.fd_map[1] = FIO_FD_CONSOLE_OUT;
> remote_fio_data.fd_map[2] = FIO_FD_CONSOLE_OUT;
>
> See below, but overall, I don’t really think we need to keep the "grow
> by 10" strategy when using std::vector, this could simply be
>
> remote_fio_data.fd_map.emplace_back (FIO_FD_CONSOLE_IN)
> remote_fio_data.fd_map.emplace_back (FIO_FD_CONSOLE_OUT)
> remote_fio_data.fd_map.emplace_back (FIO_FD_CONSOLE_OUT)
I agree with Lancelot. And from what I saw after quickly skimming the
code, remote_fileio_resize_fd_map and remote_fileio_next_free_fd could
be removed, since they callers can use simple vector operations.
Simon
next prev parent reply other threads:[~2024-01-01 18:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-31 20:25 [PATCH 0/6] Make remote-fileio per-target Tom Tromey
2023-12-31 20:25 ` [PATCH 1/6] Make remote_fio_func_map 'const' Tom Tromey
2023-12-31 20:25 ` [PATCH 2/6] Use vector in remote-fileio.c Tom Tromey
2024-01-01 14:20 ` Lancelot SIX
2024-01-01 18:39 ` Simon Marchi [this message]
2023-12-31 20:25 ` [PATCH 3/6] Use methods for remote fileio Tom Tromey
2023-12-31 20:25 ` [PATCH 4/6] Remove sentinel from remote_fio_func_map Tom Tromey
2023-12-31 20:25 ` [PATCH 5/6] Move remote_fileio_data to header file Tom Tromey
2023-12-31 20:25 ` [PATCH 6/6] Store remote fileio state in remote_state Tom Tromey
2024-01-01 14:28 ` [PATCH 0/6] Make remote-fileio per-target Lancelot SIX
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=41eff013-1d3c-4345-b8a1-9e4ed41ec05a@simark.ca \
--to=simark@simark.ca \
--cc=gdb-patches@sourceware.org \
--cc=lsix@lancelotsix.com \
--cc=tom@tromey.com \
/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).