13 #include "streaming.h"
14 #include "thread-utils.h"
17 static const char index_pack_usage[] =
18 "git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
21 struct pack_idx_entry idx;
23 unsigned char hdr_size;
25 signed char real_type;
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;
47 struct base_data *base_cache;
48 size_t base_cache_used;
52 #define FLAG_LINK (1u<<20)
53 #define FLAG_CHECKED (1u<<21)
55 struct ofs_delta_entry {
60 struct ref_delta_entry {
61 unsigned char sha1[20];
65 static struct object_entry *objects;
66 static struct object_stat *obj_stat;
67 static struct ofs_delta_entry *ofs_deltas;
68 static struct ref_delta_entry *ref_deltas;
69 static struct thread_local nothread_data;
70 static int nr_objects;
71 static int nr_ofs_deltas;
72 static int nr_ref_deltas;
73 static int ref_deltas_alloc;
74 static int nr_resolved_deltas;
75 static int nr_threads;
77 static int from_stdin;
79 static int do_fsck_object;
80 static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT;
82 static int show_resolving_progress;
84 static int check_self_contained_and_connected;
86 static struct progress *progress;
88 /* We always read in 4kB chunks. */
89 static unsigned char input_buffer[4096];
90 static unsigned int input_offset, input_len;
91 static off_t consumed_bytes;
92 static off_t max_input_size;
93 static unsigned deepest_delta;
94 static git_SHA_CTX input_ctx;
95 static uint32_t input_crc32;
96 static int input_fd, output_fd;
97 static const char *curr_pack;
101 static struct thread_local *thread_data;
102 static int nr_dispatched;
103 static int threads_active;
105 static pthread_mutex_t read_mutex;
106 #define read_lock() lock_mutex(&read_mutex)
107 #define read_unlock() unlock_mutex(&read_mutex)
109 static pthread_mutex_t counter_mutex;
110 #define counter_lock() lock_mutex(&counter_mutex)
111 #define counter_unlock() unlock_mutex(&counter_mutex)
113 static pthread_mutex_t work_mutex;
114 #define work_lock() lock_mutex(&work_mutex)
115 #define work_unlock() unlock_mutex(&work_mutex)
117 static pthread_mutex_t deepest_delta_mutex;
118 #define deepest_delta_lock() lock_mutex(&deepest_delta_mutex)
119 #define deepest_delta_unlock() unlock_mutex(&deepest_delta_mutex)
121 static pthread_mutex_t type_cas_mutex;
122 #define type_cas_lock() lock_mutex(&type_cas_mutex)
123 #define type_cas_unlock() unlock_mutex(&type_cas_mutex)
125 static pthread_key_t key;
127 static inline void lock_mutex(pthread_mutex_t *mutex)
130 pthread_mutex_lock(mutex);
133 static inline void unlock_mutex(pthread_mutex_t *mutex)
136 pthread_mutex_unlock(mutex);
140 * Mutex and conditional variable can't be statically-initialized on Windows.
142 static void init_thread(void)
145 init_recursive_mutex(&read_mutex);
146 pthread_mutex_init(&counter_mutex, NULL);
147 pthread_mutex_init(&work_mutex, NULL);
148 pthread_mutex_init(&type_cas_mutex, NULL);
150 pthread_mutex_init(&deepest_delta_mutex, NULL);
151 pthread_key_create(&key, NULL);
152 thread_data = xcalloc(nr_threads, sizeof(*thread_data));
153 for (i = 0; i < nr_threads; i++) {
154 thread_data[i].pack_fd = open(curr_pack, O_RDONLY);
155 if (thread_data[i].pack_fd == -1)
156 die_errno(_("unable to open %s"), curr_pack);
162 static void cleanup_thread(void)
168 pthread_mutex_destroy(&read_mutex);
169 pthread_mutex_destroy(&counter_mutex);
170 pthread_mutex_destroy(&work_mutex);
171 pthread_mutex_destroy(&type_cas_mutex);
173 pthread_mutex_destroy(&deepest_delta_mutex);
174 for (i = 0; i < nr_threads; i++)
175 close(thread_data[i].pack_fd);
176 pthread_key_delete(key);
183 #define read_unlock()
185 #define counter_lock()
186 #define counter_unlock()
189 #define work_unlock()
191 #define deepest_delta_lock()
192 #define deepest_delta_unlock()
194 #define type_cas_lock()
195 #define type_cas_unlock()
200 static int mark_link(struct object *obj, int type, void *data, struct fsck_options *options)
205 if (type != OBJ_ANY && obj->type != type)
206 die(_("object type mismatch at %s"), oid_to_hex(&obj->oid));
208 obj->flags |= FLAG_LINK;
212 /* The content of each linked object must have been checked
213 or it must be already present in the object database */
214 static unsigned check_object(struct object *obj)
219 if (!(obj->flags & FLAG_LINK))
222 if (!(obj->flags & FLAG_CHECKED)) {
224 int type = sha1_object_info(obj->oid.hash, &size);
226 die(_("did not receive expected object %s"),
227 oid_to_hex(&obj->oid));
228 if (type != obj->type)
229 die(_("object %s: expected type %s, found %s"),
230 oid_to_hex(&obj->oid),
231 typename(obj->type), typename(type));
232 obj->flags |= FLAG_CHECKED;
239 static unsigned check_objects(void)
241 unsigned i, max, foreign_nr = 0;
243 max = get_max_object_index();
244 for (i = 0; i < max; i++)
245 foreign_nr += check_object(get_indexed_object(i));
250 /* Discard current buffer used content. */
251 static void flush(void)
255 write_or_die(output_fd, input_buffer, input_offset);
256 git_SHA1_Update(&input_ctx, input_buffer, input_offset);
257 memmove(input_buffer, input_buffer + input_offset, input_len);
263 * Make sure at least "min" bytes are available in the buffer, and
264 * return the pointer to the buffer.
266 static void *fill(int min)
268 if (min <= input_len)
269 return input_buffer + input_offset;
270 if (min > sizeof(input_buffer))
271 die(Q_("cannot fill %d byte",
272 "cannot fill %d bytes",
277 ssize_t ret = xread(input_fd, input_buffer + input_len,
278 sizeof(input_buffer) - input_len);
282 die_errno(_("read error on input"));
286 display_throughput(progress, consumed_bytes + input_len);
287 } while (input_len < min);
291 static void use(int bytes)
293 if (bytes > input_len)
294 die(_("used more bytes than were available"));
295 input_crc32 = crc32(input_crc32, input_buffer + input_offset, bytes);
297 input_offset += bytes;
299 /* make sure off_t is sufficiently large not to wrap */
300 if (signed_add_overflows(consumed_bytes, bytes))
301 die(_("pack too large for current definition of off_t"));
302 consumed_bytes += bytes;
303 if (max_input_size && consumed_bytes > max_input_size)
304 die(_("pack exceeds maximum allowed size"));
307 static const char *open_pack_file(const char *pack_name)
312 struct strbuf tmp_file = STRBUF_INIT;
313 output_fd = odb_mkstemp(&tmp_file,
314 "pack/tmp_pack_XXXXXX");
315 pack_name = strbuf_detach(&tmp_file, NULL);
317 output_fd = open(pack_name, O_CREAT|O_EXCL|O_RDWR, 0600);
319 die_errno(_("unable to create '%s'"), pack_name);
321 nothread_data.pack_fd = output_fd;
323 input_fd = open(pack_name, O_RDONLY);
325 die_errno(_("cannot open packfile '%s'"), pack_name);
327 nothread_data.pack_fd = input_fd;
329 git_SHA1_Init(&input_ctx);
333 static void parse_pack_header(void)
335 struct pack_header *hdr = fill(sizeof(struct pack_header));
337 /* Header consistency check */
338 if (hdr->hdr_signature != htonl(PACK_SIGNATURE))
339 die(_("pack signature mismatch"));
340 if (!pack_version_ok(hdr->hdr_version))
341 die(_("pack version %"PRIu32" unsupported"),
342 ntohl(hdr->hdr_version));
344 nr_objects = ntohl(hdr->hdr_entries);
345 use(sizeof(struct pack_header));
348 static NORETURN void bad_object(off_t offset, const char *format,
349 ...) __attribute__((format (printf, 2, 3)));
351 static NORETURN void bad_object(off_t offset, const char *format, ...)
356 va_start(params, format);
357 vsnprintf(buf, sizeof(buf), format, params);
359 die(_("pack has bad object at offset %"PRIuMAX": %s"),
360 (uintmax_t)offset, buf);
363 static inline struct thread_local *get_thread_data(void)
367 return pthread_getspecific(key);
368 assert(!threads_active &&
369 "This should only be reached when all threads are gone");
371 return ¬hread_data;
375 static void set_thread_data(struct thread_local *data)
378 pthread_setspecific(key, data);
382 static struct base_data *alloc_base_data(void)
384 struct base_data *base = xcalloc(1, sizeof(struct base_data));
390 static void free_base_data(struct base_data *c)
393 FREE_AND_NULL(c->data);
394 get_thread_data()->base_cache_used -= c->size;
398 static void prune_base_data(struct base_data *retain)
401 struct thread_local *data = get_thread_data();
402 for (b = data->base_cache;
403 data->base_cache_used > delta_base_cache_limit && b;
405 if (b->data && b != retain)
410 static void link_base_data(struct base_data *base, struct base_data *c)
415 get_thread_data()->base_cache = c;
420 get_thread_data()->base_cache_used += c->size;
424 static void unlink_base_data(struct base_data *c)
426 struct base_data *base = c->base;
430 get_thread_data()->base_cache = NULL;
434 static int is_delta_type(enum object_type type)
436 return (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA);
439 static void *unpack_entry_data(off_t offset, unsigned long size,
440 enum object_type type, unsigned char *sha1)
442 static char fixed_buf[8192];
450 if (!is_delta_type(type)) {
451 hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", typename(type), size) + 1;
453 git_SHA1_Update(&c, hdr, hdrlen);
456 if (type == OBJ_BLOB && size > big_file_threshold)
459 buf = xmallocz(size);
461 memset(&stream, 0, sizeof(stream));
462 git_inflate_init(&stream);
463 stream.next_out = buf;
464 stream.avail_out = buf == fixed_buf ? sizeof(fixed_buf) : size;
467 unsigned char *last_out = stream.next_out;
468 stream.next_in = fill(1);
469 stream.avail_in = input_len;
470 status = git_inflate(&stream, 0);
471 use(input_len - stream.avail_in);
473 git_SHA1_Update(&c, last_out, stream.next_out - last_out);
474 if (buf == fixed_buf) {
475 stream.next_out = buf;
476 stream.avail_out = sizeof(fixed_buf);
478 } while (status == Z_OK);
479 if (stream.total_out != size || status != Z_STREAM_END)
480 bad_object(offset, _("inflate returned %d"), status);
481 git_inflate_end(&stream);
483 git_SHA1_Final(sha1, &c);
484 return buf == fixed_buf ? NULL : buf;
487 static void *unpack_raw_entry(struct object_entry *obj,
489 unsigned char *ref_sha1,
493 unsigned long size, c;
498 obj->idx.offset = consumed_bytes;
499 input_crc32 = crc32(0, NULL, 0);
504 obj->type = (c >> 4) & 7;
511 size += (c & 0x7f) << shift;
518 hashcpy(ref_sha1, fill(20));
525 base_offset = c & 127;
528 if (!base_offset || MSB(base_offset, 7))
529 bad_object(obj->idx.offset, _("offset value overflow for delta base object"));
533 base_offset = (base_offset << 7) + (c & 127);
535 *ofs_offset = obj->idx.offset - base_offset;
536 if (*ofs_offset <= 0 || *ofs_offset >= obj->idx.offset)
537 bad_object(obj->idx.offset, _("delta base offset is out of bound"));
545 bad_object(obj->idx.offset, _("unknown object type %d"), obj->type);
547 obj->hdr_size = consumed_bytes - obj->idx.offset;
549 data = unpack_entry_data(obj->idx.offset, obj->size, obj->type, sha1);
550 obj->idx.crc32 = input_crc32;
554 static void *unpack_data(struct object_entry *obj,
555 int (*consume)(const unsigned char *, unsigned long, void *),
558 off_t from = obj[0].idx.offset + obj[0].hdr_size;
559 off_t len = obj[1].idx.offset - from;
560 unsigned char *data, *inbuf;
564 data = xmallocz(consume ? 64*1024 : obj->size);
565 inbuf = xmalloc((len < 64*1024) ? (int)len : 64*1024);
567 memset(&stream, 0, sizeof(stream));
568 git_inflate_init(&stream);
569 stream.next_out = data;
570 stream.avail_out = consume ? 64*1024 : obj->size;
573 ssize_t n = (len < 64*1024) ? (ssize_t)len : 64*1024;
574 n = xpread(get_thread_data()->pack_fd, inbuf, n, from);
576 die_errno(_("cannot pread pack file"));
578 die(Q_("premature end of pack file, %"PRIuMAX" byte missing",
579 "premature end of pack file, %"PRIuMAX" bytes missing",
584 stream.next_in = inbuf;
587 status = git_inflate(&stream, 0);
590 status = git_inflate(&stream, 0);
591 if (consume(data, stream.next_out - data, cb_data)) {
596 stream.next_out = data;
597 stream.avail_out = 64*1024;
598 } while (status == Z_OK && stream.avail_in);
600 } while (len && status == Z_OK && !stream.avail_in);
602 /* This has been inflated OK when first encountered, so... */
603 if (status != Z_STREAM_END || stream.total_out != obj->size)
604 die(_("serious inflate inconsistency"));
606 git_inflate_end(&stream);
614 static void *get_data_from_pack(struct object_entry *obj)
616 return unpack_data(obj, NULL, NULL);
619 static int compare_ofs_delta_bases(off_t offset1, off_t offset2,
620 enum object_type type1,
621 enum object_type type2)
623 int cmp = type1 - type2;
626 return offset1 < offset2 ? -1 :
627 offset1 > offset2 ? 1 :
631 static int find_ofs_delta(const off_t offset, enum object_type type)
633 int first = 0, last = nr_ofs_deltas;
635 while (first < last) {
636 int next = first + (last - first) / 2;
637 struct ofs_delta_entry *delta = &ofs_deltas[next];
640 cmp = compare_ofs_delta_bases(offset, delta->offset,
641 type, objects[delta->obj_no].type);
653 static void find_ofs_delta_children(off_t offset,
654 int *first_index, int *last_index,
655 enum object_type type)
657 int first = find_ofs_delta(offset, type);
659 int end = nr_ofs_deltas - 1;
666 while (first > 0 && ofs_deltas[first - 1].offset == offset)
668 while (last < end && ofs_deltas[last + 1].offset == offset)
670 *first_index = first;
674 static int compare_ref_delta_bases(const unsigned char *sha1,
675 const unsigned char *sha2,
676 enum object_type type1,
677 enum object_type type2)
679 int cmp = type1 - type2;
682 return hashcmp(sha1, sha2);
685 static int find_ref_delta(const unsigned char *sha1, enum object_type type)
687 int first = 0, last = nr_ref_deltas;
689 while (first < last) {
690 int next = first + (last - first) / 2;
691 struct ref_delta_entry *delta = &ref_deltas[next];
694 cmp = compare_ref_delta_bases(sha1, delta->sha1,
695 type, objects[delta->obj_no].type);
707 static void find_ref_delta_children(const unsigned char *sha1,
708 int *first_index, int *last_index,
709 enum object_type type)
711 int first = find_ref_delta(sha1, type);
713 int end = nr_ref_deltas - 1;
720 while (first > 0 && !hashcmp(ref_deltas[first - 1].sha1, sha1))
722 while (last < end && !hashcmp(ref_deltas[last + 1].sha1, sha1))
724 *first_index = first;
728 struct compare_data {
729 struct object_entry *entry;
730 struct git_istream *st;
732 unsigned long buf_size;
735 static int compare_objects(const unsigned char *buf, unsigned long size,
738 struct compare_data *data = cb_data;
740 if (data->buf_size < size) {
742 data->buf = xmalloc(size);
743 data->buf_size = size;
747 ssize_t len = read_istream(data->st, data->buf, size);
749 die(_("SHA1 COLLISION FOUND WITH %s !"),
750 oid_to_hex(&data->entry->idx.oid));
752 die(_("unable to read %s"),
753 oid_to_hex(&data->entry->idx.oid));
754 if (memcmp(buf, data->buf, len))
755 die(_("SHA1 COLLISION FOUND WITH %s !"),
756 oid_to_hex(&data->entry->idx.oid));
763 static int check_collison(struct object_entry *entry)
765 struct compare_data data;
766 enum object_type type;
769 if (entry->size <= big_file_threshold || entry->type != OBJ_BLOB)
772 memset(&data, 0, sizeof(data));
774 data.st = open_istream(entry->idx.oid.hash, &type, &size, NULL);
777 if (size != entry->size || type != entry->type)
778 die(_("SHA1 COLLISION FOUND WITH %s !"),
779 oid_to_hex(&entry->idx.oid));
780 unpack_data(entry, compare_objects, &data);
781 close_istream(data.st);
786 static void sha1_object(const void *data, struct object_entry *obj_entry,
787 unsigned long size, enum object_type type,
788 const struct object_id *oid)
790 void *new_data = NULL;
791 int collision_test_needed = 0;
793 assert(data || obj_entry);
795 if (startup_info->have_repository) {
797 collision_test_needed =
798 has_sha1_file_with_flags(oid->hash, OBJECT_INFO_QUICK);
802 if (collision_test_needed && !data) {
804 if (!check_collison(obj_entry))
805 collision_test_needed = 0;
808 if (collision_test_needed) {
810 enum object_type has_type;
811 unsigned long has_size;
813 has_type = sha1_object_info(oid->hash, &has_size);
815 die(_("cannot read existing object info %s"), oid_to_hex(oid));
816 if (has_type != type || has_size != size)
817 die(_("SHA1 COLLISION FOUND WITH %s !"), oid_to_hex(oid));
818 has_data = read_sha1_file(oid->hash, &has_type, &has_size);
821 data = new_data = get_data_from_pack(obj_entry);
823 die(_("cannot read existing object %s"), oid_to_hex(oid));
824 if (size != has_size || type != has_type ||
825 memcmp(data, has_data, size) != 0)
826 die(_("SHA1 COLLISION FOUND WITH %s !"), oid_to_hex(oid));
832 if (type == OBJ_BLOB) {
833 struct blob *blob = lookup_blob(oid);
835 blob->object.flags |= FLAG_CHECKED;
837 die(_("invalid blob object %s"), oid_to_hex(oid));
841 void *buf = (void *) data;
843 assert(data && "data can only be NULL for large _blobs_");
846 * we do not need to free the memory here, as the
847 * buf is deleted by the caller.
849 obj = parse_object_buffer(oid, type, size, buf,
852 die(_("invalid %s"), typename(type));
853 if (do_fsck_object &&
854 fsck_object(obj, buf, size, &fsck_options))
855 die(_("Error in object"));
856 if (fsck_walk(obj, NULL, &fsck_options))
857 die(_("Not all child objects of %s are reachable"), oid_to_hex(&obj->oid));
859 if (obj->type == OBJ_TREE) {
860 struct tree *item = (struct tree *) obj;
864 if (obj->type == OBJ_COMMIT) {
865 struct commit *commit = (struct commit *) obj;
866 if (detach_commit_buffer(commit, NULL) != data)
867 die("BUG: parse_object_buffer transmogrified our buffer");
869 obj->flags |= FLAG_CHECKED;
878 * This function is part of find_unresolved_deltas(). There are two
879 * walkers going in the opposite ways.
881 * The first one in find_unresolved_deltas() traverses down from
882 * parent node to children, deflating nodes along the way. However,
883 * memory for deflated nodes is limited by delta_base_cache_limit, so
884 * at some point parent node's deflated content may be freed.
886 * The second walker is this function, which goes from current node up
887 * to top parent if necessary to deflate the node. In normal
888 * situation, its parent node would be already deflated, so it just
889 * needs to apply delta.
891 * In the worst case scenario, parent node is no longer deflated because
892 * we're running out of delta_base_cache_limit; we need to re-deflate
893 * parents, possibly up to the top base.
895 * All deflated objects here are subject to be freed if we exceed
896 * delta_base_cache_limit, just like in find_unresolved_deltas(), we
897 * just need to make sure the last node is not freed.
899 static void *get_base_data(struct base_data *c)
902 struct object_entry *obj = c->obj;
903 struct base_data **delta = NULL;
904 int delta_nr = 0, delta_alloc = 0;
906 while (is_delta_type(c->obj->type) && !c->data) {
907 ALLOC_GROW(delta, delta_nr + 1, delta_alloc);
908 delta[delta_nr++] = c;
912 c->data = get_data_from_pack(obj);
914 get_thread_data()->base_cache_used += c->size;
917 for (; delta_nr > 0; delta_nr--) {
919 c = delta[delta_nr - 1];
921 base = get_base_data(c->base);
922 raw = get_data_from_pack(obj);
923 c->data = patch_delta(
929 bad_object(obj->idx.offset, _("failed to apply delta"));
930 get_thread_data()->base_cache_used += c->size;
938 static void resolve_delta(struct object_entry *delta_obj,
939 struct base_data *base, struct base_data *result)
941 void *base_data, *delta_data;
944 int i = delta_obj - objects;
945 int j = base->obj - objects;
946 obj_stat[i].delta_depth = obj_stat[j].delta_depth + 1;
947 deepest_delta_lock();
948 if (deepest_delta < obj_stat[i].delta_depth)
949 deepest_delta = obj_stat[i].delta_depth;
950 deepest_delta_unlock();
951 obj_stat[i].base_object_no = j;
953 delta_data = get_data_from_pack(delta_obj);
954 base_data = get_base_data(base);
955 result->obj = delta_obj;
956 result->data = patch_delta(base_data, base->size,
957 delta_data, delta_obj->size, &result->size);
960 bad_object(delta_obj->idx.offset, _("failed to apply delta"));
961 hash_sha1_file(result->data, result->size,
962 typename(delta_obj->real_type),
963 delta_obj->idx.oid.hash);
964 sha1_object(result->data, NULL, result->size, delta_obj->real_type,
965 &delta_obj->idx.oid);
967 nr_resolved_deltas++;
972 * Standard boolean compare-and-swap: atomically check whether "*type" is
973 * "want"; if so, swap in "set" and return true. Otherwise, leave it untouched
976 static int compare_and_swap_type(signed char *type,
977 enum object_type want,
978 enum object_type set)
980 enum object_type old;
991 static struct base_data *find_unresolved_deltas_1(struct base_data *base,
992 struct base_data *prev_base)
994 if (base->ref_last == -1 && base->ofs_last == -1) {
995 find_ref_delta_children(base->obj->idx.oid.hash,
996 &base->ref_first, &base->ref_last,
999 find_ofs_delta_children(base->obj->idx.offset,
1000 &base->ofs_first, &base->ofs_last,
1003 if (base->ref_last == -1 && base->ofs_last == -1) {
1008 link_base_data(prev_base, base);
1011 if (base->ref_first <= base->ref_last) {
1012 struct object_entry *child = objects + ref_deltas[base->ref_first].obj_no;
1013 struct base_data *result = alloc_base_data();
1015 if (!compare_and_swap_type(&child->real_type, OBJ_REF_DELTA,
1016 base->obj->real_type))
1017 die("BUG: child->real_type != OBJ_REF_DELTA");
1019 resolve_delta(child, base, result);
1020 if (base->ref_first == base->ref_last && base->ofs_last == -1)
1021 free_base_data(base);
1027 if (base->ofs_first <= base->ofs_last) {
1028 struct object_entry *child = objects + ofs_deltas[base->ofs_first].obj_no;
1029 struct base_data *result = alloc_base_data();
1031 assert(child->real_type == OBJ_OFS_DELTA);
1032 child->real_type = base->obj->real_type;
1033 resolve_delta(child, base, result);
1034 if (base->ofs_first == base->ofs_last)
1035 free_base_data(base);
1041 unlink_base_data(base);
1045 static void find_unresolved_deltas(struct base_data *base)
1047 struct base_data *new_base, *prev_base = NULL;
1049 new_base = find_unresolved_deltas_1(base, prev_base);
1059 prev_base = base->base;
1064 static int compare_ofs_delta_entry(const void *a, const void *b)
1066 const struct ofs_delta_entry *delta_a = a;
1067 const struct ofs_delta_entry *delta_b = b;
1069 return delta_a->offset < delta_b->offset ? -1 :
1070 delta_a->offset > delta_b->offset ? 1 :
1074 static int compare_ref_delta_entry(const void *a, const void *b)
1076 const struct ref_delta_entry *delta_a = a;
1077 const struct ref_delta_entry *delta_b = b;
1079 return hashcmp(delta_a->sha1, delta_b->sha1);
1082 static void resolve_base(struct object_entry *obj)
1084 struct base_data *base_obj = alloc_base_data();
1085 base_obj->obj = obj;
1086 base_obj->data = NULL;
1087 find_unresolved_deltas(base_obj);
1091 static void *threaded_second_pass(void *data)
1093 set_thread_data(data);
1097 display_progress(progress, nr_resolved_deltas);
1100 while (nr_dispatched < nr_objects &&
1101 is_delta_type(objects[nr_dispatched].type))
1103 if (nr_dispatched >= nr_objects) {
1107 i = nr_dispatched++;
1110 resolve_base(&objects[i]);
1118 * - find locations of all objects;
1119 * - calculate SHA1 of all non-delta objects;
1120 * - remember base (SHA1 or offset) for all deltas.
1122 static void parse_pack_objects(unsigned char *sha1)
1124 int i, nr_delays = 0;
1125 struct ofs_delta_entry *ofs_delta = ofs_deltas;
1126 unsigned char ref_delta_sha1[20];
1130 progress = start_progress(
1131 from_stdin ? _("Receiving objects") : _("Indexing objects"),
1133 for (i = 0; i < nr_objects; i++) {
1134 struct object_entry *obj = &objects[i];
1135 void *data = unpack_raw_entry(obj, &ofs_delta->offset,
1138 obj->real_type = obj->type;
1139 if (obj->type == OBJ_OFS_DELTA) {
1141 ofs_delta->obj_no = i;
1143 } else if (obj->type == OBJ_REF_DELTA) {
1144 ALLOC_GROW(ref_deltas, nr_ref_deltas + 1, ref_deltas_alloc);
1145 hashcpy(ref_deltas[nr_ref_deltas].sha1, ref_delta_sha1);
1146 ref_deltas[nr_ref_deltas].obj_no = i;
1149 /* large blobs, check later */
1150 obj->real_type = OBJ_BAD;
1153 sha1_object(data, NULL, obj->size, obj->type,
1156 display_progress(progress, i+1);
1158 objects[i].idx.offset = consumed_bytes;
1159 stop_progress(&progress);
1161 /* Check pack integrity */
1163 git_SHA1_Final(sha1, &input_ctx);
1164 if (hashcmp(fill(20), sha1))
1165 die(_("pack is corrupted (SHA1 mismatch)"));
1168 /* If input_fd is a file, we should have reached its end now. */
1169 if (fstat(input_fd, &st))
1170 die_errno(_("cannot fstat packfile"));
1171 if (S_ISREG(st.st_mode) &&
1172 lseek(input_fd, 0, SEEK_CUR) - input_len != st.st_size)
1173 die(_("pack has junk at the end"));
1175 for (i = 0; i < nr_objects; i++) {
1176 struct object_entry *obj = &objects[i];
1177 if (obj->real_type != OBJ_BAD)
1179 obj->real_type = obj->type;
1180 sha1_object(NULL, obj, obj->size, obj->type,
1185 die(_("confusion beyond insanity in parse_pack_objects()"));
1190 * - for all non-delta objects, look if it is used as a base for
1192 * - if used as a base, uncompress the object and apply all deltas,
1193 * recursively checking if the resulting object is used as a base
1194 * for some more deltas.
1196 static void resolve_deltas(void)
1200 if (!nr_ofs_deltas && !nr_ref_deltas)
1203 /* Sort deltas by base SHA1/offset for fast searching */
1204 QSORT(ofs_deltas, nr_ofs_deltas, compare_ofs_delta_entry);
1205 QSORT(ref_deltas, nr_ref_deltas, compare_ref_delta_entry);
1207 if (verbose || show_resolving_progress)
1208 progress = start_progress(_("Resolving deltas"),
1209 nr_ref_deltas + nr_ofs_deltas);
1213 if (nr_threads > 1 || getenv("GIT_FORCE_THREADS")) {
1215 for (i = 0; i < nr_threads; i++) {
1216 int ret = pthread_create(&thread_data[i].thread, NULL,
1217 threaded_second_pass, thread_data + i);
1219 die(_("unable to create thread: %s"),
1222 for (i = 0; i < nr_threads; i++)
1223 pthread_join(thread_data[i].thread, NULL);
1229 for (i = 0; i < nr_objects; i++) {
1230 struct object_entry *obj = &objects[i];
1232 if (is_delta_type(obj->type))
1235 display_progress(progress, nr_resolved_deltas);
1241 * - append objects to convert thin pack to full pack if required
1242 * - write the final 20-byte SHA-1
1244 static void fix_unresolved_deltas(struct sha1file *f);
1245 static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned char *pack_sha1)
1247 if (nr_ref_deltas + nr_ofs_deltas == nr_resolved_deltas) {
1248 stop_progress(&progress);
1249 /* Flush remaining pack final 20-byte SHA1. */
1254 if (fix_thin_pack) {
1256 unsigned char read_sha1[20], tail_sha1[20];
1257 struct strbuf msg = STRBUF_INIT;
1258 int nr_unresolved = nr_ofs_deltas + nr_ref_deltas - nr_resolved_deltas;
1259 int nr_objects_initial = nr_objects;
1260 if (nr_unresolved <= 0)
1261 die(_("confusion beyond insanity"));
1262 REALLOC_ARRAY(objects, nr_objects + nr_unresolved + 1);
1263 memset(objects + nr_objects + 1, 0,
1264 nr_unresolved * sizeof(*objects));
1265 f = sha1fd(output_fd, curr_pack);
1266 fix_unresolved_deltas(f);
1267 strbuf_addf(&msg, Q_("completed with %d local object",
1268 "completed with %d local objects",
1269 nr_objects - nr_objects_initial),
1270 nr_objects - nr_objects_initial);
1271 stop_progress_msg(&progress, msg.buf);
1272 strbuf_release(&msg);
1273 sha1close(f, tail_sha1, 0);
1274 hashcpy(read_sha1, pack_sha1);
1275 fixup_pack_header_footer(output_fd, pack_sha1,
1276 curr_pack, nr_objects,
1277 read_sha1, consumed_bytes-20);
1278 if (hashcmp(read_sha1, tail_sha1) != 0)
1279 die(_("Unexpected tail checksum for %s "
1280 "(disk corruption?)"), curr_pack);
1282 if (nr_ofs_deltas + nr_ref_deltas != nr_resolved_deltas)
1283 die(Q_("pack has %d unresolved delta",
1284 "pack has %d unresolved deltas",
1285 nr_ofs_deltas + nr_ref_deltas - nr_resolved_deltas),
1286 nr_ofs_deltas + nr_ref_deltas - nr_resolved_deltas);
1289 static int write_compressed(struct sha1file *f, void *in, unsigned int size)
1293 unsigned char outbuf[4096];
1295 git_deflate_init(&stream, zlib_compression_level);
1296 stream.next_in = in;
1297 stream.avail_in = size;
1300 stream.next_out = outbuf;
1301 stream.avail_out = sizeof(outbuf);
1302 status = git_deflate(&stream, Z_FINISH);
1303 sha1write(f, outbuf, sizeof(outbuf) - stream.avail_out);
1304 } while (status == Z_OK);
1306 if (status != Z_STREAM_END)
1307 die(_("unable to deflate appended object (%d)"), status);
1308 size = stream.total_out;
1309 git_deflate_end(&stream);
1313 static struct object_entry *append_obj_to_pack(struct sha1file *f,
1314 const unsigned char *sha1, void *buf,
1315 unsigned long size, enum object_type type)
1317 struct object_entry *obj = &objects[nr_objects++];
1318 unsigned char header[10];
1319 unsigned long s = size;
1321 unsigned char c = (type << 4) | (s & 15);
1324 header[n++] = c | 0x80;
1330 sha1write(f, header, n);
1332 obj[0].hdr_size = n;
1334 obj[0].real_type = type;
1335 obj[1].idx.offset = obj[0].idx.offset + n;
1336 obj[1].idx.offset += write_compressed(f, buf, size);
1337 obj[0].idx.crc32 = crc32_end(f);
1339 hashcpy(obj->idx.oid.hash, sha1);
1343 static int delta_pos_compare(const void *_a, const void *_b)
1345 struct ref_delta_entry *a = *(struct ref_delta_entry **)_a;
1346 struct ref_delta_entry *b = *(struct ref_delta_entry **)_b;
1347 return a->obj_no - b->obj_no;
1350 static void fix_unresolved_deltas(struct sha1file *f)
1352 struct ref_delta_entry **sorted_by_pos;
1356 * Since many unresolved deltas may well be themselves base objects
1357 * for more unresolved deltas, we really want to include the
1358 * smallest number of base objects that would cover as much delta
1359 * as possible by picking the
1360 * trunc deltas first, allowing for other deltas to resolve without
1361 * additional base objects. Since most base objects are to be found
1362 * before deltas depending on them, a good heuristic is to start
1363 * resolving deltas in the same order as their position in the pack.
1365 ALLOC_ARRAY(sorted_by_pos, nr_ref_deltas);
1366 for (i = 0; i < nr_ref_deltas; i++)
1367 sorted_by_pos[i] = &ref_deltas[i];
1368 QSORT(sorted_by_pos, nr_ref_deltas, delta_pos_compare);
1370 for (i = 0; i < nr_ref_deltas; i++) {
1371 struct ref_delta_entry *d = sorted_by_pos[i];
1372 enum object_type type;
1373 struct base_data *base_obj = alloc_base_data();
1375 if (objects[d->obj_no].real_type != OBJ_REF_DELTA)
1377 base_obj->data = read_sha1_file(d->sha1, &type, &base_obj->size);
1378 if (!base_obj->data)
1381 if (check_sha1_signature(d->sha1, base_obj->data,
1382 base_obj->size, typename(type)))
1383 die(_("local object %s is corrupt"), sha1_to_hex(d->sha1));
1384 base_obj->obj = append_obj_to_pack(f, d->sha1,
1385 base_obj->data, base_obj->size, type);
1386 find_unresolved_deltas(base_obj);
1387 display_progress(progress, nr_resolved_deltas);
1389 free(sorted_by_pos);
1392 static void final(const char *final_pack_name, const char *curr_pack_name,
1393 const char *final_index_name, const char *curr_index_name,
1394 const char *keep_name, const char *keep_msg,
1395 unsigned char *sha1)
1397 const char *report = "pack";
1398 struct strbuf pack_name = STRBUF_INIT;
1399 struct strbuf index_name = STRBUF_INIT;
1400 struct strbuf keep_name_buf = STRBUF_INIT;
1406 fsync_or_die(output_fd, curr_pack_name);
1407 err = close(output_fd);
1409 die_errno(_("error while closing pack file"));
1413 int keep_fd, keep_msg_len = strlen(keep_msg);
1416 keep_name = odb_pack_name(&keep_name_buf, sha1, "keep");
1418 keep_fd = odb_pack_keep(keep_name);
1420 if (errno != EEXIST)
1421 die_errno(_("cannot write keep file '%s'"),
1424 if (keep_msg_len > 0) {
1425 write_or_die(keep_fd, keep_msg, keep_msg_len);
1426 write_or_die(keep_fd, "\n", 1);
1428 if (close(keep_fd) != 0)
1429 die_errno(_("cannot close written keep file '%s'"),
1435 if (final_pack_name != curr_pack_name) {
1436 if (!final_pack_name)
1437 final_pack_name = odb_pack_name(&pack_name, sha1, "pack");
1438 if (finalize_object_file(curr_pack_name, final_pack_name))
1439 die(_("cannot store pack file"));
1440 } else if (from_stdin)
1441 chmod(final_pack_name, 0444);
1443 if (final_index_name != curr_index_name) {
1444 if (!final_index_name)
1445 final_index_name = odb_pack_name(&index_name, sha1, "idx");
1446 if (finalize_object_file(curr_index_name, final_index_name))
1447 die(_("cannot store index file"));
1449 chmod(final_index_name, 0444);
1452 printf("%s\n", sha1_to_hex(sha1));
1454 struct strbuf buf = STRBUF_INIT;
1456 strbuf_addf(&buf, "%s\t%s\n", report, sha1_to_hex(sha1));
1457 write_or_die(1, buf.buf, buf.len);
1458 strbuf_release(&buf);
1461 * Let's just mimic git-unpack-objects here and write
1462 * the last part of the input buffer to stdout.
1465 err = xwrite(1, input_buffer + input_offset, input_len);
1469 input_offset += err;
1473 strbuf_release(&index_name);
1474 strbuf_release(&pack_name);
1475 strbuf_release(&keep_name_buf);
1478 static int git_index_pack_config(const char *k, const char *v, void *cb)
1480 struct pack_idx_option *opts = cb;
1482 if (!strcmp(k, "pack.indexversion")) {
1483 opts->version = git_config_int(k, v);
1484 if (opts->version > 2)
1485 die(_("bad pack.indexversion=%"PRIu32), opts->version);
1488 if (!strcmp(k, "pack.threads")) {
1489 nr_threads = git_config_int(k, v);
1491 die(_("invalid number of threads specified (%d)"),
1494 if (nr_threads != 1)
1495 warning(_("no threads support, ignoring %s"), k);
1500 return git_default_config(k, v, cb);
1503 static int cmp_uint32(const void *a_, const void *b_)
1505 uint32_t a = *((uint32_t *)a_);
1506 uint32_t b = *((uint32_t *)b_);
1508 return (a < b) ? -1 : (a != b);
1511 static void read_v2_anomalous_offsets(struct packed_git *p,
1512 struct pack_idx_option *opts)
1514 const uint32_t *idx1, *idx2;
1517 /* The address of the 4-byte offset table */
1518 idx1 = (((const uint32_t *)p->index_data)
1519 + 2 /* 8-byte header */
1521 + 5 * p->num_objects /* 20-byte SHA-1 table */
1522 + p->num_objects /* CRC32 table */
1525 /* The address of the 8-byte offset table */
1526 idx2 = idx1 + p->num_objects;
1528 for (i = 0; i < p->num_objects; i++) {
1529 uint32_t off = ntohl(idx1[i]);
1530 if (!(off & 0x80000000))
1532 off = off & 0x7fffffff;
1533 check_pack_index_ptr(p, &idx2[off * 2]);
1537 * The real offset is ntohl(idx2[off * 2]) in high 4
1538 * octets, and ntohl(idx2[off * 2 + 1]) in low 4
1539 * octets. But idx2[off * 2] is Zero!!!
1541 ALLOC_GROW(opts->anomaly, opts->anomaly_nr + 1, opts->anomaly_alloc);
1542 opts->anomaly[opts->anomaly_nr++] = ntohl(idx2[off * 2 + 1]);
1545 QSORT(opts->anomaly, opts->anomaly_nr, cmp_uint32);
1548 static void read_idx_option(struct pack_idx_option *opts, const char *pack_name)
1550 struct packed_git *p = add_packed_git(pack_name, strlen(pack_name), 1);
1553 die(_("Cannot open existing pack file '%s'"), pack_name);
1554 if (open_pack_index(p))
1555 die(_("Cannot open existing pack idx file for '%s'"), pack_name);
1557 /* Read the attributes from the existing idx file */
1558 opts->version = p->index_version;
1560 if (opts->version == 2)
1561 read_v2_anomalous_offsets(p, opts);
1564 * Get rid of the idx file as we do not need it anymore.
1565 * NEEDSWORK: extract this bit from free_pack_by_name() in
1566 * sha1_file.c, perhaps? It shouldn't matter very much as we
1567 * know we haven't installed this pack (hence we never have
1568 * read anything from it).
1570 close_pack_index(p);
1574 static void show_pack_info(int stat_only)
1576 int i, baseobjects = nr_objects - nr_ref_deltas - nr_ofs_deltas;
1577 unsigned long *chain_histogram = NULL;
1580 chain_histogram = xcalloc(deepest_delta, sizeof(unsigned long));
1582 for (i = 0; i < nr_objects; i++) {
1583 struct object_entry *obj = &objects[i];
1585 if (is_delta_type(obj->type))
1586 chain_histogram[obj_stat[i].delta_depth - 1]++;
1589 printf("%s %-6s %lu %lu %"PRIuMAX,
1590 oid_to_hex(&obj->idx.oid),
1591 typename(obj->real_type), obj->size,
1592 (unsigned long)(obj[1].idx.offset - obj->idx.offset),
1593 (uintmax_t)obj->idx.offset);
1594 if (is_delta_type(obj->type)) {
1595 struct object_entry *bobj = &objects[obj_stat[i].base_object_no];
1596 printf(" %u %s", obj_stat[i].delta_depth,
1597 oid_to_hex(&bobj->idx.oid));
1603 printf_ln(Q_("non delta: %d object",
1604 "non delta: %d objects",
1607 for (i = 0; i < deepest_delta; i++) {
1608 if (!chain_histogram[i])
1610 printf_ln(Q_("chain length = %d: %lu object",
1611 "chain length = %d: %lu objects",
1612 chain_histogram[i]),
1614 chain_histogram[i]);
1618 static const char *derive_filename(const char *pack_name, const char *suffix,
1622 if (!strip_suffix(pack_name, ".pack", &len))
1623 die(_("packfile name '%s' does not end with '.pack'"),
1625 strbuf_add(buf, pack_name, len);
1626 strbuf_addstr(buf, suffix);
1630 int cmd_index_pack(int argc, const char **argv, const char *prefix)
1632 int i, fix_thin_pack = 0, verify = 0, stat_only = 0;
1633 const char *curr_index;
1634 const char *index_name = NULL, *pack_name = NULL;
1635 const char *keep_name = NULL, *keep_msg = NULL;
1636 struct strbuf index_name_buf = STRBUF_INIT,
1637 keep_name_buf = STRBUF_INIT;
1638 struct pack_idx_entry **idx_objects;
1639 struct pack_idx_option opts;
1640 unsigned char pack_sha1[20];
1641 unsigned foreign_nr = 1; /* zero is a "good" value, assume bad */
1642 int report_end_of_input = 0;
1644 if (argc == 2 && !strcmp(argv[1], "-h"))
1645 usage(index_pack_usage);
1647 check_replace_refs = 0;
1648 fsck_options.walk = mark_link;
1650 reset_pack_idx_option(&opts);
1651 git_config(git_index_pack_config, &opts);
1652 if (prefix && chdir(prefix))
1653 die(_("Cannot come back to cwd"));
1655 for (i = 1; i < argc; i++) {
1656 const char *arg = argv[i];
1659 if (!strcmp(arg, "--stdin")) {
1661 } else if (!strcmp(arg, "--fix-thin")) {
1663 } else if (skip_to_optional_arg(arg, "--strict", &arg)) {
1666 fsck_set_msg_types(&fsck_options, arg);
1667 } else if (!strcmp(arg, "--check-self-contained-and-connected")) {
1669 check_self_contained_and_connected = 1;
1670 } else if (!strcmp(arg, "--verify")) {
1672 } else if (!strcmp(arg, "--verify-stat")) {
1675 } else if (!strcmp(arg, "--verify-stat-only")) {
1679 } else if (skip_to_optional_arg(arg, "--keep", &keep_msg)) {
1680 ; /* nothing to do */
1681 } else if (starts_with(arg, "--threads=")) {
1683 nr_threads = strtoul(arg+10, &end, 0);
1684 if (!arg[10] || *end || nr_threads < 0)
1685 usage(index_pack_usage);
1687 if (nr_threads != 1)
1688 warning(_("no threads support, "
1689 "ignoring %s"), arg);
1692 } else if (starts_with(arg, "--pack_header=")) {
1693 struct pack_header *hdr;
1696 hdr = (struct pack_header *)input_buffer;
1697 hdr->hdr_signature = htonl(PACK_SIGNATURE);
1698 hdr->hdr_version = htonl(strtoul(arg + 14, &c, 10));
1700 die(_("bad %s"), arg);
1701 hdr->hdr_entries = htonl(strtoul(c + 1, &c, 10));
1703 die(_("bad %s"), arg);
1704 input_len = sizeof(*hdr);
1705 } else if (!strcmp(arg, "-v")) {
1707 } else if (!strcmp(arg, "--show-resolving-progress")) {
1708 show_resolving_progress = 1;
1709 } else if (!strcmp(arg, "--report-end-of-input")) {
1710 report_end_of_input = 1;
1711 } else if (!strcmp(arg, "-o")) {
1712 if (index_name || (i+1) >= argc)
1713 usage(index_pack_usage);
1714 index_name = argv[++i];
1715 } else if (starts_with(arg, "--index-version=")) {
1717 opts.version = strtoul(arg + 16, &c, 10);
1718 if (opts.version > 2)
1719 die(_("bad %s"), arg);
1721 opts.off32_limit = strtoul(c+1, &c, 0);
1722 if (*c || opts.off32_limit & 0x80000000)
1723 die(_("bad %s"), arg);
1724 } else if (skip_prefix(arg, "--max-input-size=", &arg)) {
1725 max_input_size = strtoumax(arg, NULL, 10);
1727 usage(index_pack_usage);
1732 usage(index_pack_usage);
1736 if (!pack_name && !from_stdin)
1737 usage(index_pack_usage);
1738 if (fix_thin_pack && !from_stdin)
1739 die(_("--fix-thin cannot be used without --stdin"));
1740 if (from_stdin && !startup_info->have_repository)
1741 die(_("--stdin requires a git repository"));
1742 if (!index_name && pack_name)
1743 index_name = derive_filename(pack_name, ".idx", &index_name_buf);
1744 if (keep_msg && !keep_name && pack_name)
1745 keep_name = derive_filename(pack_name, ".keep", &keep_name_buf);
1749 die(_("--verify with no packfile name given"));
1750 read_idx_option(&opts, index_name);
1751 opts.flags |= WRITE_IDX_VERIFY | WRITE_IDX_STRICT;
1754 opts.flags |= WRITE_IDX_STRICT;
1758 nr_threads = online_cpus();
1759 /* An experiment showed that more threads does not mean faster */
1765 curr_pack = open_pack_file(pack_name);
1766 parse_pack_header();
1767 objects = xcalloc(st_add(nr_objects, 1), sizeof(struct object_entry));
1769 obj_stat = xcalloc(st_add(nr_objects, 1), sizeof(struct object_stat));
1770 ofs_deltas = xcalloc(nr_objects, sizeof(struct ofs_delta_entry));
1771 parse_pack_objects(pack_sha1);
1772 if (report_end_of_input)
1773 write_in_full(2, "\0", 1);
1775 conclude_pack(fix_thin_pack, curr_pack, pack_sha1);
1779 foreign_nr = check_objects();
1782 show_pack_info(stat_only);
1784 ALLOC_ARRAY(idx_objects, nr_objects);
1785 for (i = 0; i < nr_objects; i++)
1786 idx_objects[i] = &objects[i].idx;
1787 curr_index = write_idx_file(index_name, idx_objects, nr_objects, &opts, pack_sha1);
1791 final(pack_name, curr_pack,
1792 index_name, curr_index,
1793 keep_name, keep_msg,
1798 strbuf_release(&index_name_buf);
1799 strbuf_release(&keep_name_buf);
1800 if (pack_name == NULL)
1801 free((void *) curr_pack);
1802 if (index_name == NULL)
1803 free((void *) curr_index);
1806 * Let the caller know this pack is not self contained
1808 if (check_self_contained_and_connected && foreign_nr)