diff options
Diffstat (limited to 'alloc.c')
| -rw-r--r-- | alloc.c | 44 |
1 files changed, 16 insertions, 28 deletions
@@ -8,7 +8,7 @@ * up with maximal alignment because it doesn't know what the object alignment * for the new allocation is. */ -#include "cache.h" +#include "git-compat-util.h" #include "object.h" #include "blob.h" #include "tree.h" @@ -27,7 +27,6 @@ union any_object { }; struct alloc_state { - int count; /* total number of nodes allocated */ int nr; /* number of nodes left in current allocation */ void *p; /* first free node in current allocation */ @@ -36,7 +35,7 @@ struct alloc_state { int slab_nr, slab_alloc; }; -void *allocate_alloc_state(void) +struct alloc_state *allocate_alloc_state(void) { return xcalloc(1, sizeof(struct alloc_state)); } @@ -63,7 +62,6 @@ static inline void *alloc_node(struct alloc_state *s, size_t node_size) s->slabs[s->slab_nr++] = s->p; } s->nr--; - s->count++; ret = s->p; s->p = (char *)s->p + node_size; memset(ret, 0, node_size); @@ -99,36 +97,26 @@ void *alloc_object_node(struct repository *r) return obj; } -unsigned int alloc_commit_index(struct repository *r) +/* + * The returned count is to be used as an index into commit slabs, + * that are *NOT* maintained per repository, and that is why a single + * global counter is used. + */ +static unsigned int alloc_commit_index(void) { - return r->parsed_objects->commit_count++; + static unsigned int parsed_commits_count; + return parsed_commits_count++; } -void *alloc_commit_node(struct repository *r) +void init_commit_node(struct commit *c) { - struct commit *c = alloc_node(r->parsed_objects->commit_state, sizeof(struct commit)); c->object.type = OBJ_COMMIT; - c->index = alloc_commit_index(r); - c->graph_pos = COMMIT_NOT_FROM_GRAPH; - c->generation = GENERATION_NUMBER_INFINITY; - return c; -} - -static void report(const char *name, unsigned int count, size_t size) -{ - fprintf(stderr, "%10s: %8u (%"PRIuMAX" kB)\n", - name, count, (uintmax_t) size); + c->index = alloc_commit_index(); } -#define REPORT(name, type) \ - report(#name, r->parsed_objects->name##_state->count, \ - r->parsed_objects->name##_state->count * sizeof(type) >> 10) - -void alloc_report(struct repository *r) +void *alloc_commit_node(struct repository *r) { - REPORT(blob, struct blob); - REPORT(tree, struct tree); - REPORT(commit, struct commit); - REPORT(tag, struct tag); - REPORT(object, union any_object); + struct commit *c = alloc_node(r->parsed_objects->commit_state, sizeof(struct commit)); + init_commit_node(c); + return c; } |