X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=pack-objects.c;h=c5a5e61605b7aefde9fd3cc8c43a085156671bc9;hb=b992933853ccffac85f7e40310167ef7b8f0432e;hp=d1e62dc019b46afb4eab076be430381d8fe07c64;hpb=fead2836a16829fba427635f92d7df9acf771a55;p=git.git diff --git a/pack-objects.c b/pack-objects.c index d1e62dc0..c5a5e616 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -1,11 +1,11 @@ -#include #include "cache.h" #include "object.h" #include "delta.h" #include "pack.h" #include "csum-file.h" +#include -static const char pack_usage[] = "git-pack-objects [--window=N] [--depth=N] {--stdout | base-name} < object-list"; +static const char pack_usage[] = "git-pack-objects [-q] [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list"; struct object_entry { unsigned char sha1[20]; @@ -18,11 +18,16 @@ struct object_entry { struct object_entry *delta; }; +static unsigned char object_list_sha1[20]; +static int non_empty = 0; +static int local = 0; +static int incremental = 0; static struct object_entry **sorted_by_sha, **sorted_by_type; static struct object_entry *objects = NULL; static int nr_objects = 0, nr_alloc = 0; static const char *base_name; static unsigned char pack_file_sha1[20]; +static int progress = 1; static void *delta_against(void *buf, unsigned long size, struct object_entry *entry) { @@ -34,7 +39,7 @@ static void *delta_against(void *buf, unsigned long size, struct object_entry *e if (!otherbuf) die("unable to read %s", sha1_to_hex(entry->delta->sha1)); delta_buf = diff_delta(otherbuf, othersize, - buf, size, &delta_size, ~0UL); + buf, size, &delta_size, 0); if (!delta_buf || delta_size != entry->delta_size) die("delta size changed"); free(buf); @@ -51,32 +56,19 @@ static void *delta_against(void *buf, unsigned long size, struct object_entry *e */ static int encode_header(enum object_type type, unsigned long size, unsigned char *hdr) { - int n = 1, i; + int n = 1; unsigned char c; if (type < OBJ_COMMIT || type > OBJ_DELTA) die("bad type %d", type); - /* - * Shift the size up by 7 bits at a time, - * until you get bits in the "high four". - * That will be our beginning. We'll have - * four size bits in 28..31, then groups - * of seven in 21..27, 14..20, 7..13 and - * finally 0..6. - */ - if (size) { - n = 5; - while (!(size & 0xfe000000)) { - size <<= 7; - n--; - } - } - c = (type << 4) | (size >> 28); - for (i = 1; i < n; i++) { + c = (type << 4) | (size & 15); + size >>= 4; + while (size) { *hdr++ = c | 0x80; - c = (size >> 21) & 0x7f; - size <<= 7; + c = size & 0x7f; + size >>= 7; + n++; } *hdr = c; return n; @@ -97,9 +89,9 @@ static unsigned long write_object(struct sha1file *f, struct object_entry *entry die("object %s size inconsistency (%lu vs %lu)", sha1_to_hex(entry->sha1), size, entry->size); /* - * The object header is a byte of 'type' followed by four bytes of - * length, except for deltas that has the 20 bytes of delta sha - * instead. + * The object header is a byte of 'type' followed by zero or + * more bytes of length. For deltas, the 20 bytes of delta sha1 + * follows that. */ obj_type = entry->type; if (entry->delta) { @@ -118,6 +110,23 @@ static unsigned long write_object(struct sha1file *f, struct object_entry *entry return hdrlen + datalen; } +static unsigned long write_one(struct sha1file *f, + struct object_entry *e, + unsigned long offset) +{ + if (e->offset) + /* offset starts from header size and cannot be zero + * if it is written already. + */ + return offset; + e->offset = offset; + offset += write_object(f, e); + /* if we are deltified, write out its base object. */ + if (e->delta) + offset = write_one(f, e->delta, offset); + return offset; +} + static void write_pack_file(void) { int i; @@ -129,17 +138,15 @@ static void write_pack_file(void) if (!base_name) f = sha1fd(1, ""); else - f = sha1create("%s.%s", base_name, "pack"); + f = sha1create("%s-%s.%s", base_name, sha1_to_hex(object_list_sha1), "pack"); hdr.hdr_signature = htonl(PACK_SIGNATURE); - hdr.hdr_version = htonl(1); + hdr.hdr_version = htonl(PACK_VERSION); hdr.hdr_entries = htonl(nr_objects); sha1write(f, &hdr, sizeof(hdr)); offset = sizeof(hdr); - for (i = 0; i < nr_objects; i++) { - struct object_entry *entry = objects + i; - entry->offset = offset; - offset += write_object(f, entry); - } + for (i = 0; i < nr_objects; i++) + offset = write_one(f, objects + i, offset); + sha1close(f, pack_file_sha1, 1); mb = offset >> 20; offset &= 0xfffff; @@ -148,7 +155,7 @@ static void write_pack_file(void) static void write_index_file(void) { int i; - struct sha1file *f = sha1create("%s.%s", base_name, "idx"); + struct sha1file *f = sha1create("%s-%s.%s", base_name, sha1_to_hex(object_list_sha1), "idx"); struct object_entry **list = sorted_by_sha; struct object_entry **last = list + nr_objects; unsigned int array[256]; @@ -185,11 +192,26 @@ static void write_index_file(void) sha1close(f, NULL, 1); } -static void add_object_entry(unsigned char *sha1, unsigned int hash) +static int add_object_entry(unsigned char *sha1, unsigned int hash) { unsigned int idx = nr_objects; struct object_entry *entry; + if (incremental || local) { + struct packed_git *p; + + for (p = packed_git; p; p = p->next) { + struct pack_entry e; + + if (find_pack_entry_one(sha1, &e, p)) { + if (incremental) + return 0; + if (local && !p->pack_local) + return 0; + } + } + } + if (idx >= nr_alloc) { unsigned int needed = (idx + 1024) * 3 / 2; objects = xrealloc(objects, needed * sizeof(*entry)); @@ -200,6 +222,7 @@ static void add_object_entry(unsigned char *sha1, unsigned int hash) memcpy(entry->sha1, sha1, 20); entry->hash = hash; nr_objects = idx+1; + return 1; } static void check_object(struct object_entry *entry) @@ -341,10 +364,13 @@ static void find_deltas(struct object_entry **list, int window, int depth) int i, idx; unsigned int array_size = window * sizeof(struct unpacked); struct unpacked *array = xmalloc(array_size); + int eye_candy; memset(array, 0, array_size); i = nr_objects; idx = 0; + eye_candy = i - (nr_objects / 20); + while (--i >= 0) { struct object_entry *entry = list[i]; struct unpacked *n = array + idx; @@ -352,6 +378,10 @@ static void find_deltas(struct object_entry **list, int window, int depth) char type[10]; int j; + if (progress && i <= eye_candy) { + eye_candy -= nr_objects / 20; + fputc('.', stderr); + } free(n->data); n->entry = entry; n->data = read_sha1_file(entry->sha1, type, &size); @@ -373,18 +403,109 @@ static void find_deltas(struct object_entry **list, int window, int depth) if (idx >= window) idx = 0; } + + for (i = 0; i < window; ++i) + free(array[i].data); + free(array); +} + +static void prepare_pack(int window, int depth) +{ + get_object_details(); + + if (progress) + fprintf(stderr, "Packing %d objects", nr_objects); + sorted_by_type = create_sorted_list(type_size_sort); + if (window && depth) + find_deltas(sorted_by_type, window+1, depth); + if (progress) + fputc('\n', stderr); + write_pack_file(); +} + +static int reuse_cached_pack(unsigned char *sha1, int pack_to_stdout) +{ + static const char cache[] = "pack-cache/pack-%s.%s"; + char *cached_pack, *cached_idx; + int ifd, ofd, ifd_ix = -1; + + cached_pack = git_path(cache, sha1_to_hex(sha1), "pack"); + ifd = open(cached_pack, O_RDONLY); + if (ifd < 0) + return 0; + + if (!pack_to_stdout) { + cached_idx = git_path(cache, sha1_to_hex(sha1), "idx"); + ifd_ix = open(cached_idx, O_RDONLY); + if (ifd_ix < 0) { + close(ifd); + return 0; + } + } + + fprintf(stderr, "Reusing %d objects pack %s\n", nr_objects, + sha1_to_hex(sha1)); + + if (pack_to_stdout) { + if (copy_fd(ifd, 1)) + exit(1); + close(ifd); + } + else { + char name[PATH_MAX]; + snprintf(name, sizeof(name), + "%s-%s.%s", base_name, sha1_to_hex(sha1), "pack"); + ofd = open(name, O_CREAT | O_EXCL | O_WRONLY, 0666); + if (ofd < 0) + die("unable to open %s (%s)", name, strerror(errno)); + if (copy_fd(ifd, ofd)) + exit(1); + close(ifd); + + snprintf(name, sizeof(name), + "%s-%s.%s", base_name, sha1_to_hex(sha1), "idx"); + ofd = open(name, O_CREAT | O_EXCL | O_WRONLY, 0666); + if (ofd < 0) + die("unable to open %s (%s)", name, strerror(errno)); + if (copy_fd(ifd_ix, ofd)) + exit(1); + close(ifd_ix); + puts(sha1_to_hex(sha1)); + } + + return 1; } int main(int argc, char **argv) { + SHA_CTX ctx; char line[PATH_MAX + 20]; int window = 10, depth = 10, pack_to_stdout = 0; + struct object_entry **list; int i; + struct timeval prev_tv; + int eye_candy = 0; + int eye_candy_incr = 500; + + + setup_git_directory(); for (i = 1; i < argc; i++) { const char *arg = argv[i]; if (*arg == '-') { + if (!strcmp("--non-empty", arg)) { + non_empty = 1; + continue; + } + if (!strcmp("--local", arg)) { + local = 1; + continue; + } + if (!strcmp("--incremental", arg)) { + incremental = 1; + continue; + } if (!strncmp("--window=", arg, 9)) { char *end; window = strtoul(arg+9, &end, 0); @@ -399,6 +520,10 @@ int main(int argc, char **argv) usage(pack_usage); continue; } + if (!strcmp("-q", arg)) { + progress = 0; + continue; + } if (!strcmp("--stdout", arg)) { pack_to_stdout = 1; continue; @@ -413,13 +538,34 @@ int main(int argc, char **argv) if (pack_to_stdout != !base_name) usage(pack_usage); + prepare_packed_git(); + if (progress) { + fprintf(stderr, "Generating pack...\n"); + gettimeofday(&prev_tv, NULL); + } while (fgets(line, sizeof(line), stdin) != NULL) { unsigned int hash; char *p; unsigned char sha1[20]; + if (progress && (eye_candy <= nr_objects)) { + fprintf(stderr, "Counting objects...%d\r", nr_objects); + if (eye_candy && (50 <= eye_candy_incr)) { + struct timeval tv; + int time_diff; + gettimeofday(&tv, NULL); + time_diff = (tv.tv_sec - prev_tv.tv_sec); + time_diff <<= 10; + time_diff += (tv.tv_usec - prev_tv.tv_usec); + if ((1 << 9) < time_diff) + eye_candy_incr += 50; + else if (50 < eye_candy_incr) + eye_candy_incr -= 50; + } + eye_candy += eye_candy_incr; + } if (get_sha1_hex(line, sha1)) - die("expected sha1, got garbage"); + die("expected sha1, got garbage:\n %s", line); hash = 0; p = line+40; while (*p) { @@ -430,17 +576,28 @@ int main(int argc, char **argv) } add_object_entry(sha1, hash); } - get_object_details(); - - fprintf(stderr, "Packing %d objects\n", nr_objects); + if (progress) + fprintf(stderr, "Done counting %d objects.\n", nr_objects); + if (non_empty && !nr_objects) + return 0; sorted_by_sha = create_sorted_list(sha1_sort); - sorted_by_type = create_sorted_list(type_size_sort); - if (window && depth) - find_deltas(sorted_by_type, window+1, depth); - - write_pack_file(); - if (!pack_to_stdout) - write_index_file(); + SHA1_Init(&ctx); + list = sorted_by_sha; + for (i = 0; i < nr_objects; i++) { + struct object_entry *entry = *list++; + SHA1_Update(&ctx, entry->sha1, 20); + } + SHA1_Final(object_list_sha1, &ctx); + + if (reuse_cached_pack(object_list_sha1, pack_to_stdout)) + ; + else { + prepare_pack(window, depth); + if (!pack_to_stdout) { + write_index_file(); + puts(sha1_to_hex(object_list_sha1)); + } + } return 0; }