11 #include "pack-revindex.h"
12 #include "csum-file.h"
13 #include "tree-walk.h"
16 #include "list-objects.h"
17 #include "pack-objects.h"
20 #include "streaming.h"
21 #include "thread-utils.h"
22 #include "pack-bitmap.h"
24 static const char *pack_usage[] = {
25 N_("git pack-objects --stdout [options...] [< ref-list | < object-list]"),
26 N_("git pack-objects [options...] base-name [< ref-list | < object-list]"),
31 * Objects we are going to pack are collected in the `to_pack` structure.
32 * It contains an array (dynamically expanded) of the object data, and a map
33 * that can resolve SHA1s to their position in the array.
35 static struct packing_data to_pack;
37 static struct pack_idx_entry **written_list;
38 static uint32_t nr_result, nr_written;
41 static int reuse_delta = 1, reuse_object = 1;
42 static int keep_unreachable, unpack_unreachable, include_tag;
43 static unsigned long unpack_unreachable_expiration;
45 static int incremental;
46 static int ignore_packed_keep;
47 static int allow_ofs_delta;
48 static struct pack_idx_option pack_idx_opts;
49 static const char *base_name;
50 static int progress = 1;
51 static int window = 10;
52 static unsigned long pack_size_limit;
53 static int depth = 50;
54 static int delta_search_threads;
55 static int pack_to_stdout;
56 static int num_preferred_base;
57 static struct progress *progress_state;
58 static int pack_compression_level = Z_DEFAULT_COMPRESSION;
59 static int pack_compression_seen;
61 static struct packed_git *reuse_packfile;
62 static uint32_t reuse_packfile_objects;
63 static off_t reuse_packfile_offset;
65 static int use_bitmap_index = 1;
66 static int write_bitmap_index;
67 static uint16_t write_bitmap_options;
69 static unsigned long delta_cache_size = 0;
70 static unsigned long max_delta_cache_size = 256 * 1024 * 1024;
71 static unsigned long cache_max_small_delta_size = 1000;
73 static unsigned long window_memory_limit = 0;
78 static uint32_t written, written_delta;
79 static uint32_t reused, reused_delta;
84 static struct commit **indexed_commits;
85 static unsigned int indexed_commits_nr;
86 static unsigned int indexed_commits_alloc;
88 static void index_commit_for_bitmap(struct commit *commit)
90 if (indexed_commits_nr >= indexed_commits_alloc) {
91 indexed_commits_alloc = (indexed_commits_alloc + 32) * 2;
92 REALLOC_ARRAY(indexed_commits, indexed_commits_alloc);
95 indexed_commits[indexed_commits_nr++] = commit;
98 static void *get_delta(struct object_entry *entry)
100 unsigned long size, base_size, delta_size;
101 void *buf, *base_buf, *delta_buf;
102 enum object_type type;
104 buf = read_sha1_file(entry->idx.sha1, &type, &size);
106 die("unable to read %s", sha1_to_hex(entry->idx.sha1));
107 base_buf = read_sha1_file(entry->delta->idx.sha1, &type, &base_size);
109 die("unable to read %s", sha1_to_hex(entry->delta->idx.sha1));
110 delta_buf = diff_delta(base_buf, base_size,
111 buf, size, &delta_size, 0);
112 if (!delta_buf || delta_size != entry->delta_size)
113 die("delta size changed");
119 static unsigned long do_compress(void **pptr, unsigned long size)
123 unsigned long maxsize;
125 memset(&stream, 0, sizeof(stream));
126 git_deflate_init(&stream, pack_compression_level);
127 maxsize = git_deflate_bound(&stream, size);
130 out = xmalloc(maxsize);
134 stream.avail_in = size;
135 stream.next_out = out;
136 stream.avail_out = maxsize;
137 while (git_deflate(&stream, Z_FINISH) == Z_OK)
139 git_deflate_end(&stream);
142 return stream.total_out;
145 static unsigned long write_large_blob_data(struct git_istream *st, struct sha1file *f,
146 const unsigned char *sha1)
149 unsigned char ibuf[1024 * 16];
150 unsigned char obuf[1024 * 16];
151 unsigned long olen = 0;
153 memset(&stream, 0, sizeof(stream));
154 git_deflate_init(&stream, pack_compression_level);
159 readlen = read_istream(st, ibuf, sizeof(ibuf));
161 die(_("unable to read %s"), sha1_to_hex(sha1));
163 stream.next_in = ibuf;
164 stream.avail_in = readlen;
165 while ((stream.avail_in || readlen == 0) &&
166 (zret == Z_OK || zret == Z_BUF_ERROR)) {
167 stream.next_out = obuf;
168 stream.avail_out = sizeof(obuf);
169 zret = git_deflate(&stream, readlen ? 0 : Z_FINISH);
170 sha1write(f, obuf, stream.next_out - obuf);
171 olen += stream.next_out - obuf;
174 die(_("deflate error (%d)"), zret);
176 if (zret != Z_STREAM_END)
177 die(_("deflate error (%d)"), zret);
181 git_deflate_end(&stream);
186 * we are going to reuse the existing object data as is. make
187 * sure it is not corrupt.
189 static int check_pack_inflate(struct packed_git *p,
190 struct pack_window **w_curs,
193 unsigned long expect)
196 unsigned char fakebuf[4096], *in;
199 memset(&stream, 0, sizeof(stream));
200 git_inflate_init(&stream);
202 in = use_pack(p, w_curs, offset, &stream.avail_in);
204 stream.next_out = fakebuf;
205 stream.avail_out = sizeof(fakebuf);
206 st = git_inflate(&stream, Z_FINISH);
207 offset += stream.next_in - in;
208 } while (st == Z_OK || st == Z_BUF_ERROR);
209 git_inflate_end(&stream);
210 return (st == Z_STREAM_END &&
211 stream.total_out == expect &&
212 stream.total_in == len) ? 0 : -1;
215 static void copy_pack_data(struct sha1file *f,
216 struct packed_git *p,
217 struct pack_window **w_curs,
225 in = use_pack(p, w_curs, offset, &avail);
227 avail = (unsigned long)len;
228 sha1write(f, in, avail);
234 /* Return 0 if we will bust the pack-size limit */
235 static unsigned long write_no_reuse_object(struct sha1file *f, struct object_entry *entry,
236 unsigned long limit, int usable_delta)
238 unsigned long size, datalen;
239 unsigned char header[10], dheader[10];
241 enum object_type type;
243 struct git_istream *st = NULL;
246 if (entry->type == OBJ_BLOB &&
247 entry->size > big_file_threshold &&
248 (st = open_istream(entry->idx.sha1, &type, &size, NULL)) != NULL)
251 buf = read_sha1_file(entry->idx.sha1, &type, &size);
253 die(_("unable to read %s"), sha1_to_hex(entry->idx.sha1));
256 * make sure no cached delta data remains from a
257 * previous attempt before a pack split occurred.
259 free(entry->delta_data);
260 entry->delta_data = NULL;
261 entry->z_delta_size = 0;
262 } else if (entry->delta_data) {
263 size = entry->delta_size;
264 buf = entry->delta_data;
265 entry->delta_data = NULL;
266 type = (allow_ofs_delta && entry->delta->idx.offset) ?
267 OBJ_OFS_DELTA : OBJ_REF_DELTA;
269 buf = get_delta(entry);
270 size = entry->delta_size;
271 type = (allow_ofs_delta && entry->delta->idx.offset) ?
272 OBJ_OFS_DELTA : OBJ_REF_DELTA;
275 if (st) /* large blob case, just assume we don't compress well */
277 else if (entry->z_delta_size)
278 datalen = entry->z_delta_size;
280 datalen = do_compress(&buf, size);
283 * The object header is a byte of 'type' followed by zero or
284 * more bytes of length.
286 hdrlen = encode_in_pack_object_header(type, size, header);
288 if (type == OBJ_OFS_DELTA) {
290 * Deltas with relative base contain an additional
291 * encoding of the relative offset for the delta
292 * base from this object's position in the pack.
294 off_t ofs = entry->idx.offset - entry->delta->idx.offset;
295 unsigned pos = sizeof(dheader) - 1;
296 dheader[pos] = ofs & 127;
298 dheader[--pos] = 128 | (--ofs & 127);
299 if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) {
305 sha1write(f, header, hdrlen);
306 sha1write(f, dheader + pos, sizeof(dheader) - pos);
307 hdrlen += sizeof(dheader) - pos;
308 } else if (type == OBJ_REF_DELTA) {
310 * Deltas with a base reference contain
311 * an additional 20 bytes for the base sha1.
313 if (limit && hdrlen + 20 + datalen + 20 >= limit) {
319 sha1write(f, header, hdrlen);
320 sha1write(f, entry->delta->idx.sha1, 20);
323 if (limit && hdrlen + datalen + 20 >= limit) {
329 sha1write(f, header, hdrlen);
332 datalen = write_large_blob_data(st, f, entry->idx.sha1);
335 sha1write(f, buf, datalen);
339 return hdrlen + datalen;
342 /* Return 0 if we will bust the pack-size limit */
343 static unsigned long write_reuse_object(struct sha1file *f, struct object_entry *entry,
344 unsigned long limit, int usable_delta)
346 struct packed_git *p = entry->in_pack;
347 struct pack_window *w_curs = NULL;
348 struct revindex_entry *revidx;
350 enum object_type type = entry->type;
351 unsigned long datalen;
352 unsigned char header[10], dheader[10];
356 type = (allow_ofs_delta && entry->delta->idx.offset) ?
357 OBJ_OFS_DELTA : OBJ_REF_DELTA;
358 hdrlen = encode_in_pack_object_header(type, entry->size, header);
360 offset = entry->in_pack_offset;
361 revidx = find_pack_revindex(p, offset);
362 datalen = revidx[1].offset - offset;
363 if (!pack_to_stdout && p->index_version > 1 &&
364 check_pack_crc(p, &w_curs, offset, datalen, revidx->nr)) {
365 error("bad packed object CRC for %s", sha1_to_hex(entry->idx.sha1));
367 return write_no_reuse_object(f, entry, limit, usable_delta);
370 offset += entry->in_pack_header_size;
371 datalen -= entry->in_pack_header_size;
373 if (!pack_to_stdout && p->index_version == 1 &&
374 check_pack_inflate(p, &w_curs, offset, datalen, entry->size)) {
375 error("corrupt packed object for %s", sha1_to_hex(entry->idx.sha1));
377 return write_no_reuse_object(f, entry, limit, usable_delta);
380 if (type == OBJ_OFS_DELTA) {
381 off_t ofs = entry->idx.offset - entry->delta->idx.offset;
382 unsigned pos = sizeof(dheader) - 1;
383 dheader[pos] = ofs & 127;
385 dheader[--pos] = 128 | (--ofs & 127);
386 if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) {
390 sha1write(f, header, hdrlen);
391 sha1write(f, dheader + pos, sizeof(dheader) - pos);
392 hdrlen += sizeof(dheader) - pos;
394 } else if (type == OBJ_REF_DELTA) {
395 if (limit && hdrlen + 20 + datalen + 20 >= limit) {
399 sha1write(f, header, hdrlen);
400 sha1write(f, entry->delta->idx.sha1, 20);
404 if (limit && hdrlen + datalen + 20 >= limit) {
408 sha1write(f, header, hdrlen);
410 copy_pack_data(f, p, &w_curs, offset, datalen);
413 return hdrlen + datalen;
416 /* Return 0 if we will bust the pack-size limit */
417 static unsigned long write_object(struct sha1file *f,
418 struct object_entry *entry,
421 unsigned long limit, len;
422 int usable_delta, to_reuse;
427 /* apply size limit if limited packsize and not first object */
428 if (!pack_size_limit || !nr_written)
430 else if (pack_size_limit <= write_offset)
432 * the earlier object did not fit the limit; avoid
433 * mistaking this with unlimited (i.e. limit = 0).
437 limit = pack_size_limit - write_offset;
440 usable_delta = 0; /* no delta */
441 else if (!pack_size_limit)
442 usable_delta = 1; /* unlimited packfile */
443 else if (entry->delta->idx.offset == (off_t)-1)
444 usable_delta = 0; /* base was written to another pack */
445 else if (entry->delta->idx.offset)
446 usable_delta = 1; /* base already exists in this pack */
448 usable_delta = 0; /* base could end up in another pack */
451 to_reuse = 0; /* explicit */
452 else if (!entry->in_pack)
453 to_reuse = 0; /* can't reuse what we don't have */
454 else if (entry->type == OBJ_REF_DELTA || entry->type == OBJ_OFS_DELTA)
455 /* check_object() decided it for us ... */
456 to_reuse = usable_delta;
457 /* ... but pack split may override that */
458 else if (entry->type != entry->in_pack_type)
459 to_reuse = 0; /* pack has delta which is unusable */
460 else if (entry->delta)
461 to_reuse = 0; /* we want to pack afresh */
463 to_reuse = 1; /* we have it in-pack undeltified,
464 * and we do not need to deltify it.
468 len = write_no_reuse_object(f, entry, limit, usable_delta);
470 len = write_reuse_object(f, entry, limit, usable_delta);
478 entry->idx.crc32 = crc32_end(f);
482 enum write_one_status {
483 WRITE_ONE_SKIP = -1, /* already written */
484 WRITE_ONE_BREAK = 0, /* writing this will bust the limit; not written */
485 WRITE_ONE_WRITTEN = 1, /* normal */
486 WRITE_ONE_RECURSIVE = 2 /* already scheduled to be written */
489 static enum write_one_status write_one(struct sha1file *f,
490 struct object_entry *e,
497 * we set offset to 1 (which is an impossible value) to mark
498 * the fact that this object is involved in "write its base
499 * first before writing a deltified object" recursion.
501 recursing = (e->idx.offset == 1);
503 warning("recursive delta detected for object %s",
504 sha1_to_hex(e->idx.sha1));
505 return WRITE_ONE_RECURSIVE;
506 } else if (e->idx.offset || e->preferred_base) {
507 /* offset is non zero if object is written already. */
508 return WRITE_ONE_SKIP;
511 /* if we are deltified, write out base object first. */
513 e->idx.offset = 1; /* now recurse */
514 switch (write_one(f, e->delta, offset)) {
515 case WRITE_ONE_RECURSIVE:
516 /* we cannot depend on this one */
521 case WRITE_ONE_BREAK:
522 e->idx.offset = recursing;
523 return WRITE_ONE_BREAK;
527 e->idx.offset = *offset;
528 size = write_object(f, e, *offset);
530 e->idx.offset = recursing;
531 return WRITE_ONE_BREAK;
533 written_list[nr_written++] = &e->idx;
535 /* make sure off_t is sufficiently large not to wrap */
536 if (signed_add_overflows(*offset, size))
537 die("pack too large for current definition of off_t");
539 return WRITE_ONE_WRITTEN;
542 static int mark_tagged(const char *path, const unsigned char *sha1, int flag,
545 unsigned char peeled[20];
546 struct object_entry *entry = packlist_find(&to_pack, sha1, NULL);
550 if (!peel_ref(path, peeled)) {
551 entry = packlist_find(&to_pack, peeled, NULL);
558 static inline void add_to_write_order(struct object_entry **wo,
560 struct object_entry *e)
568 static void add_descendants_to_write_order(struct object_entry **wo,
570 struct object_entry *e)
572 int add_to_order = 1;
575 struct object_entry *s;
576 /* add this node... */
577 add_to_write_order(wo, endp, e);
578 /* all its siblings... */
579 for (s = e->delta_sibling; s; s = s->delta_sibling) {
580 add_to_write_order(wo, endp, s);
583 /* drop down a level to add left subtree nodes if possible */
584 if (e->delta_child) {
589 /* our sibling might have some children, it is next */
590 if (e->delta_sibling) {
591 e = e->delta_sibling;
594 /* go back to our parent node */
596 while (e && !e->delta_sibling) {
597 /* we're on the right side of a subtree, keep
598 * going up until we can go right again */
602 /* done- we hit our original root node */
605 /* pass it off to sibling at this level */
606 e = e->delta_sibling;
611 static void add_family_to_write_order(struct object_entry **wo,
613 struct object_entry *e)
615 struct object_entry *root;
617 for (root = e; root->delta; root = root->delta)
619 add_descendants_to_write_order(wo, endp, root);
622 static struct object_entry **compute_write_order(void)
624 unsigned int i, wo_end, last_untagged;
626 struct object_entry **wo = xmalloc(to_pack.nr_objects * sizeof(*wo));
627 struct object_entry *objects = to_pack.objects;
629 for (i = 0; i < to_pack.nr_objects; i++) {
630 objects[i].tagged = 0;
631 objects[i].filled = 0;
632 objects[i].delta_child = NULL;
633 objects[i].delta_sibling = NULL;
637 * Fully connect delta_child/delta_sibling network.
638 * Make sure delta_sibling is sorted in the original
641 for (i = to_pack.nr_objects; i > 0;) {
642 struct object_entry *e = &objects[--i];
645 /* Mark me as the first child */
646 e->delta_sibling = e->delta->delta_child;
647 e->delta->delta_child = e;
651 * Mark objects that are at the tip of tags.
653 for_each_tag_ref(mark_tagged, NULL);
656 * Give the objects in the original recency order until
657 * we see a tagged tip.
659 for (i = wo_end = 0; i < to_pack.nr_objects; i++) {
660 if (objects[i].tagged)
662 add_to_write_order(wo, &wo_end, &objects[i]);
667 * Then fill all the tagged tips.
669 for (; i < to_pack.nr_objects; i++) {
670 if (objects[i].tagged)
671 add_to_write_order(wo, &wo_end, &objects[i]);
675 * And then all remaining commits and tags.
677 for (i = last_untagged; i < to_pack.nr_objects; i++) {
678 if (objects[i].type != OBJ_COMMIT &&
679 objects[i].type != OBJ_TAG)
681 add_to_write_order(wo, &wo_end, &objects[i]);
685 * And then all the trees.
687 for (i = last_untagged; i < to_pack.nr_objects; i++) {
688 if (objects[i].type != OBJ_TREE)
690 add_to_write_order(wo, &wo_end, &objects[i]);
694 * Finally all the rest in really tight order
696 for (i = last_untagged; i < to_pack.nr_objects; i++) {
697 if (!objects[i].filled)
698 add_family_to_write_order(wo, &wo_end, &objects[i]);
701 if (wo_end != to_pack.nr_objects)
702 die("ordered %u objects, expected %"PRIu32, wo_end, to_pack.nr_objects);
707 static off_t write_reused_pack(struct sha1file *f)
709 unsigned char buffer[8192];
710 off_t to_write, total;
713 if (!is_pack_valid(reuse_packfile))
714 die("packfile is invalid: %s", reuse_packfile->pack_name);
716 fd = git_open_noatime(reuse_packfile->pack_name);
718 die_errno("unable to open packfile for reuse: %s",
719 reuse_packfile->pack_name);
721 if (lseek(fd, sizeof(struct pack_header), SEEK_SET) == -1)
722 die_errno("unable to seek in reused packfile");
724 if (reuse_packfile_offset < 0)
725 reuse_packfile_offset = reuse_packfile->pack_size - 20;
727 total = to_write = reuse_packfile_offset - sizeof(struct pack_header);
730 int read_pack = xread(fd, buffer, sizeof(buffer));
733 die_errno("unable to read from reused packfile");
735 if (read_pack > to_write)
736 read_pack = to_write;
738 sha1write(f, buffer, read_pack);
739 to_write -= read_pack;
742 * We don't know the actual number of objects written,
743 * only how many bytes written, how many bytes total, and
744 * how many objects total. So we can fake it by pretending all
745 * objects we are writing are the same size. This gives us a
746 * smooth progress meter, and at the end it matches the true
749 written = reuse_packfile_objects *
750 (((double)(total - to_write)) / total);
751 display_progress(progress_state, written);
755 written = reuse_packfile_objects;
756 display_progress(progress_state, written);
757 return reuse_packfile_offset - sizeof(struct pack_header);
760 static void write_pack_file(void)
765 uint32_t nr_remaining = nr_result;
766 time_t last_mtime = 0;
767 struct object_entry **write_order;
769 if (progress > pack_to_stdout)
770 progress_state = start_progress(_("Writing objects"), nr_result);
771 written_list = xmalloc(to_pack.nr_objects * sizeof(*written_list));
772 write_order = compute_write_order();
775 unsigned char sha1[20];
776 char *pack_tmp_name = NULL;
779 f = sha1fd_throughput(1, "<stdout>", progress_state);
781 f = create_tmp_packfile(&pack_tmp_name);
783 offset = write_pack_header(f, nr_remaining);
785 if (reuse_packfile) {
787 assert(pack_to_stdout);
789 packfile_size = write_reused_pack(f);
790 offset += packfile_size;
794 for (; i < to_pack.nr_objects; i++) {
795 struct object_entry *e = write_order[i];
796 if (write_one(f, e, &offset) == WRITE_ONE_BREAK)
798 display_progress(progress_state, written);
802 * Did we write the wrong # entries in the header?
803 * If so, rewrite it like in fast-import
805 if (pack_to_stdout) {
806 sha1close(f, sha1, CSUM_CLOSE);
807 } else if (nr_written == nr_remaining) {
808 sha1close(f, sha1, CSUM_FSYNC);
810 int fd = sha1close(f, sha1, 0);
811 fixup_pack_header_footer(fd, sha1, pack_tmp_name,
812 nr_written, sha1, offset);
816 if (!pack_to_stdout) {
818 struct strbuf tmpname = STRBUF_INIT;
821 * Packs are runtime accessed in their mtime
822 * order since newer packs are more likely to contain
823 * younger objects. So if we are creating multiple
824 * packs then we should modify the mtime of later ones
825 * to preserve this property.
827 if (stat(pack_tmp_name, &st) < 0) {
828 warning("failed to stat %s: %s",
829 pack_tmp_name, strerror(errno));
830 } else if (!last_mtime) {
831 last_mtime = st.st_mtime;
834 utb.actime = st.st_atime;
835 utb.modtime = --last_mtime;
836 if (utime(pack_tmp_name, &utb) < 0)
837 warning("failed utime() on %s: %s",
838 pack_tmp_name, strerror(errno));
841 strbuf_addf(&tmpname, "%s-", base_name);
843 if (write_bitmap_index) {
844 bitmap_writer_set_checksum(sha1);
845 bitmap_writer_build_type_index(written_list, nr_written);
848 finish_tmp_packfile(&tmpname, pack_tmp_name,
849 written_list, nr_written,
850 &pack_idx_opts, sha1);
852 if (write_bitmap_index) {
853 strbuf_addf(&tmpname, "%s.bitmap", sha1_to_hex(sha1));
855 stop_progress(&progress_state);
857 bitmap_writer_show_progress(progress);
858 bitmap_writer_reuse_bitmaps(&to_pack);
859 bitmap_writer_select_commits(indexed_commits, indexed_commits_nr, -1);
860 bitmap_writer_build(&to_pack);
861 bitmap_writer_finish(written_list, nr_written,
862 tmpname.buf, write_bitmap_options);
863 write_bitmap_index = 0;
866 strbuf_release(&tmpname);
868 puts(sha1_to_hex(sha1));
871 /* mark written objects as written to previous pack */
872 for (j = 0; j < nr_written; j++) {
873 written_list[j]->offset = (off_t)-1;
875 nr_remaining -= nr_written;
876 } while (nr_remaining && i < to_pack.nr_objects);
880 stop_progress(&progress_state);
881 if (written != nr_result)
882 die("wrote %"PRIu32" objects while expecting %"PRIu32,
886 static void setup_delta_attr_check(struct git_attr_check *check)
888 static struct git_attr *attr_delta;
891 attr_delta = git_attr("delta");
893 check[0].attr = attr_delta;
896 static int no_try_delta(const char *path)
898 struct git_attr_check check[1];
900 setup_delta_attr_check(check);
901 if (git_check_attr(path, ARRAY_SIZE(check), check))
903 if (ATTR_FALSE(check->value))
909 * When adding an object, check whether we have already added it
910 * to our packing list. If so, we can skip. However, if we are
911 * being asked to excludei t, but the previous mention was to include
912 * it, make sure to adjust its flags and tweak our numbers accordingly.
914 * As an optimization, we pass out the index position where we would have
915 * found the item, since that saves us from having to look it up again a
916 * few lines later when we want to add the new entry.
918 static int have_duplicate_entry(const unsigned char *sha1,
922 struct object_entry *entry;
924 entry = packlist_find(&to_pack, sha1, index_pos);
929 if (!entry->preferred_base)
931 entry->preferred_base = 1;
938 * Check whether we want the object in the pack (e.g., we do not want
939 * objects found in non-local stores if the "--local" option was used).
941 * As a side effect of this check, we will find the packed version of this
942 * object, if any. We therefore pass out the pack information to avoid having
943 * to look it up again later.
945 static int want_object_in_pack(const unsigned char *sha1,
947 struct packed_git **found_pack,
950 struct packed_git *p;
952 if (!exclude && local && has_loose_object_nonlocal(sha1))
958 for (p = packed_git; p; p = p->next) {
959 off_t offset = find_pack_entry_one(sha1, p);
962 if (!is_pack_valid(p)) {
963 warning("packfile %s cannot be accessed", p->pack_name);
966 *found_offset = offset;
973 if (local && !p->pack_local)
975 if (ignore_packed_keep && p->pack_local && p->pack_keep)
983 static void create_object_entry(const unsigned char *sha1,
984 enum object_type type,
989 struct packed_git *found_pack,
992 struct object_entry *entry;
994 entry = packlist_alloc(&to_pack, sha1, index_pos);
999 entry->preferred_base = 1;
1003 entry->in_pack = found_pack;
1004 entry->in_pack_offset = found_offset;
1007 entry->no_try_delta = no_try_delta;
1010 static const char no_closure_warning[] = N_(
1011 "disabling bitmap writing, as some objects are not being packed"
1014 static int add_object_entry(const unsigned char *sha1, enum object_type type,
1015 const char *name, int exclude)
1017 struct packed_git *found_pack;
1021 if (have_duplicate_entry(sha1, exclude, &index_pos))
1024 if (!want_object_in_pack(sha1, exclude, &found_pack, &found_offset)) {
1025 /* The pack is missing an object, so it will not have closure */
1026 if (write_bitmap_index) {
1027 warning(_(no_closure_warning));
1028 write_bitmap_index = 0;
1033 create_object_entry(sha1, type, pack_name_hash(name),
1034 exclude, name && no_try_delta(name),
1035 index_pos, found_pack, found_offset);
1037 display_progress(progress_state, nr_result);
1041 static int add_object_entry_from_bitmap(const unsigned char *sha1,
1042 enum object_type type,
1043 int flags, uint32_t name_hash,
1044 struct packed_git *pack, off_t offset)
1048 if (have_duplicate_entry(sha1, 0, &index_pos))
1051 create_object_entry(sha1, type, name_hash, 0, 0, index_pos, pack, offset);
1053 display_progress(progress_state, nr_result);
1057 struct pbase_tree_cache {
1058 unsigned char sha1[20];
1062 unsigned long tree_size;
1065 static struct pbase_tree_cache *(pbase_tree_cache[256]);
1066 static int pbase_tree_cache_ix(const unsigned char *sha1)
1068 return sha1[0] % ARRAY_SIZE(pbase_tree_cache);
1070 static int pbase_tree_cache_ix_incr(int ix)
1072 return (ix+1) % ARRAY_SIZE(pbase_tree_cache);
1075 static struct pbase_tree {
1076 struct pbase_tree *next;
1077 /* This is a phony "cache" entry; we are not
1078 * going to evict it or find it through _get()
1079 * mechanism -- this is for the toplevel node that
1080 * would almost always change with any commit.
1082 struct pbase_tree_cache pcache;
1085 static struct pbase_tree_cache *pbase_tree_get(const unsigned char *sha1)
1087 struct pbase_tree_cache *ent, *nent;
1090 enum object_type type;
1092 int my_ix = pbase_tree_cache_ix(sha1);
1093 int available_ix = -1;
1095 /* pbase-tree-cache acts as a limited hashtable.
1096 * your object will be found at your index or within a few
1097 * slots after that slot if it is cached.
1099 for (neigh = 0; neigh < 8; neigh++) {
1100 ent = pbase_tree_cache[my_ix];
1101 if (ent && !hashcmp(ent->sha1, sha1)) {
1105 else if (((available_ix < 0) && (!ent || !ent->ref)) ||
1106 ((0 <= available_ix) &&
1107 (!ent && pbase_tree_cache[available_ix])))
1108 available_ix = my_ix;
1111 my_ix = pbase_tree_cache_ix_incr(my_ix);
1114 /* Did not find one. Either we got a bogus request or
1115 * we need to read and perhaps cache.
1117 data = read_sha1_file(sha1, &type, &size);
1120 if (type != OBJ_TREE) {
1125 /* We need to either cache or return a throwaway copy */
1127 if (available_ix < 0)
1130 ent = pbase_tree_cache[available_ix];
1131 my_ix = available_ix;
1135 nent = xmalloc(sizeof(*nent));
1136 nent->temporary = (available_ix < 0);
1139 /* evict and reuse */
1140 free(ent->tree_data);
1143 hashcpy(nent->sha1, sha1);
1144 nent->tree_data = data;
1145 nent->tree_size = size;
1147 if (!nent->temporary)
1148 pbase_tree_cache[my_ix] = nent;
1152 static void pbase_tree_put(struct pbase_tree_cache *cache)
1154 if (!cache->temporary) {
1158 free(cache->tree_data);
1162 static int name_cmp_len(const char *name)
1165 for (i = 0; name[i] && name[i] != '\n' && name[i] != '/'; i++)
1170 static void add_pbase_object(struct tree_desc *tree,
1173 const char *fullname)
1175 struct name_entry entry;
1178 while (tree_entry(tree,&entry)) {
1179 if (S_ISGITLINK(entry.mode))
1181 cmp = tree_entry_len(&entry) != cmplen ? 1 :
1182 memcmp(name, entry.path, cmplen);
1187 if (name[cmplen] != '/') {
1188 add_object_entry(entry.sha1,
1189 object_type(entry.mode),
1193 if (S_ISDIR(entry.mode)) {
1194 struct tree_desc sub;
1195 struct pbase_tree_cache *tree;
1196 const char *down = name+cmplen+1;
1197 int downlen = name_cmp_len(down);
1199 tree = pbase_tree_get(entry.sha1);
1202 init_tree_desc(&sub, tree->tree_data, tree->tree_size);
1204 add_pbase_object(&sub, down, downlen, fullname);
1205 pbase_tree_put(tree);
1210 static unsigned *done_pbase_paths;
1211 static int done_pbase_paths_num;
1212 static int done_pbase_paths_alloc;
1213 static int done_pbase_path_pos(unsigned hash)
1216 int hi = done_pbase_paths_num;
1218 int mi = (hi + lo) / 2;
1219 if (done_pbase_paths[mi] == hash)
1221 if (done_pbase_paths[mi] < hash)
1229 static int check_pbase_path(unsigned hash)
1231 int pos = (!done_pbase_paths) ? -1 : done_pbase_path_pos(hash);
1235 ALLOC_GROW(done_pbase_paths,
1236 done_pbase_paths_num + 1,
1237 done_pbase_paths_alloc);
1238 done_pbase_paths_num++;
1239 if (pos < done_pbase_paths_num)
1240 memmove(done_pbase_paths + pos + 1,
1241 done_pbase_paths + pos,
1242 (done_pbase_paths_num - pos - 1) * sizeof(unsigned));
1243 done_pbase_paths[pos] = hash;
1247 static void add_preferred_base_object(const char *name)
1249 struct pbase_tree *it;
1251 unsigned hash = pack_name_hash(name);
1253 if (!num_preferred_base || check_pbase_path(hash))
1256 cmplen = name_cmp_len(name);
1257 for (it = pbase_tree; it; it = it->next) {
1259 add_object_entry(it->pcache.sha1, OBJ_TREE, NULL, 1);
1262 struct tree_desc tree;
1263 init_tree_desc(&tree, it->pcache.tree_data, it->pcache.tree_size);
1264 add_pbase_object(&tree, name, cmplen, name);
1269 static void add_preferred_base(unsigned char *sha1)
1271 struct pbase_tree *it;
1274 unsigned char tree_sha1[20];
1276 if (window <= num_preferred_base++)
1279 data = read_object_with_reference(sha1, tree_type, &size, tree_sha1);
1283 for (it = pbase_tree; it; it = it->next) {
1284 if (!hashcmp(it->pcache.sha1, tree_sha1)) {
1290 it = xcalloc(1, sizeof(*it));
1291 it->next = pbase_tree;
1294 hashcpy(it->pcache.sha1, tree_sha1);
1295 it->pcache.tree_data = data;
1296 it->pcache.tree_size = size;
1299 static void cleanup_preferred_base(void)
1301 struct pbase_tree *it;
1307 struct pbase_tree *this = it;
1309 free(this->pcache.tree_data);
1313 for (i = 0; i < ARRAY_SIZE(pbase_tree_cache); i++) {
1314 if (!pbase_tree_cache[i])
1316 free(pbase_tree_cache[i]->tree_data);
1317 free(pbase_tree_cache[i]);
1318 pbase_tree_cache[i] = NULL;
1321 free(done_pbase_paths);
1322 done_pbase_paths = NULL;
1323 done_pbase_paths_num = done_pbase_paths_alloc = 0;
1326 static void check_object(struct object_entry *entry)
1328 if (entry->in_pack) {
1329 struct packed_git *p = entry->in_pack;
1330 struct pack_window *w_curs = NULL;
1331 const unsigned char *base_ref = NULL;
1332 struct object_entry *base_entry;
1333 unsigned long used, used_0;
1334 unsigned long avail;
1336 unsigned char *buf, c;
1338 buf = use_pack(p, &w_curs, entry->in_pack_offset, &avail);
1341 * We want in_pack_type even if we do not reuse delta
1342 * since non-delta representations could still be reused.
1344 used = unpack_object_header_buffer(buf, avail,
1345 &entry->in_pack_type,
1351 * Determine if this is a delta and if so whether we can
1352 * reuse it or not. Otherwise let's find out as cheaply as
1353 * possible what the actual type and size for this object is.
1355 switch (entry->in_pack_type) {
1357 /* Not a delta hence we've already got all we need. */
1358 entry->type = entry->in_pack_type;
1359 entry->in_pack_header_size = used;
1360 if (entry->type < OBJ_COMMIT || entry->type > OBJ_BLOB)
1362 unuse_pack(&w_curs);
1365 if (reuse_delta && !entry->preferred_base)
1366 base_ref = use_pack(p, &w_curs,
1367 entry->in_pack_offset + used, NULL);
1368 entry->in_pack_header_size = used + 20;
1371 buf = use_pack(p, &w_curs,
1372 entry->in_pack_offset + used, NULL);
1378 if (!ofs || MSB(ofs, 7)) {
1379 error("delta base offset overflow in pack for %s",
1380 sha1_to_hex(entry->idx.sha1));
1384 ofs = (ofs << 7) + (c & 127);
1386 ofs = entry->in_pack_offset - ofs;
1387 if (ofs <= 0 || ofs >= entry->in_pack_offset) {
1388 error("delta base offset out of bound for %s",
1389 sha1_to_hex(entry->idx.sha1));
1392 if (reuse_delta && !entry->preferred_base) {
1393 struct revindex_entry *revidx;
1394 revidx = find_pack_revindex(p, ofs);
1397 base_ref = nth_packed_object_sha1(p, revidx->nr);
1399 entry->in_pack_header_size = used + used_0;
1403 if (base_ref && (base_entry = packlist_find(&to_pack, base_ref, NULL))) {
1405 * If base_ref was set above that means we wish to
1406 * reuse delta data, and we even found that base
1407 * in the list of objects we want to pack. Goodie!
1409 * Depth value does not matter - find_deltas() will
1410 * never consider reused delta as the base object to
1411 * deltify other objects against, in order to avoid
1414 entry->type = entry->in_pack_type;
1415 entry->delta = base_entry;
1416 entry->delta_size = entry->size;
1417 entry->delta_sibling = base_entry->delta_child;
1418 base_entry->delta_child = entry;
1419 unuse_pack(&w_curs);
1425 * This must be a delta and we already know what the
1426 * final object type is. Let's extract the actual
1427 * object size from the delta header.
1429 entry->size = get_size_from_delta(p, &w_curs,
1430 entry->in_pack_offset + entry->in_pack_header_size);
1431 if (entry->size == 0)
1433 unuse_pack(&w_curs);
1438 * No choice but to fall back to the recursive delta walk
1439 * with sha1_object_info() to find about the object type
1443 unuse_pack(&w_curs);
1446 entry->type = sha1_object_info(entry->idx.sha1, &entry->size);
1448 * The error condition is checked in prepare_pack(). This is
1449 * to permit a missing preferred base object to be ignored
1450 * as a preferred base. Doing so can result in a larger
1451 * pack file, but the transfer will still take place.
1455 static int pack_offset_sort(const void *_a, const void *_b)
1457 const struct object_entry *a = *(struct object_entry **)_a;
1458 const struct object_entry *b = *(struct object_entry **)_b;
1460 /* avoid filesystem trashing with loose objects */
1461 if (!a->in_pack && !b->in_pack)
1462 return hashcmp(a->idx.sha1, b->idx.sha1);
1464 if (a->in_pack < b->in_pack)
1466 if (a->in_pack > b->in_pack)
1468 return a->in_pack_offset < b->in_pack_offset ? -1 :
1469 (a->in_pack_offset > b->in_pack_offset);
1472 static void get_object_details(void)
1475 struct object_entry **sorted_by_offset;
1477 sorted_by_offset = xcalloc(to_pack.nr_objects, sizeof(struct object_entry *));
1478 for (i = 0; i < to_pack.nr_objects; i++)
1479 sorted_by_offset[i] = to_pack.objects + i;
1480 qsort(sorted_by_offset, to_pack.nr_objects, sizeof(*sorted_by_offset), pack_offset_sort);
1482 for (i = 0; i < to_pack.nr_objects; i++) {
1483 struct object_entry *entry = sorted_by_offset[i];
1484 check_object(entry);
1485 if (big_file_threshold < entry->size)
1486 entry->no_try_delta = 1;
1489 free(sorted_by_offset);
1493 * We search for deltas in a list sorted by type, by filename hash, and then
1494 * by size, so that we see progressively smaller and smaller files.
1495 * That's because we prefer deltas to be from the bigger file
1496 * to the smaller -- deletes are potentially cheaper, but perhaps
1497 * more importantly, the bigger file is likely the more recent
1498 * one. The deepest deltas are therefore the oldest objects which are
1499 * less susceptible to be accessed often.
1501 static int type_size_sort(const void *_a, const void *_b)
1503 const struct object_entry *a = *(struct object_entry **)_a;
1504 const struct object_entry *b = *(struct object_entry **)_b;
1506 if (a->type > b->type)
1508 if (a->type < b->type)
1510 if (a->hash > b->hash)
1512 if (a->hash < b->hash)
1514 if (a->preferred_base > b->preferred_base)
1516 if (a->preferred_base < b->preferred_base)
1518 if (a->size > b->size)
1520 if (a->size < b->size)
1522 return a < b ? -1 : (a > b); /* newest first */
1526 struct object_entry *entry;
1528 struct delta_index *index;
1532 static int delta_cacheable(unsigned long src_size, unsigned long trg_size,
1533 unsigned long delta_size)
1535 if (max_delta_cache_size && delta_cache_size + delta_size > max_delta_cache_size)
1538 if (delta_size < cache_max_small_delta_size)
1541 /* cache delta, if objects are large enough compared to delta size */
1542 if ((src_size >> 20) + (trg_size >> 21) > (delta_size >> 10))
1550 static pthread_mutex_t read_mutex;
1551 #define read_lock() pthread_mutex_lock(&read_mutex)
1552 #define read_unlock() pthread_mutex_unlock(&read_mutex)
1554 static pthread_mutex_t cache_mutex;
1555 #define cache_lock() pthread_mutex_lock(&cache_mutex)
1556 #define cache_unlock() pthread_mutex_unlock(&cache_mutex)
1558 static pthread_mutex_t progress_mutex;
1559 #define progress_lock() pthread_mutex_lock(&progress_mutex)
1560 #define progress_unlock() pthread_mutex_unlock(&progress_mutex)
1564 #define read_lock() (void)0
1565 #define read_unlock() (void)0
1566 #define cache_lock() (void)0
1567 #define cache_unlock() (void)0
1568 #define progress_lock() (void)0
1569 #define progress_unlock() (void)0
1573 static int try_delta(struct unpacked *trg, struct unpacked *src,
1574 unsigned max_depth, unsigned long *mem_usage)
1576 struct object_entry *trg_entry = trg->entry;
1577 struct object_entry *src_entry = src->entry;
1578 unsigned long trg_size, src_size, delta_size, sizediff, max_size, sz;
1580 enum object_type type;
1583 /* Don't bother doing diffs between different types */
1584 if (trg_entry->type != src_entry->type)
1588 * We do not bother to try a delta that we discarded on an
1589 * earlier try, but only when reusing delta data. Note that
1590 * src_entry that is marked as the preferred_base should always
1591 * be considered, as even if we produce a suboptimal delta against
1592 * it, we will still save the transfer cost, as we already know
1593 * the other side has it and we won't send src_entry at all.
1595 if (reuse_delta && trg_entry->in_pack &&
1596 trg_entry->in_pack == src_entry->in_pack &&
1597 !src_entry->preferred_base &&
1598 trg_entry->in_pack_type != OBJ_REF_DELTA &&
1599 trg_entry->in_pack_type != OBJ_OFS_DELTA)
1602 /* Let's not bust the allowed depth. */
1603 if (src->depth >= max_depth)
1606 /* Now some size filtering heuristics. */
1607 trg_size = trg_entry->size;
1608 if (!trg_entry->delta) {
1609 max_size = trg_size/2 - 20;
1612 max_size = trg_entry->delta_size;
1613 ref_depth = trg->depth;
1615 max_size = (uint64_t)max_size * (max_depth - src->depth) /
1616 (max_depth - ref_depth + 1);
1619 src_size = src_entry->size;
1620 sizediff = src_size < trg_size ? trg_size - src_size : 0;
1621 if (sizediff >= max_size)
1623 if (trg_size < src_size / 32)
1626 /* Load data if not already done */
1629 trg->data = read_sha1_file(trg_entry->idx.sha1, &type, &sz);
1632 die("object %s cannot be read",
1633 sha1_to_hex(trg_entry->idx.sha1));
1635 die("object %s inconsistent object length (%lu vs %lu)",
1636 sha1_to_hex(trg_entry->idx.sha1), sz, trg_size);
1641 src->data = read_sha1_file(src_entry->idx.sha1, &type, &sz);
1644 if (src_entry->preferred_base) {
1645 static int warned = 0;
1647 warning("object %s cannot be read",
1648 sha1_to_hex(src_entry->idx.sha1));
1650 * Those objects are not included in the
1651 * resulting pack. Be resilient and ignore
1652 * them if they can't be read, in case the
1653 * pack could be created nevertheless.
1657 die("object %s cannot be read",
1658 sha1_to_hex(src_entry->idx.sha1));
1661 die("object %s inconsistent object length (%lu vs %lu)",
1662 sha1_to_hex(src_entry->idx.sha1), sz, src_size);
1666 src->index = create_delta_index(src->data, src_size);
1668 static int warned = 0;
1670 warning("suboptimal pack - out of memory");
1673 *mem_usage += sizeof_delta_index(src->index);
1676 delta_buf = create_delta(src->index, trg->data, trg_size, &delta_size, max_size);
1680 if (trg_entry->delta) {
1681 /* Prefer only shallower same-sized deltas. */
1682 if (delta_size == trg_entry->delta_size &&
1683 src->depth + 1 >= trg->depth) {
1690 * Handle memory allocation outside of the cache
1691 * accounting lock. Compiler will optimize the strangeness
1692 * away when NO_PTHREADS is defined.
1694 free(trg_entry->delta_data);
1696 if (trg_entry->delta_data) {
1697 delta_cache_size -= trg_entry->delta_size;
1698 trg_entry->delta_data = NULL;
1700 if (delta_cacheable(src_size, trg_size, delta_size)) {
1701 delta_cache_size += delta_size;
1703 trg_entry->delta_data = xrealloc(delta_buf, delta_size);
1709 trg_entry->delta = src_entry;
1710 trg_entry->delta_size = delta_size;
1711 trg->depth = src->depth + 1;
1716 static unsigned int check_delta_limit(struct object_entry *me, unsigned int n)
1718 struct object_entry *child = me->delta_child;
1721 unsigned int c = check_delta_limit(child, n + 1);
1724 child = child->delta_sibling;
1729 static unsigned long free_unpacked(struct unpacked *n)
1731 unsigned long freed_mem = sizeof_delta_index(n->index);
1732 free_delta_index(n->index);
1735 freed_mem += n->entry->size;
1744 static void find_deltas(struct object_entry **list, unsigned *list_size,
1745 int window, int depth, unsigned *processed)
1747 uint32_t i, idx = 0, count = 0;
1748 struct unpacked *array;
1749 unsigned long mem_usage = 0;
1751 array = xcalloc(window, sizeof(struct unpacked));
1754 struct object_entry *entry;
1755 struct unpacked *n = array + idx;
1756 int j, max_depth, best_base = -1;
1765 if (!entry->preferred_base) {
1767 display_progress(progress_state, *processed);
1771 mem_usage -= free_unpacked(n);
1774 while (window_memory_limit &&
1775 mem_usage > window_memory_limit &&
1777 uint32_t tail = (idx + window - count) % window;
1778 mem_usage -= free_unpacked(array + tail);
1782 /* We do not compute delta to *create* objects we are not
1785 if (entry->preferred_base)
1789 * If the current object is at pack edge, take the depth the
1790 * objects that depend on the current object into account
1791 * otherwise they would become too deep.
1794 if (entry->delta_child) {
1795 max_depth -= check_delta_limit(entry, 0);
1803 uint32_t other_idx = idx + j;
1805 if (other_idx >= window)
1806 other_idx -= window;
1807 m = array + other_idx;
1810 ret = try_delta(n, m, max_depth, &mem_usage);
1814 best_base = other_idx;
1818 * If we decided to cache the delta data, then it is best
1819 * to compress it right away. First because we have to do
1820 * it anyway, and doing it here while we're threaded will
1821 * save a lot of time in the non threaded write phase,
1822 * as well as allow for caching more deltas within
1823 * the same cache size limit.
1825 * But only if not writing to stdout, since in that case
1826 * the network is most likely throttling writes anyway,
1827 * and therefore it is best to go to the write phase ASAP
1828 * instead, as we can afford spending more time compressing
1829 * between writes at that moment.
1831 if (entry->delta_data && !pack_to_stdout) {
1832 entry->z_delta_size = do_compress(&entry->delta_data,
1835 delta_cache_size -= entry->delta_size;
1836 delta_cache_size += entry->z_delta_size;
1840 /* if we made n a delta, and if n is already at max
1841 * depth, leaving it in the window is pointless. we
1842 * should evict it first.
1844 if (entry->delta && max_depth <= n->depth)
1848 * Move the best delta base up in the window, after the
1849 * currently deltified object, to keep it longer. It will
1850 * be the first base object to be attempted next.
1853 struct unpacked swap = array[best_base];
1854 int dist = (window + idx - best_base) % window;
1855 int dst = best_base;
1857 int src = (dst + 1) % window;
1858 array[dst] = array[src];
1866 if (count + 1 < window)
1872 for (i = 0; i < window; ++i) {
1873 free_delta_index(array[i].index);
1874 free(array[i].data);
1881 static void try_to_free_from_threads(size_t size)
1884 release_pack_memory(size);
1888 static try_to_free_t old_try_to_free_routine;
1891 * The main thread waits on the condition that (at least) one of the workers
1892 * has stopped working (which is indicated in the .working member of
1893 * struct thread_params).
1894 * When a work thread has completed its work, it sets .working to 0 and
1895 * signals the main thread and waits on the condition that .data_ready
1899 struct thread_params {
1901 struct object_entry **list;
1908 pthread_mutex_t mutex;
1909 pthread_cond_t cond;
1910 unsigned *processed;
1913 static pthread_cond_t progress_cond;
1916 * Mutex and conditional variable can't be statically-initialized on Windows.
1918 static void init_threaded_search(void)
1920 init_recursive_mutex(&read_mutex);
1921 pthread_mutex_init(&cache_mutex, NULL);
1922 pthread_mutex_init(&progress_mutex, NULL);
1923 pthread_cond_init(&progress_cond, NULL);
1924 old_try_to_free_routine = set_try_to_free_routine(try_to_free_from_threads);
1927 static void cleanup_threaded_search(void)
1929 set_try_to_free_routine(old_try_to_free_routine);
1930 pthread_cond_destroy(&progress_cond);
1931 pthread_mutex_destroy(&read_mutex);
1932 pthread_mutex_destroy(&cache_mutex);
1933 pthread_mutex_destroy(&progress_mutex);
1936 static void *threaded_find_deltas(void *arg)
1938 struct thread_params *me = arg;
1940 while (me->remaining) {
1941 find_deltas(me->list, &me->remaining,
1942 me->window, me->depth, me->processed);
1946 pthread_cond_signal(&progress_cond);
1950 * We must not set ->data_ready before we wait on the
1951 * condition because the main thread may have set it to 1
1952 * before we get here. In order to be sure that new
1953 * work is available if we see 1 in ->data_ready, it
1954 * was initialized to 0 before this thread was spawned
1955 * and we reset it to 0 right away.
1957 pthread_mutex_lock(&me->mutex);
1958 while (!me->data_ready)
1959 pthread_cond_wait(&me->cond, &me->mutex);
1961 pthread_mutex_unlock(&me->mutex);
1963 /* leave ->working 1 so that this doesn't get more work assigned */
1967 static void ll_find_deltas(struct object_entry **list, unsigned list_size,
1968 int window, int depth, unsigned *processed)
1970 struct thread_params *p;
1971 int i, ret, active_threads = 0;
1973 init_threaded_search();
1975 if (!delta_search_threads) /* --threads=0 means autodetect */
1976 delta_search_threads = online_cpus();
1977 if (delta_search_threads <= 1) {
1978 find_deltas(list, &list_size, window, depth, processed);
1979 cleanup_threaded_search();
1982 if (progress > pack_to_stdout)
1983 fprintf(stderr, "Delta compression using up to %d threads.\n",
1984 delta_search_threads);
1985 p = xcalloc(delta_search_threads, sizeof(*p));
1987 /* Partition the work amongst work threads. */
1988 for (i = 0; i < delta_search_threads; i++) {
1989 unsigned sub_size = list_size / (delta_search_threads - i);
1991 /* don't use too small segments or no deltas will be found */
1992 if (sub_size < 2*window && i+1 < delta_search_threads)
1995 p[i].window = window;
1997 p[i].processed = processed;
1999 p[i].data_ready = 0;
2001 /* try to split chunks on "path" boundaries */
2002 while (sub_size && sub_size < list_size &&
2003 list[sub_size]->hash &&
2004 list[sub_size]->hash == list[sub_size-1]->hash)
2008 p[i].list_size = sub_size;
2009 p[i].remaining = sub_size;
2012 list_size -= sub_size;
2015 /* Start work threads. */
2016 for (i = 0; i < delta_search_threads; i++) {
2017 if (!p[i].list_size)
2019 pthread_mutex_init(&p[i].mutex, NULL);
2020 pthread_cond_init(&p[i].cond, NULL);
2021 ret = pthread_create(&p[i].thread, NULL,
2022 threaded_find_deltas, &p[i]);
2024 die("unable to create thread: %s", strerror(ret));
2029 * Now let's wait for work completion. Each time a thread is done
2030 * with its work, we steal half of the remaining work from the
2031 * thread with the largest number of unprocessed objects and give
2032 * it to that newly idle thread. This ensure good load balancing
2033 * until the remaining object list segments are simply too short
2034 * to be worth splitting anymore.
2036 while (active_threads) {
2037 struct thread_params *target = NULL;
2038 struct thread_params *victim = NULL;
2039 unsigned sub_size = 0;
2043 for (i = 0; !target && i < delta_search_threads; i++)
2048 pthread_cond_wait(&progress_cond, &progress_mutex);
2051 for (i = 0; i < delta_search_threads; i++)
2052 if (p[i].remaining > 2*window &&
2053 (!victim || victim->remaining < p[i].remaining))
2056 sub_size = victim->remaining / 2;
2057 list = victim->list + victim->list_size - sub_size;
2058 while (sub_size && list[0]->hash &&
2059 list[0]->hash == list[-1]->hash) {
2065 * It is possible for some "paths" to have
2066 * so many objects that no hash boundary
2067 * might be found. Let's just steal the
2068 * exact half in that case.
2070 sub_size = victim->remaining / 2;
2073 target->list = list;
2074 victim->list_size -= sub_size;
2075 victim->remaining -= sub_size;
2077 target->list_size = sub_size;
2078 target->remaining = sub_size;
2079 target->working = 1;
2082 pthread_mutex_lock(&target->mutex);
2083 target->data_ready = 1;
2084 pthread_cond_signal(&target->cond);
2085 pthread_mutex_unlock(&target->mutex);
2088 pthread_join(target->thread, NULL);
2089 pthread_cond_destroy(&target->cond);
2090 pthread_mutex_destroy(&target->mutex);
2094 cleanup_threaded_search();
2099 #define ll_find_deltas(l, s, w, d, p) find_deltas(l, &s, w, d, p)
2102 static int add_ref_tag(const char *path, const unsigned char *sha1, int flag, void *cb_data)
2104 unsigned char peeled[20];
2106 if (starts_with(path, "refs/tags/") && /* is a tag? */
2107 !peel_ref(path, peeled) && /* peelable? */
2108 packlist_find(&to_pack, peeled, NULL)) /* object packed? */
2109 add_object_entry(sha1, OBJ_TAG, NULL, 0);
2113 static void prepare_pack(int window, int depth)
2115 struct object_entry **delta_list;
2116 uint32_t i, nr_deltas;
2119 get_object_details();
2122 * If we're locally repacking then we need to be doubly careful
2123 * from now on in order to make sure no stealth corruption gets
2124 * propagated to the new pack. Clients receiving streamed packs
2125 * should validate everything they get anyway so no need to incur
2126 * the additional cost here in that case.
2128 if (!pack_to_stdout)
2129 do_check_packed_object_crc = 1;
2131 if (!to_pack.nr_objects || !window || !depth)
2134 delta_list = xmalloc(to_pack.nr_objects * sizeof(*delta_list));
2137 for (i = 0; i < to_pack.nr_objects; i++) {
2138 struct object_entry *entry = to_pack.objects + i;
2141 /* This happens if we decided to reuse existing
2142 * delta from a pack. "reuse_delta &&" is implied.
2146 if (entry->size < 50)
2149 if (entry->no_try_delta)
2152 if (!entry->preferred_base) {
2154 if (entry->type < 0)
2155 die("unable to get type of object %s",
2156 sha1_to_hex(entry->idx.sha1));
2158 if (entry->type < 0) {
2160 * This object is not found, but we
2161 * don't have to include it anyway.
2167 delta_list[n++] = entry;
2170 if (nr_deltas && n > 1) {
2171 unsigned nr_done = 0;
2173 progress_state = start_progress(_("Compressing objects"),
2175 qsort(delta_list, n, sizeof(*delta_list), type_size_sort);
2176 ll_find_deltas(delta_list, n, window+1, depth, &nr_done);
2177 stop_progress(&progress_state);
2178 if (nr_done != nr_deltas)
2179 die("inconsistency with delta count");
2184 static int git_pack_config(const char *k, const char *v, void *cb)
2186 if (!strcmp(k, "pack.window")) {
2187 window = git_config_int(k, v);
2190 if (!strcmp(k, "pack.windowmemory")) {
2191 window_memory_limit = git_config_ulong(k, v);
2194 if (!strcmp(k, "pack.depth")) {
2195 depth = git_config_int(k, v);
2198 if (!strcmp(k, "pack.compression")) {
2199 int level = git_config_int(k, v);
2201 level = Z_DEFAULT_COMPRESSION;
2202 else if (level < 0 || level > Z_BEST_COMPRESSION)
2203 die("bad pack compression level %d", level);
2204 pack_compression_level = level;
2205 pack_compression_seen = 1;
2208 if (!strcmp(k, "pack.deltacachesize")) {
2209 max_delta_cache_size = git_config_int(k, v);
2212 if (!strcmp(k, "pack.deltacachelimit")) {
2213 cache_max_small_delta_size = git_config_int(k, v);
2216 if (!strcmp(k, "pack.writebitmaphashcache")) {
2217 if (git_config_bool(k, v))
2218 write_bitmap_options |= BITMAP_OPT_HASH_CACHE;
2220 write_bitmap_options &= ~BITMAP_OPT_HASH_CACHE;
2222 if (!strcmp(k, "pack.usebitmaps")) {
2223 use_bitmap_index = git_config_bool(k, v);
2226 if (!strcmp(k, "pack.threads")) {
2227 delta_search_threads = git_config_int(k, v);
2228 if (delta_search_threads < 0)
2229 die("invalid number of threads specified (%d)",
2230 delta_search_threads);
2232 if (delta_search_threads != 1)
2233 warning("no threads support, ignoring %s", k);
2237 if (!strcmp(k, "pack.indexversion")) {
2238 pack_idx_opts.version = git_config_int(k, v);
2239 if (pack_idx_opts.version > 2)
2240 die("bad pack.indexversion=%"PRIu32,
2241 pack_idx_opts.version);
2244 return git_default_config(k, v, cb);
2247 static void read_object_list_from_stdin(void)
2249 char line[40 + 1 + PATH_MAX + 2];
2250 unsigned char sha1[20];
2253 if (!fgets(line, sizeof(line), stdin)) {
2257 die("fgets returned NULL, not EOF, not error!");
2263 if (line[0] == '-') {
2264 if (get_sha1_hex(line+1, sha1))
2265 die("expected edge sha1, got garbage:\n %s",
2267 add_preferred_base(sha1);
2270 if (get_sha1_hex(line, sha1))
2271 die("expected sha1, got garbage:\n %s", line);
2273 add_preferred_base_object(line+41);
2274 add_object_entry(sha1, 0, line+41, 0);
2278 #define OBJECT_ADDED (1u<<20)
2280 static void show_commit(struct commit *commit, void *data)
2282 add_object_entry(commit->object.sha1, OBJ_COMMIT, NULL, 0);
2283 commit->object.flags |= OBJECT_ADDED;
2285 if (write_bitmap_index)
2286 index_commit_for_bitmap(commit);
2289 static void show_object(struct object *obj,
2290 const struct name_path *path, const char *last,
2293 char *name = path_name(path, last);
2295 add_preferred_base_object(name);
2296 add_object_entry(obj->sha1, obj->type, name, 0);
2297 obj->flags |= OBJECT_ADDED;
2300 * We will have generated the hash from the name,
2301 * but not saved a pointer to it - we can free it
2306 static void show_edge(struct commit *commit)
2308 add_preferred_base(commit->object.sha1);
2311 struct in_pack_object {
2313 struct object *object;
2319 struct in_pack_object *array;
2322 static void mark_in_pack_object(struct object *object, struct packed_git *p, struct in_pack *in_pack)
2324 in_pack->array[in_pack->nr].offset = find_pack_entry_one(object->sha1, p);
2325 in_pack->array[in_pack->nr].object = object;
2330 * Compare the objects in the offset order, in order to emulate the
2331 * "git rev-list --objects" output that produced the pack originally.
2333 static int ofscmp(const void *a_, const void *b_)
2335 struct in_pack_object *a = (struct in_pack_object *)a_;
2336 struct in_pack_object *b = (struct in_pack_object *)b_;
2338 if (a->offset < b->offset)
2340 else if (a->offset > b->offset)
2343 return hashcmp(a->object->sha1, b->object->sha1);
2346 static void add_objects_in_unpacked_packs(struct rev_info *revs)
2348 struct packed_git *p;
2349 struct in_pack in_pack;
2352 memset(&in_pack, 0, sizeof(in_pack));
2354 for (p = packed_git; p; p = p->next) {
2355 const unsigned char *sha1;
2358 if (!p->pack_local || p->pack_keep)
2360 if (open_pack_index(p))
2361 die("cannot open pack index");
2363 ALLOC_GROW(in_pack.array,
2364 in_pack.nr + p->num_objects,
2367 for (i = 0; i < p->num_objects; i++) {
2368 sha1 = nth_packed_object_sha1(p, i);
2369 o = lookup_unknown_object(sha1);
2370 if (!(o->flags & OBJECT_ADDED))
2371 mark_in_pack_object(o, p, &in_pack);
2372 o->flags |= OBJECT_ADDED;
2377 qsort(in_pack.array, in_pack.nr, sizeof(in_pack.array[0]),
2379 for (i = 0; i < in_pack.nr; i++) {
2380 struct object *o = in_pack.array[i].object;
2381 add_object_entry(o->sha1, o->type, "", 0);
2384 free(in_pack.array);
2387 static int has_sha1_pack_kept_or_nonlocal(const unsigned char *sha1)
2389 static struct packed_git *last_found = (void *)1;
2390 struct packed_git *p;
2392 p = (last_found != (void *)1) ? last_found : packed_git;
2395 if ((!p->pack_local || p->pack_keep) &&
2396 find_pack_entry_one(sha1, p)) {
2400 if (p == last_found)
2404 if (p == last_found)
2410 static void loosen_unused_packed_objects(struct rev_info *revs)
2412 struct packed_git *p;
2414 const unsigned char *sha1;
2416 for (p = packed_git; p; p = p->next) {
2417 if (!p->pack_local || p->pack_keep)
2420 if (unpack_unreachable_expiration &&
2421 p->mtime < unpack_unreachable_expiration)
2424 if (open_pack_index(p))
2425 die("cannot open pack index");
2427 for (i = 0; i < p->num_objects; i++) {
2428 sha1 = nth_packed_object_sha1(p, i);
2429 if (!packlist_find(&to_pack, sha1, NULL) &&
2430 !has_sha1_pack_kept_or_nonlocal(sha1))
2431 if (force_object_loose(sha1, p->mtime))
2432 die("unable to force loose object");
2438 * This tracks any options which a reader of the pack might
2439 * not understand, and which would therefore prevent blind reuse
2440 * of what we have on disk.
2442 static int pack_options_allow_reuse(void)
2444 return allow_ofs_delta;
2447 static int get_object_list_from_bitmap(struct rev_info *revs)
2449 if (prepare_bitmap_walk(revs) < 0)
2452 if (pack_options_allow_reuse() &&
2453 !reuse_partial_packfile_from_bitmap(
2455 &reuse_packfile_objects,
2456 &reuse_packfile_offset)) {
2457 assert(reuse_packfile_objects);
2458 nr_result += reuse_packfile_objects;
2459 display_progress(progress_state, nr_result);
2462 traverse_bitmap_commit_list(&add_object_entry_from_bitmap);
2466 static void get_object_list(int ac, const char **av)
2468 struct rev_info revs;
2472 init_revisions(&revs, NULL);
2473 save_commit_buffer = 0;
2474 setup_revisions(ac, av, &revs, NULL);
2476 /* make sure shallows are read */
2477 is_repository_shallow();
2479 while (fgets(line, sizeof(line), stdin) != NULL) {
2480 int len = strlen(line);
2481 if (len && line[len - 1] == '\n')
2486 if (!strcmp(line, "--not")) {
2487 flags ^= UNINTERESTING;
2488 write_bitmap_index = 0;
2491 if (starts_with(line, "--shallow ")) {
2492 unsigned char sha1[20];
2493 if (get_sha1_hex(line + 10, sha1))
2494 die("not an SHA-1 '%s'", line + 10);
2495 register_shallow(sha1);
2496 use_bitmap_index = 0;
2499 die("not a rev '%s'", line);
2501 if (handle_revision_arg(line, &revs, flags, REVARG_CANNOT_BE_FILENAME))
2502 die("bad revision '%s'", line);
2505 if (use_bitmap_index && !get_object_list_from_bitmap(&revs))
2508 if (prepare_revision_walk(&revs))
2509 die("revision walk setup failed");
2510 mark_edges_uninteresting(&revs, show_edge);
2511 traverse_commit_list(&revs, show_commit, show_object, NULL);
2513 if (keep_unreachable)
2514 add_objects_in_unpacked_packs(&revs);
2515 if (unpack_unreachable)
2516 loosen_unused_packed_objects(&revs);
2519 static int option_parse_index_version(const struct option *opt,
2520 const char *arg, int unset)
2523 const char *val = arg;
2524 pack_idx_opts.version = strtoul(val, &c, 10);
2525 if (pack_idx_opts.version > 2)
2526 die(_("unsupported index version %s"), val);
2527 if (*c == ',' && c[1])
2528 pack_idx_opts.off32_limit = strtoul(c+1, &c, 0);
2529 if (*c || pack_idx_opts.off32_limit & 0x80000000)
2530 die(_("bad index version '%s'"), val);
2534 static int option_parse_unpack_unreachable(const struct option *opt,
2535 const char *arg, int unset)
2538 unpack_unreachable = 0;
2539 unpack_unreachable_expiration = 0;
2542 unpack_unreachable = 1;
2544 unpack_unreachable_expiration = approxidate(arg);
2549 static int option_parse_ulong(const struct option *opt,
2550 const char *arg, int unset)
2553 die(_("option %s does not accept negative form"),
2556 if (!git_parse_ulong(arg, opt->value))
2557 die(_("unable to parse value '%s' for option %s"),
2558 arg, opt->long_name);
2562 #define OPT_ULONG(s, l, v, h) \
2563 { OPTION_CALLBACK, (s), (l), (v), "n", (h), \
2564 PARSE_OPT_NONEG, option_parse_ulong }
2566 int cmd_pack_objects(int argc, const char **argv, const char *prefix)
2568 int use_internal_rev_list = 0;
2570 int all_progress_implied = 0;
2571 const char *rp_av[6];
2573 int rev_list_unpacked = 0, rev_list_all = 0, rev_list_reflog = 0;
2574 struct option pack_objects_options[] = {
2575 OPT_SET_INT('q', "quiet", &progress,
2576 N_("do not show progress meter"), 0),
2577 OPT_SET_INT(0, "progress", &progress,
2578 N_("show progress meter"), 1),
2579 OPT_SET_INT(0, "all-progress", &progress,
2580 N_("show progress meter during object writing phase"), 2),
2581 OPT_BOOL(0, "all-progress-implied",
2582 &all_progress_implied,
2583 N_("similar to --all-progress when progress meter is shown")),
2584 { OPTION_CALLBACK, 0, "index-version", NULL, N_("version[,offset]"),
2585 N_("write the pack index file in the specified idx format version"),
2586 0, option_parse_index_version },
2587 OPT_ULONG(0, "max-pack-size", &pack_size_limit,
2588 N_("maximum size of each output pack file")),
2589 OPT_BOOL(0, "local", &local,
2590 N_("ignore borrowed objects from alternate object store")),
2591 OPT_BOOL(0, "incremental", &incremental,
2592 N_("ignore packed objects")),
2593 OPT_INTEGER(0, "window", &window,
2594 N_("limit pack window by objects")),
2595 OPT_ULONG(0, "window-memory", &window_memory_limit,
2596 N_("limit pack window by memory in addition to object limit")),
2597 OPT_INTEGER(0, "depth", &depth,
2598 N_("maximum length of delta chain allowed in the resulting pack")),
2599 OPT_BOOL(0, "reuse-delta", &reuse_delta,
2600 N_("reuse existing deltas")),
2601 OPT_BOOL(0, "reuse-object", &reuse_object,
2602 N_("reuse existing objects")),
2603 OPT_BOOL(0, "delta-base-offset", &allow_ofs_delta,
2604 N_("use OFS_DELTA objects")),
2605 OPT_INTEGER(0, "threads", &delta_search_threads,
2606 N_("use threads when searching for best delta matches")),
2607 OPT_BOOL(0, "non-empty", &non_empty,
2608 N_("do not create an empty pack output")),
2609 OPT_BOOL(0, "revs", &use_internal_rev_list,
2610 N_("read revision arguments from standard input")),
2611 { OPTION_SET_INT, 0, "unpacked", &rev_list_unpacked, NULL,
2612 N_("limit the objects to those that are not yet packed"),
2613 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
2614 { OPTION_SET_INT, 0, "all", &rev_list_all, NULL,
2615 N_("include objects reachable from any reference"),
2616 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
2617 { OPTION_SET_INT, 0, "reflog", &rev_list_reflog, NULL,
2618 N_("include objects referred by reflog entries"),
2619 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
2620 OPT_BOOL(0, "stdout", &pack_to_stdout,
2621 N_("output pack to stdout")),
2622 OPT_BOOL(0, "include-tag", &include_tag,
2623 N_("include tag objects that refer to objects to be packed")),
2624 OPT_BOOL(0, "keep-unreachable", &keep_unreachable,
2625 N_("keep unreachable objects")),
2626 { OPTION_CALLBACK, 0, "unpack-unreachable", NULL, N_("time"),
2627 N_("unpack unreachable objects newer than <time>"),
2628 PARSE_OPT_OPTARG, option_parse_unpack_unreachable },
2629 OPT_BOOL(0, "thin", &thin,
2630 N_("create thin packs")),
2631 OPT_BOOL(0, "honor-pack-keep", &ignore_packed_keep,
2632 N_("ignore packs that have companion .keep file")),
2633 OPT_INTEGER(0, "compression", &pack_compression_level,
2634 N_("pack compression level")),
2635 OPT_SET_INT(0, "keep-true-parents", &grafts_replace_parents,
2636 N_("do not hide commits by grafts"), 0),
2637 OPT_BOOL(0, "use-bitmap-index", &use_bitmap_index,
2638 N_("use a bitmap index if available to speed up counting objects")),
2639 OPT_BOOL(0, "write-bitmap-index", &write_bitmap_index,
2640 N_("write a bitmap index together with the pack index")),
2644 check_replace_refs = 0;
2646 reset_pack_idx_option(&pack_idx_opts);
2647 git_config(git_pack_config, NULL);
2648 if (!pack_compression_seen && core_compression_seen)
2649 pack_compression_level = core_compression_level;
2651 progress = isatty(2);
2652 argc = parse_options(argc, argv, prefix, pack_objects_options,
2656 base_name = argv[0];
2659 if (pack_to_stdout != !base_name || argc)
2660 usage_with_options(pack_usage, pack_objects_options);
2662 rp_av[rp_ac++] = "pack-objects";
2664 use_internal_rev_list = 1;
2665 rp_av[rp_ac++] = "--objects-edge";
2667 rp_av[rp_ac++] = "--objects";
2670 use_internal_rev_list = 1;
2671 rp_av[rp_ac++] = "--all";
2673 if (rev_list_reflog) {
2674 use_internal_rev_list = 1;
2675 rp_av[rp_ac++] = "--reflog";
2677 if (rev_list_unpacked) {
2678 use_internal_rev_list = 1;
2679 rp_av[rp_ac++] = "--unpacked";
2684 if (pack_compression_level == -1)
2685 pack_compression_level = Z_DEFAULT_COMPRESSION;
2686 else if (pack_compression_level < 0 || pack_compression_level > Z_BEST_COMPRESSION)
2687 die("bad pack compression level %d", pack_compression_level);
2689 if (delta_search_threads != 1)
2690 warning("no threads support, ignoring --threads");
2692 if (!pack_to_stdout && !pack_size_limit)
2693 pack_size_limit = pack_size_limit_cfg;
2694 if (pack_to_stdout && pack_size_limit)
2695 die("--max-pack-size cannot be used to build a pack for transfer.");
2696 if (pack_size_limit && pack_size_limit < 1024*1024) {
2697 warning("minimum pack size limit is 1 MiB");
2698 pack_size_limit = 1024*1024;
2701 if (!pack_to_stdout && thin)
2702 die("--thin cannot be used to build an indexable pack.");
2704 if (keep_unreachable && unpack_unreachable)
2705 die("--keep-unreachable and --unpack-unreachable are incompatible.");
2707 if (!use_internal_rev_list || !pack_to_stdout || is_repository_shallow())
2708 use_bitmap_index = 0;
2710 if (pack_to_stdout || !rev_list_all)
2711 write_bitmap_index = 0;
2713 if (progress && all_progress_implied)
2716 prepare_packed_git();
2719 progress_state = start_progress(_("Counting objects"), 0);
2720 if (!use_internal_rev_list)
2721 read_object_list_from_stdin();
2723 rp_av[rp_ac] = NULL;
2724 get_object_list(rp_ac, rp_av);
2726 cleanup_preferred_base();
2727 if (include_tag && nr_result)
2728 for_each_ref(add_ref_tag, NULL);
2729 stop_progress(&progress_state);
2731 if (non_empty && !nr_result)
2734 prepare_pack(window, depth);
2737 fprintf(stderr, "Total %"PRIu32" (delta %"PRIu32"),"
2738 " reused %"PRIu32" (delta %"PRIu32")\n",
2739 written, written_delta, reused, reused_delta);