pack-objects: break out of want_object loop early
[git/git.git] / builtin / pack-objects.c
CommitLineData
5d4a6003 1#include "builtin.h"
c323ac7d 2#include "cache.h"
a74db82e 3#include "attr.h"
c323ac7d 4#include "object.h"
8e440259
PE
5#include "blob.h"
6#include "commit.h"
7#include "tag.h"
8#include "tree.h"
c323ac7d 9#include "delta.h"
a733cb60 10#include "pack.h"
3449f8c4 11#include "pack-revindex.h"
c38138cd 12#include "csum-file.h"
1b0c7174 13#include "tree-walk.h"
b5d97e6b
JH
14#include "diff.h"
15#include "revision.h"
16#include "list-objects.h"
2834bc27 17#include "pack-objects.h"
96a02f8f 18#include "progress.h"
f0a24aa5 19#include "refs.h"
cf2ba13a 20#include "streaming.h"
93749194 21#include "thread-utils.h"
6b8fda2d 22#include "pack-bitmap.h"
abcb8655
JK
23#include "reachable.h"
24#include "sha1-array.h"
edfbb2aa 25#include "argv-array.h"
8ecce684 26
99fb6e04 27static const char *pack_usage[] = {
b8c1d275
AH
28 N_("git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"),
29 N_("git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"),
99fb6e04
NTND
30 NULL
31};
c323ac7d 32
3f9ac8d2 33/*
2834bc27
VM
34 * Objects we are going to pack are collected in the `to_pack` structure.
35 * It contains an array (dynamically expanded) of the object data, and a map
36 * that can resolve SHA1s to their position in the array.
3f9ac8d2 37 */
2834bc27
VM
38static struct packing_data to_pack;
39
79814f42 40static struct pack_idx_entry **written_list;
2834bc27 41static uint32_t nr_result, nr_written;
3f9ac8d2 42
96f1e58f 43static int non_empty;
a7de7130 44static int reuse_delta = 1, reuse_object = 1;
e5e9714a 45static int keep_unreachable, unpack_unreachable, include_tag;
7e52f566 46static unsigned long unpack_unreachable_expiration;
e26a8c47 47static int pack_loose_unreachable;
96f1e58f
DR
48static int local;
49static int incremental;
e96fb9b8 50static int ignore_packed_keep;
be6b1914 51static int allow_ofs_delta;
ebcfb379 52static struct pack_idx_option pack_idx_opts;
d01fb92f 53static const char *base_name;
024701f1 54static int progress = 1;
4812a93a 55static int window = 10;
568508e7 56static unsigned long pack_size_limit;
618e613a 57static int depth = 50;
43cc2b42 58static int delta_search_threads;
df6d6101 59static int pack_to_stdout;
8d1d8f83 60static int num_preferred_base;
dc6a0757 61static struct progress *progress_state;
960ccca6
DH
62static int pack_compression_level = Z_DEFAULT_COMPRESSION;
63static int pack_compression_seen;
c323ac7d 64
6b8fda2d
VM
65static struct packed_git *reuse_packfile;
66static uint32_t reuse_packfile_objects;
67static off_t reuse_packfile_offset;
68
69static int use_bitmap_index = 1;
7cc8f971 70static int write_bitmap_index;
ae4f07fb 71static uint16_t write_bitmap_options;
6b8fda2d 72
074b2eea 73static unsigned long delta_cache_size = 0;
5749b0b2 74static unsigned long max_delta_cache_size = 256 * 1024 * 1024;
e3dfddb3 75static unsigned long cache_max_small_delta_size = 1000;
074b2eea 76
a97773ce
BD
77static unsigned long window_memory_limit = 0;
78
3f9ac8d2
JH
79/*
80 * stats
81 */
7cadf491
SP
82static uint32_t written, written_delta;
83static uint32_t reused, reused_delta;
3f9ac8d2 84
7cc8f971
VM
85/*
86 * Indexed commits
87 */
88static struct commit **indexed_commits;
89static unsigned int indexed_commits_nr;
90static unsigned int indexed_commits_alloc;
91
92static void index_commit_for_bitmap(struct commit *commit)
93{
94 if (indexed_commits_nr >= indexed_commits_alloc) {
95 indexed_commits_alloc = (indexed_commits_alloc + 32) * 2;
2756ca43 96 REALLOC_ARRAY(indexed_commits, indexed_commits_alloc);
7cc8f971
VM
97 }
98
99 indexed_commits[indexed_commits_nr++] = commit;
100}
780e6e73 101
3613f9b4 102static void *get_delta(struct object_entry *entry)
c323ac7d 103{
3613f9b4
NP
104 unsigned long size, base_size, delta_size;
105 void *buf, *base_buf, *delta_buf;
21666f1a 106 enum object_type type;
c323ac7d 107
3613f9b4
NP
108 buf = read_sha1_file(entry->idx.sha1, &type, &size);
109 if (!buf)
110 die("unable to read %s", sha1_to_hex(entry->idx.sha1));
111 base_buf = read_sha1_file(entry->delta->idx.sha1, &type, &base_size);
112 if (!base_buf)
aa7e44bf 113 die("unable to read %s", sha1_to_hex(entry->delta->idx.sha1));
3613f9b4 114 delta_buf = diff_delta(base_buf, base_size,
dcde55bc 115 buf, size, &delta_size, 0);
3613f9b4 116 if (!delta_buf || delta_size != entry->delta_size)
a6080a0a 117 die("delta size changed");
3613f9b4
NP
118 free(buf);
119 free(base_buf);
c323ac7d
LT
120 return delta_buf;
121}
122
30ebb40a
NP
123static unsigned long do_compress(void **pptr, unsigned long size)
124{
ef49a7a0 125 git_zstream stream;
30ebb40a
NP
126 void *in, *out;
127 unsigned long maxsize;
128
55bb5c91 129 git_deflate_init(&stream, pack_compression_level);
225a6f10 130 maxsize = git_deflate_bound(&stream, size);
30ebb40a
NP
131
132 in = *pptr;
133 out = xmalloc(maxsize);
134 *pptr = out;
135
136 stream.next_in = in;
137 stream.avail_in = size;
138 stream.next_out = out;
139 stream.avail_out = maxsize;
55bb5c91 140 while (git_deflate(&stream, Z_FINISH) == Z_OK)
30ebb40a 141 ; /* nothing */
55bb5c91 142 git_deflate_end(&stream);
30ebb40a
NP
143
144 free(in);
145 return stream.total_out;
146}
147
cf2ba13a
NTND
148static unsigned long write_large_blob_data(struct git_istream *st, struct sha1file *f,
149 const unsigned char *sha1)
150{
151 git_zstream stream;
152 unsigned char ibuf[1024 * 16];
153 unsigned char obuf[1024 * 16];
154 unsigned long olen = 0;
155
cf2ba13a
NTND
156 git_deflate_init(&stream, pack_compression_level);
157
158 for (;;) {
159 ssize_t readlen;
160 int zret = Z_OK;
161 readlen = read_istream(st, ibuf, sizeof(ibuf));
162 if (readlen == -1)
163 die(_("unable to read %s"), sha1_to_hex(sha1));
164
165 stream.next_in = ibuf;
166 stream.avail_in = readlen;
167 while ((stream.avail_in || readlen == 0) &&
168 (zret == Z_OK || zret == Z_BUF_ERROR)) {
169 stream.next_out = obuf;
170 stream.avail_out = sizeof(obuf);
171 zret = git_deflate(&stream, readlen ? 0 : Z_FINISH);
172 sha1write(f, obuf, stream.next_out - obuf);
173 olen += stream.next_out - obuf;
174 }
175 if (stream.avail_in)
176 die(_("deflate error (%d)"), zret);
177 if (readlen == 0) {
178 if (zret != Z_STREAM_END)
179 die(_("deflate error (%d)"), zret);
180 break;
181 }
182 }
183 git_deflate_end(&stream);
184 return olen;
185}
186
780e6e73
NP
187/*
188 * we are going to reuse the existing object data as is. make
189 * sure it is not corrupt.
190 */
079afb18
SP
191static int check_pack_inflate(struct packed_git *p,
192 struct pack_window **w_curs,
6777a59f
SP
193 off_t offset,
194 off_t len,
079afb18
SP
195 unsigned long expect)
196{
ef49a7a0 197 git_zstream stream;
079afb18
SP
198 unsigned char fakebuf[4096], *in;
199 int st;
200
201 memset(&stream, 0, sizeof(stream));
39c68542 202 git_inflate_init(&stream);
079afb18
SP
203 do {
204 in = use_pack(p, w_curs, offset, &stream.avail_in);
205 stream.next_in = in;
206 stream.next_out = fakebuf;
207 stream.avail_out = sizeof(fakebuf);
39c68542 208 st = git_inflate(&stream, Z_FINISH);
079afb18
SP
209 offset += stream.next_in - in;
210 } while (st == Z_OK || st == Z_BUF_ERROR);
39c68542 211 git_inflate_end(&stream);
079afb18
SP
212 return (st == Z_STREAM_END &&
213 stream.total_out == expect &&
214 stream.total_in == len) ? 0 : -1;
215}
216
217static void copy_pack_data(struct sha1file *f,
218 struct packed_git *p,
219 struct pack_window **w_curs,
6777a59f
SP
220 off_t offset,
221 off_t len)
079afb18
SP
222{
223 unsigned char *in;
ef49a7a0 224 unsigned long avail;
079afb18
SP
225
226 while (len) {
227 in = use_pack(p, w_curs, offset, &avail);
228 if (avail > len)
ef49a7a0 229 avail = (unsigned long)len;
079afb18
SP
230 sha1write(f, in, avail);
231 offset += avail;
232 len -= avail;
233 }
234}
235
1b4bb16b 236/* Return 0 if we will bust the pack-size limit */
c9018b03
NTND
237static unsigned long write_no_reuse_object(struct sha1file *f, struct object_entry *entry,
238 unsigned long limit, int usable_delta)
c323ac7d 239{
c9018b03 240 unsigned long size, datalen;
2c5ef824 241 unsigned char header[10], dheader[10];
6777a59f 242 unsigned hdrlen;
2c5ef824 243 enum object_type type;
c9018b03 244 void *buf;
cf2ba13a 245 struct git_istream *st = NULL;
c9018b03
NTND
246
247 if (!usable_delta) {
cf2ba13a
NTND
248 if (entry->type == OBJ_BLOB &&
249 entry->size > big_file_threshold &&
250 (st = open_istream(entry->idx.sha1, &type, &size, NULL)) != NULL)
251 buf = NULL;
252 else {
253 buf = read_sha1_file(entry->idx.sha1, &type, &size);
254 if (!buf)
255 die(_("unable to read %s"), sha1_to_hex(entry->idx.sha1));
256 }
c9018b03
NTND
257 /*
258 * make sure no cached delta data remains from a
259 * previous attempt before a pack split occurred.
260 */
261 free(entry->delta_data);
262 entry->delta_data = NULL;
263 entry->z_delta_size = 0;
264 } else if (entry->delta_data) {
265 size = entry->delta_size;
266 buf = entry->delta_data;
267 entry->delta_data = NULL;
268 type = (allow_ofs_delta && entry->delta->idx.offset) ?
269 OBJ_OFS_DELTA : OBJ_REF_DELTA;
270 } else {
271 buf = get_delta(entry);
272 size = entry->delta_size;
273 type = (allow_ofs_delta && entry->delta->idx.offset) ?
274 OBJ_OFS_DELTA : OBJ_REF_DELTA;
275 }
276
cf2ba13a
NTND
277 if (st) /* large blob case, just assume we don't compress well */
278 datalen = size;
279 else if (entry->z_delta_size)
c9018b03
NTND
280 datalen = entry->z_delta_size;
281 else
282 datalen = do_compress(&buf, size);
283
284 /*
285 * The object header is a byte of 'type' followed by zero or
286 * more bytes of length.
287 */
288 hdrlen = encode_in_pack_object_header(type, size, header);
289
290 if (type == OBJ_OFS_DELTA) {
291 /*
292 * Deltas with relative base contain an additional
293 * encoding of the relative offset for the delta
294 * base from this object's position in the pack.
295 */
296 off_t ofs = entry->idx.offset - entry->delta->idx.offset;
297 unsigned pos = sizeof(dheader) - 1;
298 dheader[pos] = ofs & 127;
299 while (ofs >>= 7)
300 dheader[--pos] = 128 | (--ofs & 127);
301 if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) {
cf2ba13a
NTND
302 if (st)
303 close_istream(st);
c9018b03
NTND
304 free(buf);
305 return 0;
306 }
307 sha1write(f, header, hdrlen);
308 sha1write(f, dheader + pos, sizeof(dheader) - pos);
309 hdrlen += sizeof(dheader) - pos;
310 } else if (type == OBJ_REF_DELTA) {
311 /*
312 * Deltas with a base reference contain
313 * an additional 20 bytes for the base sha1.
314 */
315 if (limit && hdrlen + 20 + datalen + 20 >= limit) {
cf2ba13a
NTND
316 if (st)
317 close_istream(st);
c9018b03
NTND
318 free(buf);
319 return 0;
320 }
321 sha1write(f, header, hdrlen);
322 sha1write(f, entry->delta->idx.sha1, 20);
323 hdrlen += 20;
324 } else {
325 if (limit && hdrlen + datalen + 20 >= limit) {
cf2ba13a
NTND
326 if (st)
327 close_istream(st);
c9018b03
NTND
328 free(buf);
329 return 0;
330 }
331 sha1write(f, header, hdrlen);
332 }
cf2ba13a
NTND
333 if (st) {
334 datalen = write_large_blob_data(st, f, entry->idx.sha1);
335 close_istream(st);
336 } else {
337 sha1write(f, buf, datalen);
338 free(buf);
339 }
c9018b03
NTND
340
341 return hdrlen + datalen;
342}
343
344/* Return 0 if we will bust the pack-size limit */
345static unsigned long write_reuse_object(struct sha1file *f, struct object_entry *entry,
346 unsigned long limit, int usable_delta)
347{
348 struct packed_git *p = entry->in_pack;
349 struct pack_window *w_curs = NULL;
350 struct revindex_entry *revidx;
351 off_t offset;
352 enum object_type type = entry->type;
353 unsigned long datalen;
354 unsigned char header[10], dheader[10];
355 unsigned hdrlen;
356
357 if (entry->delta)
358 type = (allow_ofs_delta && entry->delta->idx.offset) ?
359 OBJ_OFS_DELTA : OBJ_REF_DELTA;
360 hdrlen = encode_in_pack_object_header(type, entry->size, header);
361
362 offset = entry->in_pack_offset;
363 revidx = find_pack_revindex(p, offset);
364 datalen = revidx[1].offset - offset;
365 if (!pack_to_stdout && p->index_version > 1 &&
366 check_pack_crc(p, &w_curs, offset, datalen, revidx->nr)) {
367 error("bad packed object CRC for %s", sha1_to_hex(entry->idx.sha1));
368 unuse_pack(&w_curs);
369 return write_no_reuse_object(f, entry, limit, usable_delta);
370 }
371
372 offset += entry->in_pack_header_size;
373 datalen -= entry->in_pack_header_size;
374
375 if (!pack_to_stdout && p->index_version == 1 &&
376 check_pack_inflate(p, &w_curs, offset, datalen, entry->size)) {
377 error("corrupt packed object for %s", sha1_to_hex(entry->idx.sha1));
378 unuse_pack(&w_curs);
379 return write_no_reuse_object(f, entry, limit, usable_delta);
380 }
381
382 if (type == OBJ_OFS_DELTA) {
383 off_t ofs = entry->idx.offset - entry->delta->idx.offset;
384 unsigned pos = sizeof(dheader) - 1;
385 dheader[pos] = ofs & 127;
386 while (ofs >>= 7)
387 dheader[--pos] = 128 | (--ofs & 127);
388 if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) {
389 unuse_pack(&w_curs);
390 return 0;
391 }
392 sha1write(f, header, hdrlen);
393 sha1write(f, dheader + pos, sizeof(dheader) - pos);
394 hdrlen += sizeof(dheader) - pos;
395 reused_delta++;
396 } else if (type == OBJ_REF_DELTA) {
397 if (limit && hdrlen + 20 + datalen + 20 >= limit) {
398 unuse_pack(&w_curs);
399 return 0;
400 }
401 sha1write(f, header, hdrlen);
402 sha1write(f, entry->delta->idx.sha1, 20);
403 hdrlen += 20;
404 reused_delta++;
405 } else {
406 if (limit && hdrlen + datalen + 20 >= limit) {
407 unuse_pack(&w_curs);
408 return 0;
409 }
410 sha1write(f, header, hdrlen);
411 }
412 copy_pack_data(f, p, &w_curs, offset, datalen);
413 unuse_pack(&w_curs);
414 reused++;
415 return hdrlen + datalen;
416}
417
418/* Return 0 if we will bust the pack-size limit */
419static unsigned long write_object(struct sha1file *f,
420 struct object_entry *entry,
421 off_t write_offset)
422{
423 unsigned long limit, len;
2c5ef824 424 int usable_delta, to_reuse;
c323ac7d 425
78d1e84f
NP
426 if (!pack_to_stdout)
427 crc32_begin(f);
428
a2430dde 429 /* apply size limit if limited packsize and not first object */
a1e4760f
NP
430 if (!pack_size_limit || !nr_written)
431 limit = 0;
432 else if (pack_size_limit <= write_offset)
433 /*
434 * the earlier object did not fit the limit; avoid
435 * mistaking this with unlimited (i.e. limit = 0).
436 */
437 limit = 1;
438 else
439 limit = pack_size_limit - write_offset;
2c5ef824
NP
440
441 if (!entry->delta)
442 usable_delta = 0; /* no delta */
443 else if (!pack_size_limit)
444 usable_delta = 1; /* unlimited packfile */
445 else if (entry->delta->idx.offset == (off_t)-1)
446 usable_delta = 0; /* base was written to another pack */
447 else if (entry->delta->idx.offset)
448 usable_delta = 1; /* base already exists in this pack */
449 else
450 usable_delta = 0; /* base could end up in another pack */
451
a7de7130 452 if (!reuse_object)
fa736f72
NP
453 to_reuse = 0; /* explicit */
454 else if (!entry->in_pack)
ab7cd7bb 455 to_reuse = 0; /* can't reuse what we don't have */
c9018b03 456 else if (entry->type == OBJ_REF_DELTA || entry->type == OBJ_OFS_DELTA)
17b08f2c
DH
457 /* check_object() decided it for us ... */
458 to_reuse = usable_delta;
459 /* ... but pack split may override that */
c9018b03 460 else if (entry->type != entry->in_pack_type)
ab7cd7bb
JH
461 to_reuse = 0; /* pack has delta which is unusable */
462 else if (entry->delta)
463 to_reuse = 0; /* we want to pack afresh */
464 else
465 to_reuse = 1; /* we have it in-pack undeltified,
466 * and we do not need to deltify it.
467 */
468
c9018b03
NTND
469 if (!to_reuse)
470 len = write_no_reuse_object(f, entry, limit, usable_delta);
471 else
472 len = write_reuse_object(f, entry, limit, usable_delta);
473 if (!len)
474 return 0;
64bd76b1 475
17b08f2c 476 if (usable_delta)
ab7cd7bb 477 written_delta++;
3f9ac8d2 478 written++;
78d1e84f 479 if (!pack_to_stdout)
aa7e44bf 480 entry->idx.crc32 = crc32_end(f);
c9018b03 481 return len;
c323ac7d
LT
482}
483
f63c79db
JH
484enum write_one_status {
485 WRITE_ONE_SKIP = -1, /* already written */
486 WRITE_ONE_BREAK = 0, /* writing this will bust the limit; not written */
487 WRITE_ONE_WRITTEN = 1, /* normal */
488 WRITE_ONE_RECURSIVE = 2 /* already scheduled to be written */
489};
490
491static enum write_one_status write_one(struct sha1file *f,
492 struct object_entry *e,
493 off_t *offset)
9d5ab962 494{
d7dd0223 495 unsigned long size;
f63c79db 496 int recursing;
d7dd0223 497
f63c79db
JH
498 /*
499 * we set offset to 1 (which is an impossible value) to mark
500 * the fact that this object is involved in "write its base
501 * first before writing a deltified object" recursion.
502 */
503 recursing = (e->idx.offset == 1);
504 if (recursing) {
505 warning("recursive delta detected for object %s",
506 sha1_to_hex(e->idx.sha1));
507 return WRITE_ONE_RECURSIVE;
508 } else if (e->idx.offset || e->preferred_base) {
509 /* offset is non zero if object is written already. */
510 return WRITE_ONE_SKIP;
511 }
d7dd0223 512
720c9f7b 513 /* if we are deltified, write out base object first. */
f63c79db
JH
514 if (e->delta) {
515 e->idx.offset = 1; /* now recurse */
516 switch (write_one(f, e->delta, offset)) {
517 case WRITE_ONE_RECURSIVE:
518 /* we cannot depend on this one */
519 e->delta = NULL;
520 break;
521 default:
522 break;
523 case WRITE_ONE_BREAK:
524 e->idx.offset = recursing;
525 return WRITE_ONE_BREAK;
526 }
527 }
d7dd0223 528
6ed7f25e
NP
529 e->idx.offset = *offset;
530 size = write_object(f, e, *offset);
17b08f2c 531 if (!size) {
f63c79db
JH
532 e->idx.offset = recursing;
533 return WRITE_ONE_BREAK;
17b08f2c 534 }
79814f42 535 written_list[nr_written++] = &e->idx;
d7dd0223
NP
536
537 /* make sure off_t is sufficiently large not to wrap */
c03c8315 538 if (signed_add_overflows(*offset, size))
d7dd0223 539 die("pack too large for current definition of off_t");
6ed7f25e 540 *offset += size;
f63c79db 541 return WRITE_ONE_WRITTEN;
9d5ab962
JH
542}
543
d155254c 544static int mark_tagged(const char *path, const struct object_id *oid, int flag,
1b4bb16b
JH
545 void *cb_data)
546{
547 unsigned char peeled[20];
d155254c 548 struct object_entry *entry = packlist_find(&to_pack, oid->hash, NULL);
1b4bb16b
JH
549
550 if (entry)
551 entry->tagged = 1;
552 if (!peel_ref(path, peeled)) {
2834bc27 553 entry = packlist_find(&to_pack, peeled, NULL);
1b4bb16b
JH
554 if (entry)
555 entry->tagged = 1;
556 }
557 return 0;
558}
559
be126818 560static inline void add_to_write_order(struct object_entry **wo,
92bef1a1 561 unsigned int *endp,
1b4bb16b
JH
562 struct object_entry *e)
563{
564 if (e->filled)
565 return;
566 wo[(*endp)++] = e;
567 e->filled = 1;
568}
569
570static void add_descendants_to_write_order(struct object_entry **wo,
92bef1a1 571 unsigned int *endp,
1b4bb16b
JH
572 struct object_entry *e)
573{
f380872f
DM
574 int add_to_order = 1;
575 while (e) {
576 if (add_to_order) {
577 struct object_entry *s;
578 /* add this node... */
579 add_to_write_order(wo, endp, e);
580 /* all its siblings... */
581 for (s = e->delta_sibling; s; s = s->delta_sibling) {
582 add_to_write_order(wo, endp, s);
583 }
584 }
585 /* drop down a level to add left subtree nodes if possible */
586 if (e->delta_child) {
587 add_to_order = 1;
588 e = e->delta_child;
589 } else {
590 add_to_order = 0;
591 /* our sibling might have some children, it is next */
592 if (e->delta_sibling) {
593 e = e->delta_sibling;
594 continue;
595 }
596 /* go back to our parent node */
597 e = e->delta;
598 while (e && !e->delta_sibling) {
599 /* we're on the right side of a subtree, keep
600 * going up until we can go right again */
601 e = e->delta;
602 }
603 if (!e) {
604 /* done- we hit our original root node */
605 return;
606 }
607 /* pass it off to sibling at this level */
608 e = e->delta_sibling;
609 }
610 };
1b4bb16b
JH
611}
612
613static void add_family_to_write_order(struct object_entry **wo,
92bef1a1 614 unsigned int *endp,
1b4bb16b
JH
615 struct object_entry *e)
616{
617 struct object_entry *root;
618
619 for (root = e; root->delta; root = root->delta)
620 ; /* nothing */
1b4bb16b
JH
621 add_descendants_to_write_order(wo, endp, root);
622}
623
624static struct object_entry **compute_write_order(void)
625{
38d4debb 626 unsigned int i, wo_end, last_untagged;
1b4bb16b 627
b32fa95f 628 struct object_entry **wo;
2834bc27 629 struct object_entry *objects = to_pack.objects;
1b4bb16b 630
2834bc27 631 for (i = 0; i < to_pack.nr_objects; i++) {
1b4bb16b
JH
632 objects[i].tagged = 0;
633 objects[i].filled = 0;
634 objects[i].delta_child = NULL;
635 objects[i].delta_sibling = NULL;
636 }
637
638 /*
639 * Fully connect delta_child/delta_sibling network.
640 * Make sure delta_sibling is sorted in the original
641 * recency order.
642 */
2834bc27 643 for (i = to_pack.nr_objects; i > 0;) {
92bef1a1 644 struct object_entry *e = &objects[--i];
1b4bb16b
JH
645 if (!e->delta)
646 continue;
647 /* Mark me as the first child */
648 e->delta_sibling = e->delta->delta_child;
649 e->delta->delta_child = e;
650 }
651
652 /*
653 * Mark objects that are at the tip of tags.
654 */
d155254c 655 for_each_tag_ref(mark_tagged, NULL);
1b4bb16b
JH
656
657 /*
38d4debb 658 * Give the objects in the original recency order until
1b4bb16b
JH
659 * we see a tagged tip.
660 */
b32fa95f 661 ALLOC_ARRAY(wo, to_pack.nr_objects);
2834bc27 662 for (i = wo_end = 0; i < to_pack.nr_objects; i++) {
1b4bb16b
JH
663 if (objects[i].tagged)
664 break;
665 add_to_write_order(wo, &wo_end, &objects[i]);
666 }
38d4debb 667 last_untagged = i;
1b4bb16b
JH
668
669 /*
670 * Then fill all the tagged tips.
671 */
2834bc27 672 for (; i < to_pack.nr_objects; i++) {
1b4bb16b
JH
673 if (objects[i].tagged)
674 add_to_write_order(wo, &wo_end, &objects[i]);
675 }
676
677 /*
678 * And then all remaining commits and tags.
679 */
2834bc27 680 for (i = last_untagged; i < to_pack.nr_objects; i++) {
1b4bb16b
JH
681 if (objects[i].type != OBJ_COMMIT &&
682 objects[i].type != OBJ_TAG)
683 continue;
684 add_to_write_order(wo, &wo_end, &objects[i]);
685 }
686
687 /*
688 * And then all the trees.
689 */
2834bc27 690 for (i = last_untagged; i < to_pack.nr_objects; i++) {
1b4bb16b
JH
691 if (objects[i].type != OBJ_TREE)
692 continue;
693 add_to_write_order(wo, &wo_end, &objects[i]);
694 }
695
696 /*
697 * Finally all the rest in really tight order
698 */
2834bc27 699 for (i = last_untagged; i < to_pack.nr_objects; i++) {
38d4debb
DM
700 if (!objects[i].filled)
701 add_family_to_write_order(wo, &wo_end, &objects[i]);
702 }
703
2834bc27
VM
704 if (wo_end != to_pack.nr_objects)
705 die("ordered %u objects, expected %"PRIu32, wo_end, to_pack.nr_objects);
1b4bb16b
JH
706
707 return wo;
708}
709
6b8fda2d
VM
710static off_t write_reused_pack(struct sha1file *f)
711{
712 unsigned char buffer[8192];
657673f1 713 off_t to_write, total;
6b8fda2d
VM
714 int fd;
715
716 if (!is_pack_valid(reuse_packfile))
717 die("packfile is invalid: %s", reuse_packfile->pack_name);
718
719 fd = git_open_noatime(reuse_packfile->pack_name);
720 if (fd < 0)
721 die_errno("unable to open packfile for reuse: %s",
722 reuse_packfile->pack_name);
723
724 if (lseek(fd, sizeof(struct pack_header), SEEK_SET) == -1)
725 die_errno("unable to seek in reused packfile");
726
727 if (reuse_packfile_offset < 0)
728 reuse_packfile_offset = reuse_packfile->pack_size - 20;
729
657673f1 730 total = to_write = reuse_packfile_offset - sizeof(struct pack_header);
6b8fda2d
VM
731
732 while (to_write) {
733 int read_pack = xread(fd, buffer, sizeof(buffer));
734
735 if (read_pack <= 0)
736 die_errno("unable to read from reused packfile");
737
738 if (read_pack > to_write)
739 read_pack = to_write;
740
741 sha1write(f, buffer, read_pack);
742 to_write -= read_pack;
657673f1
JK
743
744 /*
745 * We don't know the actual number of objects written,
746 * only how many bytes written, how many bytes total, and
747 * how many objects total. So we can fake it by pretending all
748 * objects we are writing are the same size. This gives us a
749 * smooth progress meter, and at the end it matches the true
750 * answer.
751 */
752 written = reuse_packfile_objects *
753 (((double)(total - to_write)) / total);
754 display_progress(progress_state, written);
6b8fda2d
VM
755 }
756
757 close(fd);
657673f1
JK
758 written = reuse_packfile_objects;
759 display_progress(progress_state, written);
6b8fda2d
VM
760 return reuse_packfile_offset - sizeof(struct pack_header);
761}
762
9cea46cd
EW
763static const char no_split_warning[] = N_(
764"disabling bitmap writing, packs are split due to pack.packSizeLimit"
765);
766
d01fb92f 767static void write_pack_file(void)
c323ac7d 768{
ebe27b13 769 uint32_t i = 0, j;
d22b9290 770 struct sha1file *f;
6ed7f25e 771 off_t offset;
ebe27b13 772 uint32_t nr_remaining = nr_result;
f746bae8 773 time_t last_mtime = 0;
1b4bb16b 774 struct object_entry **write_order;
81a216a5 775
bcd7954e 776 if (progress > pack_to_stdout)
754dbc43 777 progress_state = start_progress(_("Writing objects"), nr_result);
b32fa95f 778 ALLOC_ARRAY(written_list, to_pack.nr_objects);
1b4bb16b 779 write_order = compute_write_order();
183bdb2c 780
ebe27b13 781 do {
aa7e44bf 782 unsigned char sha1[20];
7ba502c4 783 char *pack_tmp_name = NULL;
aa7e44bf 784
cdf9db3c 785 if (pack_to_stdout)
2a128d63 786 f = sha1fd_throughput(1, "<stdout>", progress_state);
cdf9db3c
JH
787 else
788 f = create_tmp_packfile(&pack_tmp_name);
ebe27b13 789
c0ad4657 790 offset = write_pack_header(f, nr_remaining);
6b8fda2d
VM
791
792 if (reuse_packfile) {
793 off_t packfile_size;
794 assert(pack_to_stdout);
795
796 packfile_size = write_reused_pack(f);
797 offset += packfile_size;
798 }
799
ebe27b13 800 nr_written = 0;
2834bc27 801 for (; i < to_pack.nr_objects; i++) {
1b4bb16b 802 struct object_entry *e = write_order[i];
cddec4f8 803 if (write_one(f, e, &offset) == WRITE_ONE_BREAK)
720c9f7b
NP
804 break;
805 display_progress(progress_state, written);
806 }
c553ca25 807
ebe27b13
DH
808 /*
809 * Did we write the wrong # entries in the header?
810 * If so, rewrite it like in fast-import
811 */
54352bb2
LT
812 if (pack_to_stdout) {
813 sha1close(f, sha1, CSUM_CLOSE);
814 } else if (nr_written == nr_remaining) {
815 sha1close(f, sha1, CSUM_FSYNC);
ebe27b13 816 } else {
ac0463ed 817 int fd = sha1close(f, sha1, 0);
abeb40e5 818 fixup_pack_header_footer(fd, sha1, pack_tmp_name,
ac0463ed 819 nr_written, sha1, offset);
7ba502c4 820 close(fd);
9cea46cd
EW
821 if (write_bitmap_index) {
822 warning(_(no_split_warning));
823 write_bitmap_index = 0;
824 }
ebe27b13
DH
825 }
826
827 if (!pack_to_stdout) {
f746bae8 828 struct stat st;
58892711 829 struct strbuf tmpname = STRBUF_INIT;
d01fb92f 830
f746bae8
NP
831 /*
832 * Packs are runtime accessed in their mtime
833 * order since newer packs are more likely to contain
834 * younger objects. So if we are creating multiple
835 * packs then we should modify the mtime of later ones
836 * to preserve this property.
837 */
0e990530 838 if (stat(pack_tmp_name, &st) < 0) {
54d47394 839 warning_errno("failed to stat %s", pack_tmp_name);
f746bae8
NP
840 } else if (!last_mtime) {
841 last_mtime = st.st_mtime;
842 } else {
843 struct utimbuf utb;
844 utb.actime = st.st_atime;
845 utb.modtime = --last_mtime;
0e990530 846 if (utime(pack_tmp_name, &utb) < 0)
54d47394 847 warning_errno("failed utime() on %s", pack_tmp_name);
f746bae8
NP
848 }
849
58892711 850 strbuf_addf(&tmpname, "%s-", base_name);
7cc8f971
VM
851
852 if (write_bitmap_index) {
853 bitmap_writer_set_checksum(sha1);
854 bitmap_writer_build_type_index(written_list, nr_written);
855 }
856
58892711 857 finish_tmp_packfile(&tmpname, pack_tmp_name,
0e990530
JH
858 written_list, nr_written,
859 &pack_idx_opts, sha1);
7cc8f971
VM
860
861 if (write_bitmap_index) {
58892711 862 strbuf_addf(&tmpname, "%s.bitmap", sha1_to_hex(sha1));
7cc8f971
VM
863
864 stop_progress(&progress_state);
865
866 bitmap_writer_show_progress(progress);
867 bitmap_writer_reuse_bitmaps(&to_pack);
868 bitmap_writer_select_commits(indexed_commits, indexed_commits_nr, -1);
869 bitmap_writer_build(&to_pack);
ae4f07fb 870 bitmap_writer_finish(written_list, nr_written,
58892711 871 tmpname.buf, write_bitmap_options);
7cc8f971
VM
872 write_bitmap_index = 0;
873 }
874
58892711 875 strbuf_release(&tmpname);
7ba502c4 876 free(pack_tmp_name);
aa7e44bf 877 puts(sha1_to_hex(sha1));
ebe27b13
DH
878 }
879
880 /* mark written objects as written to previous pack */
881 for (j = 0; j < nr_written; j++) {
79814f42 882 written_list[j]->offset = (off_t)-1;
ebe27b13
DH
883 }
884 nr_remaining -= nr_written;
2834bc27 885 } while (nr_remaining && i < to_pack.nr_objects);
ebe27b13
DH
886
887 free(written_list);
1b4bb16b 888 free(write_order);
4d4fcc54 889 stop_progress(&progress_state);
67c08ce1 890 if (written != nr_result)
6e1c2344
RJ
891 die("wrote %"PRIu32" objects while expecting %"PRIu32,
892 written, nr_result);
c323ac7d
LT
893}
894
a74db82e
JH
895static void setup_delta_attr_check(struct git_attr_check *check)
896{
897 static struct git_attr *attr_delta;
898
899 if (!attr_delta)
7fb0eaa2 900 attr_delta = git_attr("delta");
a74db82e
JH
901
902 check[0].attr = attr_delta;
903}
904
905static int no_try_delta(const char *path)
906{
907 struct git_attr_check check[1];
908
909 setup_delta_attr_check(check);
d932f4eb 910 if (git_check_attr(path, ARRAY_SIZE(check), check))
a74db82e
JH
911 return 0;
912 if (ATTR_FALSE(check->value))
913 return 1;
914 return 0;
915}
916
ce2bc424
JK
917/*
918 * When adding an object, check whether we have already added it
919 * to our packing list. If so, we can skip. However, if we are
920 * being asked to excludei t, but the previous mention was to include
921 * it, make sure to adjust its flags and tweak our numbers accordingly.
922 *
923 * As an optimization, we pass out the index position where we would have
924 * found the item, since that saves us from having to look it up again a
925 * few lines later when we want to add the new entry.
926 */
927static int have_duplicate_entry(const unsigned char *sha1,
928 int exclude,
929 uint32_t *index_pos)
c323ac7d 930{
c323ac7d 931 struct object_entry *entry;
29b734e4 932
ce2bc424
JK
933 entry = packlist_find(&to_pack, sha1, index_pos);
934 if (!entry)
29b734e4 935 return 0;
ce2bc424
JK
936
937 if (exclude) {
938 if (!entry->preferred_base)
939 nr_result--;
940 entry->preferred_base = 1;
29b734e4 941 }
c323ac7d 942
ce2bc424
JK
943 return 1;
944}
945
946/*
947 * Check whether we want the object in the pack (e.g., we do not want
948 * objects found in non-local stores if the "--local" option was used).
949 *
950 * As a side effect of this check, we will find the packed version of this
951 * object, if any. We therefore pass out the pack information to avoid having
952 * to look it up again later.
953 */
954static int want_object_in_pack(const unsigned char *sha1,
955 int exclude,
956 struct packed_git **found_pack,
957 off_t *found_offset)
958{
959 struct packed_git *p;
960
daae0625
BC
961 if (!exclude && local && has_loose_object_nonlocal(sha1))
962 return 0;
963
ce2bc424
JK
964 *found_pack = NULL;
965 *found_offset = 0;
966
5c49c116
NP
967 for (p = packed_git; p; p = p->next) {
968 off_t offset = find_pack_entry_one(sha1, p);
969 if (offset) {
ce2bc424 970 if (!*found_pack) {
319b678a 971 if (!is_pack_valid(p))
4c080182 972 continue;
ce2bc424
JK
973 *found_offset = offset;
974 *found_pack = p;
64560374 975 }
5c49c116 976 if (exclude)
ce2bc424 977 return 1;
5c49c116
NP
978 if (incremental)
979 return 0;
cd379967
JK
980
981 /*
982 * When asked to do --local (do not include an
983 * object that appears in a pack we borrow
984 * from elsewhere) or --honor-pack-keep (do not
985 * include an object that appears in a pack marked
986 * with .keep), we need to make sure no copy of this
987 * object come from in _any_ pack that causes us to
988 * omit it, and need to complete this loop. When
989 * neither option is in effect, we know the object
990 * we just found is going to be packed, so break
991 * out of the loop to return 1 now.
992 */
993 if (!ignore_packed_keep && !local)
994 break;
995
5c49c116
NP
996 if (local && !p->pack_local)
997 return 0;
e96fb9b8
BC
998 if (ignore_packed_keep && p->pack_local && p->pack_keep)
999 return 0;
64560374
LT
1000 }
1001 }
eb019375 1002
ce2bc424
JK
1003 return 1;
1004}
1005
1006static void create_object_entry(const unsigned char *sha1,
1007 enum object_type type,
1008 uint32_t hash,
1009 int exclude,
1010 int no_try_delta,
1011 uint32_t index_pos,
1012 struct packed_git *found_pack,
1013 off_t found_offset)
1014{
1015 struct object_entry *entry;
29b734e4 1016
2834bc27 1017 entry = packlist_alloc(&to_pack, sha1, index_pos);
27225f2e 1018 entry->hash = hash;
5c49c116
NP
1019 if (type)
1020 entry->type = type;
29b734e4
NP
1021 if (exclude)
1022 entry->preferred_base = 1;
81a216a5
NP
1023 else
1024 nr_result++;
29b734e4
NP
1025 if (found_pack) {
1026 entry->in_pack = found_pack;
1027 entry->in_pack_offset = found_offset;
1028 }
7a979d99 1029
ce2bc424
JK
1030 entry->no_try_delta = no_try_delta;
1031}
29b734e4 1032
373c67da
JK
1033static const char no_closure_warning[] = N_(
1034"disabling bitmap writing, as some objects are not being packed"
1035);
1036
ce2bc424
JK
1037static int add_object_entry(const unsigned char *sha1, enum object_type type,
1038 const char *name, int exclude)
1039{
1040 struct packed_git *found_pack;
1041 off_t found_offset;
1042 uint32_t index_pos;
7a979d99 1043
ce2bc424
JK
1044 if (have_duplicate_entry(sha1, exclude, &index_pos))
1045 return 0;
a74db82e 1046
373c67da
JK
1047 if (!want_object_in_pack(sha1, exclude, &found_pack, &found_offset)) {
1048 /* The pack is missing an object, so it will not have closure */
1049 if (write_bitmap_index) {
1050 warning(_(no_closure_warning));
1051 write_bitmap_index = 0;
1052 }
ce2bc424 1053 return 0;
373c67da 1054 }
29b734e4 1055
ce2bc424
JK
1056 create_object_entry(sha1, type, pack_name_hash(name),
1057 exclude, name && no_try_delta(name),
1058 index_pos, found_pack, found_offset);
a74db82e 1059
78d2214e 1060 display_progress(progress_state, nr_result);
29b734e4 1061 return 1;
c323ac7d
LT
1062}
1063
6b8fda2d
VM
1064static int add_object_entry_from_bitmap(const unsigned char *sha1,
1065 enum object_type type,
1066 int flags, uint32_t name_hash,
1067 struct packed_git *pack, off_t offset)
1068{
1069 uint32_t index_pos;
1070
1071 if (have_duplicate_entry(sha1, 0, &index_pos))
1072 return 0;
1073
1074 create_object_entry(sha1, type, name_hash, 0, 0, index_pos, pack, offset);
1075
78d2214e 1076 display_progress(progress_state, nr_result);
29b734e4 1077 return 1;
c323ac7d
LT
1078}
1079
5379a5c5
JH
1080struct pbase_tree_cache {
1081 unsigned char sha1[20];
1082 int ref;
1083 int temporary;
1084 void *tree_data;
1085 unsigned long tree_size;
1086};
1087
1088static struct pbase_tree_cache *(pbase_tree_cache[256]);
1089static int pbase_tree_cache_ix(const unsigned char *sha1)
1090{
1091 return sha1[0] % ARRAY_SIZE(pbase_tree_cache);
1092}
1093static int pbase_tree_cache_ix_incr(int ix)
1094{
1095 return (ix+1) % ARRAY_SIZE(pbase_tree_cache);
1096}
1097
1098static struct pbase_tree {
1099 struct pbase_tree *next;
1100 /* This is a phony "cache" entry; we are not
01689909 1101 * going to evict it or find it through _get()
5379a5c5
JH
1102 * mechanism -- this is for the toplevel node that
1103 * would almost always change with any commit.
1104 */
1105 struct pbase_tree_cache pcache;
1106} *pbase_tree;
1107
1108static struct pbase_tree_cache *pbase_tree_get(const unsigned char *sha1)
1109{
1110 struct pbase_tree_cache *ent, *nent;
1111 void *data;
1112 unsigned long size;
21666f1a 1113 enum object_type type;
5379a5c5
JH
1114 int neigh;
1115 int my_ix = pbase_tree_cache_ix(sha1);
1116 int available_ix = -1;
1117
1118 /* pbase-tree-cache acts as a limited hashtable.
1119 * your object will be found at your index or within a few
1120 * slots after that slot if it is cached.
1121 */
1122 for (neigh = 0; neigh < 8; neigh++) {
1123 ent = pbase_tree_cache[my_ix];
a89fccd2 1124 if (ent && !hashcmp(ent->sha1, sha1)) {
5379a5c5
JH
1125 ent->ref++;
1126 return ent;
1127 }
1128 else if (((available_ix < 0) && (!ent || !ent->ref)) ||
1129 ((0 <= available_ix) &&
1130 (!ent && pbase_tree_cache[available_ix])))
1131 available_ix = my_ix;
1132 if (!ent)
1133 break;
1134 my_ix = pbase_tree_cache_ix_incr(my_ix);
1135 }
1136
1137 /* Did not find one. Either we got a bogus request or
1138 * we need to read and perhaps cache.
1139 */
21666f1a 1140 data = read_sha1_file(sha1, &type, &size);
5379a5c5
JH
1141 if (!data)
1142 return NULL;
21666f1a 1143 if (type != OBJ_TREE) {
5379a5c5
JH
1144 free(data);
1145 return NULL;
1146 }
1147
1148 /* We need to either cache or return a throwaway copy */
1149
1150 if (available_ix < 0)
1151 ent = NULL;
1152 else {
1153 ent = pbase_tree_cache[available_ix];
1154 my_ix = available_ix;
1155 }
1156
1157 if (!ent) {
1158 nent = xmalloc(sizeof(*nent));
1159 nent->temporary = (available_ix < 0);
1160 }
1161 else {
1162 /* evict and reuse */
1163 free(ent->tree_data);
1164 nent = ent;
1165 }
e702496e 1166 hashcpy(nent->sha1, sha1);
5379a5c5
JH
1167 nent->tree_data = data;
1168 nent->tree_size = size;
1169 nent->ref = 1;
1170 if (!nent->temporary)
1171 pbase_tree_cache[my_ix] = nent;
1172 return nent;
1173}
1174
1175static void pbase_tree_put(struct pbase_tree_cache *cache)
1176{
1177 if (!cache->temporary) {
1178 cache->ref--;
1179 return;
1180 }
1181 free(cache->tree_data);
1182 free(cache);
1183}
1184
1185static int name_cmp_len(const char *name)
1186{
1187 int i;
1188 for (i = 0; name[i] && name[i] != '\n' && name[i] != '/'; i++)
1189 ;
1190 return i;
1191}
1192
1193static void add_pbase_object(struct tree_desc *tree,
5379a5c5 1194 const char *name,
ce0bd642
LT
1195 int cmplen,
1196 const char *fullname)
3f9ac8d2 1197{
4c068a98 1198 struct name_entry entry;
8a5a8d6c 1199 int cmp;
4c068a98
LT
1200
1201 while (tree_entry(tree,&entry)) {
1211be6b
LT
1202 if (S_ISGITLINK(entry.mode))
1203 continue;
0de16337 1204 cmp = tree_entry_len(&entry) != cmplen ? 1 :
8a5a8d6c
NP
1205 memcmp(name, entry.path, cmplen);
1206 if (cmp > 0)
7a979d99 1207 continue;
8a5a8d6c
NP
1208 if (cmp < 0)
1209 return;
5379a5c5 1210 if (name[cmplen] != '/') {
7d924c91 1211 add_object_entry(entry.oid->hash,
4d1012c3 1212 object_type(entry.mode),
bc32fed5 1213 fullname, 1);
5379a5c5
JH
1214 return;
1215 }
8a5a8d6c 1216 if (S_ISDIR(entry.mode)) {
7a979d99 1217 struct tree_desc sub;
5379a5c5
JH
1218 struct pbase_tree_cache *tree;
1219 const char *down = name+cmplen+1;
1220 int downlen = name_cmp_len(down);
1221
7d924c91 1222 tree = pbase_tree_get(entry.oid->hash);
5379a5c5
JH
1223 if (!tree)
1224 return;
6fda5e51 1225 init_tree_desc(&sub, tree->tree_data, tree->tree_size);
5379a5c5 1226
ce0bd642 1227 add_pbase_object(&sub, down, downlen, fullname);
5379a5c5
JH
1228 pbase_tree_put(tree);
1229 }
1230 }
1231}
1d6b38cc 1232
5379a5c5
JH
1233static unsigned *done_pbase_paths;
1234static int done_pbase_paths_num;
1235static int done_pbase_paths_alloc;
1236static int done_pbase_path_pos(unsigned hash)
1237{
1238 int lo = 0;
1239 int hi = done_pbase_paths_num;
1240 while (lo < hi) {
1241 int mi = (hi + lo) / 2;
1242 if (done_pbase_paths[mi] == hash)
1243 return mi;
1244 if (done_pbase_paths[mi] < hash)
1245 hi = mi;
1246 else
1247 lo = mi + 1;
1248 }
1249 return -lo-1;
1250}
1251
1252static int check_pbase_path(unsigned hash)
1253{
1254 int pos = (!done_pbase_paths) ? -1 : done_pbase_path_pos(hash);
1255 if (0 <= pos)
1256 return 1;
1257 pos = -pos - 1;
25e19407
DD
1258 ALLOC_GROW(done_pbase_paths,
1259 done_pbase_paths_num + 1,
1260 done_pbase_paths_alloc);
5379a5c5
JH
1261 done_pbase_paths_num++;
1262 if (pos < done_pbase_paths_num)
1263 memmove(done_pbase_paths + pos + 1,
1264 done_pbase_paths + pos,
1265 (done_pbase_paths_num - pos - 1) * sizeof(unsigned));
1266 done_pbase_paths[pos] = hash;
1267 return 0;
1268}
1269
bc32fed5 1270static void add_preferred_base_object(const char *name)
5379a5c5
JH
1271{
1272 struct pbase_tree *it;
8a5a8d6c 1273 int cmplen;
68fb36eb 1274 unsigned hash = pack_name_hash(name);
5379a5c5 1275
8a5a8d6c 1276 if (!num_preferred_base || check_pbase_path(hash))
5379a5c5
JH
1277 return;
1278
8a5a8d6c 1279 cmplen = name_cmp_len(name);
5379a5c5
JH
1280 for (it = pbase_tree; it; it = it->next) {
1281 if (cmplen == 0) {
bc32fed5 1282 add_object_entry(it->pcache.sha1, OBJ_TREE, NULL, 1);
5379a5c5
JH
1283 }
1284 else {
1285 struct tree_desc tree;
6fda5e51 1286 init_tree_desc(&tree, it->pcache.tree_data, it->pcache.tree_size);
ce0bd642 1287 add_pbase_object(&tree, name, cmplen, name);
7a979d99 1288 }
3f9ac8d2 1289 }
3f9ac8d2
JH
1290}
1291
7a979d99 1292static void add_preferred_base(unsigned char *sha1)
3f9ac8d2 1293{
5379a5c5
JH
1294 struct pbase_tree *it;
1295 void *data;
1296 unsigned long size;
1297 unsigned char tree_sha1[20];
1d6b38cc 1298
8d1d8f83
JH
1299 if (window <= num_preferred_base++)
1300 return;
1301
5379a5c5
JH
1302 data = read_object_with_reference(sha1, tree_type, &size, tree_sha1);
1303 if (!data)
7a979d99 1304 return;
5379a5c5
JH
1305
1306 for (it = pbase_tree; it; it = it->next) {
a89fccd2 1307 if (!hashcmp(it->pcache.sha1, tree_sha1)) {
5379a5c5
JH
1308 free(data);
1309 return;
1310 }
1311 }
1312
1313 it = xcalloc(1, sizeof(*it));
1314 it->next = pbase_tree;
1315 pbase_tree = it;
1316
e702496e 1317 hashcpy(it->pcache.sha1, tree_sha1);
5379a5c5
JH
1318 it->pcache.tree_data = data;
1319 it->pcache.tree_size = size;
3f9ac8d2
JH
1320}
1321
0ef95f72
NP
1322static void cleanup_preferred_base(void)
1323{
1324 struct pbase_tree *it;
1325 unsigned i;
1326
1327 it = pbase_tree;
1328 pbase_tree = NULL;
1329 while (it) {
1330 struct pbase_tree *this = it;
1331 it = this->next;
1332 free(this->pcache.tree_data);
1333 free(this);
1334 }
1335
1336 for (i = 0; i < ARRAY_SIZE(pbase_tree_cache); i++) {
1337 if (!pbase_tree_cache[i])
1338 continue;
1339 free(pbase_tree_cache[i]->tree_data);
1340 free(pbase_tree_cache[i]);
1341 pbase_tree_cache[i] = NULL;
1342 }
1343
1344 free(done_pbase_paths);
1345 done_pbase_paths = NULL;
1346 done_pbase_paths_num = done_pbase_paths_alloc = 0;
1347}
1348
c323ac7d
LT
1349static void check_object(struct object_entry *entry)
1350{
5c49c116 1351 if (entry->in_pack) {
780e6e73 1352 struct packed_git *p = entry->in_pack;
03e79c88 1353 struct pack_window *w_curs = NULL;
5c49c116
NP
1354 const unsigned char *base_ref = NULL;
1355 struct object_entry *base_entry;
1356 unsigned long used, used_0;
ef49a7a0 1357 unsigned long avail;
5c49c116
NP
1358 off_t ofs;
1359 unsigned char *buf, c;
780e6e73 1360
6777a59f 1361 buf = use_pack(p, &w_curs, entry->in_pack_offset, &avail);
ab7cd7bb 1362
5c49c116 1363 /*
fa736f72
NP
1364 * We want in_pack_type even if we do not reuse delta
1365 * since non-delta representations could still be reused.
ab7cd7bb 1366 */
09ded04b 1367 used = unpack_object_header_buffer(buf, avail,
5c49c116
NP
1368 &entry->in_pack_type,
1369 &entry->size);
03d66015
NP
1370 if (used == 0)
1371 goto give_up;
ab7cd7bb 1372
5c49c116
NP
1373 /*
1374 * Determine if this is a delta and if so whether we can
1375 * reuse it or not. Otherwise let's find out as cheaply as
1376 * possible what the actual type and size for this object is.
3f9ac8d2 1377 */
5c49c116
NP
1378 switch (entry->in_pack_type) {
1379 default:
1380 /* Not a delta hence we've already got all we need. */
1381 entry->type = entry->in_pack_type;
1382 entry->in_pack_header_size = used;
03d66015
NP
1383 if (entry->type < OBJ_COMMIT || entry->type > OBJ_BLOB)
1384 goto give_up;
5c49c116
NP
1385 unuse_pack(&w_curs);
1386 return;
1387 case OBJ_REF_DELTA:
a7de7130 1388 if (reuse_delta && !entry->preferred_base)
5c49c116
NP
1389 base_ref = use_pack(p, &w_curs,
1390 entry->in_pack_offset + used, NULL);
1391 entry->in_pack_header_size = used + 20;
1392 break;
1393 case OBJ_OFS_DELTA:
1394 buf = use_pack(p, &w_curs,
1395 entry->in_pack_offset + used, NULL);
1396 used_0 = 0;
1397 c = buf[used_0++];
1398 ofs = c & 127;
1399 while (c & 128) {
1400 ofs += 1;
03d66015
NP
1401 if (!ofs || MSB(ofs, 7)) {
1402 error("delta base offset overflow in pack for %s",
1403 sha1_to_hex(entry->idx.sha1));
1404 goto give_up;
1405 }
5c49c116
NP
1406 c = buf[used_0++];
1407 ofs = (ofs << 7) + (c & 127);
780e6e73 1408 }
5c49c116 1409 ofs = entry->in_pack_offset - ofs;
03d66015
NP
1410 if (ofs <= 0 || ofs >= entry->in_pack_offset) {
1411 error("delta base offset out of bound for %s",
1412 sha1_to_hex(entry->idx.sha1));
1413 goto give_up;
1414 }
a7de7130 1415 if (reuse_delta && !entry->preferred_base) {
3449f8c4
NP
1416 struct revindex_entry *revidx;
1417 revidx = find_pack_revindex(p, ofs);
08698b1e
NP
1418 if (!revidx)
1419 goto give_up;
3449f8c4
NP
1420 base_ref = nth_packed_object_sha1(p, revidx->nr);
1421 }
5c49c116
NP
1422 entry->in_pack_header_size = used + used_0;
1423 break;
780e6e73 1424 }
780e6e73 1425
2834bc27 1426 if (base_ref && (base_entry = packlist_find(&to_pack, base_ref, NULL))) {
5c49c116
NP
1427 /*
1428 * If base_ref was set above that means we wish to
1429 * reuse delta data, and we even found that base
1430 * in the list of objects we want to pack. Goodie!
1431 *
1432 * Depth value does not matter - find_deltas() will
1433 * never consider reused delta as the base object to
1434 * deltify other objects against, in order to avoid
1435 * circular deltas.
3f9ac8d2 1436 */
780e6e73 1437 entry->type = entry->in_pack_type;
5c49c116 1438 entry->delta = base_entry;
64bd76b1 1439 entry->delta_size = entry->size;
15b4d577
JH
1440 entry->delta_sibling = base_entry->delta_child;
1441 base_entry->delta_child = entry;
5c49c116
NP
1442 unuse_pack(&w_curs);
1443 return;
1444 }
ab7cd7bb 1445
5c49c116
NP
1446 if (entry->type) {
1447 /*
1448 * This must be a delta and we already know what the
1449 * final object type is. Let's extract the actual
1450 * object size from the delta header.
1451 */
1452 entry->size = get_size_from_delta(p, &w_curs,
1453 entry->in_pack_offset + entry->in_pack_header_size);
03d66015
NP
1454 if (entry->size == 0)
1455 goto give_up;
5c49c116 1456 unuse_pack(&w_curs);
3f9ac8d2
JH
1457 return;
1458 }
5c49c116
NP
1459
1460 /*
1461 * No choice but to fall back to the recursive delta walk
1462 * with sha1_object_info() to find about the object type
1463 * at this point...
1464 */
03d66015 1465 give_up:
5c49c116 1466 unuse_pack(&w_curs);
36e4d74a 1467 }
3f9ac8d2 1468
aa7e44bf 1469 entry->type = sha1_object_info(entry->idx.sha1, &entry->size);
6d6f9cdd
SP
1470 /*
1471 * The error condition is checked in prepare_pack(). This is
1472 * to permit a missing preferred base object to be ignored
1473 * as a preferred base. Doing so can result in a larger
1474 * pack file, but the transfer will still take place.
1475 */
3f9ac8d2
JH
1476}
1477
5c49c116
NP
1478static int pack_offset_sort(const void *_a, const void *_b)
1479{
1480 const struct object_entry *a = *(struct object_entry **)_a;
1481 const struct object_entry *b = *(struct object_entry **)_b;
1482
1483 /* avoid filesystem trashing with loose objects */
1484 if (!a->in_pack && !b->in_pack)
aa7e44bf 1485 return hashcmp(a->idx.sha1, b->idx.sha1);
5c49c116
NP
1486
1487 if (a->in_pack < b->in_pack)
1488 return -1;
1489 if (a->in_pack > b->in_pack)
1490 return 1;
1491 return a->in_pack_offset < b->in_pack_offset ? -1 :
1492 (a->in_pack_offset > b->in_pack_offset);
1493}
1494
c323ac7d
LT
1495static void get_object_details(void)
1496{
7cadf491 1497 uint32_t i;
5c49c116
NP
1498 struct object_entry **sorted_by_offset;
1499
2834bc27
VM
1500 sorted_by_offset = xcalloc(to_pack.nr_objects, sizeof(struct object_entry *));
1501 for (i = 0; i < to_pack.nr_objects; i++)
1502 sorted_by_offset[i] = to_pack.objects + i;
1503 qsort(sorted_by_offset, to_pack.nr_objects, sizeof(*sorted_by_offset), pack_offset_sort);
c323ac7d 1504
2834bc27 1505 for (i = 0; i < to_pack.nr_objects; i++) {
15366280
JH
1506 struct object_entry *entry = sorted_by_offset[i];
1507 check_object(entry);
754980d0 1508 if (big_file_threshold < entry->size)
15366280
JH
1509 entry->no_try_delta = 1;
1510 }
3449f8c4 1511
5c49c116 1512 free(sorted_by_offset);
c323ac7d
LT
1513}
1514
b904166c
NP
1515/*
1516 * We search for deltas in a list sorted by type, by filename hash, and then
1517 * by size, so that we see progressively smaller and smaller files.
1518 * That's because we prefer deltas to be from the bigger file
1519 * to the smaller -- deletes are potentially cheaper, but perhaps
1520 * more importantly, the bigger file is likely the more recent
1521 * one. The deepest deltas are therefore the oldest objects which are
1522 * less susceptible to be accessed often.
1523 */
9668cf59 1524static int type_size_sort(const void *_a, const void *_b)
c323ac7d 1525{
9668cf59
NP
1526 const struct object_entry *a = *(struct object_entry **)_a;
1527 const struct object_entry *b = *(struct object_entry **)_b;
1528
c323ac7d 1529 if (a->type > b->type)
27225f2e 1530 return -1;
b904166c 1531 if (a->type < b->type)
27225f2e 1532 return 1;
b904166c 1533 if (a->hash > b->hash)
7a979d99 1534 return -1;
b904166c 1535 if (a->hash < b->hash)
7a979d99 1536 return 1;
b904166c 1537 if (a->preferred_base > b->preferred_base)
c323ac7d 1538 return -1;
b904166c
NP
1539 if (a->preferred_base < b->preferred_base)
1540 return 1;
c323ac7d 1541 if (a->size > b->size)
b904166c
NP
1542 return -1;
1543 if (a->size < b->size)
c323ac7d 1544 return 1;
b904166c 1545 return a < b ? -1 : (a > b); /* newest first */
c323ac7d
LT
1546}
1547
1548struct unpacked {
1549 struct object_entry *entry;
1550 void *data;
f6c7081a 1551 struct delta_index *index;
5a235b5e 1552 unsigned depth;
c323ac7d
LT
1553};
1554
d250626c
NP
1555static int delta_cacheable(unsigned long src_size, unsigned long trg_size,
1556 unsigned long delta_size)
074b2eea
MK
1557{
1558 if (max_delta_cache_size && delta_cache_size + delta_size > max_delta_cache_size)
1559 return 0;
1560
e3dfddb3
MK
1561 if (delta_size < cache_max_small_delta_size)
1562 return 1;
1563
074b2eea
MK
1564 /* cache delta, if objects are large enough compared to delta size */
1565 if ((src_size >> 20) + (trg_size >> 21) > (delta_size >> 10))
1566 return 1;
1567
1568 return 0;
1569}
1570
7eb151d6 1571#ifndef NO_PTHREADS
8ecce684 1572
44626dc7 1573static pthread_mutex_t read_mutex;
8ecce684
NP
1574#define read_lock() pthread_mutex_lock(&read_mutex)
1575#define read_unlock() pthread_mutex_unlock(&read_mutex)
1576
44626dc7 1577static pthread_mutex_t cache_mutex;
3c701839
NP
1578#define cache_lock() pthread_mutex_lock(&cache_mutex)
1579#define cache_unlock() pthread_mutex_unlock(&cache_mutex)
1580
44626dc7 1581static pthread_mutex_t progress_mutex;
8ecce684
NP
1582#define progress_lock() pthread_mutex_lock(&progress_mutex)
1583#define progress_unlock() pthread_mutex_unlock(&progress_mutex)
1584
1585#else
1586
e1ef8673
JH
1587#define read_lock() (void)0
1588#define read_unlock() (void)0
1589#define cache_lock() (void)0
1590#define cache_unlock() (void)0
1591#define progress_lock() (void)0
1592#define progress_unlock() (void)0
8ecce684
NP
1593
1594#endif
1595
f6c7081a 1596static int try_delta(struct unpacked *trg, struct unpacked *src,
ef0316fc 1597 unsigned max_depth, unsigned long *mem_usage)
c323ac7d 1598{
f6c7081a
NP
1599 struct object_entry *trg_entry = trg->entry;
1600 struct object_entry *src_entry = src->entry;
560b25a8 1601 unsigned long trg_size, src_size, delta_size, sizediff, max_size, sz;
c83f032e 1602 unsigned ref_depth;
21666f1a 1603 enum object_type type;
c323ac7d
LT
1604 void *delta_buf;
1605
1606 /* Don't bother doing diffs between different types */
f6c7081a 1607 if (trg_entry->type != src_entry->type)
c323ac7d
LT
1608 return -1;
1609
51d1e83f 1610 /*
15f07e06
JK
1611 * We do not bother to try a delta that we discarded on an
1612 * earlier try, but only when reusing delta data. Note that
1613 * src_entry that is marked as the preferred_base should always
1614 * be considered, as even if we produce a suboptimal delta against
1615 * it, we will still save the transfer cost, as we already know
1616 * the other side has it and we won't send src_entry at all.
51d1e83f 1617 */
a7de7130 1618 if (reuse_delta && trg_entry->in_pack &&
e9195b58 1619 trg_entry->in_pack == src_entry->in_pack &&
15f07e06 1620 !src_entry->preferred_base &&
e9195b58
JH
1621 trg_entry->in_pack_type != OBJ_REF_DELTA &&
1622 trg_entry->in_pack_type != OBJ_OFS_DELTA)
51d1e83f
LT
1623 return 0;
1624
898b14ce 1625 /* Let's not bust the allowed depth. */
5a235b5e 1626 if (src->depth >= max_depth)
d116a45a 1627 return 0;
c323ac7d 1628
c3b06a69 1629 /* Now some size filtering heuristics. */
560b25a8 1630 trg_size = trg_entry->size;
c83f032e
NP
1631 if (!trg_entry->delta) {
1632 max_size = trg_size/2 - 20;
1633 ref_depth = 1;
1634 } else {
1635 max_size = trg_entry->delta_size;
5a235b5e 1636 ref_depth = trg->depth;
c83f032e 1637 }
720fe22d 1638 max_size = (uint64_t)max_size * (max_depth - src->depth) /
c83f032e 1639 (max_depth - ref_depth + 1);
c3b06a69
NP
1640 if (max_size == 0)
1641 return 0;
f6c7081a 1642 src_size = src_entry->size;
560b25a8 1643 sizediff = src_size < trg_size ? trg_size - src_size : 0;
27225f2e 1644 if (sizediff >= max_size)
f527cb8c 1645 return 0;
a1dab41a
BD
1646 if (trg_size < src_size / 32)
1647 return 0;
f6c7081a 1648
560b25a8
NP
1649 /* Load data if not already done */
1650 if (!trg->data) {
8ecce684 1651 read_lock();
aa7e44bf 1652 trg->data = read_sha1_file(trg_entry->idx.sha1, &type, &sz);
8ecce684 1653 read_unlock();
2e3404c3
JH
1654 if (!trg->data)
1655 die("object %s cannot be read",
1656 sha1_to_hex(trg_entry->idx.sha1));
560b25a8
NP
1657 if (sz != trg_size)
1658 die("object %s inconsistent object length (%lu vs %lu)",
aa7e44bf 1659 sha1_to_hex(trg_entry->idx.sha1), sz, trg_size);
ef0316fc 1660 *mem_usage += sz;
560b25a8
NP
1661 }
1662 if (!src->data) {
8ecce684 1663 read_lock();
aa7e44bf 1664 src->data = read_sha1_file(src_entry->idx.sha1, &type, &sz);
8ecce684 1665 read_unlock();
71064a95
NP
1666 if (!src->data) {
1667 if (src_entry->preferred_base) {
1668 static int warned = 0;
1669 if (!warned++)
1670 warning("object %s cannot be read",
1671 sha1_to_hex(src_entry->idx.sha1));
1672 /*
1673 * Those objects are not included in the
1674 * resulting pack. Be resilient and ignore
1675 * them if they can't be read, in case the
1676 * pack could be created nevertheless.
1677 */
1678 return 0;
1679 }
2e3404c3
JH
1680 die("object %s cannot be read",
1681 sha1_to_hex(src_entry->idx.sha1));
71064a95 1682 }
560b25a8
NP
1683 if (sz != src_size)
1684 die("object %s inconsistent object length (%lu vs %lu)",
aa7e44bf 1685 sha1_to_hex(src_entry->idx.sha1), sz, src_size);
ef0316fc 1686 *mem_usage += sz;
560b25a8
NP
1687 }
1688 if (!src->index) {
1689 src->index = create_delta_index(src->data, src_size);
a588d88a
MK
1690 if (!src->index) {
1691 static int warned = 0;
1692 if (!warned++)
1693 warning("suboptimal pack - out of memory");
1694 return 0;
1695 }
ef0316fc 1696 *mem_usage += sizeof_delta_index(src->index);
560b25a8
NP
1697 }
1698
1699 delta_buf = create_delta(src->index, trg->data, trg_size, &delta_size, max_size);
c323ac7d 1700 if (!delta_buf)
75c42d8c 1701 return 0;
f6c7081a 1702
9e2d57a0 1703 if (trg_entry->delta) {
848d732c
BD
1704 /* Prefer only shallower same-sized deltas. */
1705 if (delta_size == trg_entry->delta_size &&
5a235b5e 1706 src->depth + 1 >= trg->depth) {
848d732c
BD
1707 free(delta_buf);
1708 return 0;
1709 }
074b2eea 1710 }
9e2d57a0 1711
3c701839
NP
1712 /*
1713 * Handle memory allocation outside of the cache
1714 * accounting lock. Compiler will optimize the strangeness
7eb151d6 1715 * away when NO_PTHREADS is defined.
3c701839 1716 */
8e0f7003 1717 free(trg_entry->delta_data);
3c701839 1718 cache_lock();
9e2d57a0
NP
1719 if (trg_entry->delta_data) {
1720 delta_cache_size -= trg_entry->delta_size;
9e2d57a0
NP
1721 trg_entry->delta_data = NULL;
1722 }
d250626c 1723 if (delta_cacheable(src_size, trg_size, delta_size)) {
b7a28f78 1724 delta_cache_size += delta_size;
3c701839
NP
1725 cache_unlock();
1726 trg_entry->delta_data = xrealloc(delta_buf, delta_size);
1727 } else {
1728 cache_unlock();
074b2eea 1729 free(delta_buf);
3c701839
NP
1730 }
1731
b7a28f78
NP
1732 trg_entry->delta = src_entry;
1733 trg_entry->delta_size = delta_size;
1734 trg->depth = src->depth + 1;
1735
f6c7081a 1736 return 1;
c323ac7d
LT
1737}
1738
898b14ce 1739static unsigned int check_delta_limit(struct object_entry *me, unsigned int n)
b2504a0d 1740{
898b14ce
NP
1741 struct object_entry *child = me->delta_child;
1742 unsigned int m = n;
1743 while (child) {
1744 unsigned int c = check_delta_limit(child, n + 1);
1745 if (m < c)
1746 m = c;
1747 child = child->delta_sibling;
1748 }
1749 return m;
b2504a0d
NP
1750}
1751
75ad235c 1752static unsigned long free_unpacked(struct unpacked *n)
a97773ce 1753{
ef0316fc 1754 unsigned long freed_mem = sizeof_delta_index(n->index);
a97773ce
BD
1755 free_delta_index(n->index);
1756 n->index = NULL;
1757 if (n->data) {
ef0316fc 1758 freed_mem += n->entry->size;
a97773ce
BD
1759 free(n->data);
1760 n->data = NULL;
a97773ce
BD
1761 }
1762 n->entry = NULL;
7d7baa5e 1763 n->depth = 0;
ef0316fc 1764 return freed_mem;
a97773ce
BD
1765}
1766
384b32c0 1767static void find_deltas(struct object_entry **list, unsigned *list_size,
e334977d 1768 int window, int depth, unsigned *processed)
c323ac7d 1769{
384b32c0 1770 uint32_t i, idx = 0, count = 0;
7cadf491 1771 struct unpacked *array;
ef0316fc 1772 unsigned long mem_usage = 0;
c323ac7d 1773
19d4b416 1774 array = xcalloc(window, sizeof(struct unpacked));
21fcd1bd 1775
384b32c0 1776 for (;;) {
421b488a 1777 struct object_entry *entry;
c323ac7d 1778 struct unpacked *n = array + idx;
ef0316fc 1779 int j, max_depth, best_base = -1;
c323ac7d 1780
384b32c0
NP
1781 progress_lock();
1782 if (!*list_size) {
1783 progress_unlock();
1784 break;
1785 }
421b488a 1786 entry = *list++;
384b32c0
NP
1787 (*list_size)--;
1788 if (!entry->preferred_base) {
1789 (*processed)++;
1790 display_progress(progress_state, *processed);
1791 }
1792 progress_unlock();
1793
ef0316fc 1794 mem_usage -= free_unpacked(n);
c323ac7d 1795 n->entry = entry;
ab7cd7bb 1796
a97773ce 1797 while (window_memory_limit &&
ef0316fc 1798 mem_usage > window_memory_limit &&
a97773ce
BD
1799 count > 1) {
1800 uint32_t tail = (idx + window - count) % window;
75ad235c 1801 mem_usage -= free_unpacked(array + tail);
a97773ce
BD
1802 count--;
1803 }
1804
75d39853
NP
1805 /* We do not compute delta to *create* objects we are not
1806 * going to pack.
1807 */
1808 if (entry->preferred_base)
1809 goto next;
1810
898b14ce
NP
1811 /*
1812 * If the current object is at pack edge, take the depth the
1813 * objects that depend on the current object into account
1814 * otherwise they would become too deep.
1815 */
1816 max_depth = depth;
1817 if (entry->delta_child) {
1818 max_depth -= check_delta_limit(entry, 0);
1819 if (max_depth <= 0)
1820 goto next;
1821 }
1822
78817c15
LT
1823 j = window;
1824 while (--j > 0) {
77639870 1825 int ret;
7cadf491 1826 uint32_t other_idx = idx + j;
c323ac7d 1827 struct unpacked *m;
78817c15
LT
1828 if (other_idx >= window)
1829 other_idx -= window;
c323ac7d
LT
1830 m = array + other_idx;
1831 if (!m->entry)
1832 break;
ef0316fc 1833 ret = try_delta(n, m, max_depth, &mem_usage);
77639870 1834 if (ret < 0)
c323ac7d 1835 break;
77639870
JH
1836 else if (ret > 0)
1837 best_base = other_idx;
c323ac7d 1838 }
898b14ce 1839
ed4a9031
NP
1840 /*
1841 * If we decided to cache the delta data, then it is best
1842 * to compress it right away. First because we have to do
1843 * it anyway, and doing it here while we're threaded will
1844 * save a lot of time in the non threaded write phase,
1845 * as well as allow for caching more deltas within
1846 * the same cache size limit.
1847 * ...
1848 * But only if not writing to stdout, since in that case
1849 * the network is most likely throttling writes anyway,
1850 * and therefore it is best to go to the write phase ASAP
1851 * instead, as we can afford spending more time compressing
1852 * between writes at that moment.
1853 */
1854 if (entry->delta_data && !pack_to_stdout) {
1855 entry->z_delta_size = do_compress(&entry->delta_data,
1856 entry->delta_size);
1857 cache_lock();
1858 delta_cache_size -= entry->delta_size;
1859 delta_cache_size += entry->z_delta_size;
1860 cache_unlock();
1861 }
1862
70ca1a3f
JH
1863 /* if we made n a delta, and if n is already at max
1864 * depth, leaving it in the window is pointless. we
1865 * should evict it first.
70ca1a3f 1866 */
70baf5d4 1867 if (entry->delta && max_depth <= n->depth)
70ca1a3f 1868 continue;
ff45715c 1869
77639870
JH
1870 /*
1871 * Move the best delta base up in the window, after the
1872 * currently deltified object, to keep it longer. It will
1873 * be the first base object to be attempted next.
1874 */
1875 if (entry->delta) {
1876 struct unpacked swap = array[best_base];
1877 int dist = (window + idx - best_base) % window;
1878 int dst = best_base;
1879 while (dist--) {
1880 int src = (dst + 1) % window;
1881 array[dst] = array[src];
1882 dst = src;
1883 }
1884 array[dst] = swap;
1885 }
1886
898b14ce 1887 next:
521a4f4c 1888 idx++;
a97773ce
BD
1889 if (count + 1 < window)
1890 count++;
521a4f4c
LT
1891 if (idx >= window)
1892 idx = 0;
384b32c0 1893 }
adee7bdf 1894
f6c7081a 1895 for (i = 0; i < window; ++i) {
ff45715c 1896 free_delta_index(array[i].index);
adee7bdf 1897 free(array[i].data);
f6c7081a 1898 }
adee7bdf 1899 free(array);
c323ac7d
LT
1900}
1901
7eb151d6 1902#ifndef NO_PTHREADS
8ecce684 1903
a9a74636
NP
1904static void try_to_free_from_threads(size_t size)
1905{
1906 read_lock();
7c3ecb32 1907 release_pack_memory(size);
a9a74636
NP
1908 read_unlock();
1909}
1910
bc9b2175 1911static try_to_free_t old_try_to_free_routine;
851c34b0 1912
50f22ada
JS
1913/*
1914 * The main thread waits on the condition that (at least) one of the workers
1915 * has stopped working (which is indicated in the .working member of
1916 * struct thread_params).
1917 * When a work thread has completed its work, it sets .working to 0 and
1918 * signals the main thread and waits on the condition that .data_ready
1919 * becomes 1.
1920 */
1921
8ecce684
NP
1922struct thread_params {
1923 pthread_t thread;
1924 struct object_entry **list;
1925 unsigned list_size;
384b32c0 1926 unsigned remaining;
8ecce684
NP
1927 int window;
1928 int depth;
50f22ada
JS
1929 int working;
1930 int data_ready;
1931 pthread_mutex_t mutex;
1932 pthread_cond_t cond;
8ecce684
NP
1933 unsigned *processed;
1934};
1935
44626dc7
AH
1936static pthread_cond_t progress_cond;
1937
1938/*
1939 * Mutex and conditional variable can't be statically-initialized on Windows.
1940 */
1941static void init_threaded_search(void)
1942{
93749194 1943 init_recursive_mutex(&read_mutex);
44626dc7
AH
1944 pthread_mutex_init(&cache_mutex, NULL);
1945 pthread_mutex_init(&progress_mutex, NULL);
1946 pthread_cond_init(&progress_cond, NULL);
851c34b0 1947 old_try_to_free_routine = set_try_to_free_routine(try_to_free_from_threads);
44626dc7
AH
1948}
1949
1950static void cleanup_threaded_search(void)
1951{
851c34b0 1952 set_try_to_free_routine(old_try_to_free_routine);
44626dc7
AH
1953 pthread_cond_destroy(&progress_cond);
1954 pthread_mutex_destroy(&read_mutex);
1955 pthread_mutex_destroy(&cache_mutex);
1956 pthread_mutex_destroy(&progress_mutex);
1957}
c2a33679 1958
8ecce684
NP
1959static void *threaded_find_deltas(void *arg)
1960{
c2a33679
NP
1961 struct thread_params *me = arg;
1962
50f22ada 1963 while (me->remaining) {
384b32c0 1964 find_deltas(me->list, &me->remaining,
c2a33679 1965 me->window, me->depth, me->processed);
50f22ada
JS
1966
1967 progress_lock();
1968 me->working = 0;
1969 pthread_cond_signal(&progress_cond);
1970 progress_unlock();
1971
1972 /*
1973 * We must not set ->data_ready before we wait on the
1974 * condition because the main thread may have set it to 1
1975 * before we get here. In order to be sure that new
1976 * work is available if we see 1 in ->data_ready, it
1977 * was initialized to 0 before this thread was spawned
1978 * and we reset it to 0 right away.
1979 */
1980 pthread_mutex_lock(&me->mutex);
1981 while (!me->data_ready)
1982 pthread_cond_wait(&me->cond, &me->mutex);
1983 me->data_ready = 0;
1984 pthread_mutex_unlock(&me->mutex);
c2a33679 1985 }
50f22ada
JS
1986 /* leave ->working 1 so that this doesn't get more work assigned */
1987 return NULL;
8ecce684
NP
1988}
1989
8ecce684
NP
1990static void ll_find_deltas(struct object_entry **list, unsigned list_size,
1991 int window, int depth, unsigned *processed)
1992{
dcda3614 1993 struct thread_params *p;
384b32c0 1994 int i, ret, active_threads = 0;
c2a33679 1995
44626dc7
AH
1996 init_threaded_search();
1997
367f4a43 1998 if (delta_search_threads <= 1) {
384b32c0 1999 find_deltas(list, &list_size, window, depth, processed);
44626dc7 2000 cleanup_threaded_search();
367f4a43
NP
2001 return;
2002 }
43cc2b42 2003 if (progress > pack_to_stdout)
b6c29915 2004 fprintf(stderr, "Delta compression using up to %d threads.\n",
43cc2b42 2005 delta_search_threads);
dcda3614 2006 p = xcalloc(delta_search_threads, sizeof(*p));
367f4a43 2007
50f22ada 2008 /* Partition the work amongst work threads. */
367f4a43 2009 for (i = 0; i < delta_search_threads; i++) {
50f22ada
JS
2010 unsigned sub_size = list_size / (delta_search_threads - i);
2011
bf874896
NP
2012 /* don't use too small segments or no deltas will be found */
2013 if (sub_size < 2*window && i+1 < delta_search_threads)
2014 sub_size = 0;
2015
8ecce684
NP
2016 p[i].window = window;
2017 p[i].depth = depth;
2018 p[i].processed = processed;
50f22ada
JS
2019 p[i].working = 1;
2020 p[i].data_ready = 0;
c2a33679 2021
59921b4b 2022 /* try to split chunks on "path" boundaries */
6fc74703
NP
2023 while (sub_size && sub_size < list_size &&
2024 list[sub_size]->hash &&
384b32c0
NP
2025 list[sub_size]->hash == list[sub_size-1]->hash)
2026 sub_size++;
2027
50f22ada
JS
2028 p[i].list = list;
2029 p[i].list_size = sub_size;
2030 p[i].remaining = sub_size;
59921b4b 2031
384b32c0
NP
2032 list += sub_size;
2033 list_size -= sub_size;
2034 }
2035
50f22ada
JS
2036 /* Start work threads. */
2037 for (i = 0; i < delta_search_threads; i++) {
2038 if (!p[i].list_size)
2039 continue;
68e6a4f8
JS
2040 pthread_mutex_init(&p[i].mutex, NULL);
2041 pthread_cond_init(&p[i].cond, NULL);
50f22ada
JS
2042 ret = pthread_create(&p[i].thread, NULL,
2043 threaded_find_deltas, &p[i]);
2044 if (ret)
2045 die("unable to create thread: %s", strerror(ret));
2046 active_threads++;
2047 }
2048
384b32c0
NP
2049 /*
2050 * Now let's wait for work completion. Each time a thread is done
2051 * with its work, we steal half of the remaining work from the
2052 * thread with the largest number of unprocessed objects and give
2053 * it to that newly idle thread. This ensure good load balancing
2054 * until the remaining object list segments are simply too short
2055 * to be worth splitting anymore.
2056 */
50f22ada
JS
2057 while (active_threads) {
2058 struct thread_params *target = NULL;
384b32c0
NP
2059 struct thread_params *victim = NULL;
2060 unsigned sub_size = 0;
384b32c0
NP
2061
2062 progress_lock();
50f22ada
JS
2063 for (;;) {
2064 for (i = 0; !target && i < delta_search_threads; i++)
2065 if (!p[i].working)
2066 target = &p[i];
2067 if (target)
2068 break;
2069 pthread_cond_wait(&progress_cond, &progress_mutex);
2070 }
2071
384b32c0
NP
2072 for (i = 0; i < delta_search_threads; i++)
2073 if (p[i].remaining > 2*window &&
2074 (!victim || victim->remaining < p[i].remaining))
2075 victim = &p[i];
2076 if (victim) {
2077 sub_size = victim->remaining / 2;
2078 list = victim->list + victim->list_size - sub_size;
2079 while (sub_size && list[0]->hash &&
2080 list[0]->hash == list[-1]->hash) {
2081 list++;
2082 sub_size--;
2083 }
eb9688ff
NP
2084 if (!sub_size) {
2085 /*
2086 * It is possible for some "paths" to have
2087 * so many objects that no hash boundary
2088 * might be found. Let's just steal the
2089 * exact half in that case.
2090 */
2091 sub_size = victim->remaining / 2;
2092 list -= sub_size;
2093 }
384b32c0
NP
2094 target->list = list;
2095 victim->list_size -= sub_size;
2096 victim->remaining -= sub_size;
2097 }
384b32c0
NP
2098 target->list_size = sub_size;
2099 target->remaining = sub_size;
50f22ada
JS
2100 target->working = 1;
2101 progress_unlock();
2102
2103 pthread_mutex_lock(&target->mutex);
2104 target->data_ready = 1;
2105 pthread_cond_signal(&target->cond);
2106 pthread_mutex_unlock(&target->mutex);
c2a33679 2107
384b32c0 2108 if (!sub_size) {
b81d9af7 2109 pthread_join(target->thread, NULL);
50f22ada
JS
2110 pthread_cond_destroy(&target->cond);
2111 pthread_mutex_destroy(&target->mutex);
384b32c0 2112 active_threads--;
c2a33679 2113 }
50f22ada 2114 }
44626dc7 2115 cleanup_threaded_search();
dcda3614 2116 free(p);
8ecce684
NP
2117}
2118
2119#else
384b32c0 2120#define ll_find_deltas(l, s, w, d, p) find_deltas(l, &s, w, d, p)
8ecce684
NP
2121#endif
2122
d155254c 2123static int add_ref_tag(const char *path, const struct object_id *oid, int flag, void *cb_data)
f0a24aa5 2124{
d155254c 2125 struct object_id peeled;
f0a24aa5 2126
59556548 2127 if (starts_with(path, "refs/tags/") && /* is a tag? */
d155254c
MH
2128 !peel_ref(path, peeled.hash) && /* peelable? */
2129 packlist_find(&to_pack, peeled.hash, NULL)) /* object packed? */
2130 add_object_entry(oid->hash, OBJ_TAG, NULL, 0);
f0a24aa5
SP
2131 return 0;
2132}
2133
f3123c4a
JH
2134static void prepare_pack(int window, int depth)
2135{
9668cf59 2136 struct object_entry **delta_list;
6e1c2344
RJ
2137 uint32_t i, nr_deltas;
2138 unsigned n;
9668cf59 2139
3f9ac8d2 2140 get_object_details();
9668cf59 2141
0e8189e2
NP
2142 /*
2143 * If we're locally repacking then we need to be doubly careful
2144 * from now on in order to make sure no stealth corruption gets
2145 * propagated to the new pack. Clients receiving streamed packs
2146 * should validate everything they get anyway so no need to incur
2147 * the additional cost here in that case.
2148 */
2149 if (!pack_to_stdout)
2150 do_check_packed_object_crc = 1;
2151
2834bc27 2152 if (!to_pack.nr_objects || !window || !depth)
9668cf59
NP
2153 return;
2154
b32fa95f 2155 ALLOC_ARRAY(delta_list, to_pack.nr_objects);
75d39853
NP
2156 nr_deltas = n = 0;
2157
2834bc27
VM
2158 for (i = 0; i < to_pack.nr_objects; i++) {
2159 struct object_entry *entry = to_pack.objects + i;
75d39853
NP
2160
2161 if (entry->delta)
2162 /* This happens if we decided to reuse existing
a7de7130 2163 * delta from a pack. "reuse_delta &&" is implied.
75d39853
NP
2164 */
2165 continue;
2166
2167 if (entry->size < 50)
2168 continue;
2169
2170 if (entry->no_try_delta)
2171 continue;
2172
6d6f9cdd 2173 if (!entry->preferred_base) {
75d39853 2174 nr_deltas++;
6d6f9cdd
SP
2175 if (entry->type < 0)
2176 die("unable to get type of object %s",
2177 sha1_to_hex(entry->idx.sha1));
eede9f42
NP
2178 } else {
2179 if (entry->type < 0) {
2180 /*
2181 * This object is not found, but we
2182 * don't have to include it anyway.
2183 */
2184 continue;
2185 }
6d6f9cdd 2186 }
75d39853
NP
2187
2188 delta_list[n++] = entry;
2189 }
2190
2f8b8947 2191 if (nr_deltas && n > 1) {
e334977d
NP
2192 unsigned nr_done = 0;
2193 if (progress)
754dbc43 2194 progress_state = start_progress(_("Compressing objects"),
dc6a0757 2195 nr_deltas);
75d39853 2196 qsort(delta_list, n, sizeof(*delta_list), type_size_sort);
8ecce684 2197 ll_find_deltas(delta_list, n, window+1, depth, &nr_done);
4d4fcc54 2198 stop_progress(&progress_state);
e334977d
NP
2199 if (nr_done != nr_deltas)
2200 die("inconsistency with delta count");
75d39853 2201 }
9668cf59 2202 free(delta_list);
f3123c4a
JH
2203}
2204
ef90d6d4 2205static int git_pack_config(const char *k, const char *v, void *cb)
4812a93a 2206{
eeefa7c9 2207 if (!strcmp(k, "pack.window")) {
4812a93a
JK
2208 window = git_config_int(k, v);
2209 return 0;
2210 }
a97773ce
BD
2211 if (!strcmp(k, "pack.windowmemory")) {
2212 window_memory_limit = git_config_ulong(k, v);
2213 return 0;
2214 }
2215 if (!strcmp(k, "pack.depth")) {
842aaf93
TT
2216 depth = git_config_int(k, v);
2217 return 0;
2218 }
960ccca6
DH
2219 if (!strcmp(k, "pack.compression")) {
2220 int level = git_config_int(k, v);
2221 if (level == -1)
2222 level = Z_DEFAULT_COMPRESSION;
2223 else if (level < 0 || level > Z_BEST_COMPRESSION)
2224 die("bad pack compression level %d", level);
2225 pack_compression_level = level;
2226 pack_compression_seen = 1;
2227 return 0;
2228 }
074b2eea
MK
2229 if (!strcmp(k, "pack.deltacachesize")) {
2230 max_delta_cache_size = git_config_int(k, v);
2231 return 0;
2232 }
e3dfddb3
MK
2233 if (!strcmp(k, "pack.deltacachelimit")) {
2234 cache_max_small_delta_size = git_config_int(k, v);
2235 return 0;
2236 }
ae4f07fb
VM
2237 if (!strcmp(k, "pack.writebitmaphashcache")) {
2238 if (git_config_bool(k, v))
2239 write_bitmap_options |= BITMAP_OPT_HASH_CACHE;
2240 else
2241 write_bitmap_options &= ~BITMAP_OPT_HASH_CACHE;
2242 }
6b8fda2d
VM
2243 if (!strcmp(k, "pack.usebitmaps")) {
2244 use_bitmap_index = git_config_bool(k, v);
2245 return 0;
2246 }
693b86ff
NP
2247 if (!strcmp(k, "pack.threads")) {
2248 delta_search_threads = git_config_int(k, v);
833e3df1 2249 if (delta_search_threads < 0)
693b86ff
NP
2250 die("invalid number of threads specified (%d)",
2251 delta_search_threads);
7eb151d6 2252#ifdef NO_PTHREADS
833e3df1 2253 if (delta_search_threads != 1)
693b86ff
NP
2254 warning("no threads support, ignoring %s", k);
2255#endif
2256 return 0;
2257 }
4d00bda2 2258 if (!strcmp(k, "pack.indexversion")) {
ebcfb379
JH
2259 pack_idx_opts.version = git_config_int(k, v);
2260 if (pack_idx_opts.version > 2)
6e1c2344 2261 die("bad pack.indexversion=%"PRIu32,
ebcfb379 2262 pack_idx_opts.version);
4d00bda2
NP
2263 return 0;
2264 }
ef90d6d4 2265 return git_default_config(k, v, cb);
4812a93a
JK
2266}
2267
b5d97e6b 2268static void read_object_list_from_stdin(void)
c323ac7d 2269{
b5d97e6b
JH
2270 char line[40 + 1 + PATH_MAX + 2];
2271 unsigned char sha1[20];
b2504a0d 2272
da93d12b 2273 for (;;) {
da93d12b
LT
2274 if (!fgets(line, sizeof(line), stdin)) {
2275 if (feof(stdin))
2276 break;
2277 if (!ferror(stdin))
2278 die("fgets returned NULL, not EOF, not error!");
687dd75c 2279 if (errno != EINTR)
d824cbba 2280 die_errno("fgets");
687dd75c
JH
2281 clearerr(stdin);
2282 continue;
da93d12b 2283 }
7a979d99
JH
2284 if (line[0] == '-') {
2285 if (get_sha1_hex(line+1, sha1))
2286 die("expected edge sha1, got garbage:\n %s",
b5d97e6b 2287 line);
8d1d8f83 2288 add_preferred_base(sha1);
7a979d99 2289 continue;
21fcd1bd 2290 }
c323ac7d 2291 if (get_sha1_hex(line, sha1))
ef07618f 2292 die("expected sha1, got garbage:\n %s", line);
b5d97e6b 2293
bc32fed5
JH
2294 add_preferred_base_object(line+41);
2295 add_object_entry(sha1, 0, line+41, 0);
c323ac7d 2296 }
b5d97e6b
JH
2297}
2298
08cdfb13
JH
2299#define OBJECT_ADDED (1u<<20)
2300
11c211fa 2301static void show_commit(struct commit *commit, void *data)
b5d97e6b 2302{
ed1c9977 2303 add_object_entry(commit->object.oid.hash, OBJ_COMMIT, NULL, 0);
08cdfb13 2304 commit->object.flags |= OBJECT_ADDED;
7cc8f971
VM
2305
2306 if (write_bitmap_index)
2307 index_commit_for_bitmap(commit);
b5d97e6b
JH
2308}
2309
de1e67d0 2310static void show_object(struct object *obj, const char *name, void *data)
b5d97e6b 2311{
8d2dfc49 2312 add_preferred_base_object(name);
ed1c9977 2313 add_object_entry(obj->oid.hash, obj->type, name, 0);
8d2dfc49 2314 obj->flags |= OBJECT_ADDED;
b5d97e6b
JH
2315}
2316
8d1d8f83
JH
2317static void show_edge(struct commit *commit)
2318{
ed1c9977 2319 add_preferred_base(commit->object.oid.hash);
8d1d8f83
JH
2320}
2321
08cdfb13
JH
2322struct in_pack_object {
2323 off_t offset;
2324 struct object *object;
2325};
2326
2327struct in_pack {
2328 int alloc;
2329 int nr;
2330 struct in_pack_object *array;
2331};
2332
2333static void mark_in_pack_object(struct object *object, struct packed_git *p, struct in_pack *in_pack)
2334{
ed1c9977 2335 in_pack->array[in_pack->nr].offset = find_pack_entry_one(object->oid.hash, p);
08cdfb13
JH
2336 in_pack->array[in_pack->nr].object = object;
2337 in_pack->nr++;
2338}
2339
2340/*
2341 * Compare the objects in the offset order, in order to emulate the
f18d244a 2342 * "git rev-list --objects" output that produced the pack originally.
08cdfb13
JH
2343 */
2344static int ofscmp(const void *a_, const void *b_)
2345{
2346 struct in_pack_object *a = (struct in_pack_object *)a_;
2347 struct in_pack_object *b = (struct in_pack_object *)b_;
2348
2349 if (a->offset < b->offset)
2350 return -1;
2351 else if (a->offset > b->offset)
2352 return 1;
2353 else
f2fd0760 2354 return oidcmp(&a->object->oid, &b->object->oid);
08cdfb13
JH
2355}
2356
2357static void add_objects_in_unpacked_packs(struct rev_info *revs)
2358{
2359 struct packed_git *p;
2360 struct in_pack in_pack;
2361 uint32_t i;
2362
2363 memset(&in_pack, 0, sizeof(in_pack));
2364
2365 for (p = packed_git; p; p = p->next) {
2366 const unsigned char *sha1;
2367 struct object *o;
2368
79bc4c71 2369 if (!p->pack_local || p->pack_keep)
08cdfb13
JH
2370 continue;
2371 if (open_pack_index(p))
2372 die("cannot open pack index");
2373
2374 ALLOC_GROW(in_pack.array,
2375 in_pack.nr + p->num_objects,
2376 in_pack.alloc);
2377
2378 for (i = 0; i < p->num_objects; i++) {
2379 sha1 = nth_packed_object_sha1(p, i);
2380 o = lookup_unknown_object(sha1);
2381 if (!(o->flags & OBJECT_ADDED))
2382 mark_in_pack_object(o, p, &in_pack);
2383 o->flags |= OBJECT_ADDED;
2384 }
2385 }
2386
2387 if (in_pack.nr) {
2388 qsort(in_pack.array, in_pack.nr, sizeof(in_pack.array[0]),
2389 ofscmp);
2390 for (i = 0; i < in_pack.nr; i++) {
2391 struct object *o = in_pack.array[i].object;
ed1c9977 2392 add_object_entry(o->oid.hash, o->type, "", 0);
08cdfb13
JH
2393 }
2394 }
2395 free(in_pack.array);
2396}
2397
e26a8c47
JK
2398static int add_loose_object(const unsigned char *sha1, const char *path,
2399 void *data)
2400{
2401 enum object_type type = sha1_object_info(sha1, NULL);
2402
2403 if (type < 0) {
2404 warning("loose object at %s could not be examined", path);
2405 return 0;
2406 }
2407
2408 add_object_entry(sha1, type, "", 0);
2409 return 0;
2410}
2411
2412/*
2413 * We actually don't even have to worry about reachability here.
2414 * add_object_entry will weed out duplicates, so we just add every
2415 * loose object we find.
2416 */
2417static void add_unreachable_loose_objects(void)
2418{
2419 for_each_loose_file_in_objdir(get_object_directory(),
2420 add_loose_object,
2421 NULL, NULL, NULL);
2422}
2423
094085e3
BC
2424static int has_sha1_pack_kept_or_nonlocal(const unsigned char *sha1)
2425{
2426 static struct packed_git *last_found = (void *)1;
2427 struct packed_git *p;
2428
2429 p = (last_found != (void *)1) ? last_found : packed_git;
2430
2431 while (p) {
2432 if ((!p->pack_local || p->pack_keep) &&
2433 find_pack_entry_one(sha1, p)) {
2434 last_found = p;
2435 return 1;
2436 }
2437 if (p == last_found)
2438 p = packed_git;
2439 else
2440 p = p->next;
2441 if (p == last_found)
2442 p = p->next;
2443 }
2444 return 0;
2445}
2446
abcb8655
JK
2447/*
2448 * Store a list of sha1s that are should not be discarded
2449 * because they are either written too recently, or are
2450 * reachable from another object that was.
2451 *
2452 * This is filled by get_object_list.
2453 */
2454static struct sha1_array recent_objects;
2455
d0d46abc
JK
2456static int loosened_object_can_be_discarded(const unsigned char *sha1,
2457 unsigned long mtime)
2458{
2459 if (!unpack_unreachable_expiration)
2460 return 0;
2461 if (mtime > unpack_unreachable_expiration)
2462 return 0;
abcb8655
JK
2463 if (sha1_array_lookup(&recent_objects, sha1) >= 0)
2464 return 0;
d0d46abc
JK
2465 return 1;
2466}
2467
ca11b212
NP
2468static void loosen_unused_packed_objects(struct rev_info *revs)
2469{
2470 struct packed_git *p;
2471 uint32_t i;
2472 const unsigned char *sha1;
2473
2474 for (p = packed_git; p; p = p->next) {
79bc4c71 2475 if (!p->pack_local || p->pack_keep)
ca11b212
NP
2476 continue;
2477
2478 if (open_pack_index(p))
2479 die("cannot open pack index");
2480
2481 for (i = 0; i < p->num_objects; i++) {
2482 sha1 = nth_packed_object_sha1(p, i);
2834bc27 2483 if (!packlist_find(&to_pack, sha1, NULL) &&
d0d46abc
JK
2484 !has_sha1_pack_kept_or_nonlocal(sha1) &&
2485 !loosened_object_can_be_discarded(sha1, p->mtime))
ca11b212
NP
2486 if (force_object_loose(sha1, p->mtime))
2487 die("unable to force loose object");
2488 }
2489 }
2490}
2491
69e4b342
JK
2492/*
2493 * This tracks any options which a reader of the pack might
2494 * not understand, and which would therefore prevent blind reuse
2495 * of what we have on disk.
2496 */
2497static int pack_options_allow_reuse(void)
2498{
2499 return allow_ofs_delta;
2500}
2501
6b8fda2d
VM
2502static int get_object_list_from_bitmap(struct rev_info *revs)
2503{
2504 if (prepare_bitmap_walk(revs) < 0)
2505 return -1;
2506
69e4b342
JK
2507 if (pack_options_allow_reuse() &&
2508 !reuse_partial_packfile_from_bitmap(
6b8fda2d
VM
2509 &reuse_packfile,
2510 &reuse_packfile_objects,
2511 &reuse_packfile_offset)) {
2512 assert(reuse_packfile_objects);
2513 nr_result += reuse_packfile_objects;
78d2214e 2514 display_progress(progress_state, nr_result);
6b8fda2d
VM
2515 }
2516
2517 traverse_bitmap_commit_list(&add_object_entry_from_bitmap);
2518 return 0;
2519}
2520
abcb8655 2521static void record_recent_object(struct object *obj,
de1e67d0 2522 const char *name,
abcb8655
JK
2523 void *data)
2524{
ed1c9977 2525 sha1_array_append(&recent_objects, obj->oid.hash);
abcb8655
JK
2526}
2527
2528static void record_recent_commit(struct commit *commit, void *data)
2529{
ed1c9977 2530 sha1_array_append(&recent_objects, commit->object.oid.hash);
abcb8655
JK
2531}
2532
8d1d8f83 2533static void get_object_list(int ac, const char **av)
b5d97e6b
JH
2534{
2535 struct rev_info revs;
2536 char line[1000];
b5d97e6b
JH
2537 int flags = 0;
2538
b5d97e6b
JH
2539 init_revisions(&revs, NULL);
2540 save_commit_buffer = 0;
b5d97e6b
JH
2541 setup_revisions(ac, av, &revs, NULL);
2542
b790e0f6
NTND
2543 /* make sure shallows are read */
2544 is_repository_shallow();
2545
b5d97e6b
JH
2546 while (fgets(line, sizeof(line), stdin) != NULL) {
2547 int len = strlen(line);
872c930d 2548 if (len && line[len - 1] == '\n')
b5d97e6b
JH
2549 line[--len] = 0;
2550 if (!len)
2551 break;
2552 if (*line == '-') {
2553 if (!strcmp(line, "--not")) {
2554 flags ^= UNINTERESTING;
7cc8f971 2555 write_bitmap_index = 0;
b5d97e6b
JH
2556 continue;
2557 }
b790e0f6
NTND
2558 if (starts_with(line, "--shallow ")) {
2559 unsigned char sha1[20];
2560 if (get_sha1_hex(line + 10, sha1))
2561 die("not an SHA-1 '%s'", line + 10);
2562 register_shallow(sha1);
f7f91086 2563 use_bitmap_index = 0;
b790e0f6
NTND
2564 continue;
2565 }
b5d97e6b
JH
2566 die("not a rev '%s'", line);
2567 }
8e676e8b 2568 if (handle_revision_arg(line, &revs, flags, REVARG_CANNOT_BE_FILENAME))
b5d97e6b
JH
2569 die("bad revision '%s'", line);
2570 }
2571
6b8fda2d
VM
2572 if (use_bitmap_index && !get_object_list_from_bitmap(&revs))
2573 return;
2574
3d51e1b5
MK
2575 if (prepare_revision_walk(&revs))
2576 die("revision walk setup failed");
e76a5fb4 2577 mark_edges_uninteresting(&revs, show_edge);
11c211fa 2578 traverse_commit_list(&revs, show_commit, show_object, NULL);
08cdfb13 2579
abcb8655
JK
2580 if (unpack_unreachable_expiration) {
2581 revs.ignore_missing_links = 1;
2582 if (add_unseen_recent_objects_to_traversal(&revs,
2583 unpack_unreachable_expiration))
2584 die("unable to add recent objects");
2585 if (prepare_revision_walk(&revs))
2586 die("revision walk setup failed");
2587 traverse_commit_list(&revs, record_recent_commit,
2588 record_recent_object, NULL);
2589 }
2590
08cdfb13
JH
2591 if (keep_unreachable)
2592 add_objects_in_unpacked_packs(&revs);
e26a8c47
JK
2593 if (pack_loose_unreachable)
2594 add_unreachable_loose_objects();
ca11b212
NP
2595 if (unpack_unreachable)
2596 loosen_unused_packed_objects(&revs);
abcb8655
JK
2597
2598 sha1_array_clear(&recent_objects);
b5d97e6b
JH
2599}
2600
99fb6e04
NTND
2601static int option_parse_index_version(const struct option *opt,
2602 const char *arg, int unset)
2603{
2604 char *c;
2605 const char *val = arg;
2606 pack_idx_opts.version = strtoul(val, &c, 10);
2607 if (pack_idx_opts.version > 2)
2608 die(_("unsupported index version %s"), val);
2609 if (*c == ',' && c[1])
2610 pack_idx_opts.off32_limit = strtoul(c+1, &c, 0);
2611 if (*c || pack_idx_opts.off32_limit & 0x80000000)
2612 die(_("bad index version '%s'"), val);
2613 return 0;
2614}
2615
7e52f566
JK
2616static int option_parse_unpack_unreachable(const struct option *opt,
2617 const char *arg, int unset)
2618{
2619 if (unset) {
2620 unpack_unreachable = 0;
2621 unpack_unreachable_expiration = 0;
2622 }
2623 else {
2624 unpack_unreachable = 1;
2625 if (arg)
2626 unpack_unreachable_expiration = approxidate(arg);
2627 }
2628 return 0;
2629}
2630
b5d97e6b
JH
2631int cmd_pack_objects(int argc, const char **argv, const char *prefix)
2632{
b5d97e6b 2633 int use_internal_rev_list = 0;
8d1d8f83 2634 int thin = 0;
2dacf26d 2635 int shallow = 0;
4f366275 2636 int all_progress_implied = 0;
edfbb2aa 2637 struct argv_array rp = ARGV_ARRAY_INIT;
99fb6e04 2638 int rev_list_unpacked = 0, rev_list_all = 0, rev_list_reflog = 0;
c90f9e13 2639 int rev_list_index = 0;
99fb6e04
NTND
2640 struct option pack_objects_options[] = {
2641 OPT_SET_INT('q', "quiet", &progress,
4c688120 2642 N_("do not show progress meter"), 0),
99fb6e04 2643 OPT_SET_INT(0, "progress", &progress,
4c688120 2644 N_("show progress meter"), 1),
99fb6e04 2645 OPT_SET_INT(0, "all-progress", &progress,
4c688120 2646 N_("show progress meter during object writing phase"), 2),
99fb6e04
NTND
2647 OPT_BOOL(0, "all-progress-implied",
2648 &all_progress_implied,
4c688120
NTND
2649 N_("similar to --all-progress when progress meter is shown")),
2650 { OPTION_CALLBACK, 0, "index-version", NULL, N_("version[,offset]"),
2651 N_("write the pack index file in the specified idx format version"),
99fb6e04 2652 0, option_parse_index_version },
2a514ed8
CB
2653 OPT_MAGNITUDE(0, "max-pack-size", &pack_size_limit,
2654 N_("maximum size of each output pack file")),
99fb6e04 2655 OPT_BOOL(0, "local", &local,
4c688120 2656 N_("ignore borrowed objects from alternate object store")),
99fb6e04 2657 OPT_BOOL(0, "incremental", &incremental,
4c688120 2658 N_("ignore packed objects")),
99fb6e04 2659 OPT_INTEGER(0, "window", &window,
4c688120 2660 N_("limit pack window by objects")),
2a514ed8
CB
2661 OPT_MAGNITUDE(0, "window-memory", &window_memory_limit,
2662 N_("limit pack window by memory in addition to object limit")),
99fb6e04 2663 OPT_INTEGER(0, "depth", &depth,
4c688120 2664 N_("maximum length of delta chain allowed in the resulting pack")),
99fb6e04 2665 OPT_BOOL(0, "reuse-delta", &reuse_delta,
4c688120 2666 N_("reuse existing deltas")),
99fb6e04 2667 OPT_BOOL(0, "reuse-object", &reuse_object,
4c688120 2668 N_("reuse existing objects")),
99fb6e04 2669 OPT_BOOL(0, "delta-base-offset", &allow_ofs_delta,
4c688120 2670 N_("use OFS_DELTA objects")),
99fb6e04 2671 OPT_INTEGER(0, "threads", &delta_search_threads,
4c688120 2672 N_("use threads when searching for best delta matches")),
99fb6e04 2673 OPT_BOOL(0, "non-empty", &non_empty,
4c688120 2674 N_("do not create an empty pack output")),
99fb6e04 2675 OPT_BOOL(0, "revs", &use_internal_rev_list,
4c688120 2676 N_("read revision arguments from standard input")),
99fb6e04 2677 { OPTION_SET_INT, 0, "unpacked", &rev_list_unpacked, NULL,
4c688120 2678 N_("limit the objects to those that are not yet packed"),
99fb6e04
NTND
2679 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
2680 { OPTION_SET_INT, 0, "all", &rev_list_all, NULL,
4c688120 2681 N_("include objects reachable from any reference"),
99fb6e04
NTND
2682 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
2683 { OPTION_SET_INT, 0, "reflog", &rev_list_reflog, NULL,
4c688120 2684 N_("include objects referred by reflog entries"),
99fb6e04 2685 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
c90f9e13
JK
2686 { OPTION_SET_INT, 0, "indexed-objects", &rev_list_index, NULL,
2687 N_("include objects referred to by the index"),
2688 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
99fb6e04 2689 OPT_BOOL(0, "stdout", &pack_to_stdout,
4c688120 2690 N_("output pack to stdout")),
99fb6e04 2691 OPT_BOOL(0, "include-tag", &include_tag,
4c688120 2692 N_("include tag objects that refer to objects to be packed")),
99fb6e04 2693 OPT_BOOL(0, "keep-unreachable", &keep_unreachable,
4c688120 2694 N_("keep unreachable objects")),
e26a8c47
JK
2695 OPT_BOOL(0, "pack-loose-unreachable", &pack_loose_unreachable,
2696 N_("pack loose unreachable objects")),
4c688120
NTND
2697 { OPTION_CALLBACK, 0, "unpack-unreachable", NULL, N_("time"),
2698 N_("unpack unreachable objects newer than <time>"),
7e52f566 2699 PARSE_OPT_OPTARG, option_parse_unpack_unreachable },
99fb6e04 2700 OPT_BOOL(0, "thin", &thin,
4c688120 2701 N_("create thin packs")),
2dacf26d 2702 OPT_BOOL(0, "shallow", &shallow,
2703 N_("create packs suitable for shallow fetches")),
99fb6e04 2704 OPT_BOOL(0, "honor-pack-keep", &ignore_packed_keep,
4c688120 2705 N_("ignore packs that have companion .keep file")),
99fb6e04 2706 OPT_INTEGER(0, "compression", &pack_compression_level,
4c688120 2707 N_("pack compression level")),
99fb6e04 2708 OPT_SET_INT(0, "keep-true-parents", &grafts_replace_parents,
4c688120 2709 N_("do not hide commits by grafts"), 0),
6b8fda2d
VM
2710 OPT_BOOL(0, "use-bitmap-index", &use_bitmap_index,
2711 N_("use a bitmap index if available to speed up counting objects")),
7cc8f971
VM
2712 OPT_BOOL(0, "write-bitmap-index", &write_bitmap_index,
2713 N_("write a bitmap index together with the pack index")),
99fb6e04
NTND
2714 OPT_END(),
2715 };
8d1d8f83 2716
afc711b8 2717 check_replace_refs = 0;
dae556bd 2718
ebcfb379 2719 reset_pack_idx_option(&pack_idx_opts);
ef90d6d4 2720 git_config(git_pack_config, NULL);
960ccca6
DH
2721 if (!pack_compression_seen && core_compression_seen)
2722 pack_compression_level = core_compression_level;
b5d97e6b
JH
2723
2724 progress = isatty(2);
99fb6e04
NTND
2725 argc = parse_options(argc, argv, prefix, pack_objects_options,
2726 pack_usage, 0);
b5d97e6b 2727
99fb6e04
NTND
2728 if (argc) {
2729 base_name = argv[0];
2730 argc--;
b5d97e6b 2731 }
99fb6e04
NTND
2732 if (pack_to_stdout != !base_name || argc)
2733 usage_with_options(pack_usage, pack_objects_options);
b5d97e6b 2734
edfbb2aa 2735 argv_array_push(&rp, "pack-objects");
99fb6e04
NTND
2736 if (thin) {
2737 use_internal_rev_list = 1;
2dacf26d 2738 argv_array_push(&rp, shallow
2739 ? "--objects-edge-aggressive"
2740 : "--objects-edge");
99fb6e04 2741 } else
edfbb2aa 2742 argv_array_push(&rp, "--objects");
b5d97e6b 2743
99fb6e04
NTND
2744 if (rev_list_all) {
2745 use_internal_rev_list = 1;
edfbb2aa 2746 argv_array_push(&rp, "--all");
99fb6e04
NTND
2747 }
2748 if (rev_list_reflog) {
2749 use_internal_rev_list = 1;
edfbb2aa 2750 argv_array_push(&rp, "--reflog");
99fb6e04 2751 }
c90f9e13
JK
2752 if (rev_list_index) {
2753 use_internal_rev_list = 1;
2754 argv_array_push(&rp, "--indexed-objects");
99fb6e04
NTND
2755 }
2756 if (rev_list_unpacked) {
2757 use_internal_rev_list = 1;
edfbb2aa 2758 argv_array_push(&rp, "--unpacked");
99fb6e04 2759 }
b5d97e6b 2760
99fb6e04
NTND
2761 if (!reuse_object)
2762 reuse_delta = 0;
2763 if (pack_compression_level == -1)
2764 pack_compression_level = Z_DEFAULT_COMPRESSION;
2765 else if (pack_compression_level < 0 || pack_compression_level > Z_BEST_COMPRESSION)
2766 die("bad pack compression level %d", pack_compression_level);
0c45d258
JH
2767
2768 if (!delta_search_threads) /* --threads=0 means autodetect */
2769 delta_search_threads = online_cpus();
2770
99fb6e04
NTND
2771#ifdef NO_PTHREADS
2772 if (delta_search_threads != 1)
2b34e486 2773 warning("no threads support, ignoring --threads");
99fb6e04 2774#endif
2b84b5a8
JS
2775 if (!pack_to_stdout && !pack_size_limit)
2776 pack_size_limit = pack_size_limit_cfg;
01c12a23
DH
2777 if (pack_to_stdout && pack_size_limit)
2778 die("--max-pack-size cannot be used to build a pack for transfer.");
07cf0f24
NP
2779 if (pack_size_limit && pack_size_limit < 1024*1024) {
2780 warning("minimum pack size limit is 1 MiB");
2781 pack_size_limit = 1024*1024;
2782 }
01c12a23 2783
8d1d8f83
JH
2784 if (!pack_to_stdout && thin)
2785 die("--thin cannot be used to build an indexable pack.");
b5d97e6b 2786
ca11b212
NP
2787 if (keep_unreachable && unpack_unreachable)
2788 die("--keep-unreachable and --unpack-unreachable are incompatible.");
b1e757f3
JK
2789 if (!rev_list_all || !rev_list_reflog || !rev_list_index)
2790 unpack_unreachable_expiration = 0;
ca11b212 2791
6b8fda2d
VM
2792 if (!use_internal_rev_list || !pack_to_stdout || is_repository_shallow())
2793 use_bitmap_index = 0;
2794
7cc8f971
VM
2795 if (pack_to_stdout || !rev_list_all)
2796 write_bitmap_index = 0;
2797
4f366275
NP
2798 if (progress && all_progress_implied)
2799 progress = 2;
2800
b5d97e6b
JH
2801 prepare_packed_git();
2802
13aaf148 2803 if (progress)
754dbc43 2804 progress_state = start_progress(_("Counting objects"), 0);
b5d97e6b
JH
2805 if (!use_internal_rev_list)
2806 read_object_list_from_stdin();
8d1d8f83 2807 else {
edfbb2aa
JK
2808 get_object_list(rp.argc, rp.argv);
2809 argv_array_clear(&rp);
8d1d8f83 2810 }
0ef95f72 2811 cleanup_preferred_base();
d155254c
MH
2812 if (include_tag && nr_result)
2813 for_each_ref(add_ref_tag, NULL);
4d4fcc54 2814 stop_progress(&progress_state);
96a02f8f 2815
f0b0af1b 2816 if (non_empty && !nr_result)
1c4a2912 2817 return 0;
f7ae6a93
NP
2818 if (nr_result)
2819 prepare_pack(window, depth);
d01fb92f 2820 write_pack_file();
ab7cd7bb 2821 if (progress)
6e1c2344
RJ
2822 fprintf(stderr, "Total %"PRIu32" (delta %"PRIu32"),"
2823 " reused %"PRIu32" (delta %"PRIu32")\n",
67c08ce1 2824 written, written_delta, reused, reused_delta);
c323ac7d
LT
2825 return 0;
2826}