From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Michael Haggerty <mhagger@alum.mit.edu>,
git discussion list <git@vger.kernel.org>
Subject: Re: [PATCH 2/2] log: do not shorten decoration names too early
Date: Thu, 14 May 2015 17:54:53 -0400 [thread overview]
Message-ID: <20150514215453.GA16897@peff.net> (raw)
In-Reply-To: <xmqqfv6yj0dl.fsf@gitster.dls.corp.google.com>
On Thu, May 14, 2015 at 02:49:10PM -0700, Junio C Hamano wrote:
> > But if we do not have the "buffer" data cached for that commit (via
> > an earlier call to set_commit_buffer()), we don't have to enlarge
> > the slab, as we are not adding anything to the slab system with this
> > call.
>
> The change may look something like this. I do not think it would
> make a difference to the get_cached_commit_buffer() codepath (when
> we use the commit->buffer, we pretty much know we use that for all
> commits), though.
I'm not sure that's true. Most of the _users_ of the commit buffer will
try to look in the cache, and if it's not there, do a one-off read. But
they don't attach the result to the commit; they throw it away. The
reasoning is that we don't have a cached buffer because we are going to
look at a lot of commits (i.e., save_commit_buffer is off).
So basically anytime save_commit_buffer is off (e.g., in rev-list) we
are expanding the slab unnecessarily, even though literally nobody will
write to it.
> diff --git a/commit.c b/commit.c
> index 65179f9..2d1901f 100644
> --- a/commit.c
> +++ b/commit.c
> @@ -244,7 +244,12 @@ void set_commit_buffer(struct commit *commit, void *buffer, unsigned long size)
>
> const void *get_cached_commit_buffer(const struct commit *commit, unsigned long *sizep)
> {
> - struct commit_buffer *v = buffer_slab_at(&buffer_slab, commit);
> + struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
> + if (!v) {
> + if (sizep)
> + *sizep = 0;
> + return NULL;
> + }
> if (sizep)
> *sizep = v->size;
> return v->buffer;
I think you need matching changes in unused_commit_buffer and
free_commit_buffer. And detach_commit_buffer, too, I guess. Basically
everywhere except set_commit_buffer would want to use the peek version.
-Peff
next prev parent reply other threads:[~2015-05-14 21:55 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-13 13:11 "HEAD -> branch" decoration doesn't work with "--decorate=full" Michael Haggerty
2015-05-13 14:51 ` Junio C Hamano
2015-05-13 15:26 ` Michael J Gruber
2015-05-13 17:11 ` Junio C Hamano
2015-05-13 17:13 ` Junio C Hamano
2015-05-13 19:40 ` [PATCH 2/2] log: do not shorten decoration names too early Junio C Hamano
2015-05-14 6:33 ` Jeff King
2015-05-14 17:37 ` Junio C Hamano
2015-05-14 17:49 ` Jeff King
2015-05-14 18:01 ` Junio C Hamano
2015-05-14 18:10 ` Jeff King
2015-05-14 21:49 ` Junio C Hamano
2015-05-14 21:54 ` Jeff King [this message]
2015-05-14 22:25 ` Junio C Hamano
2015-05-14 22:33 ` Jeff King
2015-05-22 21:21 ` Junio C Hamano
2015-05-22 21:38 ` Jeff King
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=20150514215453.GA16897@peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.