development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dm/pack-objects-update'

Browse source 
* dm/pack-objects-update:
  pack-objects: don't traverse objects unnecessarily
  pack-objects: rewrite add_descendants_to_write_order() iteratively
  pack-objects: use unsigned int for counter and offset values
  pack-objects: mark add_to_write_order() as inline
This commit is contained in:
Junio C Hamano 2011-11-01 15:20:07 -07:00
parent c17f1a9117 38d4debb6d
commit 84a9ea90e1
1 changed files with 55 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
builtin/pack-objects.c
View file

@ -454,8 +454,8 @@ static int mark_tagged(const char *path, const unsigned char *sha1, int flag,
return 0; return 0;
} }
static void add_to_write_order(struct object_entry **wo, static inline void add_to_write_order(struct object_entry **wo,
int *endp, unsigned int *endp,
struct object_entry *e) struct object_entry *e)
{ {
if (e->filled) if (e->filled)
@ -465,32 +465,62 @@ static void add_to_write_order(struct object_entry **wo,
} }
static void add_descendants_to_write_order(struct object_entry **wo, static void add_descendants_to_write_order(struct object_entry **wo,
int *endp, unsigned int *endp,
struct object_entry *e) struct object_entry *e)
{ {
struct object_entry *child; int add_to_order = 1;
while (e) {
for (child = e->delta_child; child; child = child->delta_sibling) if (add_to_order) {
add_to_write_order(wo, endp, child); struct object_entry *s;
for (child = e->delta_child; child; child = child->delta_sibling) /* add this node... */
add_descendants_to_write_order(wo, endp, child); add_to_write_order(wo, endp, e);
/* all its siblings... */
for (s = e->delta_sibling; s; s = s->delta_sibling) {
add_to_write_order(wo, endp, s);
}
}
/* drop down a level to add left subtree nodes if possible */
if (e->delta_child) {
add_to_order = 1;
e = e->delta_child;
} else {
add_to_order = 0;
/* our sibling might have some children, it is next */
if (e->delta_sibling) {
e = e->delta_sibling;
continue;
}
/* go back to our parent node */
e = e->delta;
while (e && !e->delta_sibling) {
/* we're on the right side of a subtree, keep
* going up until we can go right again */
e = e->delta;
}
if (!e) {
/* done- we hit our original root node */
return;
}
/* pass it off to sibling at this level */
e = e->delta_sibling;
}
};
} }
static void add_family_to_write_order(struct object_entry **wo, static void add_family_to_write_order(struct object_entry **wo,
int *endp, unsigned int *endp,
struct object_entry *e) struct object_entry *e)
{ {
struct object_entry *root; struct object_entry *root;
for (root = e; root->delta; root = root->delta) for (root = e; root->delta; root = root->delta)
; /* nothing */ ; /* nothing */
add_to_write_order(wo, endp, root);
add_descendants_to_write_order(wo, endp, root); add_descendants_to_write_order(wo, endp, root);
} }
static struct object_entry **compute_write_order(void) static struct object_entry **compute_write_order(void)
{ {
int i, wo_end; unsigned int i, wo_end, last_untagged;
struct object_entry **wo = xmalloc(nr_objects * sizeof(*wo)); struct object_entry **wo = xmalloc(nr_objects * sizeof(*wo));
@ -506,8 +536,8 @@ static struct object_entry **compute_write_order(void)
* Make sure delta_sibling is sorted in the original * Make sure delta_sibling is sorted in the original
* recency order. * recency order.
*/ */
for (i = nr_objects - 1; 0 <= i; i--) { for (i = nr_objects; i > 0;) {
struct object_entry *e = &objects[i]; struct object_entry *e = &objects[--i];
if (!e->delta) if (!e->delta)
continue; continue;
/* Mark me as the first child */ /* Mark me as the first child */
@ -521,7 +551,7 @@ static struct object_entry **compute_write_order(void)
for_each_tag_ref(mark_tagged, NULL); for_each_tag_ref(mark_tagged, NULL);
/* /*
* Give the commits in the original recency order until * Give the objects in the original recency order until
* we see a tagged tip. * we see a tagged tip.
*/ */
for (i = wo_end = 0; i < nr_objects; i++) { for (i = wo_end = 0; i < nr_objects; i++) {
@ -529,6 +559,7 @@ static struct object_entry **compute_write_order(void)
break; break;
add_to_write_order(wo, &wo_end, &objects[i]); add_to_write_order(wo, &wo_end, &objects[i]);
} }
last_untagged = i;
/* /*
* Then fill all the tagged tips. * Then fill all the tagged tips.
@ -541,7 +572,7 @@ static struct object_entry **compute_write_order(void)
/* /*
* And then all remaining commits and tags. * And then all remaining commits and tags.
*/ */
for (i = 0; i < nr_objects; i++) { for (i = last_untagged; i < nr_objects; i++) {
if (objects[i].type != OBJ_COMMIT && if (objects[i].type != OBJ_COMMIT &&
objects[i].type != OBJ_TAG) objects[i].type != OBJ_TAG)
continue; continue;
@ -551,7 +582,7 @@ static struct object_entry **compute_write_order(void)
/* /*
* And then all the trees. * And then all the trees.
*/ */
for (i = 0; i < nr_objects; i++) { for (i = last_untagged; i < nr_objects; i++) {
if (objects[i].type != OBJ_TREE) if (objects[i].type != OBJ_TREE)
continue; continue;
add_to_write_order(wo, &wo_end, &objects[i]); add_to_write_order(wo, &wo_end, &objects[i]);
@ -560,8 +591,13 @@ static struct object_entry **compute_write_order(void)
/* /*
* Finally all the rest in really tight order * Finally all the rest in really tight order
*/ */
for (i = 0; i < nr_objects; i++) for (i = last_untagged; i < nr_objects; i++) {
add_family_to_write_order(wo, &wo_end, &objects[i]); if (!objects[i].filled)
add_family_to_write_order(wo, &wo_end, &objects[i]);
}
if (wo_end != nr_objects)
die("ordered %u objects, expected %"PRIu32, wo_end, nr_objects);
return wo; return wo;
} }