From: Josh Steadmon <steadmon@google.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: git@vger.kernel.org, stolee@gmail.com, peff@peff.net
Subject: Re: [PATCH v2 4/7] index-pack: remove redundant child field
Date: Thu, 27 Feb 2020 16:04:37 -0800 [thread overview]
Message-ID: <20200228000437.GD12115@google.com> (raw)
In-Reply-To: <3359b66b841e7eabdc45d3d937e97208b22e2901.1571343096.git.jonathantanmy@google.com>
On 2019.10.17 13:17, Jonathan Tan wrote:
> @@ -380,27 +378,37 @@ static void free_base_data(struct base_data *c)
> }
> }
>
> -static void prune_base_data(struct base_data *retain)
> +static void prune_base_data(struct base_data *youngest_child)
> {
> struct base_data *b;
> struct thread_local *data = get_thread_data();
> - for (b = data->base_cache;
> - data->base_cache_used > delta_base_cache_limit && b;
> - b = b->child) {
> - if (b->data && b != retain)
> - free_base_data(b);
> + struct base_data **ancestry = NULL;
> + size_t nr = 0, alloc = 0;
> + ssize_t i;
> +
> + if (data->base_cache_used <= delta_base_cache_limit)
> + return;
> +
> + /*
> + * Free all ancestors of youngest_child until we have enough space,
> + * starting with the oldest. (We cannot free youngest_child itself.)
> + */
> + for (b = youngest_child->base; b != NULL; b = b->base) {
> + ALLOC_GROW(ancestry, nr + 1, alloc);
> + ancestry[nr++] = b;
> }
> + for (i = nr - 1;
> + i >= 0 && data->base_cache_used > delta_base_cache_limit;
> + i--) {
> + if (ancestry[i]->data)
> + free_base_data(ancestry[i]);
> + }
> + free(ancestry);
> }
I had a small complaint that we're allocating new memory in a function
where we are trying to free up space, but in practice it probably
doesn't matter. And this is removed in a later patch anyway.
next prev parent reply other threads:[~2020-02-28 0:04 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-09 23:44 [RFC PATCH 0/6] Better threaded delta resolution in index-pack Jonathan Tan
2019-10-09 23:44 ` [PATCH 1/6] index-pack: unify threaded and unthreaded code Jonathan Tan
2019-10-17 6:20 ` Jeff King
2019-10-09 23:44 ` [PATCH 2/6] index-pack: remove redundant parameter Jonathan Tan
2019-10-17 6:21 ` Jeff King
2019-10-09 23:44 ` [PATCH 3/6] index-pack: remove redundant child field Jonathan Tan
2019-10-10 14:45 ` Derrick Stolee
2019-10-10 19:02 ` Jonathan Tan
2019-10-17 6:24 ` Jeff King
2019-10-17 6:26 ` Jeff King
2019-10-09 23:44 ` [PATCH 4/6] index-pack: calculate {ref,ofs}_{first,last} early Jonathan Tan
2019-10-17 6:30 ` Jeff King
2019-10-09 23:44 ` [PATCH 5/6] index-pack: make resolve_delta() assume base data Jonathan Tan
2019-10-17 6:32 ` Jeff King
2019-10-09 23:44 ` [PATCH 6/6] index-pack: make quantum of work smaller Jonathan Tan
2019-10-17 6:35 ` Jeff King
2019-10-17 20:17 ` [PATCH v2 0/7] Better threaded delta resolution in index-pack Jonathan Tan
2019-10-17 20:17 ` [PATCH v2 1/7] Documentation: deltaBaseCacheLimit is per-thread Jonathan Tan
2019-10-17 20:17 ` [PATCH v2 2/7] index-pack: unify threaded and unthreaded code Jonathan Tan
2019-10-17 20:17 ` [PATCH v2 3/7] index-pack: remove redundant parameter Jonathan Tan
2020-02-28 0:04 ` Josh Steadmon
2020-03-10 21:29 ` Jonathan Tan
2019-10-17 20:17 ` [PATCH v2 4/7] index-pack: remove redundant child field Jonathan Tan
2020-02-28 0:04 ` Josh Steadmon [this message]
2019-10-17 20:17 ` [PATCH v2 5/7] index-pack: calculate {ref,ofs}_{first,last} early Jonathan Tan
2019-10-17 20:17 ` [PATCH v2 6/7] index-pack: make resolve_delta() assume base data Jonathan Tan
2019-10-17 20:17 ` [PATCH v2 7/7] index-pack: make quantum of work smaller Jonathan Tan
2020-02-28 0:04 ` Josh Steadmon
2020-03-10 21:42 ` Jonathan Tan
2020-02-28 0:03 ` [PATCH v2 0/7] Better threaded delta resolution in index-pack Josh Steadmon
2020-03-10 21:45 ` Jonathan Tan
-- strict thread matches above, loose matches on Subject: below --
2020-08-24 19:16 [PATCH 0/7] Better threaded delta resolution in index-pack (another try) Jonathan Tan
2020-09-08 19:48 ` [PATCH v2 " Jonathan Tan
2020-09-08 19:48 ` [PATCH v2 4/7] index-pack: remove redundant child field Jonathan Tan
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=20200228000437.GD12115@google.com \
--to=steadmon@google.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
--cc=stolee@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).