fast-import: Avoid infinite loop after reset
Johannes Sixt noticed that a 'reset' command applied to a branch that is already active in the branch LRU cache can cause fast-import to relink the same branch into the LRU cache twice. This will cause the LRU cache to contain a cycle, making unload_one_branch run in an infinite loop as it tries to select the oldest branch for eviction. I have trivially fixed the problem by adding an active bit to each branch object; this bit indicates if the branch is already in the LRU and allows us to avoid trying to add it a second time. Converting the pack_id field into a bitfield makes this change take up no additional memory. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce committed
Mar 5, 2007 at 12:31 UTC
734c91f9e292cf6ed1401c178bc9fbb902cc82dd
1 file changed
+11
-5
fast-import.c
+11
-5
@@ -220,7 +220,8 @@ struct branch
220
const char *name;
221
struct tree_entry branch_tree;
222
uintmax_t last_commit;
223
- unsigned int pack_id;
223
+ unsigned active : 1;
224
+ unsigned pack_id : PACK_ID_BITS;
225
unsigned char sha1[20];
226
};
227
@@ -528,6 +529,7 @@ static struct branch *new_branch(const char *name)
529
b->table_next_branch = branch_table[hc];
530
b->branch_tree.versions[0].mode = S_IFDIR;
531
b->branch_tree.versions[1].mode = S_IFDIR;
532
+ b->active = 0;
533
b->pack_id = MAX_PACK_ID;
534
branch_table[hc] = b;
535
branch_count++;
@@ -1547,6 +1549,7 @@ static void unload_one_branch(void)
1549
e = active_branches;
1550
active_branches = e->active_next_branch;
1551
}
1552
+ e->active = 0;
1553
e->active_next_branch = NULL;
1554
if (e->branch_tree.tree) {
1555
release_tree_content_recursive(e->branch_tree.tree);
@@ -1559,10 +1562,13 @@ static void unload_one_branch(void)
1562
static void load_branch(struct branch *b)
1563
{
1564
load_tree(&b->branch_tree);
1562
- b->active_next_branch = active_branches;
1563
- active_branches = b;
1564
- cur_active_branches++;
1565
- branch_load_count++;
1565
+ if (!b->active) {
1566
+ b->active = 1;
1567
+ b->active_next_branch = active_branches;
1568
+ active_branches = b;
1569
+ cur_active_branches++;
1570
+ branch_load_count++;
1571
+ }
1572
}
1573
1574
static void file_change_m(struct branch *b)