From: Jeff King <peff@peff.net>
To: Maarten Bosmans <mkbosmans@gmail.com>
Cc: git@vger.kernel.org, Maarten Bosmans <maarten.bosmans@vortech.nl>
Subject: Re: [PATCH v2 5/5] notes: use strbuf_attach to take ownership of the object contents
Date: Mon, 19 Feb 2024 21:12:20 -0500 [thread overview]
Message-ID: <20240220021220.GC2713741@coredump.intra.peff.net> (raw)
In-Reply-To: <20240218195938.6253-6-maarten.bosmans@vortech.nl>
On Sun, Feb 18, 2024 at 08:59:38PM +0100, Maarten Bosmans wrote:
> @@ -705,12 +703,11 @@ static int append_edit(int argc, const char **argv, const char *prefix)
> if (!prev_buf)
> die(_("unable to read %s"), oid_to_hex(note));
> if (size)
> - strbuf_add(&buf, prev_buf, size);
> + strbuf_attach(&buf, prev_buf, size, size + 1);
> if (d.buf.len && size)
> append_separator(&buf);
> strbuf_insert(&d.buf, 0, buf.buf, buf.len);
>
> - free(prev_buf);
> strbuf_release(&buf);
> }
Is it possible for "size" to be 0, but prev_buf to be non-NULL? I assume
it is so if the previous note is the empty object (and anyway, we'd have
died earlier if prev_buf was NULL). In that case your patch introduces a
leak (we do not attach prev_buf to buf, but we no longer free prev_buf).
I'm a little skeptical that this is actually increasing the speed of the
command in a measurable way, though. It's one allocation/copy, right
next to a big old strbuf_insert() that is going to splice into an
existing array.
-Peff
next prev parent reply other threads:[~2024-02-20 2:12 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-05 20:49 [PATCH 0/4] Speed up git-notes show Maarten Bosmans
2024-02-05 20:49 ` [PATCH 1/4] notes: print note blob to stdout directly Maarten Bosmans
2024-02-06 3:44 ` Junio C Hamano
2024-02-06 9:55 ` Maarten Bosmans
2024-02-06 17:52 ` Junio C Hamano
2024-02-13 8:00 ` Jeff King
2024-02-13 17:35 ` Junio C Hamano
2024-02-15 5:26 ` Jeff King
2024-02-16 6:25 ` Junio C Hamano
2024-02-17 5:16 ` Jeff King
2024-02-17 5:56 ` Junio C Hamano
2024-02-17 6:09 ` Jeff King
2024-02-15 7:46 ` Maarten Bosmans
2024-02-15 15:04 ` Jeff King
2024-02-17 12:45 ` Maarten Bosmans
2024-02-20 1:51 ` Jeff King
2024-02-15 7:41 ` Maarten Bosmans
2024-02-06 13:55 ` Kristoffer Haugsbakk
2024-02-05 20:49 ` [PATCH 2/4] notes: use exisisting function stream_blob_to_fd Maarten Bosmans
2024-02-05 22:00 ` Eric Sunshine
2024-02-05 20:49 ` [PATCH 3/4] notes: do not clean up right before calling die() Maarten Bosmans
2024-02-05 20:49 ` [PATCH 4/4] notes: use strbuf_attach to take ownership of the object contents Maarten Bosmans
2024-02-06 7:08 ` [PATCH 0/4] Speed up git-notes show Kristoffer Haugsbakk
2024-02-06 8:51 ` Maarten Bosmans
2024-02-18 19:59 ` [PATCH v2 0/5] " Maarten Bosmans
2024-02-18 19:59 ` [PATCH v2 1/5] log: Move show_blob_object() to log.c Maarten Bosmans
2024-02-20 1:22 ` Junio C Hamano
2024-02-20 1:59 ` Jeff King
2024-02-20 3:03 ` Junio C Hamano
2024-02-20 11:40 ` Maarten Bosmans
2024-02-18 19:59 ` [PATCH v2 2/5] notes: avoid launching a child process to show a note blob Maarten Bosmans
2024-02-18 19:59 ` [PATCH v2 3/5] notes: use existing function stream_blob_to_fd Maarten Bosmans
2024-02-18 19:59 ` [PATCH v2 4/5] notes: do not clean up right before calling die() Maarten Bosmans
2024-02-18 19:59 ` [PATCH v2 5/5] notes: use strbuf_attach to take ownership of the object contents Maarten Bosmans
2024-02-20 2:12 ` Jeff King [this message]
2024-02-20 7:42 ` Maarten Bosmans
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=20240220021220.GC2713741@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=maarten.bosmans@vortech.nl \
--cc=mkbosmans@gmail.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 NNTP newsgroup(s).