diff --git a/alloc.c b/alloc.c index 957a0af3626432..951ef3e4ed78e5 100644 --- a/alloc.c +++ b/alloc.c @@ -71,30 +71,30 @@ static inline void *alloc_node(struct alloc_state *s, size_t node_size) return ret; } -void *alloc_blob_node(struct repository *r) +void *mem_pool_alloc_blob_node(struct repository *r) { - struct blob *b = alloc_node(r->parsed_objects->blob_state, sizeof(struct blob)); + struct blob *b = mem_pool_calloc(r->parsed_objects->blob_pool, 1, sizeof(struct blob)); b->object.type = OBJ_BLOB; return b; } -void *alloc_tree_node(struct repository *r) +void *mem_pool_alloc_tree_node(struct repository *r) { - struct tree *t = alloc_node(r->parsed_objects->tree_state, sizeof(struct tree)); + struct tree *t = mem_pool_calloc(r->parsed_objects->tree_pool, 1, sizeof(struct tree)); t->object.type = OBJ_TREE; return t; } -void *alloc_tag_node(struct repository *r) +void *mem_pool_alloc_tag_node(struct repository *r) { - struct tag *t = alloc_node(r->parsed_objects->tag_state, sizeof(struct tag)); + struct tag *t = mem_pool_calloc(r->parsed_objects->tag_pool, 1, sizeof(struct tag)); t->object.type = OBJ_TAG; return t; } -void *alloc_object_node(struct repository *r) +void *mem_pool_alloc_object_node(struct repository *r) { - struct object *obj = alloc_node(r->parsed_objects->object_state, sizeof(union any_object)); + struct object *obj = mem_pool_calloc(r->parsed_objects->object_pool, 1, sizeof(union any_object)); obj->type = OBJ_NONE; return obj; } @@ -116,9 +116,9 @@ void init_commit_node(struct commit *c) c->index = alloc_commit_index(); } -void *alloc_commit_node(struct repository *r) +void *mem_pool_alloc_commit_node(struct repository *r) { - struct commit *c = alloc_node(r->parsed_objects->commit_state, sizeof(struct commit)); + struct commit *c = mem_pool_calloc(r->parsed_objects->commit_pool, 1, sizeof(struct commit)); init_commit_node(c); return c; } @@ -130,8 +130,8 @@ static void report(const char *name, unsigned int count, size_t size) } #define REPORT(name, type) \ - report(#name, r->parsed_objects->name##_state->count, \ - r->parsed_objects->name##_state->count * sizeof(type) >> 10) + report(#name, r->parsed_objects->name##_pool->alloc_count, \ + r->parsed_objects->name##_pool->alloc_count * sizeof(type) >> 10) void alloc_report(struct repository *r) { diff --git a/alloc.h b/alloc.h index 371d388b552fb0..707b28b464ebae 100644 --- a/alloc.h +++ b/alloc.h @@ -7,12 +7,12 @@ struct commit; struct tag; struct repository; -void *alloc_blob_node(struct repository *r); -void *alloc_tree_node(struct repository *r); +void *mem_pool_alloc_blob_node(struct repository *r); +void *mem_pool_alloc_tree_node(struct repository *r); void init_commit_node(struct commit *c); -void *alloc_commit_node(struct repository *r); -void *alloc_tag_node(struct repository *r); -void *alloc_object_node(struct repository *r); +void *mem_pool_alloc_commit_node(struct repository *r); +void *mem_pool_alloc_tag_node(struct repository *r); +void *mem_pool_alloc_object_node(struct repository *r); void alloc_report(struct repository *r); struct alloc_state *allocate_alloc_state(void); diff --git a/blame.c b/blame.c index a5044fcfaa6264..cbb9d8316c10a3 100644 --- a/blame.c +++ b/blame.c @@ -192,7 +192,7 @@ static struct commit *fake_working_tree_commit(struct repository *r, repo_read_index(r); time(&now); - commit = alloc_commit_node(r); + commit = mem_pool_alloc_commit_node(r); commit->object.parsed = 1; commit->date = now; parent_tail = &commit->parents; diff --git a/blob.c b/blob.c index 182718aba9fe32..787c7b2b016fc4 100644 --- a/blob.c +++ b/blob.c @@ -9,7 +9,7 @@ struct blob *lookup_blob(struct repository *r, const struct object_id *oid) { struct object *obj = lookup_object(r, oid); if (!obj) - return create_object(r, oid, alloc_blob_node(r)); + return create_object(r, oid, mem_pool_alloc_blob_node(r)); return object_as_type(obj, OBJ_BLOB, 0); } diff --git a/commit-graph.c b/commit-graph.c index f3486ec18f1b88..216d770eeb98ba 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -2362,7 +2362,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags) hashcpy(cur_oid.hash, g->chunk_oid_lookup + g->hash_len * i); graph_commit = lookup_commit(r, &cur_oid); - odb_commit = (struct commit *)create_object(r, &cur_oid, alloc_commit_node(r)); + odb_commit = (struct commit *)create_object(r, &cur_oid, mem_pool_alloc_commit_node(r)); if (parse_commit_internal(odb_commit, 0, 0)) { graph_report(_("failed to parse commit %s from object database for commit-graph"), oid_to_hex(&cur_oid)); diff --git a/commit.c b/commit.c index bab8d5ab07c98f..cd9cd8f94f9429 100644 --- a/commit.c +++ b/commit.c @@ -61,7 +61,7 @@ struct commit *lookup_commit(struct repository *r, const struct object_id *oid) { struct object *obj = lookup_object(r, oid); if (!obj) - return create_object(r, oid, alloc_commit_node(r)); + return create_object(r, oid, mem_pool_alloc_commit_node(r)); return object_as_type(obj, OBJ_COMMIT, 0); } diff --git a/mem-pool.c b/mem-pool.c index 8401761dda0a2a..d7bae84a98234b 100644 --- a/mem-pool.c +++ b/mem-pool.c @@ -35,6 +35,11 @@ static struct mp_block *mem_pool_alloc_block(struct mem_pool *pool, return p; } +struct mem_pool *mem_pool_new(void) +{ + return xmalloc(sizeof(struct mem_pool)); +} + void mem_pool_init(struct mem_pool *pool, size_t initial_size) { memset(pool, 0, sizeof(*pool)); @@ -69,6 +74,7 @@ void *mem_pool_alloc(struct mem_pool *pool, size_t len) struct mp_block *p = NULL; void *r; + pool->alloc_count++; /* round up to a 'uintmax_t' alignment */ if (len & (sizeof(uintmax_t) - 1)) len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1)); diff --git a/mem-pool.h b/mem-pool.h index fe7507f022bba4..64529e136cf52e 100644 --- a/mem-pool.h +++ b/mem-pool.h @@ -19,8 +19,16 @@ struct mem_pool { /* The total amount of memory allocated by the pool. */ size_t pool_alloc; + + /* The count of calling mem_pool_alloc .*/ + size_t alloc_count; }; +/* + * Create a new mem_pool. + */ +struct mem_pool *mem_pool_new(void); + /* * Initialize mem_pool with specified initial size. */ diff --git a/merge-ort.c b/merge-ort.c index d36a92b59b76fe..880a300c35cac1 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -1774,7 +1774,7 @@ static struct commit *make_virtual_commit(struct repository *repo, struct tree *tree, const char *comment) { - struct commit *commit = alloc_commit_node(repo); + struct commit *commit = mem_pool_alloc_commit_node(repo); set_merge_remote_desc(commit, comment, (struct object *)commit); set_commit_tree(commit, tree); diff --git a/merge-recursive.c b/merge-recursive.c index b052974f191cd8..49ca817d727950 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -216,7 +216,7 @@ static struct commit *make_virtual_commit(struct repository *repo, struct tree *tree, const char *comment) { - struct commit *commit = alloc_commit_node(repo); + struct commit *commit = mem_pool_alloc_commit_node(repo); set_merge_remote_desc(commit, comment, (struct object *)commit); set_commit_tree(commit, tree); diff --git a/object.c b/object.c index 98017bed8efb7e..ec3b656188b473 100644 --- a/object.c +++ b/object.c @@ -182,7 +182,7 @@ struct object *lookup_unknown_object(const struct object_id *oid) struct object *obj = lookup_object(the_repository, oid); if (!obj) obj = create_object(the_repository, oid, - alloc_object_node(the_repository)); + mem_pool_alloc_object_node(the_repository)); return obj; } @@ -471,11 +471,16 @@ struct parsed_object_pool *parsed_object_pool_new(void) struct parsed_object_pool *o = xmalloc(sizeof(*o)); memset(o, 0, sizeof(*o)); - o->blob_state = allocate_alloc_state(); - o->tree_state = allocate_alloc_state(); - o->commit_state = allocate_alloc_state(); - o->tag_state = allocate_alloc_state(); - o->object_state = allocate_alloc_state(); + o->blob_pool = mem_pool_new(); + o->tree_pool = mem_pool_new(); + o->commit_pool = mem_pool_new(); + o->tag_pool = mem_pool_new(); + o->object_pool = mem_pool_new(); + mem_pool_init(o->blob_pool,0); + mem_pool_init(o->tree_pool,0); + mem_pool_init(o->commit_pool,0); + mem_pool_init(o->tag_pool,0); + mem_pool_init(o->object_pool,0); o->is_shallow = -1; o->shallow_stat = xcalloc(1, sizeof(*o->shallow_stat)); @@ -568,16 +573,16 @@ void parsed_object_pool_clear(struct parsed_object_pool *o) free_commit_buffer_slab(o->buffer_slab); o->buffer_slab = NULL; - clear_alloc_state(o->blob_state); - clear_alloc_state(o->tree_state); - clear_alloc_state(o->commit_state); - clear_alloc_state(o->tag_state); - clear_alloc_state(o->object_state); + mem_pool_discard(o->blob_pool,1); + mem_pool_discard(o->tree_pool,1); + mem_pool_discard(o->tag_pool,1); + mem_pool_discard(o->object_pool,1); + mem_pool_discard(o->commit_pool,1); stat_validity_clear(o->shallow_stat); - FREE_AND_NULL(o->blob_state); - FREE_AND_NULL(o->tree_state); - FREE_AND_NULL(o->commit_state); - FREE_AND_NULL(o->tag_state); - FREE_AND_NULL(o->object_state); + FREE_AND_NULL(o->blob_pool); + FREE_AND_NULL(o->tree_pool); + FREE_AND_NULL(o->commit_pool); + FREE_AND_NULL(o->tag_pool); + FREE_AND_NULL(o->object_pool); FREE_AND_NULL(o->shallow_stat); } diff --git a/object.h b/object.h index 59daadce21453c..43031d8dc042e9 100644 --- a/object.h +++ b/object.h @@ -10,11 +10,11 @@ struct parsed_object_pool { int nr_objs, obj_hash_size; /* TODO: migrate alloc_states to mem-pool? */ - struct alloc_state *blob_state; - struct alloc_state *tree_state; - struct alloc_state *commit_state; - struct alloc_state *tag_state; - struct alloc_state *object_state; + struct mem_pool *blob_pool; + struct mem_pool *tree_pool; + struct mem_pool *commit_pool; + struct mem_pool *tag_pool; + struct mem_pool *object_pool; /* parent substitutions from .git/info/grafts and .git/shallow */ struct commit_graft **grafts; diff --git a/tag.c b/tag.c index 1ed2684e45bd50..de24b6308b45bf 100644 --- a/tag.c +++ b/tag.c @@ -102,7 +102,7 @@ struct tag *lookup_tag(struct repository *r, const struct object_id *oid) { struct object *obj = lookup_object(r, oid); if (!obj) - return create_object(r, oid, alloc_tag_node(r)); + return create_object(r, oid, mem_pool_alloc_tag_node(r)); return object_as_type(obj, OBJ_TAG, 0); } diff --git a/tree.c b/tree.c index a52479812ce0c4..a4b081a42b7942 100644 --- a/tree.c +++ b/tree.c @@ -199,7 +199,7 @@ struct tree *lookup_tree(struct repository *r, const struct object_id *oid) { struct object *obj = lookup_object(r, oid); if (!obj) - return create_object(r, oid, alloc_tree_node(r)); + return create_object(r, oid, mem_pool_alloc_tree_node(r)); return object_as_type(obj, OBJ_TREE, 0); }