From: "René Scharfe." <l.s.r@web.de>
To: Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: Michael Haggerty <mhagger@alum.mit.edu>,
me@ttaylorr.com, peff@peff.net, gitster@pobox.com,
Derrick Stolee <stolee@gmail.com>,
Derrick Stolee <derrickstolee@github.com>,
Derrick Stolee <dstolee@microsoft.com>
Subject: Re: [PATCH v2 2/5] commit-reach: use one walk in remove_redundant()
Date: Mon, 1 Feb 2021 17:12:37 +0100 [thread overview]
Message-ID: <419ddcca-8534-8dc5-bcd8-1e244414bcf1@web.de> (raw)
In-Reply-To: <2f80ae5fcb00d9d5c1b0502af45921cb20ebdf94.1612183647.git.gitgitgadget@gmail.com>
Am 01.02.21 um 13:47 schrieb Derrick Stolee via GitGitGadget:
> @@ -210,12 +204,110 @@ static int remove_redundant(struct repository *r, struct commit **array, int cnt
> for (i = filled = 0; i < cnt; i++)
> if (!redundant[i])
> array[filled++] = work[i];
> + for (j = filled, i = 0; i < cnt; i++)
> + if (redundant[i])
> + array[j++] = work[i];
This puts the loop back in that you removed in the previous commit.
Intentionally?
> free(work);
> free(redundant);
> free(filled_index);
> return filled;
> }
>
> +static int remove_redundant_with_gen(struct repository *r,
> + struct commit **array, int cnt)
> +{
> + int i, count_non_stale = 0;
> + timestamp_t min_generation = GENERATION_NUMBER_INFINITY;
> + struct commit **walk_start;
> + size_t walk_start_nr = 0, walk_start_alloc = cnt;
> + struct prio_queue queue = { compare_commits_by_gen_then_commit_date };
> +
> + ALLOC_ARRAY(walk_start, walk_start_alloc);
> +
> + /* Mark all parents of the input as STALE */
> + for (i = 0; i < cnt; i++) {
> + struct commit_list *parents;
> + timestamp_t generation;
> +
> + repo_parse_commit(r, array[i]);
> + parents = array[i]->parents;
> +
> + while (parents) {
> + repo_parse_commit(r, parents->item);
> + if (!(parents->item->object.flags & STALE)) {
> + parents->item->object.flags |= STALE;
> + ALLOC_GROW(walk_start, walk_start_nr + 1, walk_start_alloc);
> + walk_start[walk_start_nr++] = parents->item;
> + prio_queue_put(&queue, parents->item);
> + }
> + parents = parents->next;
> + }
> +
> + generation = commit_graph_generation(array[i]);
> +
> + if (generation < min_generation)
> + min_generation = generation;
> + }
> +
> + /* push the STALE bits up to min generation */
> + while (queue.nr) {
> + struct commit_list *parents;
> + struct commit *c = prio_queue_get(&queue);
> +
> + repo_parse_commit(r, c);
> +
> + if (commit_graph_generation(c) < min_generation)
> + continue;
> +
> + parents = c->parents;
> + while (parents) {
> + if (!(parents->item->object.flags & STALE)) {
> + parents->item->object.flags |= STALE;
> + prio_queue_put(&queue, parents->item);
> + }
> + parents = parents->next;
> + }
> + }
> +
> + /* rearrange array */
> + for (i = count_non_stale = 0; i < cnt; i++) {
> + if (!(array[i]->object.flags & STALE))
Here I would have added another condition, count_non_stale != i, to
avoid self-assignment (array[x] = array[x]). The code works without
it, though. Not sure if there is a performance benefit to be had --
branch vs. pointer copy. Probably not worth it..
> + array[count_non_stale++] = array[i];
> + }
> +
> + /* clear marks */
> + for (i = 0; i < walk_start_nr; i++)
> + clear_commit_marks(walk_start[i], STALE);
You can replace this loop with a call to clear_commit_marks_many().
> + free(walk_start);
> +
> + return count_non_stale;
> +}
> +
> +static int remove_redundant(struct repository *r, struct commit **array, int cnt)
> +{
> + /*
> + * Some commit in the array may be an ancestor of
> + * another commit. Move the independent commits to the
> + * beginning of 'array' and return their number. Callers
> + * should not rely upon the contents of 'array' after
> + * that number.
> + */
> + if (generation_numbers_enabled(r)) {
> + int i;
> +
> + /*
> + * If we have a single commit with finite generation
> + * number, then the _with_gen algorithm is preferred.
> + */
> + for (i = 0; i < cnt; i++) {
> + if (commit_graph_generation(array[i]) < GENERATION_NUMBER_INFINITY)
> + return remove_redundant_with_gen(r, array, cnt);
> + }
> + }
> +
> + return remove_redundant_no_gen(r, array, cnt);
> +}
> +
> static struct commit_list *get_merge_bases_many_0(struct repository *r,
> struct commit *one,
> int n,
>
next prev parent reply other threads:[~2021-02-01 16:24 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-28 16:24 [PATCH 0/3] Speed up remove_redundant() Derrick Stolee via GitGitGadget
2021-01-28 16:24 ` [PATCH 1/3] commit-reach: use one walk in remove_redundant() Derrick Stolee via GitGitGadget
2021-01-28 20:51 ` Junio C Hamano
2021-01-29 17:11 ` René Scharfe
2021-01-31 3:52 ` Derrick Stolee
2021-01-31 10:20 ` René Scharfe
2021-01-31 3:59 ` Derrick Stolee
2021-01-31 20:13 ` Derrick Stolee
2021-01-31 20:25 ` Junio C Hamano
2021-02-01 3:55 ` Derrick Stolee
2021-01-29 17:10 ` René Scharfe
2021-01-28 16:24 ` [PATCH 2/3] commit-reach: move compare_commits_by_gen Derrick Stolee via GitGitGadget
2021-01-28 16:24 ` [PATCH 3/3] commit-reach: use heuristic in remove_redundant() Derrick Stolee via GitGitGadget
2021-01-28 20:20 ` [PATCH 0/3] Speed up remove_redundant() Junio C Hamano
2021-02-01 12:47 ` [PATCH v2 0/5] " Derrick Stolee via GitGitGadget
2021-02-01 12:47 ` [PATCH v2 1/5] commit-reach: reduce requirements for remove_redundant() Derrick Stolee via GitGitGadget
2021-02-01 19:51 ` Junio C Hamano
2021-02-01 12:47 ` [PATCH v2 2/5] commit-reach: use one walk in remove_redundant() Derrick Stolee via GitGitGadget
2021-02-01 16:12 ` René Scharfe. [this message]
2021-02-01 16:31 ` Derrick Stolee
2021-02-01 12:47 ` [PATCH v2 3/5] commit-reach: move compare_commits_by_gen Derrick Stolee via GitGitGadget
2021-02-01 12:47 ` [PATCH v2 4/5] commit-reach: use heuristic in remove_redundant() Derrick Stolee via GitGitGadget
2021-02-01 20:05 ` Junio C Hamano
2021-02-01 21:02 ` Derrick Stolee
2021-02-01 12:47 ` [PATCH v2 5/5] commit-reach: stale commits may prune generation further Derrick Stolee via GitGitGadget
2021-02-03 15:59 ` Taylor Blau
2021-02-01 15:48 ` [PATCH v2 0/5] Speed up remove_redundant() Derrick Stolee
2021-02-18 23:25 ` Junio C Hamano
2021-02-19 12:17 ` Derrick Stolee
2021-02-20 3:32 ` Junio C Hamano
2021-02-19 12:34 ` [PATCH v3 " Derrick Stolee via GitGitGadget
2021-02-19 12:34 ` [PATCH v3 1/5] commit-reach: reduce requirements for remove_redundant() Derrick Stolee via GitGitGadget
2021-02-19 12:34 ` [PATCH v3 2/5] commit-reach: use one walk in remove_redundant() Derrick Stolee via GitGitGadget
2021-02-19 12:34 ` [PATCH v3 3/5] commit-reach: move compare_commits_by_gen Derrick Stolee via GitGitGadget
2021-02-19 12:34 ` [PATCH v3 4/5] commit-reach: use heuristic in remove_redundant() Derrick Stolee via GitGitGadget
2021-02-19 12:34 ` [PATCH v3 5/5] commit-reach: stale commits may prune generation further Derrick Stolee via GitGitGadget
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=419ddcca-8534-8dc5-bcd8-1e244414bcf1@web.de \
--to=l.s.r@web.de \
--cc=derrickstolee@github.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=mhagger@alum.mit.edu \
--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).