2005-04-28 16:46:33 +02:00
|
|
|
#include "cache.h"
|
2006-01-07 10:33:54 +01:00
|
|
|
#include "tag.h"
|
2005-04-28 16:46:33 +02:00
|
|
|
|
|
|
|
|
const char *tag_type = "tag";
|
|
|
|
|
|
2005-11-03 00:19:13 +01:00
|
|
|
struct object *deref_tag(struct object *o, const char *warn, int warnlen)
|
2005-08-05 09:47:56 +02:00
|
|
|
{
|
2006-07-12 05:45:31 +02:00
|
|
|
while (o && o->type == OBJ_TAG)
|
2005-08-05 09:47:56 +02:00
|
|
|
o = parse_object(((struct tag *)o)->tagged->sha1);
|
2005-11-03 00:19:13 +01:00
|
|
|
if (!o && warn) {
|
|
|
|
|
if (!warnlen)
|
|
|
|
|
warnlen = strlen(warn);
|
|
|
|
|
error("missing object referenced by '%.*s'", warnlen, warn);
|
|
|
|
|
}
|
2005-08-05 09:47:56 +02:00
|
|
|
return o;
|
|
|
|
|
}
|
|
|
|
|
|
2005-06-03 17:05:39 +02:00
|
|
|
struct tag *lookup_tag(const unsigned char *sha1)
|
2005-04-28 16:46:33 +02:00
|
|
|
{
|
|
|
|
|
struct object *obj = lookup_object(sha1);
|
|
|
|
|
if (!obj) {
|
Add specialized object allocator
This creates a simple specialized object allocator for basic
objects.
This avoids wasting space with malloc overhead (metadata and
extra alignment), since the specialized allocator knows the
alignment, and that objects, once allocated, are never freed.
It also allows us to track some basic statistics about object
allocations. For example, for the mozilla import, it shows
object usage as follows:
blobs: 627629 (14710 kB)
trees: 1119035 (34969 kB)
commits: 196423 (8440 kB)
tags: 1336 (46 kB)
and the simpler allocator shaves off about 2.5% off the memory
footprint off a "git-rev-list --all --objects", and is a bit
faster too.
[ Side note: this concludes the series of "save memory in object storage".
The thing is, there simply isn't much more to be saved on the objects.
Doing "git-rev-list --all --objects" on the mozilla archive has a final
total RSS of 131498 pages for me: that's about 513MB. Of that, the
object overhead is now just 56MB, the rest is going somewhere else (put
another way: the fact that this patch shaves off 2.5% of the total
memory overhead, considering that objects are now not much more than 10%
of the total shows how big the wasted space really was: this makes
object allocations much more memory- and time-efficient).
I haven't looked at where the rest is, but I suspect the bulk of it is
just the pack-file loading. It may be that we should pack the tree
objects separately from the blob objects: for git-rev-list --objects, we
don't actually ever need to even look at the blobs, but since trees and
blobs are interspersed in the pack-file, we end up not being dense in
the tree accesses, so we end up looking at more pages than we strictly
need to.
So with a 535MB pack-file, it's entirely possible - even likely - that
most of the remaining RSS is just the mmap of the pack-file itself. We
don't need to map in _all_ of it, but we do end up mapping a fair
amount. ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-19 19:44:15 +02:00
|
|
|
struct tag *ret = alloc_tag_node();
|
2005-04-28 16:46:33 +02:00
|
|
|
created_object(sha1, &ret->object);
|
2006-07-12 05:45:31 +02:00
|
|
|
ret->object.type = OBJ_TAG;
|
2005-04-28 16:46:33 +02:00
|
|
|
return ret;
|
|
|
|
|
}
|
2005-05-20 22:59:17 +02:00
|
|
|
if (!obj->type)
|
2006-07-12 05:45:31 +02:00
|
|
|
obj->type = OBJ_TAG;
|
|
|
|
|
if (obj->type != OBJ_TAG) {
|
Shrink "struct object" a bit
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>
2006-06-15 01:45:13 +02:00
|
|
|
error("Object %s is a %s, not a tree",
|
|
|
|
|
sha1_to_hex(sha1), typename(obj->type));
|
2005-04-28 16:46:33 +02:00
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
return (struct tag *) obj;
|
|
|
|
|
}
|
|
|
|
|
|
2005-05-06 19:48:34 +02:00
|
|
|
int parse_tag_buffer(struct tag *item, void *data, unsigned long size)
|
2005-04-28 16:46:33 +02:00
|
|
|
{
|
2005-04-30 18:51:03 +02:00
|
|
|
int typelen, taglen;
|
|
|
|
|
unsigned char object[20];
|
|
|
|
|
const char *type_line, *tag_line, *sig_line;
|
2005-06-22 02:35:10 +02:00
|
|
|
char type[20];
|
2005-04-30 18:51:03 +02:00
|
|
|
|
2005-04-28 16:46:33 +02:00
|
|
|
if (item->object.parsed)
|
|
|
|
|
return 0;
|
|
|
|
|
item->object.parsed = 1;
|
|
|
|
|
|
|
|
|
|
if (size < 64)
|
2005-05-06 19:48:34 +02:00
|
|
|
return -1;
|
2006-06-18 17:18:09 +02:00
|
|
|
if (memcmp("object ", data, 7) || get_sha1_hex((char *) data + 7, object))
|
2005-05-06 19:48:34 +02:00
|
|
|
return -1;
|
2005-04-28 16:46:33 +02:00
|
|
|
|
2006-06-18 17:18:09 +02:00
|
|
|
type_line = (char *) data + 48;
|
2005-04-28 16:46:33 +02:00
|
|
|
if (memcmp("\ntype ", type_line-1, 6))
|
2005-05-06 19:48:34 +02:00
|
|
|
return -1;
|
2005-04-28 16:46:33 +02:00
|
|
|
|
|
|
|
|
tag_line = strchr(type_line, '\n');
|
|
|
|
|
if (!tag_line || memcmp("tag ", ++tag_line, 4))
|
2005-05-06 19:48:34 +02:00
|
|
|
return -1;
|
2005-04-28 16:46:33 +02:00
|
|
|
|
|
|
|
|
sig_line = strchr(tag_line, '\n');
|
|
|
|
|
if (!sig_line)
|
2005-05-06 19:48:34 +02:00
|
|
|
return -1;
|
2005-04-28 16:46:33 +02:00
|
|
|
sig_line++;
|
|
|
|
|
|
|
|
|
|
typelen = tag_line - type_line - strlen("type \n");
|
|
|
|
|
if (typelen >= 20)
|
2005-05-06 19:48:34 +02:00
|
|
|
return -1;
|
2005-06-22 02:35:10 +02:00
|
|
|
memcpy(type, type_line + 5, typelen);
|
|
|
|
|
type[typelen] = '\0';
|
2005-04-28 16:46:33 +02:00
|
|
|
taglen = sig_line - tag_line - strlen("tag \n");
|
|
|
|
|
item->tag = xmalloc(taglen + 1);
|
|
|
|
|
memcpy(item->tag, tag_line + 4, taglen);
|
|
|
|
|
item->tag[taglen] = '\0';
|
|
|
|
|
|
2005-06-22 02:35:10 +02:00
|
|
|
item->tagged = lookup_object_type(object, type);
|
2005-11-17 06:32:44 +01:00
|
|
|
if (item->tagged && track_object_refs) {
|
|
|
|
|
struct object_refs *refs = alloc_object_refs(1);
|
|
|
|
|
refs->ref[0] = item->tagged;
|
|
|
|
|
set_object_refs(&item->object, refs);
|
|
|
|
|
}
|
2005-06-22 02:35:10 +02:00
|
|
|
|
2005-04-28 16:46:33 +02:00
|
|
|
return 0;
|
2005-05-06 19:48:34 +02:00
|
|
|
}
|
2005-05-04 19:44:15 +02:00
|
|
|
|
2005-05-06 19:48:34 +02:00
|
|
|
int parse_tag(struct tag *item)
|
|
|
|
|
{
|
|
|
|
|
char type[20];
|
|
|
|
|
void *data;
|
|
|
|
|
unsigned long size;
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
if (item->object.parsed)
|
|
|
|
|
return 0;
|
|
|
|
|
data = read_sha1_file(item->object.sha1, type, &size);
|
|
|
|
|
if (!data)
|
|
|
|
|
return error("Could not read %s",
|
|
|
|
|
sha1_to_hex(item->object.sha1));
|
|
|
|
|
if (strcmp(type, tag_type)) {
|
|
|
|
|
free(data);
|
|
|
|
|
return error("Object %s not a tag",
|
|
|
|
|
sha1_to_hex(item->object.sha1));
|
|
|
|
|
}
|
|
|
|
|
ret = parse_tag_buffer(item, data, size);
|
2005-05-04 19:44:15 +02:00
|
|
|
free(data);
|
2005-05-06 19:48:34 +02:00
|
|
|
return ret;
|
2005-04-28 16:46:33 +02:00
|
|
|
}
|