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;
47 struct base_data *base_cache;
48 size_t base_cache_used;
53 * Even if sizeof(union delta_base) == 24 on 64-bit archs, we really want
54 * to memcmp() only the first 20 bytes.
56 #define UNION_BASE_SZ 20
58 #define FLAG_LINK (1u<<20)
59 #define FLAG_CHECKED (1u<<21)
62 union delta_base base;
66 static struct object_entry *objects;
67 static struct delta_entry *deltas;
68 static struct thread_local nothread_data;
69 static int nr_objects;
71 static int nr_resolved_deltas;
72 static int nr_threads;
74 static int from_stdin;
76 static int do_fsck_object;
79 static int check_self_contained_and_connected;
81 static struct progress *progress;
83 /* We always read in 4kB chunks. */
84 static unsigned char input_buffer[4096];
85 static unsigned int input_offset, input_len;
86 static off_t consumed_bytes;
87 static unsigned deepest_delta;
88 static git_SHA_CTX input_ctx;
89 static uint32_t input_crc32;
90 static int input_fd, output_fd;
91 static const char *curr_pack;
95 static struct thread_local *thread_data;
96 static int nr_dispatched;
97 static int threads_active;
99 static pthread_mutex_t read_mutex;
100 #define read_lock() lock_mutex(&read_mutex)
101 #define read_unlock() unlock_mutex(&read_mutex)
103 static pthread_mutex_t counter_mutex;
104 #define counter_lock() lock_mutex(&counter_mutex)
105 #define counter_unlock() unlock_mutex(&counter_mutex)
107 static pthread_mutex_t work_mutex;
108 #define work_lock() lock_mutex(&work_mutex)
109 #define work_unlock() unlock_mutex(&work_mutex)
111 static pthread_mutex_t deepest_delta_mutex;
112 #define deepest_delta_lock() lock_mutex(&deepest_delta_mutex)
113 #define deepest_delta_unlock() unlock_mutex(&deepest_delta_mutex)
115 static pthread_mutex_t type_cas_mutex;
116 #define type_cas_lock() lock_mutex(&type_cas_mutex)
117 #define type_cas_unlock() unlock_mutex(&type_cas_mutex)
119 static pthread_key_t key;
121 static inline void lock_mutex(pthread_mutex_t *mutex)
124 pthread_mutex_lock(mutex);
127 static inline void unlock_mutex(pthread_mutex_t *mutex)
130 pthread_mutex_unlock(mutex);
134 * Mutex and conditional variable can't be statically-initialized on Windows.
136 static void init_thread(void)
139 init_recursive_mutex(&read_mutex);
140 pthread_mutex_init(&counter_mutex, NULL);
141 pthread_mutex_init(&work_mutex, NULL);
142 pthread_mutex_init(&type_cas_mutex, NULL);
144 pthread_mutex_init(&deepest_delta_mutex, NULL);
145 pthread_key_create(&key, NULL);
146 thread_data = xcalloc(nr_threads, sizeof(*thread_data));
147 for (i = 0; i < nr_threads; i++) {
148 thread_data[i].pack_fd = open(curr_pack, O_RDONLY);
149 if (thread_data[i].pack_fd == -1)
150 die_errno(_("unable to open %s"), curr_pack);
156 static void cleanup_thread(void)
162 pthread_mutex_destroy(&read_mutex);
163 pthread_mutex_destroy(&counter_mutex);
164 pthread_mutex_destroy(&work_mutex);
165 pthread_mutex_destroy(&type_cas_mutex);
167 pthread_mutex_destroy(&deepest_delta_mutex);
168 for (i = 0; i < nr_threads; i++)
169 close(thread_data[i].pack_fd);
170 pthread_key_delete(key);
177 #define read_unlock()
179 #define counter_lock()
180 #define counter_unlock()
183 #define work_unlock()
185 #define deepest_delta_lock()
186 #define deepest_delta_unlock()
191 static int mark_link(struct object *obj, int type, void *data)
196 if (type != OBJ_ANY && obj->type != type)
197 die(_("object type mismatch at %s"), sha1_to_hex(obj->sha1));
199 obj->flags |= FLAG_LINK;
203 /* The content of each linked object must have been checked
204 or it must be already present in the object database */
205 static unsigned check_object(struct object *obj)
210 if (!(obj->flags & FLAG_LINK))
213 if (!(obj->flags & FLAG_CHECKED)) {
215 int type = sha1_object_info(obj->sha1, &size);
217 die(_("did not receive expected object %s"),
218 sha1_to_hex(obj->sha1));
219 if (type != obj->type)
220 die(_("object %s: expected type %s, found %s"),
221 sha1_to_hex(obj->sha1),
222 typename(obj->type), typename(type));
223 obj->flags |= FLAG_CHECKED;
230 static unsigned check_objects(void)
232 unsigned i, max, foreign_nr = 0;
234 max = get_max_object_index();
235 for (i = 0; i < max; i++)
236 foreign_nr += check_object(get_indexed_object(i));
241 /* Discard current buffer used content. */
242 static void flush(void)
246 write_or_die(output_fd, input_buffer, input_offset);
247 git_SHA1_Update(&input_ctx, input_buffer, input_offset);
248 memmove(input_buffer, input_buffer + input_offset, input_len);
254 * Make sure at least "min" bytes are available in the buffer, and
255 * return the pointer to the buffer.
257 static void *fill(int min)
259 if (min <= input_len)
260 return input_buffer + input_offset;
261 if (min > sizeof(input_buffer))
262 die(Q_("cannot fill %d byte",
263 "cannot fill %d bytes",
268 ssize_t ret = xread(input_fd, input_buffer + input_len,
269 sizeof(input_buffer) - input_len);
273 die_errno(_("read error on input"));
277 display_throughput(progress, consumed_bytes + input_len);
278 } while (input_len < min);
282 static void use(int bytes)
284 if (bytes > input_len)
285 die(_("used more bytes than were available"));
286 input_crc32 = crc32(input_crc32, input_buffer + input_offset, bytes);
288 input_offset += bytes;
290 /* make sure off_t is sufficiently large not to wrap */
291 if (signed_add_overflows(consumed_bytes, bytes))
292 die(_("pack too large for current definition of off_t"));
293 consumed_bytes += bytes;
296 static const char *open_pack_file(const char *pack_name)
301 static char tmp_file[PATH_MAX];
302 output_fd = odb_mkstemp(tmp_file, sizeof(tmp_file),
303 "pack/tmp_pack_XXXXXX");
304 pack_name = xstrdup(tmp_file);
306 output_fd = open(pack_name, O_CREAT|O_EXCL|O_RDWR, 0600);
308 die_errno(_("unable to create '%s'"), pack_name);
309 nothread_data.pack_fd = output_fd;
311 input_fd = open(pack_name, O_RDONLY);
313 die_errno(_("cannot open packfile '%s'"), pack_name);
315 nothread_data.pack_fd = input_fd;
317 git_SHA1_Init(&input_ctx);
321 static void parse_pack_header(void)
323 struct pack_header *hdr = fill(sizeof(struct pack_header));
325 /* Header consistency check */
326 if (hdr->hdr_signature != htonl(PACK_SIGNATURE))
327 die(_("pack signature mismatch"));
328 if (!pack_version_ok(hdr->hdr_version))
329 die(_("pack version %"PRIu32" unsupported"),
330 ntohl(hdr->hdr_version));
332 nr_objects = ntohl(hdr->hdr_entries);
333 use(sizeof(struct pack_header));
336 static NORETURN void bad_object(unsigned long offset, const char *format,
337 ...) __attribute__((format (printf, 2, 3)));
339 static NORETURN void bad_object(unsigned long offset, const char *format, ...)
344 va_start(params, format);
345 vsnprintf(buf, sizeof(buf), format, params);
347 die(_("pack has bad object at offset %lu: %s"), offset, buf);
350 static inline struct thread_local *get_thread_data(void)
354 return pthread_getspecific(key);
355 assert(!threads_active &&
356 "This should only be reached when all threads are gone");
358 return ¬hread_data;
362 static void set_thread_data(struct thread_local *data)
365 pthread_setspecific(key, data);
369 static struct base_data *alloc_base_data(void)
371 struct base_data *base = xcalloc(1, sizeof(struct base_data));
377 static void free_base_data(struct base_data *c)
382 get_thread_data()->base_cache_used -= c->size;
386 static void prune_base_data(struct base_data *retain)
389 struct thread_local *data = get_thread_data();
390 for (b = data->base_cache;
391 data->base_cache_used > delta_base_cache_limit && b;
393 if (b->data && b != retain)
398 static void link_base_data(struct base_data *base, struct base_data *c)
403 get_thread_data()->base_cache = c;
408 get_thread_data()->base_cache_used += c->size;
412 static void unlink_base_data(struct base_data *c)
414 struct base_data *base = c->base;
418 get_thread_data()->base_cache = NULL;
422 static int is_delta_type(enum object_type type)
424 return (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA);
427 static void *unpack_entry_data(unsigned long offset, unsigned long size,
428 enum object_type type, unsigned char *sha1)
430 static char fixed_buf[8192];
438 if (!is_delta_type(type)) {
439 hdrlen = sprintf(hdr, "%s %lu", typename(type), size) + 1;
441 git_SHA1_Update(&c, hdr, hdrlen);
444 if (type == OBJ_BLOB && size > big_file_threshold)
449 memset(&stream, 0, sizeof(stream));
450 git_inflate_init(&stream);
451 stream.next_out = buf;
452 stream.avail_out = buf == fixed_buf ? sizeof(fixed_buf) : size;
455 unsigned char *last_out = stream.next_out;
456 stream.next_in = fill(1);
457 stream.avail_in = input_len;
458 status = git_inflate(&stream, 0);
459 use(input_len - stream.avail_in);
461 git_SHA1_Update(&c, last_out, stream.next_out - last_out);
462 if (buf == fixed_buf) {
463 stream.next_out = buf;
464 stream.avail_out = sizeof(fixed_buf);
466 } while (status == Z_OK);
467 if (stream.total_out != size || status != Z_STREAM_END)
468 bad_object(offset, _("inflate returned %d"), status);
469 git_inflate_end(&stream);
471 git_SHA1_Final(sha1, &c);
472 return buf == fixed_buf ? NULL : buf;
475 static void *unpack_raw_entry(struct object_entry *obj,
476 union delta_base *delta_base,
480 unsigned long size, c;
485 obj->idx.offset = consumed_bytes;
486 input_crc32 = crc32(0, NULL, 0);
491 obj->type = (c >> 4) & 7;
498 size += (c & 0x7f) << shift;
505 hashcpy(delta_base->sha1, fill(20));
509 memset(delta_base, 0, sizeof(*delta_base));
513 base_offset = c & 127;
516 if (!base_offset || MSB(base_offset, 7))
517 bad_object(obj->idx.offset, _("offset value overflow for delta base object"));
521 base_offset = (base_offset << 7) + (c & 127);
523 delta_base->offset = obj->idx.offset - base_offset;
524 if (delta_base->offset <= 0 || delta_base->offset >= obj->idx.offset)
525 bad_object(obj->idx.offset, _("delta base offset is out of bound"));
533 bad_object(obj->idx.offset, _("unknown object type %d"), obj->type);
535 obj->hdr_size = consumed_bytes - obj->idx.offset;
537 data = unpack_entry_data(obj->idx.offset, obj->size, obj->type, sha1);
538 obj->idx.crc32 = input_crc32;
542 static void *unpack_data(struct object_entry *obj,
543 int (*consume)(const unsigned char *, unsigned long, void *),
546 off_t from = obj[0].idx.offset + obj[0].hdr_size;
547 unsigned long len = obj[1].idx.offset - from;
548 unsigned char *data, *inbuf;
552 data = xmalloc(consume ? 64*1024 : obj->size);
553 inbuf = xmalloc((len < 64*1024) ? len : 64*1024);
555 memset(&stream, 0, sizeof(stream));
556 git_inflate_init(&stream);
557 stream.next_out = data;
558 stream.avail_out = consume ? 64*1024 : obj->size;
561 ssize_t n = (len < 64*1024) ? len : 64*1024;
562 n = xpread(get_thread_data()->pack_fd, inbuf, n, from);
564 die_errno(_("cannot pread pack file"));
566 die(Q_("premature end of pack file, %lu byte missing",
567 "premature end of pack file, %lu bytes missing",
572 stream.next_in = inbuf;
575 status = git_inflate(&stream, 0);
578 status = git_inflate(&stream, 0);
579 if (consume(data, stream.next_out - data, cb_data)) {
584 stream.next_out = data;
585 stream.avail_out = 64*1024;
586 } while (status == Z_OK && stream.avail_in);
588 } while (len && status == Z_OK && !stream.avail_in);
590 /* This has been inflated OK when first encountered, so... */
591 if (status != Z_STREAM_END || stream.total_out != obj->size)
592 die(_("serious inflate inconsistency"));
594 git_inflate_end(&stream);
603 static void *get_data_from_pack(struct object_entry *obj)
605 return unpack_data(obj, NULL, NULL);
608 static int compare_delta_bases(const union delta_base *base1,
609 const union delta_base *base2,
610 enum object_type type1,
611 enum object_type type2)
613 int cmp = type1 - type2;
616 return memcmp(base1, base2, UNION_BASE_SZ);
619 static int find_delta(const union delta_base *base, enum object_type type)
621 int first = 0, last = nr_deltas;
623 while (first < last) {
624 int next = (first + last) / 2;
625 struct delta_entry *delta = &deltas[next];
628 cmp = compare_delta_bases(base, &delta->base,
629 type, objects[delta->obj_no].type);
641 static void find_delta_children(const union delta_base *base,
642 int *first_index, int *last_index,
643 enum object_type type)
645 int first = find_delta(base, type);
647 int end = nr_deltas - 1;
654 while (first > 0 && !memcmp(&deltas[first - 1].base, base, UNION_BASE_SZ))
656 while (last < end && !memcmp(&deltas[last + 1].base, base, UNION_BASE_SZ))
658 *first_index = first;
662 struct compare_data {
663 struct object_entry *entry;
664 struct git_istream *st;
666 unsigned long buf_size;
669 static int compare_objects(const unsigned char *buf, unsigned long size,
672 struct compare_data *data = cb_data;
674 if (data->buf_size < size) {
676 data->buf = xmalloc(size);
677 data->buf_size = size;
681 ssize_t len = read_istream(data->st, data->buf, size);
683 die(_("SHA1 COLLISION FOUND WITH %s !"),
684 sha1_to_hex(data->entry->idx.sha1));
686 die(_("unable to read %s"),
687 sha1_to_hex(data->entry->idx.sha1));
688 if (memcmp(buf, data->buf, len))
689 die(_("SHA1 COLLISION FOUND WITH %s !"),
690 sha1_to_hex(data->entry->idx.sha1));
697 static int check_collison(struct object_entry *entry)
699 struct compare_data data;
700 enum object_type type;
703 if (entry->size <= big_file_threshold || entry->type != OBJ_BLOB)
706 memset(&data, 0, sizeof(data));
708 data.st = open_istream(entry->idx.sha1, &type, &size, NULL);
711 if (size != entry->size || type != entry->type)
712 die(_("SHA1 COLLISION FOUND WITH %s !"),
713 sha1_to_hex(entry->idx.sha1));
714 unpack_data(entry, compare_objects, &data);
715 close_istream(data.st);
720 static void sha1_object(const void *data, struct object_entry *obj_entry,
721 unsigned long size, enum object_type type,
722 const unsigned char *sha1)
724 void *new_data = NULL;
725 int collision_test_needed;
727 assert(data || obj_entry);
730 collision_test_needed = has_sha1_file(sha1);
733 if (collision_test_needed && !data) {
735 if (!check_collison(obj_entry))
736 collision_test_needed = 0;
739 if (collision_test_needed) {
741 enum object_type has_type;
742 unsigned long has_size;
744 has_type = sha1_object_info(sha1, &has_size);
745 if (has_type != type || has_size != size)
746 die(_("SHA1 COLLISION FOUND WITH %s !"), sha1_to_hex(sha1));
747 has_data = read_sha1_file(sha1, &has_type, &has_size);
750 data = new_data = get_data_from_pack(obj_entry);
752 die(_("cannot read existing object %s"), sha1_to_hex(sha1));
753 if (size != has_size || type != has_type ||
754 memcmp(data, has_data, size) != 0)
755 die(_("SHA1 COLLISION FOUND WITH %s !"), sha1_to_hex(sha1));
761 if (type == OBJ_BLOB) {
762 struct blob *blob = lookup_blob(sha1);
764 blob->object.flags |= FLAG_CHECKED;
766 die(_("invalid blob object %s"), sha1_to_hex(sha1));
770 void *buf = (void *) data;
772 assert(data && "data can only be NULL for large _blobs_");
775 * we do not need to free the memory here, as the
776 * buf is deleted by the caller.
778 obj = parse_object_buffer(sha1, type, size, buf, &eaten);
780 die(_("invalid %s"), typename(type));
781 if (do_fsck_object &&
782 fsck_object(obj, 1, fsck_error_function))
783 die(_("Error in object"));
784 if (fsck_walk(obj, mark_link, NULL))
785 die(_("Not all child objects of %s are reachable"), sha1_to_hex(obj->sha1));
787 if (obj->type == OBJ_TREE) {
788 struct tree *item = (struct tree *) obj;
792 if (obj->type == OBJ_COMMIT) {
793 struct commit *commit = (struct commit *) obj;
794 if (detach_commit_buffer(commit, NULL) != data)
795 die("BUG: parse_object_buffer transmogrified our buffer");
797 obj->flags |= FLAG_CHECKED;
806 * This function is part of find_unresolved_deltas(). There are two
807 * walkers going in the opposite ways.
809 * The first one in find_unresolved_deltas() traverses down from
810 * parent node to children, deflating nodes along the way. However,
811 * memory for deflated nodes is limited by delta_base_cache_limit, so
812 * at some point parent node's deflated content may be freed.
814 * The second walker is this function, which goes from current node up
815 * to top parent if necessary to deflate the node. In normal
816 * situation, its parent node would be already deflated, so it just
817 * needs to apply delta.
819 * In the worst case scenario, parent node is no longer deflated because
820 * we're running out of delta_base_cache_limit; we need to re-deflate
821 * parents, possibly up to the top base.
823 * All deflated objects here are subject to be freed if we exceed
824 * delta_base_cache_limit, just like in find_unresolved_deltas(), we
825 * just need to make sure the last node is not freed.
827 static void *get_base_data(struct base_data *c)
830 struct object_entry *obj = c->obj;
831 struct base_data **delta = NULL;
832 int delta_nr = 0, delta_alloc = 0;
834 while (is_delta_type(c->obj->type) && !c->data) {
835 ALLOC_GROW(delta, delta_nr + 1, delta_alloc);
836 delta[delta_nr++] = c;
840 c->data = get_data_from_pack(obj);
842 get_thread_data()->base_cache_used += c->size;
845 for (; delta_nr > 0; delta_nr--) {
847 c = delta[delta_nr - 1];
849 base = get_base_data(c->base);
850 raw = get_data_from_pack(obj);
851 c->data = patch_delta(
857 bad_object(obj->idx.offset, _("failed to apply delta"));
858 get_thread_data()->base_cache_used += c->size;
866 static void resolve_delta(struct object_entry *delta_obj,
867 struct base_data *base, struct base_data *result)
869 void *base_data, *delta_data;
872 delta_obj->delta_depth = base->obj->delta_depth + 1;
873 deepest_delta_lock();
874 if (deepest_delta < delta_obj->delta_depth)
875 deepest_delta = delta_obj->delta_depth;
876 deepest_delta_unlock();
878 delta_obj->base_object_no = base->obj - objects;
879 delta_data = get_data_from_pack(delta_obj);
880 base_data = get_base_data(base);
881 result->obj = delta_obj;
882 result->data = patch_delta(base_data, base->size,
883 delta_data, delta_obj->size, &result->size);
886 bad_object(delta_obj->idx.offset, _("failed to apply delta"));
887 hash_sha1_file(result->data, result->size,
888 typename(delta_obj->real_type), delta_obj->idx.sha1);
889 sha1_object(result->data, NULL, result->size, delta_obj->real_type,
890 delta_obj->idx.sha1);
892 nr_resolved_deltas++;
897 * Standard boolean compare-and-swap: atomically check whether "*type" is
898 * "want"; if so, swap in "set" and return true. Otherwise, leave it untouched
901 static int compare_and_swap_type(enum object_type *type,
902 enum object_type want,
903 enum object_type set)
905 enum object_type old;
916 static struct base_data *find_unresolved_deltas_1(struct base_data *base,
917 struct base_data *prev_base)
919 if (base->ref_last == -1 && base->ofs_last == -1) {
920 union delta_base base_spec;
922 hashcpy(base_spec.sha1, base->obj->idx.sha1);
923 find_delta_children(&base_spec,
924 &base->ref_first, &base->ref_last, OBJ_REF_DELTA);
926 memset(&base_spec, 0, sizeof(base_spec));
927 base_spec.offset = base->obj->idx.offset;
928 find_delta_children(&base_spec,
929 &base->ofs_first, &base->ofs_last, OBJ_OFS_DELTA);
931 if (base->ref_last == -1 && base->ofs_last == -1) {
936 link_base_data(prev_base, base);
939 if (base->ref_first <= base->ref_last) {
940 struct object_entry *child = objects + deltas[base->ref_first].obj_no;
941 struct base_data *result = alloc_base_data();
943 if (!compare_and_swap_type(&child->real_type, OBJ_REF_DELTA,
944 base->obj->real_type))
945 die("BUG: child->real_type != OBJ_REF_DELTA");
947 resolve_delta(child, base, result);
948 if (base->ref_first == base->ref_last && base->ofs_last == -1)
949 free_base_data(base);
955 if (base->ofs_first <= base->ofs_last) {
956 struct object_entry *child = objects + deltas[base->ofs_first].obj_no;
957 struct base_data *result = alloc_base_data();
959 assert(child->real_type == OBJ_OFS_DELTA);
960 child->real_type = base->obj->real_type;
961 resolve_delta(child, base, result);
962 if (base->ofs_first == base->ofs_last)
963 free_base_data(base);
969 unlink_base_data(base);
973 static void find_unresolved_deltas(struct base_data *base)
975 struct base_data *new_base, *prev_base = NULL;
977 new_base = find_unresolved_deltas_1(base, prev_base);
987 prev_base = base->base;
992 static int compare_delta_entry(const void *a, const void *b)
994 const struct delta_entry *delta_a = a;
995 const struct delta_entry *delta_b = b;
997 /* group by type (ref vs ofs) and then by value (sha-1 or offset) */
998 return compare_delta_bases(&delta_a->base, &delta_b->base,
999 objects[delta_a->obj_no].type,
1000 objects[delta_b->obj_no].type);
1003 static void resolve_base(struct object_entry *obj)
1005 struct base_data *base_obj = alloc_base_data();
1006 base_obj->obj = obj;
1007 base_obj->data = NULL;
1008 find_unresolved_deltas(base_obj);
1012 static void *threaded_second_pass(void *data)
1014 set_thread_data(data);
1018 display_progress(progress, nr_resolved_deltas);
1021 while (nr_dispatched < nr_objects &&
1022 is_delta_type(objects[nr_dispatched].type))
1024 if (nr_dispatched >= nr_objects) {
1028 i = nr_dispatched++;
1031 resolve_base(&objects[i]);
1039 * - find locations of all objects;
1040 * - calculate SHA1 of all non-delta objects;
1041 * - remember base (SHA1 or offset) for all deltas.
1043 static void parse_pack_objects(unsigned char *sha1)
1045 int i, nr_delays = 0;
1046 struct delta_entry *delta = deltas;
1050 progress = start_progress(
1051 from_stdin ? _("Receiving objects") : _("Indexing objects"),
1053 for (i = 0; i < nr_objects; i++) {
1054 struct object_entry *obj = &objects[i];
1055 void *data = unpack_raw_entry(obj, &delta->base, obj->idx.sha1);
1056 obj->real_type = obj->type;
1057 if (is_delta_type(obj->type)) {
1062 /* large blobs, check later */
1063 obj->real_type = OBJ_BAD;
1066 sha1_object(data, NULL, obj->size, obj->type, obj->idx.sha1);
1068 display_progress(progress, i+1);
1070 objects[i].idx.offset = consumed_bytes;
1071 stop_progress(&progress);
1073 /* Check pack integrity */
1075 git_SHA1_Final(sha1, &input_ctx);
1076 if (hashcmp(fill(20), sha1))
1077 die(_("pack is corrupted (SHA1 mismatch)"));
1080 /* If input_fd is a file, we should have reached its end now. */
1081 if (fstat(input_fd, &st))
1082 die_errno(_("cannot fstat packfile"));
1083 if (S_ISREG(st.st_mode) &&
1084 lseek(input_fd, 0, SEEK_CUR) - input_len != st.st_size)
1085 die(_("pack has junk at the end"));
1087 for (i = 0; i < nr_objects; i++) {
1088 struct object_entry *obj = &objects[i];
1089 if (obj->real_type != OBJ_BAD)
1091 obj->real_type = obj->type;
1092 sha1_object(NULL, obj, obj->size, obj->type, obj->idx.sha1);
1096 die(_("confusion beyond insanity in parse_pack_objects()"));
1101 * - for all non-delta objects, look if it is used as a base for
1103 * - if used as a base, uncompress the object and apply all deltas,
1104 * recursively checking if the resulting object is used as a base
1105 * for some more deltas.
1107 static void resolve_deltas(void)
1114 /* Sort deltas by base SHA1/offset for fast searching */
1115 qsort(deltas, nr_deltas, sizeof(struct delta_entry),
1116 compare_delta_entry);
1119 progress = start_progress(_("Resolving deltas"), nr_deltas);
1123 if (nr_threads > 1 || getenv("GIT_FORCE_THREADS")) {
1125 for (i = 0; i < nr_threads; i++) {
1126 int ret = pthread_create(&thread_data[i].thread, NULL,
1127 threaded_second_pass, thread_data + i);
1129 die(_("unable to create thread: %s"),
1132 for (i = 0; i < nr_threads; i++)
1133 pthread_join(thread_data[i].thread, NULL);
1139 for (i = 0; i < nr_objects; i++) {
1140 struct object_entry *obj = &objects[i];
1142 if (is_delta_type(obj->type))
1145 display_progress(progress, nr_resolved_deltas);
1151 * - append objects to convert thin pack to full pack if required
1152 * - write the final 20-byte SHA-1
1154 static void fix_unresolved_deltas(struct sha1file *f, int nr_unresolved);
1155 static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned char *pack_sha1)
1157 if (nr_deltas == nr_resolved_deltas) {
1158 stop_progress(&progress);
1159 /* Flush remaining pack final 20-byte SHA1. */
1164 if (fix_thin_pack) {
1166 unsigned char read_sha1[20], tail_sha1[20];
1167 struct strbuf msg = STRBUF_INIT;
1168 int nr_unresolved = nr_deltas - nr_resolved_deltas;
1169 int nr_objects_initial = nr_objects;
1170 if (nr_unresolved <= 0)
1171 die(_("confusion beyond insanity"));
1172 objects = xrealloc(objects,
1173 (nr_objects + nr_unresolved + 1)
1174 * sizeof(*objects));
1175 memset(objects + nr_objects + 1, 0,
1176 nr_unresolved * sizeof(*objects));
1177 f = sha1fd(output_fd, curr_pack);
1178 fix_unresolved_deltas(f, nr_unresolved);
1179 strbuf_addf(&msg, _("completed with %d local objects"),
1180 nr_objects - nr_objects_initial);
1181 stop_progress_msg(&progress, msg.buf);
1182 strbuf_release(&msg);
1183 sha1close(f, tail_sha1, 0);
1184 hashcpy(read_sha1, pack_sha1);
1185 fixup_pack_header_footer(output_fd, pack_sha1,
1186 curr_pack, nr_objects,
1187 read_sha1, consumed_bytes-20);
1188 if (hashcmp(read_sha1, tail_sha1) != 0)
1189 die(_("Unexpected tail checksum for %s "
1190 "(disk corruption?)"), curr_pack);
1192 if (nr_deltas != nr_resolved_deltas)
1193 die(Q_("pack has %d unresolved delta",
1194 "pack has %d unresolved deltas",
1195 nr_deltas - nr_resolved_deltas),
1196 nr_deltas - nr_resolved_deltas);
1199 static int write_compressed(struct sha1file *f, void *in, unsigned int size)
1203 unsigned char outbuf[4096];
1205 memset(&stream, 0, sizeof(stream));
1206 git_deflate_init(&stream, zlib_compression_level);
1207 stream.next_in = in;
1208 stream.avail_in = size;
1211 stream.next_out = outbuf;
1212 stream.avail_out = sizeof(outbuf);
1213 status = git_deflate(&stream, Z_FINISH);
1214 sha1write(f, outbuf, sizeof(outbuf) - stream.avail_out);
1215 } while (status == Z_OK);
1217 if (status != Z_STREAM_END)
1218 die(_("unable to deflate appended object (%d)"), status);
1219 size = stream.total_out;
1220 git_deflate_end(&stream);
1224 static struct object_entry *append_obj_to_pack(struct sha1file *f,
1225 const unsigned char *sha1, void *buf,
1226 unsigned long size, enum object_type type)
1228 struct object_entry *obj = &objects[nr_objects++];
1229 unsigned char header[10];
1230 unsigned long s = size;
1232 unsigned char c = (type << 4) | (s & 15);
1235 header[n++] = c | 0x80;
1241 sha1write(f, header, n);
1243 obj[0].hdr_size = n;
1245 obj[0].real_type = type;
1246 obj[1].idx.offset = obj[0].idx.offset + n;
1247 obj[1].idx.offset += write_compressed(f, buf, size);
1248 obj[0].idx.crc32 = crc32_end(f);
1250 hashcpy(obj->idx.sha1, sha1);
1254 static int delta_pos_compare(const void *_a, const void *_b)
1256 struct delta_entry *a = *(struct delta_entry **)_a;
1257 struct delta_entry *b = *(struct delta_entry **)_b;
1258 return a->obj_no - b->obj_no;
1261 static void fix_unresolved_deltas(struct sha1file *f, int nr_unresolved)
1263 struct delta_entry **sorted_by_pos;
1267 * Since many unresolved deltas may well be themselves base objects
1268 * for more unresolved deltas, we really want to include the
1269 * smallest number of base objects that would cover as much delta
1270 * as possible by picking the
1271 * trunc deltas first, allowing for other deltas to resolve without
1272 * additional base objects. Since most base objects are to be found
1273 * before deltas depending on them, a good heuristic is to start
1274 * resolving deltas in the same order as their position in the pack.
1276 sorted_by_pos = xmalloc(nr_unresolved * sizeof(*sorted_by_pos));
1277 for (i = 0; i < nr_deltas; i++) {
1278 if (objects[deltas[i].obj_no].real_type != OBJ_REF_DELTA)
1280 sorted_by_pos[n++] = &deltas[i];
1282 qsort(sorted_by_pos, n, sizeof(*sorted_by_pos), delta_pos_compare);
1284 for (i = 0; i < n; i++) {
1285 struct delta_entry *d = sorted_by_pos[i];
1286 enum object_type type;
1287 struct base_data *base_obj = alloc_base_data();
1289 if (objects[d->obj_no].real_type != OBJ_REF_DELTA)
1291 base_obj->data = read_sha1_file(d->base.sha1, &type, &base_obj->size);
1292 if (!base_obj->data)
1295 if (check_sha1_signature(d->base.sha1, base_obj->data,
1296 base_obj->size, typename(type)))
1297 die(_("local object %s is corrupt"), sha1_to_hex(d->base.sha1));
1298 base_obj->obj = append_obj_to_pack(f, d->base.sha1,
1299 base_obj->data, base_obj->size, type);
1300 find_unresolved_deltas(base_obj);
1301 display_progress(progress, nr_resolved_deltas);
1303 free(sorted_by_pos);
1306 static void final(const char *final_pack_name, const char *curr_pack_name,
1307 const char *final_index_name, const char *curr_index_name,
1308 const char *keep_name, const char *keep_msg,
1309 unsigned char *sha1)
1311 const char *report = "pack";
1312 char name[PATH_MAX];
1318 fsync_or_die(output_fd, curr_pack_name);
1319 err = close(output_fd);
1321 die_errno(_("error while closing pack file"));
1325 int keep_fd, keep_msg_len = strlen(keep_msg);
1328 keep_fd = odb_pack_keep(name, sizeof(name), sha1);
1330 keep_fd = open(keep_name, O_RDWR|O_CREAT|O_EXCL, 0600);
1333 if (errno != EEXIST)
1334 die_errno(_("cannot write keep file '%s'"),
1335 keep_name ? keep_name : name);
1337 if (keep_msg_len > 0) {
1338 write_or_die(keep_fd, keep_msg, keep_msg_len);
1339 write_or_die(keep_fd, "\n", 1);
1341 if (close(keep_fd) != 0)
1342 die_errno(_("cannot close written keep file '%s'"),
1343 keep_name ? keep_name : name);
1348 if (final_pack_name != curr_pack_name) {
1349 if (!final_pack_name) {
1350 snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
1351 get_object_directory(), sha1_to_hex(sha1));
1352 final_pack_name = name;
1354 if (move_temp_to_file(curr_pack_name, final_pack_name))
1355 die(_("cannot store pack file"));
1356 } else if (from_stdin)
1357 chmod(final_pack_name, 0444);
1359 if (final_index_name != curr_index_name) {
1360 if (!final_index_name) {
1361 snprintf(name, sizeof(name), "%s/pack/pack-%s.idx",
1362 get_object_directory(), sha1_to_hex(sha1));
1363 final_index_name = name;
1365 if (move_temp_to_file(curr_index_name, final_index_name))
1366 die(_("cannot store index file"));
1368 chmod(final_index_name, 0444);
1371 printf("%s\n", sha1_to_hex(sha1));
1374 int len = snprintf(buf, sizeof(buf), "%s\t%s\n",
1375 report, sha1_to_hex(sha1));
1376 write_or_die(1, buf, len);
1379 * Let's just mimic git-unpack-objects here and write
1380 * the last part of the input buffer to stdout.
1383 err = xwrite(1, input_buffer + input_offset, input_len);
1387 input_offset += err;
1392 static int git_index_pack_config(const char *k, const char *v, void *cb)
1394 struct pack_idx_option *opts = cb;
1396 if (!strcmp(k, "pack.indexversion")) {
1397 opts->version = git_config_int(k, v);
1398 if (opts->version > 2)
1399 die(_("bad pack.indexversion=%"PRIu32), opts->version);
1402 if (!strcmp(k, "pack.threads")) {
1403 nr_threads = git_config_int(k, v);
1405 die(_("invalid number of threads specified (%d)"),
1408 if (nr_threads != 1)
1409 warning(_("no threads support, ignoring %s"), k);
1414 return git_default_config(k, v, cb);
1417 static int cmp_uint32(const void *a_, const void *b_)
1419 uint32_t a = *((uint32_t *)a_);
1420 uint32_t b = *((uint32_t *)b_);
1422 return (a < b) ? -1 : (a != b);
1425 static void read_v2_anomalous_offsets(struct packed_git *p,
1426 struct pack_idx_option *opts)
1428 const uint32_t *idx1, *idx2;
1431 /* The address of the 4-byte offset table */
1432 idx1 = (((const uint32_t *)p->index_data)
1433 + 2 /* 8-byte header */
1435 + 5 * p->num_objects /* 20-byte SHA-1 table */
1436 + p->num_objects /* CRC32 table */
1439 /* The address of the 8-byte offset table */
1440 idx2 = idx1 + p->num_objects;
1442 for (i = 0; i < p->num_objects; i++) {
1443 uint32_t off = ntohl(idx1[i]);
1444 if (!(off & 0x80000000))
1446 off = off & 0x7fffffff;
1450 * The real offset is ntohl(idx2[off * 2]) in high 4
1451 * octets, and ntohl(idx2[off * 2 + 1]) in low 4
1452 * octets. But idx2[off * 2] is Zero!!!
1454 ALLOC_GROW(opts->anomaly, opts->anomaly_nr + 1, opts->anomaly_alloc);
1455 opts->anomaly[opts->anomaly_nr++] = ntohl(idx2[off * 2 + 1]);
1458 if (1 < opts->anomaly_nr)
1459 qsort(opts->anomaly, opts->anomaly_nr, sizeof(uint32_t), cmp_uint32);
1462 static void read_idx_option(struct pack_idx_option *opts, const char *pack_name)
1464 struct packed_git *p = add_packed_git(pack_name, strlen(pack_name), 1);
1467 die(_("Cannot open existing pack file '%s'"), pack_name);
1468 if (open_pack_index(p))
1469 die(_("Cannot open existing pack idx file for '%s'"), pack_name);
1471 /* Read the attributes from the existing idx file */
1472 opts->version = p->index_version;
1474 if (opts->version == 2)
1475 read_v2_anomalous_offsets(p, opts);
1478 * Get rid of the idx file as we do not need it anymore.
1479 * NEEDSWORK: extract this bit from free_pack_by_name() in
1480 * sha1_file.c, perhaps? It shouldn't matter very much as we
1481 * know we haven't installed this pack (hence we never have
1482 * read anything from it).
1484 close_pack_index(p);
1488 static void show_pack_info(int stat_only)
1490 int i, baseobjects = nr_objects - nr_deltas;
1491 unsigned long *chain_histogram = NULL;
1494 chain_histogram = xcalloc(deepest_delta, sizeof(unsigned long));
1496 for (i = 0; i < nr_objects; i++) {
1497 struct object_entry *obj = &objects[i];
1499 if (is_delta_type(obj->type))
1500 chain_histogram[obj->delta_depth - 1]++;
1503 printf("%s %-6s %lu %lu %"PRIuMAX,
1504 sha1_to_hex(obj->idx.sha1),
1505 typename(obj->real_type), obj->size,
1506 (unsigned long)(obj[1].idx.offset - obj->idx.offset),
1507 (uintmax_t)obj->idx.offset);
1508 if (is_delta_type(obj->type)) {
1509 struct object_entry *bobj = &objects[obj->base_object_no];
1510 printf(" %u %s", obj->delta_depth, sha1_to_hex(bobj->idx.sha1));
1516 printf_ln(Q_("non delta: %d object",
1517 "non delta: %d objects",
1520 for (i = 0; i < deepest_delta; i++) {
1521 if (!chain_histogram[i])
1523 printf_ln(Q_("chain length = %d: %lu object",
1524 "chain length = %d: %lu objects",
1525 chain_histogram[i]),
1527 chain_histogram[i]);
1531 int cmd_index_pack(int argc, const char **argv, const char *prefix)
1533 int i, fix_thin_pack = 0, verify = 0, stat_only = 0;
1534 const char *curr_index;
1535 const char *index_name = NULL, *pack_name = NULL;
1536 const char *keep_name = NULL, *keep_msg = NULL;
1537 struct strbuf index_name_buf = STRBUF_INIT,
1538 keep_name_buf = STRBUF_INIT;
1539 struct pack_idx_entry **idx_objects;
1540 struct pack_idx_option opts;
1541 unsigned char pack_sha1[20];
1542 unsigned foreign_nr = 1; /* zero is a "good" value, assume bad */
1544 if (argc == 2 && !strcmp(argv[1], "-h"))
1545 usage(index_pack_usage);
1547 check_replace_refs = 0;
1549 reset_pack_idx_option(&opts);
1550 git_config(git_index_pack_config, &opts);
1551 if (prefix && chdir(prefix))
1552 die(_("Cannot come back to cwd"));
1554 for (i = 1; i < argc; i++) {
1555 const char *arg = argv[i];
1558 if (!strcmp(arg, "--stdin")) {
1560 } else if (!strcmp(arg, "--fix-thin")) {
1562 } else if (!strcmp(arg, "--strict")) {
1565 } else if (!strcmp(arg, "--check-self-contained-and-connected")) {
1567 check_self_contained_and_connected = 1;
1568 } else if (!strcmp(arg, "--verify")) {
1570 } else if (!strcmp(arg, "--verify-stat")) {
1573 } else if (!strcmp(arg, "--verify-stat-only")) {
1577 } else if (!strcmp(arg, "--keep")) {
1579 } else if (starts_with(arg, "--keep=")) {
1581 } else if (starts_with(arg, "--threads=")) {
1583 nr_threads = strtoul(arg+10, &end, 0);
1584 if (!arg[10] || *end || nr_threads < 0)
1585 usage(index_pack_usage);
1587 if (nr_threads != 1)
1588 warning(_("no threads support, "
1589 "ignoring %s"), arg);
1592 } else if (starts_with(arg, "--pack_header=")) {
1593 struct pack_header *hdr;
1596 hdr = (struct pack_header *)input_buffer;
1597 hdr->hdr_signature = htonl(PACK_SIGNATURE);
1598 hdr->hdr_version = htonl(strtoul(arg + 14, &c, 10));
1600 die(_("bad %s"), arg);
1601 hdr->hdr_entries = htonl(strtoul(c + 1, &c, 10));
1603 die(_("bad %s"), arg);
1604 input_len = sizeof(*hdr);
1605 } else if (!strcmp(arg, "-v")) {
1607 } else if (!strcmp(arg, "-o")) {
1608 if (index_name || (i+1) >= argc)
1609 usage(index_pack_usage);
1610 index_name = argv[++i];
1611 } else if (starts_with(arg, "--index-version=")) {
1613 opts.version = strtoul(arg + 16, &c, 10);
1614 if (opts.version > 2)
1615 die(_("bad %s"), arg);
1617 opts.off32_limit = strtoul(c+1, &c, 0);
1618 if (*c || opts.off32_limit & 0x80000000)
1619 die(_("bad %s"), arg);
1621 usage(index_pack_usage);
1626 usage(index_pack_usage);
1630 if (!pack_name && !from_stdin)
1631 usage(index_pack_usage);
1632 if (fix_thin_pack && !from_stdin)
1633 die(_("--fix-thin cannot be used without --stdin"));
1634 if (!index_name && pack_name) {
1636 if (!strip_suffix(pack_name, ".pack", &len))
1637 die(_("packfile name '%s' does not end with '.pack'"),
1639 strbuf_add(&index_name_buf, pack_name, len);
1640 strbuf_addstr(&index_name_buf, ".idx");
1641 index_name = index_name_buf.buf;
1643 if (keep_msg && !keep_name && pack_name) {
1645 if (!strip_suffix(pack_name, ".pack", &len))
1646 die(_("packfile name '%s' does not end with '.pack'"),
1648 strbuf_add(&keep_name_buf, pack_name, len);
1649 strbuf_addstr(&keep_name_buf, ".idx");
1650 keep_name = keep_name_buf.buf;
1654 die(_("--verify with no packfile name given"));
1655 read_idx_option(&opts, index_name);
1656 opts.flags |= WRITE_IDX_VERIFY | WRITE_IDX_STRICT;
1659 opts.flags |= WRITE_IDX_STRICT;
1663 nr_threads = online_cpus();
1664 /* An experiment showed that more threads does not mean faster */
1670 curr_pack = open_pack_file(pack_name);
1671 parse_pack_header();
1672 objects = xcalloc(nr_objects + 1, sizeof(struct object_entry));
1673 deltas = xcalloc(nr_objects, sizeof(struct delta_entry));
1674 parse_pack_objects(pack_sha1);
1676 conclude_pack(fix_thin_pack, curr_pack, pack_sha1);
1679 foreign_nr = check_objects();
1682 show_pack_info(stat_only);
1684 idx_objects = xmalloc((nr_objects) * sizeof(struct pack_idx_entry *));
1685 for (i = 0; i < nr_objects; i++)
1686 idx_objects[i] = &objects[i].idx;
1687 curr_index = write_idx_file(index_name, idx_objects, nr_objects, &opts, pack_sha1);
1691 final(pack_name, curr_pack,
1692 index_name, curr_index,
1693 keep_name, keep_msg,
1698 strbuf_release(&index_name_buf);
1699 strbuf_release(&keep_name_buf);
1700 if (pack_name == NULL)
1701 free((void *) curr_pack);
1702 if (index_name == NULL)
1703 free((void *) curr_index);
1706 * Let the caller know this pack is not self contained
1708 if (check_self_contained_and_connected && foreign_nr)