Skip to content

Commit

Permalink
fsck: reduce stack footprint
Browse files Browse the repository at this point in the history
The logic to mark all objects that are reachable from tips of refs were
implemented as a set of recursive functions.  In a repository with a deep
enough history, this can easily eat up all the available stack space.

Restructure the code to require less stackspace by using an object array
to keep track of the objects that still need to be processed.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Linus Torvalds authored and Junio C Hamano committed Dec 11, 2008
1 parent c74faea commit 04d3975
Showing 1 changed file with 31 additions and 7 deletions.
38 changes: 31 additions & 7 deletions builtin-fsck.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ static int fsck_error_func(struct object *obj, int type, const char *err, ...)
return (type == FSCK_WARN) ? 0 : 1;
}

static struct object_array pending;

static int mark_object(struct object *obj, int type, void *data)
{
struct tree *tree = NULL;
struct object *parent = data;
int result;

if (!obj) {
printf("broken link from %7s %s\n",
Expand Down Expand Up @@ -96,6 +96,20 @@ static int mark_object(struct object *obj, int type, void *data)
return 1;
}

add_object_array(obj, (void *) parent, &pending);
return 0;
}

static void mark_object_reachable(struct object *obj)
{
mark_object(obj, OBJ_ANY, 0);
}

static int traverse_one_object(struct object *obj, struct object *parent)
{
int result;
struct tree *tree = NULL;

if (obj->type == OBJ_TREE) {
obj->parsed = 0;
tree = (struct tree *)obj;
Expand All @@ -107,15 +121,22 @@ static int mark_object(struct object *obj, int type, void *data)
free(tree->buffer);
tree->buffer = NULL;
}
if (result < 0)
result = 1;

return result;
}

static void mark_object_reachable(struct object *obj)
static int traverse_reachable(void)
{
mark_object(obj, OBJ_ANY, 0);
int result = 0;
while (pending.nr) {
struct object_array_entry *entry;
struct object *obj, *parent;

entry = pending.objects + --pending.nr;
obj = entry->item;
parent = (struct object *) entry->name;
result |= traverse_one_object(obj, parent);
}
return !!result;
}

static int mark_used(struct object *obj, int type, void *data)
Expand Down Expand Up @@ -233,6 +254,9 @@ static void check_connectivity(void)
{
int i, max;

/* Traverse the pending reachable objects */
traverse_reachable();

/* Look up all the requirements, warn about missing objects.. */
max = get_max_object_index();
if (verbose)
Expand Down

0 comments on commit 04d3975

Please sign in to comment.