Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

commit-graph: generation v5 (backward compatible date ceiling) #10

Open
wants to merge 1 commit into
base: reach-perf
Choose a base branch
from
Open

commit-graph: generation v5 (backward compatible date ceiling) #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 95 additions & 31 deletions commit-graph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,9 @@ int compare_generations(struct generation *a, struct generation *b)
return 1;
return 0;

case 3:
ta = a->date + a->value1;
tb = b->date + b->value1;

case 3: /* V3: Corrected Commit Date */
case 5: /* V5: Strictly Monotonic Corrected Commit Date */
/* handle special cases, i.e. commits outside commit graph */
if (a->value1 == GENERATION_NUMBER_INFINITY) {
if (b->value1 == GENERATION_NUMBER_INFINITY)
return 0;
Expand All @@ -112,6 +111,10 @@ int compare_generations(struct generation *a, struct generation *b)
return -1;
}

/* corrected commit date = date + offset (correction) */
ta = a->date + a->value1;
tb = b->date + b->value1;

if (ta < tb)
return -1;
if (ta > tb)
Expand Down Expand Up @@ -162,6 +165,7 @@ void get_generation_version_from_commit(const struct commit *c,

case 1:
case 3:
case 5:
gen->value1 = c->generation;
gen->date = c->date;
break;
Expand Down Expand Up @@ -212,9 +216,10 @@ void set_generation_below_commit(const struct commit *c, struct generation *g)
break;

case 3:
case 5: /* ??? */
if (g->value1 + g->date >= gc.value1 + gc.date) {
g->value1 = 0;
g->date = gc.value1 + gc.date;
g->date = gc.value1 + gc.date;
}
break;

Expand Down Expand Up @@ -363,7 +368,7 @@ struct commit_graph *load_commit_graph_one(const char *graph_file)
else
graph->chunk_large_edges = data + chunk_offset;
break;

case GRAPH_CHUNKID_FELINE:
if (graph->chunk_feline_gen)
chunk_repeated = 1;
Expand Down Expand Up @@ -971,27 +976,27 @@ static void compute_generation_numbers_3(struct packed_commit_list *commits)
int i;
struct commit_list *list = NULL;

for (i = 0; i < commits->nr; i++) {
if (commits->list[i]->generation != GENERATION_NUMBER_INFINITY &&
commits->list[i]->generation != GENERATION_NUMBER_ZERO)
continue;
for (i = 0; i < commits->nr; i++) {
if (commits->list[i]->generation != GENERATION_NUMBER_INFINITY &&
commits->list[i]->generation != GENERATION_NUMBER_ZERO)
continue;

commit_list_insert(commits->list[i], &list);
commit_list_insert(commits->list[i], &list);

while (list) {
struct commit *current = list->item;
struct commit_list *parent;
int all_parents_computed = 1;
while (list) {
struct commit *current = list->item;
struct commit_list *parent;
int all_parents_computed = 1;

timestamp_t max_timestamp = current->date;
timestamp_t max_timestamp = current->date;

for (parent = current->parents; parent; parent = parent->next) {
if (parent->item->generation == GENERATION_NUMBER_INFINITY ||
parent->item->generation == GENERATION_NUMBER_ZERO) {
all_parents_computed = 0;
commit_list_insert(parent->item, &list);
break;
} else {
for (parent = current->parents; parent; parent = parent->next) {
if (parent->item->generation == GENERATION_NUMBER_INFINITY ||
parent->item->generation == GENERATION_NUMBER_ZERO) {
all_parents_computed = 0;
commit_list_insert(parent->item, &list);
break;
} else {
struct generation pg;
timestamp_t pt;
get_generation_version_from_commit(parent->item, 3, &pg);
Expand All @@ -1001,19 +1006,75 @@ static void compute_generation_numbers_3(struct packed_commit_list *commits)
if (pt > max_timestamp)
max_timestamp = pt + 1;
}
}
}

if (all_parents_computed) {
current->generation = (uint32_t)(max_timestamp - current->date) + 1;
pop_commit(&list);

if (current->generation > GENERATION_NUMBER_MAX)
die(_("generation number gap is too high!"));
}
}
}
}

static void compute_generation_numbers_5(struct packed_commit_list *commits)
{
int i;
struct commit_list *list = NULL;

for (i = 0; i < commits->nr; i++) {
/* skip already computed generation numbers */
if (commits->list[i]->generation != GENERATION_NUMBER_INFINITY &&
commits->list[i]->generation != GENERATION_NUMBER_ZERO)
continue;

commit_list_insert(commits->list[i], &list);

while (list) {
struct commit *current = list->item;
struct commit_list *parent;
int all_parents_computed = 1;

timestamp_t max_timestamp = current->date;
uint32_t max_generation = 0;

for (parent = current->parents; parent; parent = parent->next) {
if (parent->item->generation == GENERATION_NUMBER_INFINITY ||
parent->item->generation == GENERATION_NUMBER_ZERO) {
all_parents_computed = 0;
commit_list_insert(parent->item, &list);
break;

} else {
struct generation pg;
timestamp_t pt;
get_generation_version_from_commit(parent->item, 5, &pg);

pt = pg.value1 + pg.date;

if (pt > max_timestamp)
max_timestamp = pt + 1;
if (pg.value1 > max_generation)
max_generation = pg.value1;
}
}

if (all_parents_computed) {
if (all_parents_computed) {
current->generation = (uint32_t)(max_timestamp - current->date) + 1;
pop_commit(&list);
if (current->generation < max_generation + 1)
current->generation = max_generation + 1;
pop_commit(&list);

if (current->generation > GENERATION_NUMBER_MAX)
die(_("generation number gap is too high!"));
}
}
}
if (current->generation > GENERATION_NUMBER_MAX)
die(_("generation number gap is too high!"));
}
}
}
}


static void compute_generation_numbers(struct packed_commit_list *commits,
int generation_version)
{
Expand All @@ -1038,6 +1099,9 @@ static void compute_generation_numbers(struct packed_commit_list *commits,
case 4:
/* compute at write time */
return;
case 5:
compute_generation_numbers_5(commits);
return;
}
}

Expand Down