undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use proper object allocators for unknown object nodes too

Browse Source 
We used to use a different allocator scheme for when we didn't know the
object type.  That meant that objects that were created without any
up-front knowledge of the type would not go through the same allocation
paths as normal object allocations, and would miss out on the statistics.

But perhaps more importantly than the statistics (that are useful when
looking at memory usage but not much else), if we want to make the
object hash tables use a denser object pointer representation, we need
to make sure that they all go through the same blocking allocator.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Linus Torvalds 2007-04-16 22:10:19 -07:00 committed by Junio C Hamano
parent f948792990
commit 2c1cbec1e2
3 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
alloc.c
View File

@ -18,26 +18,38 @@
#define BLOCKING 1024 #define BLOCKING 1024
#define DEFINE_ALLOCATOR(name) \ #define DEFINE_ALLOCATOR(name, type) \
static unsigned int name##_allocs; \ static unsigned int name##_allocs; \
struct name *alloc_##name##_node(void) \ struct name *alloc_##name##_node(void) \
{ \ { \
static int nr; \ static int nr; \
static struct name *block; \ static type *block; \
void *ret; \
\ \
if (!nr) { \ if (!nr) { \
nr = BLOCKING; \ nr = BLOCKING; \
block = xcalloc(BLOCKING, sizeof(struct name)); \ block = xmalloc(BLOCKING * sizeof(type)); \
} \ } \
nr--; \ nr--; \
name##_allocs++; \ name##_allocs++; \
return block++; \ ret = block++; \
memset(ret, 0, sizeof(type)); \
return ret; \
} }
DEFINE_ALLOCATOR(blob) union any_object {
DEFINE_ALLOCATOR(tree) struct object object;
DEFINE_ALLOCATOR(commit) struct blob blob;
DEFINE_ALLOCATOR(tag) struct tree tree;
struct commit commit;
struct tag tag;
};
DEFINE_ALLOCATOR(blob, struct blob)
DEFINE_ALLOCATOR(tree, struct tree)
DEFINE_ALLOCATOR(commit, struct commit)
DEFINE_ALLOCATOR(tag, struct tag)
DEFINE_ALLOCATOR(object, union any_object)
#ifdef NO_C99_FORMAT #ifdef NO_C99_FORMAT
#define SZ_FMT "%u" #define SZ_FMT "%u"

1
cache.h
View File

@ -484,6 +484,7 @@ extern struct blob *alloc_blob_node(void);
extern struct tree *alloc_tree_node(void); extern struct tree *alloc_tree_node(void);
extern struct commit *alloc_commit_node(void); extern struct commit *alloc_commit_node(void);
extern struct tag *alloc_tag_node(void); extern struct tag *alloc_tag_node(void);
extern struct object *alloc_object_node(void);
extern void alloc_report(void); extern void alloc_report(void);
/* trace.c */ /* trace.c */

15
object.c
View File

@ -120,22 +120,13 @@ void created_object(const unsigned char *sha1, struct object *obj)
nr_objs++; nr_objs++;
} }
union any_object {
struct object object;
struct commit commit;
struct tree tree;
struct blob blob;
struct tag tag;
};
struct object *lookup_unknown_object(const unsigned char *sha1) struct object *lookup_unknown_object(const unsigned char *sha1)
{ {
struct object *obj = lookup_object(sha1); struct object *obj = lookup_object(sha1);
if (!obj) { if (!obj) {
union any_object *ret = xcalloc(1, sizeof(*ret)); obj = alloc_object_node();
created_object(sha1, &ret->object); created_object(sha1, obj);
ret->object.type = OBJ_NONE; obj->type = OBJ_NONE;
return &ret->object;
} }
return obj; return obj;
} }