12 #include "streaming.h"
13 #include "thread-utils.h"
15 static const char index_pack_usage[] =
16 "git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
19 struct pack_idx_entry idx;
21 unsigned int hdr_size;
22 enum object_type type;
23 enum object_type real_type;
29 unsigned char sha1[20];
34 struct base_data *base;
35 struct base_data *child;
36 struct object_entry *obj;
39 int ref_first, ref_last;
40 int ofs_first, ofs_last;
43 #if !defined(NO_PTHREADS) && defined(NO_THREAD_SAFE_PREAD)
44 /* pread() emulation is not thread-safe. Disable threading. */
52 struct base_data *base_cache;
53 size_t base_cache_used;
57 * Even if sizeof(union delta_base) == 24 on 64-bit archs, we really want
58 * to memcmp() only the first 20 bytes.
60 #define UNION_BASE_SZ 20
62 #define FLAG_LINK (1u<<20)
63 #define FLAG_CHECKED (1u<<21)
66 union delta_base base;
70 static struct object_entry *objects;
71 static struct delta_entry *deltas;
72 static struct thread_local nothread_data;
73 static int nr_objects;
75 static int nr_resolved_deltas;
76 static int nr_threads;
78 static int from_stdin;
83 static struct progress *progress;
85 /* We always read in 4kB chunks. */
86 static unsigned char input_buffer[4096];
87 static unsigned int input_offset, input_len;
88 static off_t consumed_bytes;
89 static unsigned deepest_delta;
90 static git_SHA_CTX input_ctx;
91 static uint32_t input_crc32;
92 static int input_fd, output_fd, pack_fd;
96 static struct thread_local *thread_data;
97 static int nr_dispatched;
98 static int threads_active;
100 static pthread_mutex_t read_mutex;
101 #define read_lock() lock_mutex(&read_mutex)
102 #define read_unlock() unlock_mutex(&read_mutex)
104 static pthread_mutex_t counter_mutex;
105 #define counter_lock() lock_mutex(&counter_mutex)
106 #define counter_unlock() unlock_mutex(&counter_mutex)
108 static pthread_mutex_t work_mutex;
109 #define work_lock() lock_mutex(&work_mutex)
110 #define work_unlock() unlock_mutex(&work_mutex)
112 static pthread_mutex_t deepest_delta_mutex;
113 #define deepest_delta_lock() lock_mutex(&deepest_delta_mutex)
114 #define deepest_delta_unlock() unlock_mutex(&deepest_delta_mutex)
116 static pthread_key_t key;
118 static inline void lock_mutex(pthread_mutex_t *mutex)
121 pthread_mutex_lock(mutex);
124 static inline void unlock_mutex(pthread_mutex_t *mutex)
127 pthread_mutex_unlock(mutex);
131 * Mutex and conditional variable can't be statically-initialized on Windows.
133 static void init_thread(void)
135 init_recursive_mutex(&read_mutex);
136 pthread_mutex_init(&counter_mutex, NULL);
137 pthread_mutex_init(&work_mutex, NULL);
139 pthread_mutex_init(&deepest_delta_mutex, NULL);
140 pthread_key_create(&key, NULL);
141 thread_data = xcalloc(nr_threads, sizeof(*thread_data));
145 static void cleanup_thread(void)
150 pthread_mutex_destroy(&read_mutex);
151 pthread_mutex_destroy(&counter_mutex);
152 pthread_mutex_destroy(&work_mutex);
154 pthread_mutex_destroy(&deepest_delta_mutex);
155 pthread_key_delete(key);
162 #define read_unlock()
164 #define counter_lock()
165 #define counter_unlock()
168 #define work_unlock()
170 #define deepest_delta_lock()
171 #define deepest_delta_unlock()
176 static int mark_link(struct object *obj, int type, void *data)
181 if (type != OBJ_ANY && obj->type != type)
182 die(_("object type mismatch at %s"), sha1_to_hex(obj->sha1));
184 obj->flags |= FLAG_LINK;
188 /* The content of each linked object must have been checked
189 or it must be already present in the object database */
190 static void check_object(struct object *obj)
195 if (!(obj->flags & FLAG_LINK))
198 if (!(obj->flags & FLAG_CHECKED)) {
200 int type = sha1_object_info(obj->sha1, &size);
201 if (type != obj->type || type <= 0)
202 die(_("object of unexpected type"));
203 obj->flags |= FLAG_CHECKED;
208 static void check_objects(void)
212 max = get_max_object_index();
213 for (i = 0; i < max; i++)
214 check_object(get_indexed_object(i));
218 /* Discard current buffer used content. */
219 static void flush(void)
223 write_or_die(output_fd, input_buffer, input_offset);
224 git_SHA1_Update(&input_ctx, input_buffer, input_offset);
225 memmove(input_buffer, input_buffer + input_offset, input_len);
231 * Make sure at least "min" bytes are available in the buffer, and
232 * return the pointer to the buffer.
234 static void *fill(int min)
236 if (min <= input_len)
237 return input_buffer + input_offset;
238 if (min > sizeof(input_buffer))
239 die(Q_("cannot fill %d byte",
240 "cannot fill %d bytes",
245 ssize_t ret = xread(input_fd, input_buffer + input_len,
246 sizeof(input_buffer) - input_len);
250 die_errno(_("read error on input"));
254 display_throughput(progress, consumed_bytes + input_len);
255 } while (input_len < min);
259 static void use(int bytes)
261 if (bytes > input_len)
262 die(_("used more bytes than were available"));
263 input_crc32 = crc32(input_crc32, input_buffer + input_offset, bytes);
265 input_offset += bytes;
267 /* make sure off_t is sufficiently large not to wrap */
268 if (signed_add_overflows(consumed_bytes, bytes))
269 die(_("pack too large for current definition of off_t"));
270 consumed_bytes += bytes;
273 static const char *open_pack_file(const char *pack_name)
278 static char tmp_file[PATH_MAX];
279 output_fd = odb_mkstemp(tmp_file, sizeof(tmp_file),
280 "pack/tmp_pack_XXXXXX");
281 pack_name = xstrdup(tmp_file);
283 output_fd = open(pack_name, O_CREAT|O_EXCL|O_RDWR, 0600);
285 die_errno(_("unable to create '%s'"), pack_name);
288 input_fd = open(pack_name, O_RDONLY);
290 die_errno(_("cannot open packfile '%s'"), pack_name);
294 git_SHA1_Init(&input_ctx);
298 static void parse_pack_header(void)
300 struct pack_header *hdr = fill(sizeof(struct pack_header));
302 /* Header consistency check */
303 if (hdr->hdr_signature != htonl(PACK_SIGNATURE))
304 die(_("pack signature mismatch"));
305 if (!pack_version_ok(hdr->hdr_version))
306 die(_("pack version %"PRIu32" unsupported"),
307 ntohl(hdr->hdr_version));
309 nr_objects = ntohl(hdr->hdr_entries);
310 use(sizeof(struct pack_header));
313 static NORETURN void bad_object(unsigned long offset, const char *format,
314 ...) __attribute__((format (printf, 2, 3)));
316 static NORETURN void bad_object(unsigned long offset, const char *format, ...)
321 va_start(params, format);
322 vsnprintf(buf, sizeof(buf), format, params);
324 die(_("pack has bad object at offset %lu: %s"), offset, buf);
327 static inline struct thread_local *get_thread_data(void)
331 return pthread_getspecific(key);
332 assert(!threads_active &&
333 "This should only be reached when all threads are gone");
335 return ¬hread_data;
339 static void set_thread_data(struct thread_local *data)
342 pthread_setspecific(key, data);
346 static struct base_data *alloc_base_data(void)
348 struct base_data *base = xmalloc(sizeof(struct base_data));
349 memset(base, 0, sizeof(*base));
355 static void free_base_data(struct base_data *c)
360 get_thread_data()->base_cache_used -= c->size;
364 static void prune_base_data(struct base_data *retain)
367 struct thread_local *data = get_thread_data();
368 for (b = data->base_cache;
369 data->base_cache_used > delta_base_cache_limit && b;
371 if (b->data && b != retain)
376 static void link_base_data(struct base_data *base, struct base_data *c)
381 get_thread_data()->base_cache = c;
386 get_thread_data()->base_cache_used += c->size;
390 static void unlink_base_data(struct base_data *c)
392 struct base_data *base = c->base;
396 get_thread_data()->base_cache = NULL;
400 static int is_delta_type(enum object_type type)
402 return (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA);
405 static void *unpack_entry_data(unsigned long offset, unsigned long size,
406 enum object_type type, unsigned char *sha1)
408 static char fixed_buf[8192];
416 if (!is_delta_type(type)) {
417 hdrlen = sprintf(hdr, "%s %lu", typename(type), size) + 1;
419 git_SHA1_Update(&c, hdr, hdrlen);
422 if (type == OBJ_BLOB && size > big_file_threshold)
427 memset(&stream, 0, sizeof(stream));
428 git_inflate_init(&stream);
429 stream.next_out = buf;
430 stream.avail_out = buf == fixed_buf ? sizeof(fixed_buf) : size;
433 unsigned char *last_out = stream.next_out;
434 stream.next_in = fill(1);
435 stream.avail_in = input_len;
436 status = git_inflate(&stream, 0);
437 use(input_len - stream.avail_in);
439 git_SHA1_Update(&c, last_out, stream.next_out - last_out);
440 if (buf == fixed_buf) {
441 stream.next_out = buf;
442 stream.avail_out = sizeof(fixed_buf);
444 } while (status == Z_OK);
445 if (stream.total_out != size || status != Z_STREAM_END)
446 bad_object(offset, _("inflate returned %d"), status);
447 git_inflate_end(&stream);
449 git_SHA1_Final(sha1, &c);
450 return buf == fixed_buf ? NULL : buf;
453 static void *unpack_raw_entry(struct object_entry *obj,
454 union delta_base *delta_base,
458 unsigned long size, c;
463 obj->idx.offset = consumed_bytes;
464 input_crc32 = crc32(0, NULL, 0);
469 obj->type = (c >> 4) & 7;
476 size += (c & 0x7f) << shift;
483 hashcpy(delta_base->sha1, fill(20));
487 memset(delta_base, 0, sizeof(*delta_base));
491 base_offset = c & 127;
494 if (!base_offset || MSB(base_offset, 7))
495 bad_object(obj->idx.offset, _("offset value overflow for delta base object"));
499 base_offset = (base_offset << 7) + (c & 127);
501 delta_base->offset = obj->idx.offset - base_offset;
502 if (delta_base->offset <= 0 || delta_base->offset >= obj->idx.offset)
503 bad_object(obj->idx.offset, _("delta base offset is out of bound"));
511 bad_object(obj->idx.offset, _("unknown object type %d"), obj->type);
513 obj->hdr_size = consumed_bytes - obj->idx.offset;
515 data = unpack_entry_data(obj->idx.offset, obj->size, obj->type, sha1);
516 obj->idx.crc32 = input_crc32;
520 static void *unpack_data(struct object_entry *obj,
521 int (*consume)(const unsigned char *, unsigned long, void *),
524 off_t from = obj[0].idx.offset + obj[0].hdr_size;
525 unsigned long len = obj[1].idx.offset - from;
526 unsigned char *data, *inbuf;
530 data = xmalloc(consume ? 64*1024 : obj->size);
531 inbuf = xmalloc((len < 64*1024) ? len : 64*1024);
533 memset(&stream, 0, sizeof(stream));
534 git_inflate_init(&stream);
535 stream.next_out = data;
536 stream.avail_out = consume ? 64*1024 : obj->size;
539 ssize_t n = (len < 64*1024) ? len : 64*1024;
540 n = pread(pack_fd, inbuf, n, from);
542 die_errno(_("cannot pread pack file"));
544 die(Q_("premature end of pack file, %lu byte missing",
545 "premature end of pack file, %lu bytes missing",
550 stream.next_in = inbuf;
553 status = git_inflate(&stream, 0);
556 status = git_inflate(&stream, 0);
557 if (consume(data, stream.next_out - data, cb_data)) {
562 stream.next_out = data;
563 stream.avail_out = 64*1024;
564 } while (status == Z_OK && stream.avail_in);
566 } while (len && status == Z_OK && !stream.avail_in);
568 /* This has been inflated OK when first encountered, so... */
569 if (status != Z_STREAM_END || stream.total_out != obj->size)
570 die(_("serious inflate inconsistency"));
572 git_inflate_end(&stream);
581 static void *get_data_from_pack(struct object_entry *obj)
583 return unpack_data(obj, NULL, NULL);
586 static int compare_delta_bases(const union delta_base *base1,
587 const union delta_base *base2,
588 enum object_type type1,
589 enum object_type type2)
591 int cmp = type1 - type2;
594 return memcmp(base1, base2, UNION_BASE_SZ);
597 static int find_delta(const union delta_base *base, enum object_type type)
599 int first = 0, last = nr_deltas;
601 while (first < last) {
602 int next = (first + last) / 2;
603 struct delta_entry *delta = &deltas[next];
606 cmp = compare_delta_bases(base, &delta->base,
607 type, objects[delta->obj_no].type);
619 static void find_delta_children(const union delta_base *base,
620 int *first_index, int *last_index,
621 enum object_type type)
623 int first = find_delta(base, type);
625 int end = nr_deltas - 1;
632 while (first > 0 && !memcmp(&deltas[first - 1].base, base, UNION_BASE_SZ))
634 while (last < end && !memcmp(&deltas[last + 1].base, base, UNION_BASE_SZ))
636 *first_index = first;
640 struct compare_data {
641 struct object_entry *entry;
642 struct git_istream *st;
644 unsigned long buf_size;
647 static int compare_objects(const unsigned char *buf, unsigned long size,
650 struct compare_data *data = cb_data;
652 if (data->buf_size < size) {
654 data->buf = xmalloc(size);
655 data->buf_size = size;
659 ssize_t len = read_istream(data->st, data->buf, size);
661 die(_("SHA1 COLLISION FOUND WITH %s !"),
662 sha1_to_hex(data->entry->idx.sha1));
664 die(_("unable to read %s"),
665 sha1_to_hex(data->entry->idx.sha1));
666 if (memcmp(buf, data->buf, len))
667 die(_("SHA1 COLLISION FOUND WITH %s !"),
668 sha1_to_hex(data->entry->idx.sha1));
675 static int check_collison(struct object_entry *entry)
677 struct compare_data data;
678 enum object_type type;
681 if (entry->size <= big_file_threshold || entry->type != OBJ_BLOB)
684 memset(&data, 0, sizeof(data));
686 data.st = open_istream(entry->idx.sha1, &type, &size, NULL);
689 if (size != entry->size || type != entry->type)
690 die(_("SHA1 COLLISION FOUND WITH %s !"),
691 sha1_to_hex(entry->idx.sha1));
692 unpack_data(entry, compare_objects, &data);
693 close_istream(data.st);
698 static void sha1_object(const void *data, struct object_entry *obj_entry,
699 unsigned long size, enum object_type type,
700 const unsigned char *sha1)
702 void *new_data = NULL;
703 int collision_test_needed;
705 assert(data || obj_entry);
708 collision_test_needed = has_sha1_file(sha1);
711 if (collision_test_needed && !data) {
713 if (!check_collison(obj_entry))
714 collision_test_needed = 0;
717 if (collision_test_needed) {
719 enum object_type has_type;
720 unsigned long has_size;
722 has_type = sha1_object_info(sha1, &has_size);
723 if (has_type != type || has_size != size)
724 die(_("SHA1 COLLISION FOUND WITH %s !"), sha1_to_hex(sha1));
725 has_data = read_sha1_file(sha1, &has_type, &has_size);
728 data = new_data = get_data_from_pack(obj_entry);
730 die(_("cannot read existing object %s"), sha1_to_hex(sha1));
731 if (size != has_size || type != has_type ||
732 memcmp(data, has_data, size) != 0)
733 die(_("SHA1 COLLISION FOUND WITH %s !"), sha1_to_hex(sha1));
739 if (type == OBJ_BLOB) {
740 struct blob *blob = lookup_blob(sha1);
742 blob->object.flags |= FLAG_CHECKED;
744 die(_("invalid blob object %s"), sha1_to_hex(sha1));
748 void *buf = (void *) data;
751 buf = new_data = get_data_from_pack(obj_entry);
754 * we do not need to free the memory here, as the
755 * buf is deleted by the caller.
757 obj = parse_object_buffer(sha1, type, size, buf, &eaten);
759 die(_("invalid %s"), typename(type));
760 if (fsck_object(obj, 1, fsck_error_function))
761 die(_("Error in object"));
762 if (fsck_walk(obj, mark_link, NULL))
763 die(_("Not all child objects of %s are reachable"), sha1_to_hex(obj->sha1));
765 if (obj->type == OBJ_TREE) {
766 struct tree *item = (struct tree *) obj;
770 if (obj->type == OBJ_COMMIT) {
771 struct commit *commit = (struct commit *) obj;
772 commit->buffer = NULL;
774 obj->flags |= FLAG_CHECKED;
783 * This function is part of find_unresolved_deltas(). There are two
784 * walkers going in the opposite ways.
786 * The first one in find_unresolved_deltas() traverses down from
787 * parent node to children, deflating nodes along the way. However,
788 * memory for deflated nodes is limited by delta_base_cache_limit, so
789 * at some point parent node's deflated content may be freed.
791 * The second walker is this function, which goes from current node up
792 * to top parent if necessary to deflate the node. In normal
793 * situation, its parent node would be already deflated, so it just
794 * needs to apply delta.
796 * In the worst case scenario, parent node is no longer deflated because
797 * we're running out of delta_base_cache_limit; we need to re-deflate
798 * parents, possibly up to the top base.
800 * All deflated objects here are subject to be freed if we exceed
801 * delta_base_cache_limit, just like in find_unresolved_deltas(), we
802 * just need to make sure the last node is not freed.
804 static void *get_base_data(struct base_data *c)
807 struct object_entry *obj = c->obj;
808 struct base_data **delta = NULL;
809 int delta_nr = 0, delta_alloc = 0;
811 while (is_delta_type(c->obj->type) && !c->data) {
812 ALLOC_GROW(delta, delta_nr + 1, delta_alloc);
813 delta[delta_nr++] = c;
817 c->data = get_data_from_pack(obj);
819 get_thread_data()->base_cache_used += c->size;
822 for (; delta_nr > 0; delta_nr--) {
824 c = delta[delta_nr - 1];
826 base = get_base_data(c->base);
827 raw = get_data_from_pack(obj);
828 c->data = patch_delta(
834 bad_object(obj->idx.offset, _("failed to apply delta"));
835 get_thread_data()->base_cache_used += c->size;
843 static void resolve_delta(struct object_entry *delta_obj,
844 struct base_data *base, struct base_data *result)
846 void *base_data, *delta_data;
848 delta_obj->real_type = base->obj->real_type;
850 delta_obj->delta_depth = base->obj->delta_depth + 1;
851 deepest_delta_lock();
852 if (deepest_delta < delta_obj->delta_depth)
853 deepest_delta = delta_obj->delta_depth;
854 deepest_delta_unlock();
856 delta_obj->base_object_no = base->obj - objects;
857 delta_data = get_data_from_pack(delta_obj);
858 base_data = get_base_data(base);
859 result->obj = delta_obj;
860 result->data = patch_delta(base_data, base->size,
861 delta_data, delta_obj->size, &result->size);
864 bad_object(delta_obj->idx.offset, _("failed to apply delta"));
865 hash_sha1_file(result->data, result->size,
866 typename(delta_obj->real_type), delta_obj->idx.sha1);
867 sha1_object(result->data, NULL, result->size, delta_obj->real_type,
868 delta_obj->idx.sha1);
870 nr_resolved_deltas++;
874 static struct base_data *find_unresolved_deltas_1(struct base_data *base,
875 struct base_data *prev_base)
877 if (base->ref_last == -1 && base->ofs_last == -1) {
878 union delta_base base_spec;
880 hashcpy(base_spec.sha1, base->obj->idx.sha1);
881 find_delta_children(&base_spec,
882 &base->ref_first, &base->ref_last, OBJ_REF_DELTA);
884 memset(&base_spec, 0, sizeof(base_spec));
885 base_spec.offset = base->obj->idx.offset;
886 find_delta_children(&base_spec,
887 &base->ofs_first, &base->ofs_last, OBJ_OFS_DELTA);
889 if (base->ref_last == -1 && base->ofs_last == -1) {
894 link_base_data(prev_base, base);
897 if (base->ref_first <= base->ref_last) {
898 struct object_entry *child = objects + deltas[base->ref_first].obj_no;
899 struct base_data *result = alloc_base_data();
901 assert(child->real_type == OBJ_REF_DELTA);
902 resolve_delta(child, base, result);
903 if (base->ref_first == base->ref_last && base->ofs_last == -1)
904 free_base_data(base);
910 if (base->ofs_first <= base->ofs_last) {
911 struct object_entry *child = objects + deltas[base->ofs_first].obj_no;
912 struct base_data *result = alloc_base_data();
914 assert(child->real_type == OBJ_OFS_DELTA);
915 resolve_delta(child, base, result);
916 if (base->ofs_first == base->ofs_last)
917 free_base_data(base);
923 unlink_base_data(base);
927 static void find_unresolved_deltas(struct base_data *base)
929 struct base_data *new_base, *prev_base = NULL;
931 new_base = find_unresolved_deltas_1(base, prev_base);
941 prev_base = base->base;
946 static int compare_delta_entry(const void *a, const void *b)
948 const struct delta_entry *delta_a = a;
949 const struct delta_entry *delta_b = b;
951 /* group by type (ref vs ofs) and then by value (sha-1 or offset) */
952 return compare_delta_bases(&delta_a->base, &delta_b->base,
953 objects[delta_a->obj_no].type,
954 objects[delta_b->obj_no].type);
957 static void resolve_base(struct object_entry *obj)
959 struct base_data *base_obj = alloc_base_data();
961 base_obj->data = NULL;
962 find_unresolved_deltas(base_obj);
966 static void *threaded_second_pass(void *data)
968 set_thread_data(data);
972 display_progress(progress, nr_resolved_deltas);
975 while (nr_dispatched < nr_objects &&
976 is_delta_type(objects[nr_dispatched].type))
978 if (nr_dispatched >= nr_objects) {
985 resolve_base(&objects[i]);
993 * - find locations of all objects;
994 * - calculate SHA1 of all non-delta objects;
995 * - remember base (SHA1 or offset) for all deltas.
997 static void parse_pack_objects(unsigned char *sha1)
999 int i, nr_delays = 0;
1000 struct delta_entry *delta = deltas;
1004 progress = start_progress(
1005 from_stdin ? _("Receiving objects") : _("Indexing objects"),
1007 for (i = 0; i < nr_objects; i++) {
1008 struct object_entry *obj = &objects[i];
1009 void *data = unpack_raw_entry(obj, &delta->base, obj->idx.sha1);
1010 obj->real_type = obj->type;
1011 if (is_delta_type(obj->type)) {
1016 /* large blobs, check later */
1017 obj->real_type = OBJ_BAD;
1020 sha1_object(data, NULL, obj->size, obj->type, obj->idx.sha1);
1022 display_progress(progress, i+1);
1024 objects[i].idx.offset = consumed_bytes;
1025 stop_progress(&progress);
1027 /* Check pack integrity */
1029 git_SHA1_Final(sha1, &input_ctx);
1030 if (hashcmp(fill(20), sha1))
1031 die(_("pack is corrupted (SHA1 mismatch)"));
1034 /* If input_fd is a file, we should have reached its end now. */
1035 if (fstat(input_fd, &st))
1036 die_errno(_("cannot fstat packfile"));
1037 if (S_ISREG(st.st_mode) &&
1038 lseek(input_fd, 0, SEEK_CUR) - input_len != st.st_size)
1039 die(_("pack has junk at the end"));
1041 for (i = 0; i < nr_objects; i++) {
1042 struct object_entry *obj = &objects[i];
1043 if (obj->real_type != OBJ_BAD)
1045 obj->real_type = obj->type;
1046 sha1_object(NULL, obj, obj->size, obj->type, obj->idx.sha1);
1050 die(_("confusion beyond insanity in parse_pack_objects()"));
1055 * - for all non-delta objects, look if it is used as a base for
1057 * - if used as a base, uncompress the object and apply all deltas,
1058 * recursively checking if the resulting object is used as a base
1059 * for some more deltas.
1061 static void resolve_deltas(void)
1068 /* Sort deltas by base SHA1/offset for fast searching */
1069 qsort(deltas, nr_deltas, sizeof(struct delta_entry),
1070 compare_delta_entry);
1073 progress = start_progress(_("Resolving deltas"), nr_deltas);
1077 if (nr_threads > 1 || getenv("GIT_FORCE_THREADS")) {
1079 for (i = 0; i < nr_threads; i++) {
1080 int ret = pthread_create(&thread_data[i].thread, NULL,
1081 threaded_second_pass, thread_data + i);
1083 die(_("unable to create thread: %s"),
1086 for (i = 0; i < nr_threads; i++)
1087 pthread_join(thread_data[i].thread, NULL);
1093 for (i = 0; i < nr_objects; i++) {
1094 struct object_entry *obj = &objects[i];
1096 if (is_delta_type(obj->type))
1099 display_progress(progress, nr_resolved_deltas);
1105 * - append objects to convert thin pack to full pack if required
1106 * - write the final 20-byte SHA-1
1108 static void fix_unresolved_deltas(struct sha1file *f, int nr_unresolved);
1109 static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned char *pack_sha1)
1111 if (nr_deltas == nr_resolved_deltas) {
1112 stop_progress(&progress);
1113 /* Flush remaining pack final 20-byte SHA1. */
1118 if (fix_thin_pack) {
1120 unsigned char read_sha1[20], tail_sha1[20];
1121 struct strbuf msg = STRBUF_INIT;
1122 int nr_unresolved = nr_deltas - nr_resolved_deltas;
1123 int nr_objects_initial = nr_objects;
1124 if (nr_unresolved <= 0)
1125 die(_("confusion beyond insanity"));
1126 objects = xrealloc(objects,
1127 (nr_objects + nr_unresolved + 1)
1128 * sizeof(*objects));
1129 memset(objects + nr_objects + 1, 0,
1130 nr_unresolved * sizeof(*objects));
1131 f = sha1fd(output_fd, curr_pack);
1132 fix_unresolved_deltas(f, nr_unresolved);
1133 strbuf_addf(&msg, _("completed with %d local objects"),
1134 nr_objects - nr_objects_initial);
1135 stop_progress_msg(&progress, msg.buf);
1136 strbuf_release(&msg);
1137 sha1close(f, tail_sha1, 0);
1138 hashcpy(read_sha1, pack_sha1);
1139 fixup_pack_header_footer(output_fd, pack_sha1,
1140 curr_pack, nr_objects,
1141 read_sha1, consumed_bytes-20);
1142 if (hashcmp(read_sha1, tail_sha1) != 0)
1143 die(_("Unexpected tail checksum for %s "
1144 "(disk corruption?)"), curr_pack);
1146 if (nr_deltas != nr_resolved_deltas)
1147 die(Q_("pack has %d unresolved delta",
1148 "pack has %d unresolved deltas",
1149 nr_deltas - nr_resolved_deltas),
1150 nr_deltas - nr_resolved_deltas);
1153 static int write_compressed(struct sha1file *f, void *in, unsigned int size)
1157 unsigned char outbuf[4096];
1159 memset(&stream, 0, sizeof(stream));
1160 git_deflate_init(&stream, zlib_compression_level);
1161 stream.next_in = in;
1162 stream.avail_in = size;
1165 stream.next_out = outbuf;
1166 stream.avail_out = sizeof(outbuf);
1167 status = git_deflate(&stream, Z_FINISH);
1168 sha1write(f, outbuf, sizeof(outbuf) - stream.avail_out);
1169 } while (status == Z_OK);
1171 if (status != Z_STREAM_END)
1172 die(_("unable to deflate appended object (%d)"), status);
1173 size = stream.total_out;
1174 git_deflate_end(&stream);
1178 static struct object_entry *append_obj_to_pack(struct sha1file *f,
1179 const unsigned char *sha1, void *buf,
1180 unsigned long size, enum object_type type)
1182 struct object_entry *obj = &objects[nr_objects++];
1183 unsigned char header[10];
1184 unsigned long s = size;
1186 unsigned char c = (type << 4) | (s & 15);
1189 header[n++] = c | 0x80;
1195 sha1write(f, header, n);
1197 obj[0].hdr_size = n;
1199 obj[0].real_type = type;
1200 obj[1].idx.offset = obj[0].idx.offset + n;
1201 obj[1].idx.offset += write_compressed(f, buf, size);
1202 obj[0].idx.crc32 = crc32_end(f);
1204 hashcpy(obj->idx.sha1, sha1);
1208 static int delta_pos_compare(const void *_a, const void *_b)
1210 struct delta_entry *a = *(struct delta_entry **)_a;
1211 struct delta_entry *b = *(struct delta_entry **)_b;
1212 return a->obj_no - b->obj_no;
1215 static void fix_unresolved_deltas(struct sha1file *f, int nr_unresolved)
1217 struct delta_entry **sorted_by_pos;
1221 * Since many unresolved deltas may well be themselves base objects
1222 * for more unresolved deltas, we really want to include the
1223 * smallest number of base objects that would cover as much delta
1224 * as possible by picking the
1225 * trunc deltas first, allowing for other deltas to resolve without
1226 * additional base objects. Since most base objects are to be found
1227 * before deltas depending on them, a good heuristic is to start
1228 * resolving deltas in the same order as their position in the pack.
1230 sorted_by_pos = xmalloc(nr_unresolved * sizeof(*sorted_by_pos));
1231 for (i = 0; i < nr_deltas; i++) {
1232 if (objects[deltas[i].obj_no].real_type != OBJ_REF_DELTA)
1234 sorted_by_pos[n++] = &deltas[i];
1236 qsort(sorted_by_pos, n, sizeof(*sorted_by_pos), delta_pos_compare);
1238 for (i = 0; i < n; i++) {
1239 struct delta_entry *d = sorted_by_pos[i];
1240 enum object_type type;
1241 struct base_data *base_obj = alloc_base_data();
1243 if (objects[d->obj_no].real_type != OBJ_REF_DELTA)
1245 base_obj->data = read_sha1_file(d->base.sha1, &type, &base_obj->size);
1246 if (!base_obj->data)
1249 if (check_sha1_signature(d->base.sha1, base_obj->data,
1250 base_obj->size, typename(type)))
1251 die(_("local object %s is corrupt"), sha1_to_hex(d->base.sha1));
1252 base_obj->obj = append_obj_to_pack(f, d->base.sha1,
1253 base_obj->data, base_obj->size, type);
1254 find_unresolved_deltas(base_obj);
1255 display_progress(progress, nr_resolved_deltas);
1257 free(sorted_by_pos);
1260 static void final(const char *final_pack_name, const char *curr_pack_name,
1261 const char *final_index_name, const char *curr_index_name,
1262 const char *keep_name, const char *keep_msg,
1263 unsigned char *sha1)
1265 const char *report = "pack";
1266 char name[PATH_MAX];
1272 fsync_or_die(output_fd, curr_pack_name);
1273 err = close(output_fd);
1275 die_errno(_("error while closing pack file"));
1279 int keep_fd, keep_msg_len = strlen(keep_msg);
1282 keep_fd = odb_pack_keep(name, sizeof(name), sha1);
1284 keep_fd = open(keep_name, O_RDWR|O_CREAT|O_EXCL, 0600);
1287 if (errno != EEXIST)
1288 die_errno(_("cannot write keep file '%s'"),
1291 if (keep_msg_len > 0) {
1292 write_or_die(keep_fd, keep_msg, keep_msg_len);
1293 write_or_die(keep_fd, "\n", 1);
1295 if (close(keep_fd) != 0)
1296 die_errno(_("cannot close written keep file '%s'"),
1302 if (final_pack_name != curr_pack_name) {
1303 if (!final_pack_name) {
1304 snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
1305 get_object_directory(), sha1_to_hex(sha1));
1306 final_pack_name = name;
1308 if (move_temp_to_file(curr_pack_name, final_pack_name))
1309 die(_("cannot store pack file"));
1310 } else if (from_stdin)
1311 chmod(final_pack_name, 0444);
1313 if (final_index_name != curr_index_name) {
1314 if (!final_index_name) {
1315 snprintf(name, sizeof(name), "%s/pack/pack-%s.idx",
1316 get_object_directory(), sha1_to_hex(sha1));
1317 final_index_name = name;
1319 if (move_temp_to_file(curr_index_name, final_index_name))
1320 die(_("cannot store index file"));
1322 chmod(final_index_name, 0444);
1325 printf("%s\n", sha1_to_hex(sha1));
1328 int len = snprintf(buf, sizeof(buf), "%s\t%s\n",
1329 report, sha1_to_hex(sha1));
1330 write_or_die(1, buf, len);
1333 * Let's just mimic git-unpack-objects here and write
1334 * the last part of the input buffer to stdout.
1337 err = xwrite(1, input_buffer + input_offset, input_len);
1341 input_offset += err;
1346 static int git_index_pack_config(const char *k, const char *v, void *cb)
1348 struct pack_idx_option *opts = cb;
1350 if (!strcmp(k, "pack.indexversion")) {
1351 opts->version = git_config_int(k, v);
1352 if (opts->version > 2)
1353 die(_("bad pack.indexversion=%"PRIu32), opts->version);
1356 if (!strcmp(k, "pack.threads")) {
1357 nr_threads = git_config_int(k, v);
1359 die(_("invalid number of threads specified (%d)"),
1362 if (nr_threads != 1)
1363 warning(_("no threads support, ignoring %s"), k);
1368 return git_default_config(k, v, cb);
1371 static int cmp_uint32(const void *a_, const void *b_)
1373 uint32_t a = *((uint32_t *)a_);
1374 uint32_t b = *((uint32_t *)b_);
1376 return (a < b) ? -1 : (a != b);
1379 static void read_v2_anomalous_offsets(struct packed_git *p,
1380 struct pack_idx_option *opts)
1382 const uint32_t *idx1, *idx2;
1385 /* The address of the 4-byte offset table */
1386 idx1 = (((const uint32_t *)p->index_data)
1387 + 2 /* 8-byte header */
1389 + 5 * p->num_objects /* 20-byte SHA-1 table */
1390 + p->num_objects /* CRC32 table */
1393 /* The address of the 8-byte offset table */
1394 idx2 = idx1 + p->num_objects;
1396 for (i = 0; i < p->num_objects; i++) {
1397 uint32_t off = ntohl(idx1[i]);
1398 if (!(off & 0x80000000))
1400 off = off & 0x7fffffff;
1404 * The real offset is ntohl(idx2[off * 2]) in high 4
1405 * octets, and ntohl(idx2[off * 2 + 1]) in low 4
1406 * octets. But idx2[off * 2] is Zero!!!
1408 ALLOC_GROW(opts->anomaly, opts->anomaly_nr + 1, opts->anomaly_alloc);
1409 opts->anomaly[opts->anomaly_nr++] = ntohl(idx2[off * 2 + 1]);
1412 if (1 < opts->anomaly_nr)
1413 qsort(opts->anomaly, opts->anomaly_nr, sizeof(uint32_t), cmp_uint32);
1416 static void read_idx_option(struct pack_idx_option *opts, const char *pack_name)
1418 struct packed_git *p = add_packed_git(pack_name, strlen(pack_name), 1);
1421 die(_("Cannot open existing pack file '%s'"), pack_name);
1422 if (open_pack_index(p))
1423 die(_("Cannot open existing pack idx file for '%s'"), pack_name);
1425 /* Read the attributes from the existing idx file */
1426 opts->version = p->index_version;
1428 if (opts->version == 2)
1429 read_v2_anomalous_offsets(p, opts);
1432 * Get rid of the idx file as we do not need it anymore.
1433 * NEEDSWORK: extract this bit from free_pack_by_name() in
1434 * sha1_file.c, perhaps? It shouldn't matter very much as we
1435 * know we haven't installed this pack (hence we never have
1436 * read anything from it).
1438 close_pack_index(p);
1442 static void show_pack_info(int stat_only)
1444 int i, baseobjects = nr_objects - nr_deltas;
1445 unsigned long *chain_histogram = NULL;
1448 chain_histogram = xcalloc(deepest_delta, sizeof(unsigned long));
1450 for (i = 0; i < nr_objects; i++) {
1451 struct object_entry *obj = &objects[i];
1453 if (is_delta_type(obj->type))
1454 chain_histogram[obj->delta_depth - 1]++;
1457 printf("%s %-6s %lu %lu %"PRIuMAX,
1458 sha1_to_hex(obj->idx.sha1),
1459 typename(obj->real_type), obj->size,
1460 (unsigned long)(obj[1].idx.offset - obj->idx.offset),
1461 (uintmax_t)obj->idx.offset);
1462 if (is_delta_type(obj->type)) {
1463 struct object_entry *bobj = &objects[obj->base_object_no];
1464 printf(" %u %s", obj->delta_depth, sha1_to_hex(bobj->idx.sha1));
1470 printf_ln(Q_("non delta: %d object",
1471 "non delta: %d objects",
1474 for (i = 0; i < deepest_delta; i++) {
1475 if (!chain_histogram[i])
1477 printf_ln(Q_("chain length = %d: %lu object",
1478 "chain length = %d: %lu objects",
1479 chain_histogram[i]),
1481 chain_histogram[i]);
1485 int cmd_index_pack(int argc, const char **argv, const char *prefix)
1487 int i, fix_thin_pack = 0, verify = 0, stat_only = 0;
1488 const char *curr_pack, *curr_index;
1489 const char *index_name = NULL, *pack_name = NULL;
1490 const char *keep_name = NULL, *keep_msg = NULL;
1491 char *index_name_buf = NULL, *keep_name_buf = NULL;
1492 struct pack_idx_entry **idx_objects;
1493 struct pack_idx_option opts;
1494 unsigned char pack_sha1[20];
1496 if (argc == 2 && !strcmp(argv[1], "-h"))
1497 usage(index_pack_usage);
1499 read_replace_refs = 0;
1501 reset_pack_idx_option(&opts);
1502 git_config(git_index_pack_config, &opts);
1503 if (prefix && chdir(prefix))
1504 die(_("Cannot come back to cwd"));
1506 for (i = 1; i < argc; i++) {
1507 const char *arg = argv[i];
1510 if (!strcmp(arg, "--stdin")) {
1512 } else if (!strcmp(arg, "--fix-thin")) {
1514 } else if (!strcmp(arg, "--strict")) {
1516 } else if (!strcmp(arg, "--verify")) {
1518 } else if (!strcmp(arg, "--verify-stat")) {
1521 } else if (!strcmp(arg, "--verify-stat-only")) {
1525 } else if (!strcmp(arg, "--keep")) {
1527 } else if (!prefixcmp(arg, "--keep=")) {
1529 } else if (!prefixcmp(arg, "--threads=")) {
1531 nr_threads = strtoul(arg+10, &end, 0);
1532 if (!arg[10] || *end || nr_threads < 0)
1533 usage(index_pack_usage);
1535 if (nr_threads != 1)
1536 warning(_("no threads support, "
1537 "ignoring %s"), arg);
1540 } else if (!prefixcmp(arg, "--pack_header=")) {
1541 struct pack_header *hdr;
1544 hdr = (struct pack_header *)input_buffer;
1545 hdr->hdr_signature = htonl(PACK_SIGNATURE);
1546 hdr->hdr_version = htonl(strtoul(arg + 14, &c, 10));
1548 die(_("bad %s"), arg);
1549 hdr->hdr_entries = htonl(strtoul(c + 1, &c, 10));
1551 die(_("bad %s"), arg);
1552 input_len = sizeof(*hdr);
1553 } else if (!strcmp(arg, "-v")) {
1555 } else if (!strcmp(arg, "-o")) {
1556 if (index_name || (i+1) >= argc)
1557 usage(index_pack_usage);
1558 index_name = argv[++i];
1559 } else if (!prefixcmp(arg, "--index-version=")) {
1561 opts.version = strtoul(arg + 16, &c, 10);
1562 if (opts.version > 2)
1563 die(_("bad %s"), arg);
1565 opts.off32_limit = strtoul(c+1, &c, 0);
1566 if (*c || opts.off32_limit & 0x80000000)
1567 die(_("bad %s"), arg);
1569 usage(index_pack_usage);
1574 usage(index_pack_usage);
1578 if (!pack_name && !from_stdin)
1579 usage(index_pack_usage);
1580 if (fix_thin_pack && !from_stdin)
1581 die(_("--fix-thin cannot be used without --stdin"));
1582 if (!index_name && pack_name) {
1583 int len = strlen(pack_name);
1584 if (!has_extension(pack_name, ".pack"))
1585 die(_("packfile name '%s' does not end with '.pack'"),
1587 index_name_buf = xmalloc(len);
1588 memcpy(index_name_buf, pack_name, len - 5);
1589 strcpy(index_name_buf + len - 5, ".idx");
1590 index_name = index_name_buf;
1592 if (keep_msg && !keep_name && pack_name) {
1593 int len = strlen(pack_name);
1594 if (!has_extension(pack_name, ".pack"))
1595 die(_("packfile name '%s' does not end with '.pack'"),
1597 keep_name_buf = xmalloc(len);
1598 memcpy(keep_name_buf, pack_name, len - 5);
1599 strcpy(keep_name_buf + len - 5, ".keep");
1600 keep_name = keep_name_buf;
1604 die(_("--verify with no packfile name given"));
1605 read_idx_option(&opts, index_name);
1606 opts.flags |= WRITE_IDX_VERIFY | WRITE_IDX_STRICT;
1609 opts.flags |= WRITE_IDX_STRICT;
1613 nr_threads = online_cpus();
1614 /* An experiment showed that more threads does not mean faster */
1620 curr_pack = open_pack_file(pack_name);
1621 parse_pack_header();
1622 objects = xcalloc(nr_objects + 1, sizeof(struct object_entry));
1623 deltas = xcalloc(nr_objects, sizeof(struct delta_entry));
1624 parse_pack_objects(pack_sha1);
1626 conclude_pack(fix_thin_pack, curr_pack, pack_sha1);
1632 show_pack_info(stat_only);
1634 idx_objects = xmalloc((nr_objects) * sizeof(struct pack_idx_entry *));
1635 for (i = 0; i < nr_objects; i++)
1636 idx_objects[i] = &objects[i].idx;
1637 curr_index = write_idx_file(index_name, idx_objects, nr_objects, &opts, pack_sha1);
1641 final(pack_name, curr_pack,
1642 index_name, curr_index,
1643 keep_name, keep_msg,
1648 free(index_name_buf);
1649 free(keep_name_buf);
1650 if (pack_name == NULL)
1651 free((void *) curr_pack);
1652 if (index_name == NULL)
1653 free((void *) curr_index);