From: Jeff King <peff@peff.net>
To: Olga Telezhnaya <olyatelezhnaya@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH Outreachy] mru: use double-linked list from list.h
Date: Thu, 28 Sep 2017 18:42:44 -0400 [thread overview]
Message-ID: <20170928224244.pi34zwifnornssqk@sigill.intra.peff.net> (raw)
In-Reply-To: <0102015ec7a3424b-529be659-bdb6-42c4-a48f-db264f33d53a-000000@eu-west-1.amazonses.com>
On Thu, Sep 28, 2017 at 08:38:39AM +0000, Olga Telezhnaya wrote:
> diff --git a/packfile.c b/packfile.c
> index f69a5c8d607af..ae3b0b2e9c09a 100644
> --- a/packfile.c
> +++ b/packfile.c
> @@ -876,6 +876,7 @@ void prepare_packed_git(void)
> for (alt = alt_odb_list; alt; alt = alt->next)
> prepare_packed_git_one(alt->path, 0);
> rearrange_packed_git();
> + INIT_LIST_HEAD(&packed_git_mru.list);
> prepare_packed_git_mru();
> prepare_packed_git_run_once = 1;
> }
I was thinking on this hunk a bit more, and I think it's not quite
right.
The prepare_packed_git_mru() function will clear the mru list and then
re-add each item from the packed_git list. But by calling
INIT_LIST_HEAD() here, we're effectively clearing the packed_git_mru
list, and we end up leaking whatever was on the list before.
So for the first call to prepare_packed_git, we really need this
INIT_LIST_HEAD() call. But for subsequent calls (which come from
reprepare_packed_git()), we must not call it.
There are a few ways to work around it that I can think of:
1. Check whether packed_git_mru.list.head is NULL, and only initialize
in that case.
2. Use a static initializer for packed_git_mru.list, so that we don't
have do the first-time initializing here.
3. Teach reprepare_packed_git() to do the mru_clear() call, so that we
know the list is empty when we get here.
One final and more invasive option is to stop regenerating the
packed_git_mru list from scratch during each prepare_packed_git(). I did
it that way so that we start with the same order that
rearrange_packed_git() will give us, but I'm not sure how much value
that has in practice (it probably had a lot more when we didn't have the
mru, and the time-sorted pack order helped find recent objects more
quickly).
The alternative would be to just teach install_packed_git() to add each
newly-added pack to the mru list, and then never clear the list (and we
wouldn't need an mru_clear() at all, then).
-Peff
next prev parent reply other threads:[~2017-09-28 22:42 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-27 10:18 [PATCH] [Outreachy] cleanup: use list.h in mru.h and mru.c Оля Тележная
2017-09-27 11:30 ` Christian Couder
2017-09-28 8:38 ` [PATCH Outreachy] mru: use double-linked list from list.h Olga Telezhnaya
2017-09-28 11:03 ` Junio C Hamano
2017-09-28 20:47 ` Jeff King
2017-09-28 21:56 ` Junio C Hamano
2017-09-28 22:19 ` Jeff King
2017-09-28 21:04 ` Jeff King
2017-09-28 22:42 ` Jeff King [this message]
2017-09-29 7:18 ` Christian Couder
2017-09-29 7:23 ` Jeff King
2017-09-29 11:50 ` Christian Couder
2017-09-29 16:08 ` Оля Тележная
2017-09-29 20:38 ` Оля Тележная
2017-09-29 23:40 ` Jeff King
2017-09-30 18:09 ` Оля Тележная
2017-10-02 8:22 ` Jeff King
2017-09-29 23:37 ` Jeff King
2017-09-30 0:07 ` Junio C Hamano
2017-09-30 17:51 ` [PATCH v2 " Olga Telezhnaya
2017-10-02 8:20 ` Jeff King
2017-10-02 9:37 ` Оля Тележная
2017-10-03 10:10 ` Jeff King
2017-11-08 1:44 ` Junio C Hamano
2017-11-08 4:22 ` Jeff King
2017-11-10 11:51 ` Оля Тележная
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170928224244.pi34zwifnornssqk@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=olyatelezhnaya@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).