mirror of
https://github.com/git/git.git
synced 2024-11-20 16:54:03 +01:00
885a86abe2
This shrinks "struct object" by a small amount, by getting rid of the "struct type *" pointer and replacing it with a 3-bit bitfield instead. In addition, we merge the bitfields and the "flags" field, which incidentally should also remove a useless 4-byte padding from the object when in 64-bit mode. Now, our "struct object" is still too damn large, but it's now less obviously bloated, and of the remaining fields, only the "util" (which is not used by most things) is clearly something that should be eventually discarded. This shrinks the "git-rev-list --all" memory use by about 2.5% on the kernel archive (and, perhaps more importantly, on the larger mozilla archive). That may not sound like much, but I suspect it's more on a 64-bit platform. There are other remaining inefficiencies (the parent lists, for example, probably have horrible malloc overhead), but this was pretty obvious. Most of the patch is just changing the comparison of the "type" pointer from one of the constant string pointers to the appropriate new TYPE_xxx small integer constant. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
52 lines
1.2 KiB
C
52 lines
1.2 KiB
C
#include "cache.h"
|
|
#include "blob.h"
|
|
#include <stdlib.h>
|
|
|
|
const char *blob_type = "blob";
|
|
|
|
struct blob *lookup_blob(const unsigned char *sha1)
|
|
{
|
|
struct object *obj = lookup_object(sha1);
|
|
if (!obj) {
|
|
struct blob *ret = xcalloc(1, sizeof(struct blob));
|
|
created_object(sha1, &ret->object);
|
|
ret->object.type = TYPE_BLOB;
|
|
return ret;
|
|
}
|
|
if (!obj->type)
|
|
obj->type = TYPE_BLOB;
|
|
if (obj->type != TYPE_BLOB) {
|
|
error("Object %s is a %s, not a blob",
|
|
sha1_to_hex(sha1), typename(obj->type));
|
|
return NULL;
|
|
}
|
|
return (struct blob *) obj;
|
|
}
|
|
|
|
int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size)
|
|
{
|
|
item->object.parsed = 1;
|
|
return 0;
|
|
}
|
|
|
|
int parse_blob(struct blob *item)
|
|
{
|
|
char type[20];
|
|
void *buffer;
|
|
unsigned long size;
|
|
int ret;
|
|
|
|
if (item->object.parsed)
|
|
return 0;
|
|
buffer = read_sha1_file(item->object.sha1, type, &size);
|
|
if (!buffer)
|
|
return error("Could not read %s",
|
|
sha1_to_hex(item->object.sha1));
|
|
if (strcmp(type, blob_type))
|
|
return error("Object %s not a blob",
|
|
sha1_to_hex(item->object.sha1));
|
|
ret = parse_blob_buffer(item, buffer, size);
|
|
free(buffer);
|
|
return ret;
|
|
}
|