development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-16 10:38:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'jt/skipping-negotiator-wo-recursion'

Browse source 
Rewrite a deep recursion in the skipping negotiator to use a loop
with on-heap prio queue to avoid stack wastage.

* jt/skipping-negotiator-wo-recursion:
  negotiator/skipping: avoid stack overflow
This commit is contained in:
Taylor Blau 2022-10-30 21:04:44 -04:00
parent 1e230dfd6c 4654134976
commit 2f503ee0d7
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
negotiator/skipping.c
View file

@ -86,21 +86,26 @@ static int clear_marks(const char *refname, const struct object_id *oid,
/*
* Mark this SEEN commit and all its SEEN ancestors as COMMON.
*/
static void mark_common(struct data *data, struct commit *c)
static void mark_common(struct data *data, struct commit *seen_commit)
{
struct commit_list *p;
struct prio_queue queue = { NULL };
struct commit *c;
if (c->object.flags & COMMON)
return;
c->object.flags |= COMMON;
if (!(c->object.flags & POPPED))
data->non_common_revs--;
prio_queue_put(&queue, seen_commit);
while ((c = prio_queue_get(&queue))) {
struct commit_list *p;
if (c->object.flags & COMMON)
return;
c->object.flags |= COMMON;
if (!(c->object.flags & POPPED))
data->non_common_revs--;
if (!c->object.parsed)
return;
for (p = c->parents; p; p = p->next) {
if (p->item->object.flags & SEEN)
mark_common(data, p->item);
if (!c->object.parsed)
return;
for (p = c->parents; p; p = p->next) {
if (p->item->object.flags & SEEN)
prio_queue_put(&queue, p->item);
}
}
}