summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-10-10 22:14:35 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-10-16 01:05:22 (GMT)
commit60fcc2e6ce255da1baa92905c10456981d260fa0 (patch)
tree458c6ad0e430f87432000c6dcf79905e3babfac8 /commit.c
parent7b40a4552a0fbdc6ee9a22ce10408d79ca1599af (diff)
downloadgit-60fcc2e6ce255da1baa92905c10456981d260fa0.zip
git-60fcc2e6ce255da1baa92905c10456981d260fa0.tar.gz
git-60fcc2e6ce255da1baa92905c10456981d260fa0.tar.bz2
clear_commit_marks(): avoid deep recursion
Before this patch, clear_commit_marks() recursed for each parent. This could be potentially very expensive in terms of stack space. Probably the only reason that this did not lead to problems is the fact that we typically call clear_commit_marks() after marking a relatively small set of commits. Use (sort of) a tail recursion instead: first recurse on the parents other than the first one, and then continue the loop with the first parent. Noticed by Shawn Pearce. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/commit.c b/commit.c
index dc5a064..1fbdd2d 100644
--- a/commit.c
+++ b/commit.c
@@ -441,17 +441,22 @@ struct commit *pop_most_recent_commit(struct commit_list **list,
void clear_commit_marks(struct commit *commit, unsigned int mark)
{
- struct commit_list *parents;
+ while (commit) {
+ struct commit_list *parents;
- commit->object.flags &= ~mark;
- parents = commit->parents;
- while (parents) {
- struct commit *parent = parents->item;
+ if (!(mark & commit->object.flags))
+ return;
- /* Have we already cleared this? */
- if (mark & parent->object.flags)
- clear_commit_marks(parent, mark);
- parents = parents->next;
+ commit->object.flags &= ~mark;
+
+ parents = commit->parents;
+ if (!parents)
+ return;
+
+ while ((parents = parents->next))
+ clear_commit_marks(parents->item, mark);
+
+ commit = commit->parents->item;
}
}