mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-27 08:15:11 +02:00
Code

negotiator/skipping: fix some problems in mark_common() 

The mark_common() method in negotiator/skipping.c was converted
from recursive to iterative in 4654134976 (negotiator/skipping:
avoid stack overflow, 2022-10-25), but there is some more work
to do:

1. prio_queue() should be used with clear_prio_queue(), otherwise there
   will be a memory leak.
2. It does not do duplicate protection before prio_queue_put().
   (The COMMON bit would work here, too.)
3. When it translated from recursive to iterative it kept "return"
   statements that should probably be "continue" statements.
4. It does not attempt to parse commits, and instead returns
   immediately when finding an unparsed commit. This is something
   that it did in its original version, so maybe it is by design,
   but it doesn't match the doc comment for the method.

Helped-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Han Xin <hanxin.hx@bytedance.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Han Xin 2023-04-26 21:15:04 +08:00 committed by Junio C Hamano
parent 8e21ff5edb
commit 10e8a52ef1
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
negotiator/skipping.c
View File

@ -85,29 +85,37 @@ static int clear_marks(const char *refname, const struct object_id *oid,
}
/*
* Mark this SEEN commit and all its SEEN ancestors as COMMON.
* Mark this SEEN commit and all its parsed SEEN ancestors as COMMON.
*/
static void mark_common(struct data *data, struct commit *seen_commit)
{
struct prio_queue queue = { NULL };
struct commit *c;
if (seen_commit->object.flags & COMMON)
return;
prio_queue_put(&queue, seen_commit);
seen_commit->object.flags |= COMMON;
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;
continue;
for (p = c->parents; p; p = p->next) {
if (p->item->object.flags & SEEN)
prio_queue_put(&queue, p->item);
if (!(p->item->object.flags & SEEN) ||
(p->item->object.flags & COMMON))
continue;
p->item->object.flags |= COMMON;
prio_queue_put(&queue, p->item);
}
}
clear_prio_queue(&queue);
}
/*