13 #include "streaming.h"
14 #include "thread-utils.h"
16 #include "object-store.h"
18 static const char index_pack_usage[] =
19 "git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
22 struct pack_idx_entry idx;
24 unsigned char hdr_size;
26 signed char real_type;
35 struct base_data *base;
36 struct base_data *child;
37 struct object_entry *obj;
40 int ref_first, ref_last;
41 int ofs_first, ofs_last;
46 struct base_data *base_cache;
47 size_t base_cache_used;
51 /* Remember to update object flag allocation in object.h */
52 #define FLAG_LINK (1u<<20)
53 #define FLAG_CHECKED (1u<<21)
55 struct ofs_delta_entry {
60 struct ref_delta_entry {
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_hash_ctx input_ctx;
95 static uint32_t input_crc32;
96 static int input_fd, output_fd;
97 static const char *curr_pack;
99 static struct thread_local *thread_data;
100 static int nr_dispatched;
101 static int threads_active;
103 static pthread_mutex_t read_mutex;
104 #define read_lock() lock_mutex(&read_mutex)
105 #define read_unlock() unlock_mutex(&read_mutex)
107 static pthread_mutex_t counter_mutex;
108 #define counter_lock() lock_mutex(&counter_mutex)
109 #define counter_unlock() unlock_mutex(&counter_mutex)
111 static pthread_mutex_t work_mutex;
112 #define work_lock() lock_mutex(&work_mutex)
113 #define work_unlock() unlock_mutex(&work_mutex)
115 static pthread_mutex_t deepest_delta_mutex;
116 #define deepest_delta_lock() lock_mutex(&deepest_delta_mutex)
117 #define deepest_delta_unlock() unlock_mutex(&deepest_delta_mutex)
119 static pthread_mutex_t type_cas_mutex;
120 #define type_cas_lock() lock_mutex(&type_cas_mutex)
121 #define type_cas_unlock() unlock_mutex(&type_cas_mutex)
123 static pthread_key_t key;
125 static inline void lock_mutex(pthread_mutex_t *mutex)
128 pthread_mutex_lock(mutex);
131 static inline void unlock_mutex(pthread_mutex_t *mutex)
134 pthread_mutex_unlock(mutex);
138 * Mutex and conditional variable can't be statically-initialized on Windows.
140 static void init_thread(void)
143 init_recursive_mutex(&read_mutex);
144 pthread_mutex_init(&counter_mutex, NULL);
145 pthread_mutex_init(&work_mutex, NULL);
146 pthread_mutex_init(&type_cas_mutex, NULL);
148 pthread_mutex_init(&deepest_delta_mutex, NULL);
149 pthread_key_create(&key, NULL);
150 thread_data = xcalloc(nr_threads, sizeof(*thread_data));
151 for (i = 0; i < nr_threads; i++) {
152 thread_data[i].pack_fd = open(curr_pack, O_RDONLY);
153 if (thread_data[i].pack_fd == -1)
154 die_errno(_("unable to open %s"), curr_pack);
160 static void cleanup_thread(void)
166 pthread_mutex_destroy(&read_mutex);
167 pthread_mutex_destroy(&counter_mutex);
168 pthread_mutex_destroy(&work_mutex);
169 pthread_mutex_destroy(&type_cas_mutex);
171 pthread_mutex_destroy(&deepest_delta_mutex);
172 for (i = 0; i < nr_threads; i++)
173 close(thread_data[i].pack_fd);
174 pthread_key_delete(key);
178 static int mark_link(struct object *obj, int type, void *data, struct fsck_options *options)
183 if (type != OBJ_ANY && obj->type != type)
184 die(_("object type mismatch at %s"), oid_to_hex(&obj->oid));
186 obj->flags |= FLAG_LINK;
190 /* The content of each linked object must have been checked
191 or it must be already present in the object database */
192 static unsigned check_object(struct object *obj)
197 if (!(obj->flags & FLAG_LINK))
200 if (!(obj->flags & FLAG_CHECKED)) {
202 int type = oid_object_info(the_repository, &obj->oid, &size);
204 die(_("did not receive expected object %s"),
205 oid_to_hex(&obj->oid));
206 if (type != obj->type)
207 die(_("object %s: expected type %s, found %s"),
208 oid_to_hex(&obj->oid),
209 type_name(obj->type), type_name(type));
210 obj->flags |= FLAG_CHECKED;
217 static unsigned check_objects(void)
219 unsigned i, max, foreign_nr = 0;
221 max = get_max_object_index();
224 progress = start_delayed_progress(_("Checking objects"), max);
226 for (i = 0; i < max; i++) {
227 foreign_nr += check_object(get_indexed_object(i));
228 display_progress(progress, i + 1);
231 stop_progress(&progress);
236 /* Discard current buffer used content. */
237 static void flush(void)
241 write_or_die(output_fd, input_buffer, input_offset);
242 the_hash_algo->update_fn(&input_ctx, input_buffer, input_offset);
243 memmove(input_buffer, input_buffer + input_offset, input_len);
249 * Make sure at least "min" bytes are available in the buffer, and
250 * return the pointer to the buffer.
252 static void *fill(int min)
254 if (min <= input_len)
255 return input_buffer + input_offset;
256 if (min > sizeof(input_buffer))
257 die(Q_("cannot fill %d byte",
258 "cannot fill %d bytes",
263 ssize_t ret = xread(input_fd, input_buffer + input_len,
264 sizeof(input_buffer) - input_len);
268 die_errno(_("read error on input"));
272 display_throughput(progress, consumed_bytes + input_len);
273 } while (input_len < min);
277 static void use(int bytes)
279 if (bytes > input_len)
280 die(_("used more bytes than were available"));
281 input_crc32 = crc32(input_crc32, input_buffer + input_offset, bytes);
283 input_offset += bytes;
285 /* make sure off_t is sufficiently large not to wrap */
286 if (signed_add_overflows(consumed_bytes, bytes))
287 die(_("pack too large for current definition of off_t"));
288 consumed_bytes += bytes;
289 if (max_input_size && consumed_bytes > max_input_size)
290 die(_("pack exceeds maximum allowed size"));
293 static const char *open_pack_file(const char *pack_name)
298 struct strbuf tmp_file = STRBUF_INIT;
299 output_fd = odb_mkstemp(&tmp_file,
300 "pack/tmp_pack_XXXXXX");
301 pack_name = strbuf_detach(&tmp_file, NULL);
303 output_fd = open(pack_name, O_CREAT|O_EXCL|O_RDWR, 0600);
305 die_errno(_("unable to create '%s'"), pack_name);
307 nothread_data.pack_fd = output_fd;
309 input_fd = open(pack_name, O_RDONLY);
311 die_errno(_("cannot open packfile '%s'"), pack_name);
313 nothread_data.pack_fd = input_fd;
315 the_hash_algo->init_fn(&input_ctx);
319 static void parse_pack_header(void)
321 struct pack_header *hdr = fill(sizeof(struct pack_header));
323 /* Header consistency check */
324 if (hdr->hdr_signature != htonl(PACK_SIGNATURE))
325 die(_("pack signature mismatch"));
326 if (!pack_version_ok(hdr->hdr_version))
327 die(_("pack version %"PRIu32" unsupported"),
328 ntohl(hdr->hdr_version));
330 nr_objects = ntohl(hdr->hdr_entries);
331 use(sizeof(struct pack_header));
334 static NORETURN void bad_object(off_t offset, const char *format,
335 ...) __attribute__((format (printf, 2, 3)));
337 static NORETURN void bad_object(off_t offset, const char *format, ...)
342 va_start(params, format);
343 vsnprintf(buf, sizeof(buf), format, params);
345 die(_("pack has bad object at offset %"PRIuMAX": %s"),
346 (uintmax_t)offset, buf);
349 static inline struct thread_local *get_thread_data(void)
353 return pthread_getspecific(key);
354 assert(!threads_active &&
355 "This should only be reached when all threads are gone");
357 return ¬hread_data;
360 static void set_thread_data(struct thread_local *data)
363 pthread_setspecific(key, data);
366 static struct base_data *alloc_base_data(void)
368 struct base_data *base = xcalloc(1, sizeof(struct base_data));
374 static void free_base_data(struct base_data *c)
377 FREE_AND_NULL(c->data);
378 get_thread_data()->base_cache_used -= c->size;
382 static void prune_base_data(struct base_data *retain)
385 struct thread_local *data = get_thread_data();
386 for (b = data->base_cache;
387 data->base_cache_used > delta_base_cache_limit && b;
389 if (b->data && b != retain)
394 static void link_base_data(struct base_data *base, struct base_data *c)
399 get_thread_data()->base_cache = c;
404 get_thread_data()->base_cache_used += c->size;
408 static void unlink_base_data(struct base_data *c)
410 struct base_data *base = c->base;
414 get_thread_data()->base_cache = NULL;
418 static int is_delta_type(enum object_type type)
420 return (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA);
423 static void *unpack_entry_data(off_t offset, unsigned long size,
424 enum object_type type, struct object_id *oid)
426 static char fixed_buf[8192];
434 if (!is_delta_type(type)) {
435 hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %"PRIuMAX,
436 type_name(type),(uintmax_t)size) + 1;
437 the_hash_algo->init_fn(&c);
438 the_hash_algo->update_fn(&c, hdr, hdrlen);
441 if (type == OBJ_BLOB && size > big_file_threshold)
444 buf = xmallocz(size);
446 memset(&stream, 0, sizeof(stream));
447 git_inflate_init(&stream);
448 stream.next_out = buf;
449 stream.avail_out = buf == fixed_buf ? sizeof(fixed_buf) : size;
452 unsigned char *last_out = stream.next_out;
453 stream.next_in = fill(1);
454 stream.avail_in = input_len;
455 status = git_inflate(&stream, 0);
456 use(input_len - stream.avail_in);
458 the_hash_algo->update_fn(&c, last_out, stream.next_out - last_out);
459 if (buf == fixed_buf) {
460 stream.next_out = buf;
461 stream.avail_out = sizeof(fixed_buf);
463 } while (status == Z_OK);
464 if (stream.total_out != size || status != Z_STREAM_END)
465 bad_object(offset, _("inflate returned %d"), status);
466 git_inflate_end(&stream);
468 the_hash_algo->final_fn(oid->hash, &c);
469 return buf == fixed_buf ? NULL : buf;
472 static void *unpack_raw_entry(struct object_entry *obj,
474 struct object_id *ref_oid,
475 struct object_id *oid)
478 unsigned long size, c;
483 obj->idx.offset = consumed_bytes;
484 input_crc32 = crc32(0, NULL, 0);
489 obj->type = (c >> 4) & 7;
496 size += (c & 0x7f) << shift;
503 hashcpy(ref_oid->hash, fill(the_hash_algo->rawsz));
504 use(the_hash_algo->rawsz);
510 base_offset = c & 127;
513 if (!base_offset || MSB(base_offset, 7))
514 bad_object(obj->idx.offset, _("offset value overflow for delta base object"));
518 base_offset = (base_offset << 7) + (c & 127);
520 *ofs_offset = obj->idx.offset - base_offset;
521 if (*ofs_offset <= 0 || *ofs_offset >= obj->idx.offset)
522 bad_object(obj->idx.offset, _("delta base offset is out of bound"));
530 bad_object(obj->idx.offset, _("unknown object type %d"), obj->type);
532 obj->hdr_size = consumed_bytes - obj->idx.offset;
534 data = unpack_entry_data(obj->idx.offset, obj->size, obj->type, oid);
535 obj->idx.crc32 = input_crc32;
539 static void *unpack_data(struct object_entry *obj,
540 int (*consume)(const unsigned char *, unsigned long, void *),
543 off_t from = obj[0].idx.offset + obj[0].hdr_size;
544 off_t len = obj[1].idx.offset - from;
545 unsigned char *data, *inbuf;
549 data = xmallocz(consume ? 64*1024 : obj->size);
550 inbuf = xmalloc((len < 64*1024) ? (int)len : 64*1024);
552 memset(&stream, 0, sizeof(stream));
553 git_inflate_init(&stream);
554 stream.next_out = data;
555 stream.avail_out = consume ? 64*1024 : obj->size;
558 ssize_t n = (len < 64*1024) ? (ssize_t)len : 64*1024;
559 n = xpread(get_thread_data()->pack_fd, inbuf, n, from);
561 die_errno(_("cannot pread pack file"));
563 die(Q_("premature end of pack file, %"PRIuMAX" byte missing",
564 "premature end of pack file, %"PRIuMAX" bytes missing",
569 stream.next_in = inbuf;
572 status = git_inflate(&stream, 0);
575 status = git_inflate(&stream, 0);
576 if (consume(data, stream.next_out - data, cb_data)) {
581 stream.next_out = data;
582 stream.avail_out = 64*1024;
583 } while (status == Z_OK && stream.avail_in);
585 } while (len && status == Z_OK && !stream.avail_in);
587 /* This has been inflated OK when first encountered, so... */
588 if (status != Z_STREAM_END || stream.total_out != obj->size)
589 die(_("serious inflate inconsistency"));
591 git_inflate_end(&stream);
599 static void *get_data_from_pack(struct object_entry *obj)
601 return unpack_data(obj, NULL, NULL);
604 static int compare_ofs_delta_bases(off_t offset1, off_t offset2,
605 enum object_type type1,
606 enum object_type type2)
608 int cmp = type1 - type2;
611 return offset1 < offset2 ? -1 :
612 offset1 > offset2 ? 1 :
616 static int find_ofs_delta(const off_t offset, enum object_type type)
618 int first = 0, last = nr_ofs_deltas;
620 while (first < last) {
621 int next = first + (last - first) / 2;
622 struct ofs_delta_entry *delta = &ofs_deltas[next];
625 cmp = compare_ofs_delta_bases(offset, delta->offset,
626 type, objects[delta->obj_no].type);
638 static void find_ofs_delta_children(off_t offset,
639 int *first_index, int *last_index,
640 enum object_type type)
642 int first = find_ofs_delta(offset, type);
644 int end = nr_ofs_deltas - 1;
651 while (first > 0 && ofs_deltas[first - 1].offset == offset)
653 while (last < end && ofs_deltas[last + 1].offset == offset)
655 *first_index = first;
659 static int compare_ref_delta_bases(const struct object_id *oid1,
660 const struct object_id *oid2,
661 enum object_type type1,
662 enum object_type type2)
664 int cmp = type1 - type2;
667 return oidcmp(oid1, oid2);
670 static int find_ref_delta(const struct object_id *oid, enum object_type type)
672 int first = 0, last = nr_ref_deltas;
674 while (first < last) {
675 int next = first + (last - first) / 2;
676 struct ref_delta_entry *delta = &ref_deltas[next];
679 cmp = compare_ref_delta_bases(oid, &delta->oid,
680 type, objects[delta->obj_no].type);
692 static void find_ref_delta_children(const struct object_id *oid,
693 int *first_index, int *last_index,
694 enum object_type type)
696 int first = find_ref_delta(oid, type);
698 int end = nr_ref_deltas - 1;
705 while (first > 0 && oideq(&ref_deltas[first - 1].oid, oid))
707 while (last < end && oideq(&ref_deltas[last + 1].oid, oid))
709 *first_index = first;
713 struct compare_data {
714 struct object_entry *entry;
715 struct git_istream *st;
717 unsigned long buf_size;
720 static int compare_objects(const unsigned char *buf, unsigned long size,
723 struct compare_data *data = cb_data;
725 if (data->buf_size < size) {
727 data->buf = xmalloc(size);
728 data->buf_size = size;
732 ssize_t len = read_istream(data->st, data->buf, size);
734 die(_("SHA1 COLLISION FOUND WITH %s !"),
735 oid_to_hex(&data->entry->idx.oid));
737 die(_("unable to read %s"),
738 oid_to_hex(&data->entry->idx.oid));
739 if (memcmp(buf, data->buf, len))
740 die(_("SHA1 COLLISION FOUND WITH %s !"),
741 oid_to_hex(&data->entry->idx.oid));
748 static int check_collison(struct object_entry *entry)
750 struct compare_data data;
751 enum object_type type;
754 if (entry->size <= big_file_threshold || entry->type != OBJ_BLOB)
757 memset(&data, 0, sizeof(data));
759 data.st = open_istream(&entry->idx.oid, &type, &size, NULL);
762 if (size != entry->size || type != entry->type)
763 die(_("SHA1 COLLISION FOUND WITH %s !"),
764 oid_to_hex(&entry->idx.oid));
765 unpack_data(entry, compare_objects, &data);
766 close_istream(data.st);
771 static void sha1_object(const void *data, struct object_entry *obj_entry,
772 unsigned long size, enum object_type type,
773 const struct object_id *oid)
775 void *new_data = NULL;
776 int collision_test_needed = 0;
778 assert(data || obj_entry);
780 if (startup_info->have_repository) {
782 collision_test_needed =
783 has_object_file_with_flags(oid, OBJECT_INFO_QUICK);
787 if (collision_test_needed && !data) {
789 if (!check_collison(obj_entry))
790 collision_test_needed = 0;
793 if (collision_test_needed) {
795 enum object_type has_type;
796 unsigned long has_size;
798 has_type = oid_object_info(the_repository, oid, &has_size);
800 die(_("cannot read existing object info %s"), oid_to_hex(oid));
801 if (has_type != type || has_size != size)
802 die(_("SHA1 COLLISION FOUND WITH %s !"), oid_to_hex(oid));
803 has_data = read_object_file(oid, &has_type, &has_size);
806 data = new_data = get_data_from_pack(obj_entry);
808 die(_("cannot read existing object %s"), oid_to_hex(oid));
809 if (size != has_size || type != has_type ||
810 memcmp(data, has_data, size) != 0)
811 die(_("SHA1 COLLISION FOUND WITH %s !"), oid_to_hex(oid));
815 if (strict || do_fsck_object) {
817 if (type == OBJ_BLOB) {
818 struct blob *blob = lookup_blob(the_repository, oid);
820 blob->object.flags |= FLAG_CHECKED;
822 die(_("invalid blob object %s"), oid_to_hex(oid));
823 if (do_fsck_object &&
824 fsck_object(&blob->object, (void *)data, size, &fsck_options))
825 die(_("fsck error in packed object"));
829 void *buf = (void *) data;
831 assert(data && "data can only be NULL for large _blobs_");
834 * we do not need to free the memory here, as the
835 * buf is deleted by the caller.
837 obj = parse_object_buffer(the_repository, oid, type,
841 die(_("invalid %s"), type_name(type));
842 if (do_fsck_object &&
843 fsck_object(obj, buf, size, &fsck_options))
844 die(_("fsck error in packed object"));
845 if (strict && fsck_walk(obj, NULL, &fsck_options))
846 die(_("Not all child objects of %s are reachable"), oid_to_hex(&obj->oid));
848 if (obj->type == OBJ_TREE) {
849 struct tree *item = (struct tree *) obj;
853 if (obj->type == OBJ_COMMIT) {
854 struct commit *commit = (struct commit *) obj;
855 if (detach_commit_buffer(commit, NULL) != data)
856 BUG("parse_object_buffer transmogrified our buffer");
858 obj->flags |= FLAG_CHECKED;
867 * This function is part of find_unresolved_deltas(). There are two
868 * walkers going in the opposite ways.
870 * The first one in find_unresolved_deltas() traverses down from
871 * parent node to children, deflating nodes along the way. However,
872 * memory for deflated nodes is limited by delta_base_cache_limit, so
873 * at some point parent node's deflated content may be freed.
875 * The second walker is this function, which goes from current node up
876 * to top parent if necessary to deflate the node. In normal
877 * situation, its parent node would be already deflated, so it just
878 * needs to apply delta.
880 * In the worst case scenario, parent node is no longer deflated because
881 * we're running out of delta_base_cache_limit; we need to re-deflate
882 * parents, possibly up to the top base.
884 * All deflated objects here are subject to be freed if we exceed
885 * delta_base_cache_limit, just like in find_unresolved_deltas(), we
886 * just need to make sure the last node is not freed.
888 static void *get_base_data(struct base_data *c)
891 struct object_entry *obj = c->obj;
892 struct base_data **delta = NULL;
893 int delta_nr = 0, delta_alloc = 0;
895 while (is_delta_type(c->obj->type) && !c->data) {
896 ALLOC_GROW(delta, delta_nr + 1, delta_alloc);
897 delta[delta_nr++] = c;
901 c->data = get_data_from_pack(obj);
903 get_thread_data()->base_cache_used += c->size;
906 for (; delta_nr > 0; delta_nr--) {
908 c = delta[delta_nr - 1];
910 base = get_base_data(c->base);
911 raw = get_data_from_pack(obj);
912 c->data = patch_delta(
918 bad_object(obj->idx.offset, _("failed to apply delta"));
919 get_thread_data()->base_cache_used += c->size;
927 static void resolve_delta(struct object_entry *delta_obj,
928 struct base_data *base, struct base_data *result)
930 void *base_data, *delta_data;
933 int i = delta_obj - objects;
934 int j = base->obj - objects;
935 obj_stat[i].delta_depth = obj_stat[j].delta_depth + 1;
936 deepest_delta_lock();
937 if (deepest_delta < obj_stat[i].delta_depth)
938 deepest_delta = obj_stat[i].delta_depth;
939 deepest_delta_unlock();
940 obj_stat[i].base_object_no = j;
942 delta_data = get_data_from_pack(delta_obj);
943 base_data = get_base_data(base);
944 result->obj = delta_obj;
945 result->data = patch_delta(base_data, base->size,
946 delta_data, delta_obj->size, &result->size);
949 bad_object(delta_obj->idx.offset, _("failed to apply delta"));
950 hash_object_file(result->data, result->size,
951 type_name(delta_obj->real_type), &delta_obj->idx.oid);
952 sha1_object(result->data, NULL, result->size, delta_obj->real_type,
953 &delta_obj->idx.oid);
955 nr_resolved_deltas++;
960 * Standard boolean compare-and-swap: atomically check whether "*type" is
961 * "want"; if so, swap in "set" and return true. Otherwise, leave it untouched
964 static int compare_and_swap_type(signed char *type,
965 enum object_type want,
966 enum object_type set)
968 enum object_type old;
979 static struct base_data *find_unresolved_deltas_1(struct base_data *base,
980 struct base_data *prev_base)
982 if (base->ref_last == -1 && base->ofs_last == -1) {
983 find_ref_delta_children(&base->obj->idx.oid,
984 &base->ref_first, &base->ref_last,
987 find_ofs_delta_children(base->obj->idx.offset,
988 &base->ofs_first, &base->ofs_last,
991 if (base->ref_last == -1 && base->ofs_last == -1) {
996 link_base_data(prev_base, base);
999 if (base->ref_first <= base->ref_last) {
1000 struct object_entry *child = objects + ref_deltas[base->ref_first].obj_no;
1001 struct base_data *result = alloc_base_data();
1003 if (!compare_and_swap_type(&child->real_type, OBJ_REF_DELTA,
1004 base->obj->real_type))
1005 BUG("child->real_type != OBJ_REF_DELTA");
1007 resolve_delta(child, base, result);
1008 if (base->ref_first == base->ref_last && base->ofs_last == -1)
1009 free_base_data(base);
1015 if (base->ofs_first <= base->ofs_last) {
1016 struct object_entry *child = objects + ofs_deltas[base->ofs_first].obj_no;
1017 struct base_data *result = alloc_base_data();
1019 assert(child->real_type == OBJ_OFS_DELTA);
1020 child->real_type = base->obj->real_type;
1021 resolve_delta(child, base, result);
1022 if (base->ofs_first == base->ofs_last)
1023 free_base_data(base);
1029 unlink_base_data(base);
1033 static void find_unresolved_deltas(struct base_data *base)
1035 struct base_data *new_base, *prev_base = NULL;
1037 new_base = find_unresolved_deltas_1(base, prev_base);
1047 prev_base = base->base;
1052 static int compare_ofs_delta_entry(const void *a, const void *b)
1054 const struct ofs_delta_entry *delta_a = a;
1055 const struct ofs_delta_entry *delta_b = b;
1057 return delta_a->offset < delta_b->offset ? -1 :
1058 delta_a->offset > delta_b->offset ? 1 :
1062 static int compare_ref_delta_entry(const void *a, const void *b)
1064 const struct ref_delta_entry *delta_a = a;
1065 const struct ref_delta_entry *delta_b = b;
1067 return oidcmp(&delta_a->oid, &delta_b->oid);
1070 static void resolve_base(struct object_entry *obj)
1072 struct base_data *base_obj = alloc_base_data();
1073 base_obj->obj = obj;
1074 base_obj->data = NULL;
1075 find_unresolved_deltas(base_obj);
1078 static void *threaded_second_pass(void *data)
1080 set_thread_data(data);
1084 display_progress(progress, nr_resolved_deltas);
1087 while (nr_dispatched < nr_objects &&
1088 is_delta_type(objects[nr_dispatched].type))
1090 if (nr_dispatched >= nr_objects) {
1094 i = nr_dispatched++;
1097 resolve_base(&objects[i]);
1104 * - find locations of all objects;
1105 * - calculate SHA1 of all non-delta objects;
1106 * - remember base (SHA1 or offset) for all deltas.
1108 static void parse_pack_objects(unsigned char *hash)
1110 int i, nr_delays = 0;
1111 struct ofs_delta_entry *ofs_delta = ofs_deltas;
1112 struct object_id ref_delta_oid;
1116 progress = start_progress(
1117 from_stdin ? _("Receiving objects") : _("Indexing objects"),
1119 for (i = 0; i < nr_objects; i++) {
1120 struct object_entry *obj = &objects[i];
1121 void *data = unpack_raw_entry(obj, &ofs_delta->offset,
1124 obj->real_type = obj->type;
1125 if (obj->type == OBJ_OFS_DELTA) {
1127 ofs_delta->obj_no = i;
1129 } else if (obj->type == OBJ_REF_DELTA) {
1130 ALLOC_GROW(ref_deltas, nr_ref_deltas + 1, ref_deltas_alloc);
1131 oidcpy(&ref_deltas[nr_ref_deltas].oid, &ref_delta_oid);
1132 ref_deltas[nr_ref_deltas].obj_no = i;
1135 /* large blobs, check later */
1136 obj->real_type = OBJ_BAD;
1139 sha1_object(data, NULL, obj->size, obj->type,
1142 display_progress(progress, i+1);
1144 objects[i].idx.offset = consumed_bytes;
1145 stop_progress(&progress);
1147 /* Check pack integrity */
1149 the_hash_algo->final_fn(hash, &input_ctx);
1150 if (!hasheq(fill(the_hash_algo->rawsz), hash))
1151 die(_("pack is corrupted (SHA1 mismatch)"));
1152 use(the_hash_algo->rawsz);
1154 /* If input_fd is a file, we should have reached its end now. */
1155 if (fstat(input_fd, &st))
1156 die_errno(_("cannot fstat packfile"));
1157 if (S_ISREG(st.st_mode) &&
1158 lseek(input_fd, 0, SEEK_CUR) - input_len != st.st_size)
1159 die(_("pack has junk at the end"));
1161 for (i = 0; i < nr_objects; i++) {
1162 struct object_entry *obj = &objects[i];
1163 if (obj->real_type != OBJ_BAD)
1165 obj->real_type = obj->type;
1166 sha1_object(NULL, obj, obj->size, obj->type,
1171 die(_("confusion beyond insanity in parse_pack_objects()"));
1176 * - for all non-delta objects, look if it is used as a base for
1178 * - if used as a base, uncompress the object and apply all deltas,
1179 * recursively checking if the resulting object is used as a base
1180 * for some more deltas.
1182 static void resolve_deltas(void)
1186 if (!nr_ofs_deltas && !nr_ref_deltas)
1189 /* Sort deltas by base SHA1/offset for fast searching */
1190 QSORT(ofs_deltas, nr_ofs_deltas, compare_ofs_delta_entry);
1191 QSORT(ref_deltas, nr_ref_deltas, compare_ref_delta_entry);
1193 if (verbose || show_resolving_progress)
1194 progress = start_progress(_("Resolving deltas"),
1195 nr_ref_deltas + nr_ofs_deltas);
1198 if (nr_threads > 1 || getenv("GIT_FORCE_THREADS")) {
1200 for (i = 0; i < nr_threads; i++) {
1201 int ret = pthread_create(&thread_data[i].thread, NULL,
1202 threaded_second_pass, thread_data + i);
1204 die(_("unable to create thread: %s"),
1207 for (i = 0; i < nr_threads; i++)
1208 pthread_join(thread_data[i].thread, NULL);
1213 for (i = 0; i < nr_objects; i++) {
1214 struct object_entry *obj = &objects[i];
1216 if (is_delta_type(obj->type))
1219 display_progress(progress, nr_resolved_deltas);
1225 * - append objects to convert thin pack to full pack if required
1226 * - write the final pack hash
1228 static void fix_unresolved_deltas(struct hashfile *f);
1229 static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned char *pack_hash)
1231 if (nr_ref_deltas + nr_ofs_deltas == nr_resolved_deltas) {
1232 stop_progress(&progress);
1233 /* Flush remaining pack final hash. */
1238 if (fix_thin_pack) {
1240 unsigned char read_hash[GIT_MAX_RAWSZ], tail_hash[GIT_MAX_RAWSZ];
1241 struct strbuf msg = STRBUF_INIT;
1242 int nr_unresolved = nr_ofs_deltas + nr_ref_deltas - nr_resolved_deltas;
1243 int nr_objects_initial = nr_objects;
1244 if (nr_unresolved <= 0)
1245 die(_("confusion beyond insanity"));
1246 REALLOC_ARRAY(objects, nr_objects + nr_unresolved + 1);
1247 memset(objects + nr_objects + 1, 0,
1248 nr_unresolved * sizeof(*objects));
1249 f = hashfd(output_fd, curr_pack);
1250 fix_unresolved_deltas(f);
1251 strbuf_addf(&msg, Q_("completed with %d local object",
1252 "completed with %d local objects",
1253 nr_objects - nr_objects_initial),
1254 nr_objects - nr_objects_initial);
1255 stop_progress_msg(&progress, msg.buf);
1256 strbuf_release(&msg);
1257 finalize_hashfile(f, tail_hash, 0);
1258 hashcpy(read_hash, pack_hash);
1259 fixup_pack_header_footer(output_fd, pack_hash,
1260 curr_pack, nr_objects,
1261 read_hash, consumed_bytes-the_hash_algo->rawsz);
1262 if (!hasheq(read_hash, tail_hash))
1263 die(_("Unexpected tail checksum for %s "
1264 "(disk corruption?)"), curr_pack);
1266 if (nr_ofs_deltas + nr_ref_deltas != nr_resolved_deltas)
1267 die(Q_("pack has %d unresolved delta",
1268 "pack has %d unresolved deltas",
1269 nr_ofs_deltas + nr_ref_deltas - nr_resolved_deltas),
1270 nr_ofs_deltas + nr_ref_deltas - nr_resolved_deltas);
1273 static int write_compressed(struct hashfile *f, void *in, unsigned int size)
1277 unsigned char outbuf[4096];
1279 git_deflate_init(&stream, zlib_compression_level);
1280 stream.next_in = in;
1281 stream.avail_in = size;
1284 stream.next_out = outbuf;
1285 stream.avail_out = sizeof(outbuf);
1286 status = git_deflate(&stream, Z_FINISH);
1287 hashwrite(f, outbuf, sizeof(outbuf) - stream.avail_out);
1288 } while (status == Z_OK);
1290 if (status != Z_STREAM_END)
1291 die(_("unable to deflate appended object (%d)"), status);
1292 size = stream.total_out;
1293 git_deflate_end(&stream);
1297 static struct object_entry *append_obj_to_pack(struct hashfile *f,
1298 const unsigned char *sha1, void *buf,
1299 unsigned long size, enum object_type type)
1301 struct object_entry *obj = &objects[nr_objects++];
1302 unsigned char header[10];
1303 unsigned long s = size;
1305 unsigned char c = (type << 4) | (s & 15);
1308 header[n++] = c | 0x80;
1314 hashwrite(f, header, n);
1316 obj[0].hdr_size = n;
1318 obj[0].real_type = type;
1319 obj[1].idx.offset = obj[0].idx.offset + n;
1320 obj[1].idx.offset += write_compressed(f, buf, size);
1321 obj[0].idx.crc32 = crc32_end(f);
1323 hashcpy(obj->idx.oid.hash, sha1);
1327 static int delta_pos_compare(const void *_a, const void *_b)
1329 struct ref_delta_entry *a = *(struct ref_delta_entry **)_a;
1330 struct ref_delta_entry *b = *(struct ref_delta_entry **)_b;
1331 return a->obj_no - b->obj_no;
1334 static void fix_unresolved_deltas(struct hashfile *f)
1336 struct ref_delta_entry **sorted_by_pos;
1340 * Since many unresolved deltas may well be themselves base objects
1341 * for more unresolved deltas, we really want to include the
1342 * smallest number of base objects that would cover as much delta
1343 * as possible by picking the
1344 * trunc deltas first, allowing for other deltas to resolve without
1345 * additional base objects. Since most base objects are to be found
1346 * before deltas depending on them, a good heuristic is to start
1347 * resolving deltas in the same order as their position in the pack.
1349 ALLOC_ARRAY(sorted_by_pos, nr_ref_deltas);
1350 for (i = 0; i < nr_ref_deltas; i++)
1351 sorted_by_pos[i] = &ref_deltas[i];
1352 QSORT(sorted_by_pos, nr_ref_deltas, delta_pos_compare);
1354 for (i = 0; i < nr_ref_deltas; i++) {
1355 struct ref_delta_entry *d = sorted_by_pos[i];
1356 enum object_type type;
1357 struct base_data *base_obj = alloc_base_data();
1359 if (objects[d->obj_no].real_type != OBJ_REF_DELTA)
1361 base_obj->data = read_object_file(&d->oid, &type,
1363 if (!base_obj->data)
1366 if (check_object_signature(&d->oid, base_obj->data,
1367 base_obj->size, type_name(type)))
1368 die(_("local object %s is corrupt"), oid_to_hex(&d->oid));
1369 base_obj->obj = append_obj_to_pack(f, d->oid.hash,
1370 base_obj->data, base_obj->size, type);
1371 find_unresolved_deltas(base_obj);
1372 display_progress(progress, nr_resolved_deltas);
1374 free(sorted_by_pos);
1377 static const char *derive_filename(const char *pack_name, const char *suffix,
1381 if (!strip_suffix(pack_name, ".pack", &len))
1382 die(_("packfile name '%s' does not end with '.pack'"),
1384 strbuf_add(buf, pack_name, len);
1385 strbuf_addch(buf, '.');
1386 strbuf_addstr(buf, suffix);
1390 static void write_special_file(const char *suffix, const char *msg,
1391 const char *pack_name, const unsigned char *hash,
1392 const char **report)
1394 struct strbuf name_buf = STRBUF_INIT;
1395 const char *filename;
1397 int msg_len = strlen(msg);
1400 filename = derive_filename(pack_name, suffix, &name_buf);
1402 filename = odb_pack_name(&name_buf, hash, suffix);
1404 fd = odb_pack_keep(filename);
1406 if (errno != EEXIST)
1407 die_errno(_("cannot write %s file '%s'"),
1411 write_or_die(fd, msg, msg_len);
1412 write_or_die(fd, "\n", 1);
1415 die_errno(_("cannot close written %s file '%s'"),
1420 strbuf_release(&name_buf);
1423 static void final(const char *final_pack_name, const char *curr_pack_name,
1424 const char *final_index_name, const char *curr_index_name,
1425 const char *keep_msg, const char *promisor_msg,
1426 unsigned char *hash)
1428 const char *report = "pack";
1429 struct strbuf pack_name = STRBUF_INIT;
1430 struct strbuf index_name = STRBUF_INIT;
1436 fsync_or_die(output_fd, curr_pack_name);
1437 err = close(output_fd);
1439 die_errno(_("error while closing pack file"));
1443 write_special_file("keep", keep_msg, final_pack_name, hash,
1446 write_special_file("promisor", promisor_msg, final_pack_name,
1449 if (final_pack_name != curr_pack_name) {
1450 if (!final_pack_name)
1451 final_pack_name = odb_pack_name(&pack_name, hash, "pack");
1452 if (finalize_object_file(curr_pack_name, final_pack_name))
1453 die(_("cannot store pack file"));
1454 } else if (from_stdin)
1455 chmod(final_pack_name, 0444);
1457 if (final_index_name != curr_index_name) {
1458 if (!final_index_name)
1459 final_index_name = odb_pack_name(&index_name, hash, "idx");
1460 if (finalize_object_file(curr_index_name, final_index_name))
1461 die(_("cannot store index file"));
1463 chmod(final_index_name, 0444);
1465 if (do_fsck_object) {
1466 struct packed_git *p;
1467 p = add_packed_git(final_index_name, strlen(final_index_name), 0);
1469 install_packed_git(the_repository, p);
1473 printf("%s\n", sha1_to_hex(hash));
1475 struct strbuf buf = STRBUF_INIT;
1477 strbuf_addf(&buf, "%s\t%s\n", report, sha1_to_hex(hash));
1478 write_or_die(1, buf.buf, buf.len);
1479 strbuf_release(&buf);
1482 * Let's just mimic git-unpack-objects here and write
1483 * the last part of the input buffer to stdout.
1486 err = xwrite(1, input_buffer + input_offset, input_len);
1490 input_offset += err;
1494 strbuf_release(&index_name);
1495 strbuf_release(&pack_name);
1498 static int git_index_pack_config(const char *k, const char *v, void *cb)
1500 struct pack_idx_option *opts = cb;
1502 if (!strcmp(k, "pack.indexversion")) {
1503 opts->version = git_config_int(k, v);
1504 if (opts->version > 2)
1505 die(_("bad pack.indexversion=%"PRIu32), opts->version);
1508 if (!strcmp(k, "pack.threads")) {
1509 nr_threads = git_config_int(k, v);
1511 die(_("invalid number of threads specified (%d)"),
1513 if (!HAVE_THREADS && nr_threads != 1) {
1514 warning(_("no threads support, ignoring %s"), k);
1519 return git_default_config(k, v, cb);
1522 static int cmp_uint32(const void *a_, const void *b_)
1524 uint32_t a = *((uint32_t *)a_);
1525 uint32_t b = *((uint32_t *)b_);
1527 return (a < b) ? -1 : (a != b);
1530 static void read_v2_anomalous_offsets(struct packed_git *p,
1531 struct pack_idx_option *opts)
1533 const uint32_t *idx1, *idx2;
1535 const uint32_t hashwords = the_hash_algo->rawsz / sizeof(uint32_t);
1537 /* The address of the 4-byte offset table */
1538 idx1 = (((const uint32_t *)p->index_data)
1539 + 2 /* 8-byte header */
1541 + hashwords * p->num_objects /* object ID table */
1542 + p->num_objects /* CRC32 table */
1545 /* The address of the 8-byte offset table */
1546 idx2 = idx1 + p->num_objects;
1548 for (i = 0; i < p->num_objects; i++) {
1549 uint32_t off = ntohl(idx1[i]);
1550 if (!(off & 0x80000000))
1552 off = off & 0x7fffffff;
1553 check_pack_index_ptr(p, &idx2[off * 2]);
1557 * The real offset is ntohl(idx2[off * 2]) in high 4
1558 * octets, and ntohl(idx2[off * 2 + 1]) in low 4
1559 * octets. But idx2[off * 2] is Zero!!!
1561 ALLOC_GROW(opts->anomaly, opts->anomaly_nr + 1, opts->anomaly_alloc);
1562 opts->anomaly[opts->anomaly_nr++] = ntohl(idx2[off * 2 + 1]);
1565 QSORT(opts->anomaly, opts->anomaly_nr, cmp_uint32);
1568 static void read_idx_option(struct pack_idx_option *opts, const char *pack_name)
1570 struct packed_git *p = add_packed_git(pack_name, strlen(pack_name), 1);
1573 die(_("Cannot open existing pack file '%s'"), pack_name);
1574 if (open_pack_index(p))
1575 die(_("Cannot open existing pack idx file for '%s'"), pack_name);
1577 /* Read the attributes from the existing idx file */
1578 opts->version = p->index_version;
1580 if (opts->version == 2)
1581 read_v2_anomalous_offsets(p, opts);
1584 * Get rid of the idx file as we do not need it anymore.
1585 * NEEDSWORK: extract this bit from free_pack_by_name() in
1586 * sha1-file.c, perhaps? It shouldn't matter very much as we
1587 * know we haven't installed this pack (hence we never have
1588 * read anything from it).
1590 close_pack_index(p);
1594 static void show_pack_info(int stat_only)
1596 int i, baseobjects = nr_objects - nr_ref_deltas - nr_ofs_deltas;
1597 unsigned long *chain_histogram = NULL;
1600 chain_histogram = xcalloc(deepest_delta, sizeof(unsigned long));
1602 for (i = 0; i < nr_objects; i++) {
1603 struct object_entry *obj = &objects[i];
1605 if (is_delta_type(obj->type))
1606 chain_histogram[obj_stat[i].delta_depth - 1]++;
1609 printf("%s %-6s %"PRIuMAX" %"PRIuMAX" %"PRIuMAX,
1610 oid_to_hex(&obj->idx.oid),
1611 type_name(obj->real_type), (uintmax_t)obj->size,
1612 (uintmax_t)(obj[1].idx.offset - obj->idx.offset),
1613 (uintmax_t)obj->idx.offset);
1614 if (is_delta_type(obj->type)) {
1615 struct object_entry *bobj = &objects[obj_stat[i].base_object_no];
1616 printf(" %u %s", obj_stat[i].delta_depth,
1617 oid_to_hex(&bobj->idx.oid));
1623 printf_ln(Q_("non delta: %d object",
1624 "non delta: %d objects",
1627 for (i = 0; i < deepest_delta; i++) {
1628 if (!chain_histogram[i])
1630 printf_ln(Q_("chain length = %d: %lu object",
1631 "chain length = %d: %lu objects",
1632 chain_histogram[i]),
1634 chain_histogram[i]);
1638 int cmd_index_pack(int argc, const char **argv, const char *prefix)
1640 int i, fix_thin_pack = 0, verify = 0, stat_only = 0;
1641 const char *curr_index;
1642 const char *index_name = NULL, *pack_name = NULL;
1643 const char *keep_msg = NULL;
1644 const char *promisor_msg = NULL;
1645 struct strbuf index_name_buf = STRBUF_INIT;
1646 struct pack_idx_entry **idx_objects;
1647 struct pack_idx_option opts;
1648 unsigned char pack_hash[GIT_MAX_RAWSZ];
1649 unsigned foreign_nr = 1; /* zero is a "good" value, assume bad */
1650 int report_end_of_input = 0;
1653 * index-pack never needs to fetch missing objects, since it only
1654 * accesses the repo to do hash collision checks
1656 fetch_if_missing = 0;
1658 if (argc == 2 && !strcmp(argv[1], "-h"))
1659 usage(index_pack_usage);
1661 read_replace_refs = 0;
1662 fsck_options.walk = mark_link;
1664 reset_pack_idx_option(&opts);
1665 git_config(git_index_pack_config, &opts);
1666 if (prefix && chdir(prefix))
1667 die(_("Cannot come back to cwd"));
1669 for (i = 1; i < argc; i++) {
1670 const char *arg = argv[i];
1673 if (!strcmp(arg, "--stdin")) {
1675 } else if (!strcmp(arg, "--fix-thin")) {
1677 } else if (skip_to_optional_arg(arg, "--strict", &arg)) {
1680 fsck_set_msg_types(&fsck_options, arg);
1681 } else if (!strcmp(arg, "--check-self-contained-and-connected")) {
1683 check_self_contained_and_connected = 1;
1684 } else if (!strcmp(arg, "--fsck-objects")) {
1686 } else if (!strcmp(arg, "--verify")) {
1688 } else if (!strcmp(arg, "--verify-stat")) {
1691 } else if (!strcmp(arg, "--verify-stat-only")) {
1695 } else if (skip_to_optional_arg(arg, "--keep", &keep_msg)) {
1696 ; /* nothing to do */
1697 } else if (skip_to_optional_arg(arg, "--promisor", &promisor_msg)) {
1698 ; /* already parsed */
1699 } else if (starts_with(arg, "--threads=")) {
1701 nr_threads = strtoul(arg+10, &end, 0);
1702 if (!arg[10] || *end || nr_threads < 0)
1703 usage(index_pack_usage);
1704 if (!HAVE_THREADS && nr_threads != 1) {
1705 warning(_("no threads support, ignoring %s"), arg);
1708 } else if (starts_with(arg, "--pack_header=")) {
1709 struct pack_header *hdr;
1712 hdr = (struct pack_header *)input_buffer;
1713 hdr->hdr_signature = htonl(PACK_SIGNATURE);
1714 hdr->hdr_version = htonl(strtoul(arg + 14, &c, 10));
1716 die(_("bad %s"), arg);
1717 hdr->hdr_entries = htonl(strtoul(c + 1, &c, 10));
1719 die(_("bad %s"), arg);
1720 input_len = sizeof(*hdr);
1721 } else if (!strcmp(arg, "-v")) {
1723 } else if (!strcmp(arg, "--show-resolving-progress")) {
1724 show_resolving_progress = 1;
1725 } else if (!strcmp(arg, "--report-end-of-input")) {
1726 report_end_of_input = 1;
1727 } else if (!strcmp(arg, "-o")) {
1728 if (index_name || (i+1) >= argc)
1729 usage(index_pack_usage);
1730 index_name = argv[++i];
1731 } else if (starts_with(arg, "--index-version=")) {
1733 opts.version = strtoul(arg + 16, &c, 10);
1734 if (opts.version > 2)
1735 die(_("bad %s"), arg);
1737 opts.off32_limit = strtoul(c+1, &c, 0);
1738 if (*c || opts.off32_limit & 0x80000000)
1739 die(_("bad %s"), arg);
1740 } else if (skip_prefix(arg, "--max-input-size=", &arg)) {
1741 max_input_size = strtoumax(arg, NULL, 10);
1743 usage(index_pack_usage);
1748 usage(index_pack_usage);
1752 if (!pack_name && !from_stdin)
1753 usage(index_pack_usage);
1754 if (fix_thin_pack && !from_stdin)
1755 die(_("--fix-thin cannot be used without --stdin"));
1756 if (from_stdin && !startup_info->have_repository)
1757 die(_("--stdin requires a git repository"));
1758 if (!index_name && pack_name)
1759 index_name = derive_filename(pack_name, "idx", &index_name_buf);
1763 die(_("--verify with no packfile name given"));
1764 read_idx_option(&opts, index_name);
1765 opts.flags |= WRITE_IDX_VERIFY | WRITE_IDX_STRICT;
1768 opts.flags |= WRITE_IDX_STRICT;
1770 if (HAVE_THREADS && !nr_threads) {
1771 nr_threads = online_cpus();
1772 /* An experiment showed that more threads does not mean faster */
1777 curr_pack = open_pack_file(pack_name);
1778 parse_pack_header();
1779 objects = xcalloc(st_add(nr_objects, 1), sizeof(struct object_entry));
1781 obj_stat = xcalloc(st_add(nr_objects, 1), sizeof(struct object_stat));
1782 ofs_deltas = xcalloc(nr_objects, sizeof(struct ofs_delta_entry));
1783 parse_pack_objects(pack_hash);
1784 if (report_end_of_input)
1785 write_in_full(2, "\0", 1);
1787 conclude_pack(fix_thin_pack, curr_pack, pack_hash);
1791 foreign_nr = check_objects();
1794 show_pack_info(stat_only);
1796 ALLOC_ARRAY(idx_objects, nr_objects);
1797 for (i = 0; i < nr_objects; i++)
1798 idx_objects[i] = &objects[i].idx;
1799 curr_index = write_idx_file(index_name, idx_objects, nr_objects, &opts, pack_hash);
1803 final(pack_name, curr_pack,
1804 index_name, curr_index,
1805 keep_msg, promisor_msg,
1810 if (do_fsck_object && fsck_finish(&fsck_options))
1811 die(_("fsck error in pack objects"));
1814 strbuf_release(&index_name_buf);
1815 if (pack_name == NULL)
1816 free((void *) curr_pack);
1817 if (index_name == NULL)
1818 free((void *) curr_index);
1821 * Let the caller know this pack is not self contained
1823 if (check_self_contained_and_connected && foreign_nr)