process_{tree,blob}: show objects without buffering
[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"
96a02f8f 17#include "progress.h"
f0a24aa5 18#include "refs.h"
c323ac7d 19
8ecce684 20#ifdef THREADED_DELTA_SEARCH
833e3df1 21#include "thread-utils.h"
8ecce684
NP
22#include <pthread.h>
23#endif
24
231f240b 25static const char pack_usage[] = "\
f18d244a 26git pack-objects [{ -q | --progress | --all-progress }] \n\
a97773ce
BD
27 [--max-pack-size=N] [--local] [--incremental] \n\
28 [--window=N] [--window-memory=N] [--depth=N] \n\
fa736f72 29 [--no-reuse-delta] [--no-reuse-object] [--delta-base-offset] \n\
367f4a43 30 [--threads=N] [--non-empty] [--revs [--unpacked | --all]*] [--reflog] \n\
ca11b212
NP
31 [--stdout | base-name] [--include-tag] \n\
32 [--keep-unreachable | --unpack-unreachable] \n\
f0a24aa5 33 [<ref-list | <object-list]";
c323ac7d 34
c323ac7d 35struct object_entry {
aa7e44bf 36 struct pack_idx_entry idx;
3f9ac8d2 37 unsigned long size; /* uncompressed size */
3f9ac8d2 38 struct packed_git *in_pack; /* already in pack */
6777a59f 39 off_t in_pack_offset;
a3fbf4df 40 struct object_entry *delta; /* delta base object */
82e5a82f 41 struct object_entry *delta_child; /* deltified objects who bases me */
15b4d577
JH
42 struct object_entry *delta_sibling; /* other deltified objects who
43 * uses the same base as me
44 */
074b2eea 45 void *delta_data; /* cached delta (uncompressed) */
a3fbf4df 46 unsigned long delta_size; /* delta data size (uncompressed) */
ed4a9031 47 unsigned long z_delta_size; /* delta data size (compressed) */
5a235b5e 48 unsigned int hash; /* name hint hash */
a3fbf4df
NP
49 enum object_type type;
50 enum object_type in_pack_type; /* could be delta */
51 unsigned char in_pack_header_size;
52 unsigned char preferred_base; /* we do not pack this, but is available
a74db82e 53 * to be used as the base object to delta
a3fbf4df
NP
54 * objects against.
55 */
a74db82e 56 unsigned char no_try_delta;
c323ac7d
LT
57};
58
3f9ac8d2 59/*
82e5a82f 60 * Objects we are going to pack are collected in objects array (dynamically
3f9ac8d2
JH
61 * expanded). nr_objects & nr_alloc controls this array. They are stored
62 * in the order we see -- typically rev-list --objects order that gives us
63 * nice "minimum seek" order.
3f9ac8d2 64 */
e4d58311 65static struct object_entry *objects;
79814f42 66static struct pack_idx_entry **written_list;
d01fb92f 67static uint32_t nr_objects, nr_alloc, nr_result, nr_written;
3f9ac8d2 68
96f1e58f 69static int non_empty;
a7de7130 70static int reuse_delta = 1, reuse_object = 1;
e5e9714a 71static int keep_unreachable, unpack_unreachable, include_tag;
96f1e58f
DR
72static int local;
73static int incremental;
e96fb9b8 74static int ignore_packed_keep;
be6b1914 75static int allow_ofs_delta;
d01fb92f 76static const char *base_name;
024701f1 77static int progress = 1;
4812a93a 78static int window = 10;
2b84b5a8 79static uint32_t pack_size_limit, pack_size_limit_cfg;
618e613a 80static int depth = 50;
367f4a43 81static int delta_search_threads = 1;
df6d6101 82static int pack_to_stdout;
8d1d8f83 83static int num_preferred_base;
dc6a0757 84static struct progress *progress_state;
960ccca6
DH
85static int pack_compression_level = Z_DEFAULT_COMPRESSION;
86static int pack_compression_seen;
c323ac7d 87
074b2eea
MK
88static unsigned long delta_cache_size = 0;
89static unsigned long max_delta_cache_size = 0;
e3dfddb3 90static unsigned long cache_max_small_delta_size = 1000;
074b2eea 91
a97773ce
BD
92static unsigned long window_memory_limit = 0;
93
3f9ac8d2
JH
94/*
95 * The object names in objects array are hashed with this hashtable,
e4d58311 96 * to help looking up the entry by object name.
3f9ac8d2
JH
97 * This hashtable is built after all the objects are seen.
98 */
96f1e58f
DR
99static int *object_ix;
100static int object_ix_hashsz;
3f9ac8d2 101
3f9ac8d2
JH
102/*
103 * stats
104 */
7cadf491
SP
105static uint32_t written, written_delta;
106static uint32_t reused, reused_delta;
3f9ac8d2 107
780e6e73 108
3613f9b4 109static void *get_delta(struct object_entry *entry)
c323ac7d 110{
3613f9b4
NP
111 unsigned long size, base_size, delta_size;
112 void *buf, *base_buf, *delta_buf;
21666f1a 113 enum object_type type;
c323ac7d 114
3613f9b4
NP
115 buf = read_sha1_file(entry->idx.sha1, &type, &size);
116 if (!buf)
117 die("unable to read %s", sha1_to_hex(entry->idx.sha1));
118 base_buf = read_sha1_file(entry->delta->idx.sha1, &type, &base_size);
119 if (!base_buf)
aa7e44bf 120 die("unable to read %s", sha1_to_hex(entry->delta->idx.sha1));
3613f9b4 121 delta_buf = diff_delta(base_buf, base_size,
dcde55bc 122 buf, size, &delta_size, 0);
3613f9b4 123 if (!delta_buf || delta_size != entry->delta_size)
a6080a0a 124 die("delta size changed");
3613f9b4
NP
125 free(buf);
126 free(base_buf);
c323ac7d
LT
127 return delta_buf;
128}
129
30ebb40a
NP
130static unsigned long do_compress(void **pptr, unsigned long size)
131{
132 z_stream stream;
133 void *in, *out;
134 unsigned long maxsize;
135
136 memset(&stream, 0, sizeof(stream));
137 deflateInit(&stream, pack_compression_level);
138 maxsize = deflateBound(&stream, size);
139
140 in = *pptr;
141 out = xmalloc(maxsize);
142 *pptr = out;
143
144 stream.next_in = in;
145 stream.avail_in = size;
146 stream.next_out = out;
147 stream.avail_out = maxsize;
148 while (deflate(&stream, Z_FINISH) == Z_OK)
149 ; /* nothing */
150 deflateEnd(&stream);
151
152 free(in);
153 return stream.total_out;
154}
155
a733cb60
LT
156/*
157 * The per-object header is a pretty dense thing, which is
158 * - first byte: low four bits are "size", then three bits of "type",
159 * and the high bit is "size continues".
160 * - each byte afterwards: low seven bits are size continuation,
161 * with the high bit being "size continues"
162 */
163static int encode_header(enum object_type type, unsigned long size, unsigned char *hdr)
164{
01247d87 165 int n = 1;
a733cb60
LT
166 unsigned char c;
167
eb32d236 168 if (type < OBJ_COMMIT || type > OBJ_REF_DELTA)
a733cb60
LT
169 die("bad type %d", type);
170
01247d87
LT
171 c = (type << 4) | (size & 15);
172 size >>= 4;
173 while (size) {
a733cb60 174 *hdr++ = c | 0x80;
01247d87
LT
175 c = size & 0x7f;
176 size >>= 7;
177 n++;
a733cb60
LT
178 }
179 *hdr = c;
180 return n;
181}
182
780e6e73
NP
183/*
184 * we are going to reuse the existing object data as is. make
185 * sure it is not corrupt.
186 */
079afb18
SP
187static int check_pack_inflate(struct packed_git *p,
188 struct pack_window **w_curs,
6777a59f
SP
189 off_t offset,
190 off_t len,
079afb18
SP
191 unsigned long expect)
192{
193 z_stream stream;
194 unsigned char fakebuf[4096], *in;
195 int st;
196
197 memset(&stream, 0, sizeof(stream));
198 inflateInit(&stream);
199 do {
200 in = use_pack(p, w_curs, offset, &stream.avail_in);
201 stream.next_in = in;
202 stream.next_out = fakebuf;
203 stream.avail_out = sizeof(fakebuf);
204 st = inflate(&stream, Z_FINISH);
205 offset += stream.next_in - in;
206 } while (st == Z_OK || st == Z_BUF_ERROR);
207 inflateEnd(&stream);
208 return (st == Z_STREAM_END &&
209 stream.total_out == expect &&
210 stream.total_in == len) ? 0 : -1;
211}
212
213static void copy_pack_data(struct sha1file *f,
214 struct packed_git *p,
215 struct pack_window **w_curs,
6777a59f
SP
216 off_t offset,
217 off_t len)
079afb18
SP
218{
219 unsigned char *in;
220 unsigned int avail;
221
222 while (len) {
223 in = use_pack(p, w_curs, offset, &avail);
224 if (avail > len)
6777a59f 225 avail = (unsigned int)len;
079afb18
SP
226 sha1write(f, in, avail);
227 offset += avail;
228 len -= avail;
229 }
230}
231
d7dd0223 232static unsigned long write_object(struct sha1file *f,
17b08f2c
DH
233 struct object_entry *entry,
234 off_t write_offset)
c323ac7d 235{
30ebb40a 236 unsigned long size, limit, datalen;
3f9ac8d2 237 void *buf;
2c5ef824 238 unsigned char header[10], dheader[10];
6777a59f 239 unsigned hdrlen;
2c5ef824
NP
240 enum object_type type;
241 int usable_delta, to_reuse;
c323ac7d 242
78d1e84f
NP
243 if (!pack_to_stdout)
244 crc32_begin(f);
245
2c5ef824
NP
246 type = entry->type;
247
248 /* write limit if limited packsize and not first object */
a1e4760f
NP
249 if (!pack_size_limit || !nr_written)
250 limit = 0;
251 else if (pack_size_limit <= write_offset)
252 /*
253 * the earlier object did not fit the limit; avoid
254 * mistaking this with unlimited (i.e. limit = 0).
255 */
256 limit = 1;
257 else
258 limit = pack_size_limit - write_offset;
2c5ef824
NP
259
260 if (!entry->delta)
261 usable_delta = 0; /* no delta */
262 else if (!pack_size_limit)
263 usable_delta = 1; /* unlimited packfile */
264 else if (entry->delta->idx.offset == (off_t)-1)
265 usable_delta = 0; /* base was written to another pack */
266 else if (entry->delta->idx.offset)
267 usable_delta = 1; /* base already exists in this pack */
268 else
269 usable_delta = 0; /* base could end up in another pack */
270
a7de7130 271 if (!reuse_object)
fa736f72
NP
272 to_reuse = 0; /* explicit */
273 else if (!entry->in_pack)
ab7cd7bb 274 to_reuse = 0; /* can't reuse what we don't have */
2c5ef824 275 else if (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA)
17b08f2c
DH
276 /* check_object() decided it for us ... */
277 to_reuse = usable_delta;
278 /* ... but pack split may override that */
2c5ef824 279 else if (type != entry->in_pack_type)
ab7cd7bb
JH
280 to_reuse = 0; /* pack has delta which is unusable */
281 else if (entry->delta)
282 to_reuse = 0; /* we want to pack afresh */
283 else
284 to_reuse = 1; /* we have it in-pack undeltified,
285 * and we do not need to deltify it.
286 */
287
df6d6101 288 if (!to_reuse) {
5476a8ad 289 if (!usable_delta) {
2c5ef824 290 buf = read_sha1_file(entry->idx.sha1, &type, &size);
5476a8ad 291 if (!buf)
aa7e44bf 292 die("unable to read %s", sha1_to_hex(entry->idx.sha1));
ed4a9031
NP
293 /*
294 * make sure no cached delta data remains from a
295 * previous attempt before a pack split occured.
296 */
297 free(entry->delta_data);
298 entry->delta_data = NULL;
299 entry->z_delta_size = 0;
5476a8ad 300 } else if (entry->delta_data) {
3f9ac8d2 301 size = entry->delta_size;
5476a8ad
NP
302 buf = entry->delta_data;
303 entry->delta_data = NULL;
2c5ef824 304 type = (allow_ofs_delta && entry->delta->idx.offset) ?
be6b1914 305 OBJ_OFS_DELTA : OBJ_REF_DELTA;
17b08f2c 306 } else {
3613f9b4 307 buf = get_delta(entry);
5476a8ad 308 size = entry->delta_size;
2c5ef824 309 type = (allow_ofs_delta && entry->delta->idx.offset) ?
5476a8ad 310 OBJ_OFS_DELTA : OBJ_REF_DELTA;
3f9ac8d2 311 }
ed4a9031
NP
312
313 if (entry->z_delta_size)
314 datalen = entry->z_delta_size;
315 else
316 datalen = do_compress(&buf, size);
8c3c7b2a 317
3f9ac8d2
JH
318 /*
319 * The object header is a byte of 'type' followed by zero or
be6b1914 320 * more bytes of length.
3f9ac8d2 321 */
2c5ef824 322 hdrlen = encode_header(type, size, header);
3f9ac8d2 323
2c5ef824 324 if (type == OBJ_OFS_DELTA) {
be6b1914
NP
325 /*
326 * Deltas with relative base contain an additional
327 * encoding of the relative offset for the delta
328 * base from this object's position in the pack.
329 */
aa7e44bf 330 off_t ofs = entry->idx.offset - entry->delta->idx.offset;
17b08f2c
DH
331 unsigned pos = sizeof(dheader) - 1;
332 dheader[pos] = ofs & 127;
be6b1914 333 while (ofs >>= 7)
17b08f2c
DH
334 dheader[--pos] = 128 | (--ofs & 127);
335 if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) {
17b08f2c
DH
336 free(buf);
337 return 0;
338 }
339 sha1write(f, header, hdrlen);
340 sha1write(f, dheader + pos, sizeof(dheader) - pos);
341 hdrlen += sizeof(dheader) - pos;
2c5ef824 342 } else if (type == OBJ_REF_DELTA) {
be6b1914
NP
343 /*
344 * Deltas with a base reference contain
345 * an additional 20 bytes for the base sha1.
346 */
17b08f2c 347 if (limit && hdrlen + 20 + datalen + 20 >= limit) {
17b08f2c
DH
348 free(buf);
349 return 0;
350 }
351 sha1write(f, header, hdrlen);
aa7e44bf 352 sha1write(f, entry->delta->idx.sha1, 20);
3f9ac8d2 353 hdrlen += 20;
17b08f2c
DH
354 } else {
355 if (limit && hdrlen + datalen + 20 >= limit) {
17b08f2c
DH
356 free(buf);
357 return 0;
358 }
359 sha1write(f, header, hdrlen);
3f9ac8d2 360 }
30ebb40a 361 sha1write(f, buf, datalen);
3f9ac8d2 362 free(buf);
c323ac7d 363 }
3f9ac8d2
JH
364 else {
365 struct packed_git *p = entry->in_pack;
03e79c88 366 struct pack_window *w_curs = NULL;
91ecbeca 367 struct revindex_entry *revidx;
6777a59f 368 off_t offset;
3f9ac8d2 369
780e6e73 370 if (entry->delta) {
2c5ef824 371 type = (allow_ofs_delta && entry->delta->idx.offset) ?
780e6e73
NP
372 OBJ_OFS_DELTA : OBJ_REF_DELTA;
373 reused_delta++;
374 }
2c5ef824 375 hdrlen = encode_header(type, entry->size, header);
91ecbeca 376 offset = entry->in_pack_offset;
3449f8c4 377 revidx = find_pack_revindex(p, offset);
91ecbeca
NP
378 datalen = revidx[1].offset - offset;
379 if (!pack_to_stdout && p->index_version > 1 &&
380 check_pack_crc(p, &w_curs, offset, datalen, revidx->nr))
aa7e44bf 381 die("bad packed object CRC for %s", sha1_to_hex(entry->idx.sha1));
91ecbeca
NP
382 offset += entry->in_pack_header_size;
383 datalen -= entry->in_pack_header_size;
2c5ef824 384 if (type == OBJ_OFS_DELTA) {
aa7e44bf 385 off_t ofs = entry->idx.offset - entry->delta->idx.offset;
17b08f2c
DH
386 unsigned pos = sizeof(dheader) - 1;
387 dheader[pos] = ofs & 127;
388 while (ofs >>= 7)
389 dheader[--pos] = 128 | (--ofs & 127);
390 if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit)
391 return 0;
392 sha1write(f, header, hdrlen);
393 sha1write(f, dheader + pos, sizeof(dheader) - pos);
394 hdrlen += sizeof(dheader) - pos;
2c5ef824 395 } else if (type == OBJ_REF_DELTA) {
17b08f2c
DH
396 if (limit && hdrlen + 20 + datalen + 20 >= limit)
397 return 0;
398 sha1write(f, header, hdrlen);
aa7e44bf 399 sha1write(f, entry->delta->idx.sha1, 20);
17b08f2c
DH
400 hdrlen += 20;
401 } else {
402 if (limit && hdrlen + datalen + 20 >= limit)
403 return 0;
404 sha1write(f, header, hdrlen);
405 }
406
91ecbeca
NP
407 if (!pack_to_stdout && p->index_version == 1 &&
408 check_pack_inflate(p, &w_curs, offset, datalen, entry->size))
aa7e44bf 409 die("corrupt packed object for %s", sha1_to_hex(entry->idx.sha1));
079afb18 410 copy_pack_data(f, p, &w_curs, offset, datalen);
03e79c88 411 unuse_pack(&w_curs);
3f9ac8d2 412 reused++;
a733cb60 413 }
17b08f2c 414 if (usable_delta)
ab7cd7bb 415 written_delta++;
3f9ac8d2 416 written++;
78d1e84f 417 if (!pack_to_stdout)
aa7e44bf 418 entry->idx.crc32 = crc32_end(f);
c323ac7d
LT
419 return hdrlen + datalen;
420}
421
6ed7f25e 422static int write_one(struct sha1file *f,
9d5ab962 423 struct object_entry *e,
6ed7f25e 424 off_t *offset)
9d5ab962 425{
d7dd0223
NP
426 unsigned long size;
427
428 /* offset is non zero if object is written already. */
aa7e44bf 429 if (e->idx.offset || e->preferred_base)
6ed7f25e 430 return 1;
d7dd0223
NP
431
432 /* if we are deltified, write out base object first. */
6ed7f25e
NP
433 if (e->delta && !write_one(f, e->delta, offset))
434 return 0;
d7dd0223 435
6ed7f25e
NP
436 e->idx.offset = *offset;
437 size = write_object(f, e, *offset);
17b08f2c 438 if (!size) {
aa7e44bf 439 e->idx.offset = 0;
17b08f2c
DH
440 return 0;
441 }
79814f42 442 written_list[nr_written++] = &e->idx;
d7dd0223
NP
443
444 /* make sure off_t is sufficiently large not to wrap */
6ed7f25e 445 if (*offset > *offset + size)
d7dd0223 446 die("pack too large for current definition of off_t");
6ed7f25e
NP
447 *offset += size;
448 return 1;
9d5ab962
JH
449}
450
aa7e44bf 451/* forward declaration for write_pack_file */
d01fb92f
DH
452static int adjust_perm(const char *path, mode_t mode);
453
454static void write_pack_file(void)
c323ac7d 455{
ebe27b13 456 uint32_t i = 0, j;
d22b9290 457 struct sha1file *f;
6ed7f25e 458 off_t offset;
a733cb60 459 struct pack_header hdr;
ebe27b13 460 uint32_t nr_remaining = nr_result;
f746bae8 461 time_t last_mtime = 0;
81a216a5 462
bcd7954e 463 if (progress > pack_to_stdout)
dc6a0757 464 progress_state = start_progress("Writing objects", nr_result);
79814f42 465 written_list = xmalloc(nr_objects * sizeof(*written_list));
183bdb2c 466
ebe27b13 467 do {
aa7e44bf 468 unsigned char sha1[20];
7ba502c4 469 char *pack_tmp_name = NULL;
aa7e44bf 470
ebe27b13 471 if (pack_to_stdout) {
2a128d63 472 f = sha1fd_throughput(1, "<stdout>", progress_state);
ebe27b13 473 } else {
7ba502c4
NP
474 char tmpname[PATH_MAX];
475 int fd;
476 snprintf(tmpname, sizeof(tmpname),
8b4eb6b6 477 "%s/pack/tmp_pack_XXXXXX", get_object_directory());
7ba502c4 478 fd = xmkstemp(tmpname);
ebe27b13
DH
479 pack_tmp_name = xstrdup(tmpname);
480 f = sha1fd(fd, pack_tmp_name);
481 }
482
483 hdr.hdr_signature = htonl(PACK_SIGNATURE);
484 hdr.hdr_version = htonl(PACK_VERSION);
485 hdr.hdr_entries = htonl(nr_remaining);
486 sha1write(f, &hdr, sizeof(hdr));
487 offset = sizeof(hdr);
488 nr_written = 0;
489 for (; i < nr_objects; i++) {
6ed7f25e 490 if (!write_one(f, objects + i, &offset))
ebe27b13 491 break;
4d4fcc54 492 display_progress(progress_state, written);
ebe27b13 493 }
c553ca25 494
ebe27b13
DH
495 /*
496 * Did we write the wrong # entries in the header?
497 * If so, rewrite it like in fast-import
498 */
54352bb2
LT
499 if (pack_to_stdout) {
500 sha1close(f, sha1, CSUM_CLOSE);
501 } else if (nr_written == nr_remaining) {
502 sha1close(f, sha1, CSUM_FSYNC);
ebe27b13 503 } else {
ac0463ed 504 int fd = sha1close(f, sha1, 0);
abeb40e5 505 fixup_pack_header_footer(fd, sha1, pack_tmp_name,
ac0463ed 506 nr_written, sha1, offset);
7ba502c4 507 close(fd);
ebe27b13
DH
508 }
509
510 if (!pack_to_stdout) {
d01fb92f 511 mode_t mode = umask(0);
f746bae8 512 struct stat st;
7ba502c4 513 char *idx_tmp_name, tmpname[PATH_MAX];
d01fb92f
DH
514
515 umask(mode);
516 mode = 0444 & ~mode;
517
79814f42
NP
518 idx_tmp_name = write_idx_file(NULL, written_list,
519 nr_written, sha1);
f746bae8 520
d01fb92f 521 snprintf(tmpname, sizeof(tmpname), "%s-%s.pack",
aa7e44bf 522 base_name, sha1_to_hex(sha1));
c74faea1 523 free_pack_by_name(tmpname);
d01fb92f
DH
524 if (adjust_perm(pack_tmp_name, mode))
525 die("unable to make temporary pack file readable: %s",
526 strerror(errno));
527 if (rename(pack_tmp_name, tmpname))
528 die("unable to rename temporary pack file: %s",
529 strerror(errno));
f746bae8
NP
530
531 /*
532 * Packs are runtime accessed in their mtime
533 * order since newer packs are more likely to contain
534 * younger objects. So if we are creating multiple
535 * packs then we should modify the mtime of later ones
536 * to preserve this property.
537 */
538 if (stat(tmpname, &st) < 0) {
539 warning("failed to stat %s: %s",
540 tmpname, strerror(errno));
541 } else if (!last_mtime) {
542 last_mtime = st.st_mtime;
543 } else {
544 struct utimbuf utb;
545 utb.actime = st.st_atime;
546 utb.modtime = --last_mtime;
547 if (utime(tmpname, &utb) < 0)
548 warning("failed utime() on %s: %s",
549 tmpname, strerror(errno));
550 }
551
d01fb92f 552 snprintf(tmpname, sizeof(tmpname), "%s-%s.idx",
aa7e44bf 553 base_name, sha1_to_hex(sha1));
d01fb92f
DH
554 if (adjust_perm(idx_tmp_name, mode))
555 die("unable to make temporary index file readable: %s",
556 strerror(errno));
557 if (rename(idx_tmp_name, tmpname))
558 die("unable to rename temporary index file: %s",
559 strerror(errno));
f746bae8 560
7ba502c4
NP
561 free(idx_tmp_name);
562 free(pack_tmp_name);
aa7e44bf 563 puts(sha1_to_hex(sha1));
ebe27b13
DH
564 }
565
566 /* mark written objects as written to previous pack */
567 for (j = 0; j < nr_written; j++) {
79814f42 568 written_list[j]->offset = (off_t)-1;
ebe27b13
DH
569 }
570 nr_remaining -= nr_written;
571 } while (nr_remaining && i < nr_objects);
572
573 free(written_list);
4d4fcc54 574 stop_progress(&progress_state);
67c08ce1 575 if (written != nr_result)
6e1c2344
RJ
576 die("wrote %"PRIu32" objects while expecting %"PRIu32,
577 written, nr_result);
01c12a23
DH
578 /*
579 * We have scanned through [0 ... i). Since we have written
580 * the correct number of objects, the remaining [i ... nr_objects)
581 * items must be either already written (due to out-of-order delta base)
582 * or a preferred base. Count those which are neither and complain if any.
583 */
ebe27b13
DH
584 for (j = 0; i < nr_objects; i++) {
585 struct object_entry *e = objects + i;
aa7e44bf 586 j += !e->idx.offset && !e->preferred_base;
d01fb92f 587 }
ebe27b13 588 if (j)
6e1c2344
RJ
589 die("wrote %"PRIu32" objects as expected but %"PRIu32
590 " unwritten", written, j);
c323ac7d
LT
591}
592
7a979d99
JH
593static int locate_object_entry_hash(const unsigned char *sha1)
594{
595 int i;
596 unsigned int ui;
597 memcpy(&ui, sha1, sizeof(unsigned int));
598 i = ui % object_ix_hashsz;
599 while (0 < object_ix[i]) {
aa7e44bf 600 if (!hashcmp(sha1, objects[object_ix[i] - 1].idx.sha1))
7a979d99
JH
601 return i;
602 if (++i == object_ix_hashsz)
603 i = 0;
604 }
605 return -1 - i;
606}
607
608static struct object_entry *locate_object_entry(const unsigned char *sha1)
609{
610 int i;
611
612 if (!object_ix_hashsz)
613 return NULL;
614
615 i = locate_object_entry_hash(sha1);
616 if (0 <= i)
617 return &objects[object_ix[i]-1];
618 return NULL;
619}
620
621static void rehash_objects(void)
c323ac7d 622{
7cadf491 623 uint32_t i;
7a979d99
JH
624 struct object_entry *oe;
625
626 object_ix_hashsz = nr_objects * 3;
627 if (object_ix_hashsz < 1024)
628 object_ix_hashsz = 1024;
629 object_ix = xrealloc(object_ix, sizeof(int) * object_ix_hashsz);
5379a5c5 630 memset(object_ix, 0, sizeof(int) * object_ix_hashsz);
7a979d99 631 for (i = 0, oe = objects; i < nr_objects; i++, oe++) {
aa7e44bf 632 int ix = locate_object_entry_hash(oe->idx.sha1);
7a979d99
JH
633 if (0 <= ix)
634 continue;
635 ix = -1 - ix;
636 object_ix[ix] = i + 1;
637 }
638}
639
ce0bd642 640static unsigned name_hash(const char *name)
1d6b38cc 641{
ce0bd642
LT
642 unsigned char c;
643 unsigned hash = 0;
644
bc32fed5
JH
645 if (!name)
646 return 0;
647
eeef7135 648 /*
ce0bd642
LT
649 * This effectively just creates a sortable number from the
650 * last sixteen non-whitespace characters. Last characters
651 * count "most", so things that end in ".c" sort together.
eeef7135 652 */
ce0bd642
LT
653 while ((c = *name++) != 0) {
654 if (isspace(c))
655 continue;
656 hash = (hash >> 2) + (c << 24);
657 }
1d6b38cc
JH
658 return hash;
659}
660
a74db82e
JH
661static void setup_delta_attr_check(struct git_attr_check *check)
662{
663 static struct git_attr *attr_delta;
664
665 if (!attr_delta)
666 attr_delta = git_attr("delta", 5);
667
668 check[0].attr = attr_delta;
669}
670
671static int no_try_delta(const char *path)
672{
673 struct git_attr_check check[1];
674
675 setup_delta_attr_check(check);
676 if (git_checkattr(path, ARRAY_SIZE(check), check))
677 return 0;
678 if (ATTR_FALSE(check->value))
679 return 1;
680 return 0;
681}
682
5c49c116 683static int add_object_entry(const unsigned char *sha1, enum object_type type,
bc32fed5 684 const char *name, int exclude)
c323ac7d 685{
c323ac7d 686 struct object_entry *entry;
29b734e4 687 struct packed_git *p, *found_pack = NULL;
6777a59f 688 off_t found_offset = 0;
29b734e4 689 int ix;
bc32fed5 690 unsigned hash = name_hash(name);
29b734e4
NP
691
692 ix = nr_objects ? locate_object_entry_hash(sha1) : -1;
693 if (ix >= 0) {
694 if (exclude) {
695 entry = objects + object_ix[ix] - 1;
81a216a5
NP
696 if (!entry->preferred_base)
697 nr_result--;
29b734e4
NP
698 entry->preferred_base = 1;
699 }
700 return 0;
701 }
c323ac7d 702
daae0625
BC
703 if (!exclude && local && has_loose_object_nonlocal(sha1))
704 return 0;
705
5c49c116
NP
706 for (p = packed_git; p; p = p->next) {
707 off_t offset = find_pack_entry_one(sha1, p);
708 if (offset) {
709 if (!found_pack) {
710 found_offset = offset;
711 found_pack = p;
64560374 712 }
5c49c116
NP
713 if (exclude)
714 break;
715 if (incremental)
716 return 0;
717 if (local && !p->pack_local)
718 return 0;
e96fb9b8
BC
719 if (ignore_packed_keep && p->pack_local && p->pack_keep)
720 return 0;
64560374
LT
721 }
722 }
eb019375 723
29b734e4
NP
724 if (nr_objects >= nr_alloc) {
725 nr_alloc = (nr_alloc + 1024) * 3 / 2;
7cadf491 726 objects = xrealloc(objects, nr_alloc * sizeof(*entry));
c323ac7d 727 }
29b734e4
NP
728
729 entry = objects + nr_objects++;
c323ac7d 730 memset(entry, 0, sizeof(*entry));
aa7e44bf 731 hashcpy(entry->idx.sha1, sha1);
27225f2e 732 entry->hash = hash;
5c49c116
NP
733 if (type)
734 entry->type = type;
29b734e4
NP
735 if (exclude)
736 entry->preferred_base = 1;
81a216a5
NP
737 else
738 nr_result++;
29b734e4
NP
739 if (found_pack) {
740 entry->in_pack = found_pack;
741 entry->in_pack_offset = found_offset;
742 }
7a979d99
JH
743
744 if (object_ix_hashsz * 3 <= nr_objects * 4)
745 rehash_objects();
29b734e4
NP
746 else
747 object_ix[-1 - ix] = nr_objects;
7a979d99 748
4d4fcc54 749 display_progress(progress_state, nr_objects);
29b734e4 750
a74db82e
JH
751 if (name && no_try_delta(name))
752 entry->no_try_delta = 1;
753
29b734e4 754 return 1;
c323ac7d
LT
755}
756
5379a5c5
JH
757struct pbase_tree_cache {
758 unsigned char sha1[20];
759 int ref;
760 int temporary;
761 void *tree_data;
762 unsigned long tree_size;
763};
764
765static struct pbase_tree_cache *(pbase_tree_cache[256]);
766static int pbase_tree_cache_ix(const unsigned char *sha1)
767{
768 return sha1[0] % ARRAY_SIZE(pbase_tree_cache);
769}
770static int pbase_tree_cache_ix_incr(int ix)
771{
772 return (ix+1) % ARRAY_SIZE(pbase_tree_cache);
773}
774
775static struct pbase_tree {
776 struct pbase_tree *next;
777 /* This is a phony "cache" entry; we are not
778 * going to evict it nor find it through _get()
779 * mechanism -- this is for the toplevel node that
780 * would almost always change with any commit.
781 */
782 struct pbase_tree_cache pcache;
783} *pbase_tree;
784
785static struct pbase_tree_cache *pbase_tree_get(const unsigned char *sha1)
786{
787 struct pbase_tree_cache *ent, *nent;
788 void *data;
789 unsigned long size;
21666f1a 790 enum object_type type;
5379a5c5
JH
791 int neigh;
792 int my_ix = pbase_tree_cache_ix(sha1);
793 int available_ix = -1;
794
795 /* pbase-tree-cache acts as a limited hashtable.
796 * your object will be found at your index or within a few
797 * slots after that slot if it is cached.
798 */
799 for (neigh = 0; neigh < 8; neigh++) {
800 ent = pbase_tree_cache[my_ix];
a89fccd2 801 if (ent && !hashcmp(ent->sha1, sha1)) {
5379a5c5
JH
802 ent->ref++;
803 return ent;
804 }
805 else if (((available_ix < 0) && (!ent || !ent->ref)) ||
806 ((0 <= available_ix) &&
807 (!ent && pbase_tree_cache[available_ix])))
808 available_ix = my_ix;
809 if (!ent)
810 break;
811 my_ix = pbase_tree_cache_ix_incr(my_ix);
812 }
813
814 /* Did not find one. Either we got a bogus request or
815 * we need to read and perhaps cache.
816 */
21666f1a 817 data = read_sha1_file(sha1, &type, &size);
5379a5c5
JH
818 if (!data)
819 return NULL;
21666f1a 820 if (type != OBJ_TREE) {
5379a5c5
JH
821 free(data);
822 return NULL;
823 }
824
825 /* We need to either cache or return a throwaway copy */
826
827 if (available_ix < 0)
828 ent = NULL;
829 else {
830 ent = pbase_tree_cache[available_ix];
831 my_ix = available_ix;
832 }
833
834 if (!ent) {
835 nent = xmalloc(sizeof(*nent));
836 nent->temporary = (available_ix < 0);
837 }
838 else {
839 /* evict and reuse */
840 free(ent->tree_data);
841 nent = ent;
842 }
e702496e 843 hashcpy(nent->sha1, sha1);
5379a5c5
JH
844 nent->tree_data = data;
845 nent->tree_size = size;
846 nent->ref = 1;
847 if (!nent->temporary)
848 pbase_tree_cache[my_ix] = nent;
849 return nent;
850}
851
852static void pbase_tree_put(struct pbase_tree_cache *cache)
853{
854 if (!cache->temporary) {
855 cache->ref--;
856 return;
857 }
858 free(cache->tree_data);
859 free(cache);
860}
861
862static int name_cmp_len(const char *name)
863{
864 int i;
865 for (i = 0; name[i] && name[i] != '\n' && name[i] != '/'; i++)
866 ;
867 return i;
868}
869
870static void add_pbase_object(struct tree_desc *tree,
5379a5c5 871 const char *name,
ce0bd642
LT
872 int cmplen,
873 const char *fullname)
3f9ac8d2 874{
4c068a98 875 struct name_entry entry;
8a5a8d6c 876 int cmp;
4c068a98
LT
877
878 while (tree_entry(tree,&entry)) {
1211be6b
LT
879 if (S_ISGITLINK(entry.mode))
880 continue;
8a5a8d6c
NP
881 cmp = tree_entry_len(entry.path, entry.sha1) != cmplen ? 1 :
882 memcmp(name, entry.path, cmplen);
883 if (cmp > 0)
7a979d99 884 continue;
8a5a8d6c
NP
885 if (cmp < 0)
886 return;
5379a5c5 887 if (name[cmplen] != '/') {
5c49c116 888 add_object_entry(entry.sha1,
4d1012c3 889 object_type(entry.mode),
bc32fed5 890 fullname, 1);
5379a5c5
JH
891 return;
892 }
8a5a8d6c 893 if (S_ISDIR(entry.mode)) {
7a979d99 894 struct tree_desc sub;
5379a5c5
JH
895 struct pbase_tree_cache *tree;
896 const char *down = name+cmplen+1;
897 int downlen = name_cmp_len(down);
898
4c068a98 899 tree = pbase_tree_get(entry.sha1);
5379a5c5
JH
900 if (!tree)
901 return;
6fda5e51 902 init_tree_desc(&sub, tree->tree_data, tree->tree_size);
5379a5c5 903
ce0bd642 904 add_pbase_object(&sub, down, downlen, fullname);
5379a5c5
JH
905 pbase_tree_put(tree);
906 }
907 }
908}
1d6b38cc 909
5379a5c5
JH
910static unsigned *done_pbase_paths;
911static int done_pbase_paths_num;
912static int done_pbase_paths_alloc;
913static int done_pbase_path_pos(unsigned hash)
914{
915 int lo = 0;
916 int hi = done_pbase_paths_num;
917 while (lo < hi) {
918 int mi = (hi + lo) / 2;
919 if (done_pbase_paths[mi] == hash)
920 return mi;
921 if (done_pbase_paths[mi] < hash)
922 hi = mi;
923 else
924 lo = mi + 1;
925 }
926 return -lo-1;
927}
928
929static int check_pbase_path(unsigned hash)
930{
931 int pos = (!done_pbase_paths) ? -1 : done_pbase_path_pos(hash);
932 if (0 <= pos)
933 return 1;
934 pos = -pos - 1;
935 if (done_pbase_paths_alloc <= done_pbase_paths_num) {
936 done_pbase_paths_alloc = alloc_nr(done_pbase_paths_alloc);
937 done_pbase_paths = xrealloc(done_pbase_paths,
938 done_pbase_paths_alloc *
939 sizeof(unsigned));
940 }
941 done_pbase_paths_num++;
942 if (pos < done_pbase_paths_num)
943 memmove(done_pbase_paths + pos + 1,
944 done_pbase_paths + pos,
945 (done_pbase_paths_num - pos - 1) * sizeof(unsigned));
946 done_pbase_paths[pos] = hash;
947 return 0;
948}
949
bc32fed5 950static void add_preferred_base_object(const char *name)
5379a5c5
JH
951{
952 struct pbase_tree *it;
8a5a8d6c 953 int cmplen;
bc32fed5 954 unsigned hash = name_hash(name);
5379a5c5 955
8a5a8d6c 956 if (!num_preferred_base || check_pbase_path(hash))
5379a5c5
JH
957 return;
958
8a5a8d6c 959 cmplen = name_cmp_len(name);
5379a5c5
JH
960 for (it = pbase_tree; it; it = it->next) {
961 if (cmplen == 0) {
bc32fed5 962 add_object_entry(it->pcache.sha1, OBJ_TREE, NULL, 1);
5379a5c5
JH
963 }
964 else {
965 struct tree_desc tree;
6fda5e51 966 init_tree_desc(&tree, it->pcache.tree_data, it->pcache.tree_size);
ce0bd642 967 add_pbase_object(&tree, name, cmplen, name);
7a979d99 968 }
3f9ac8d2 969 }
3f9ac8d2
JH
970}
971
7a979d99 972static void add_preferred_base(unsigned char *sha1)
3f9ac8d2 973{
5379a5c5
JH
974 struct pbase_tree *it;
975 void *data;
976 unsigned long size;
977 unsigned char tree_sha1[20];
1d6b38cc 978
8d1d8f83
JH
979 if (window <= num_preferred_base++)
980 return;
981
5379a5c5
JH
982 data = read_object_with_reference(sha1, tree_type, &size, tree_sha1);
983 if (!data)
7a979d99 984 return;
5379a5c5
JH
985
986 for (it = pbase_tree; it; it = it->next) {
a89fccd2 987 if (!hashcmp(it->pcache.sha1, tree_sha1)) {
5379a5c5
JH
988 free(data);
989 return;
990 }
991 }
992
993 it = xcalloc(1, sizeof(*it));
994 it->next = pbase_tree;
995 pbase_tree = it;
996
e702496e 997 hashcpy(it->pcache.sha1, tree_sha1);
5379a5c5
JH
998 it->pcache.tree_data = data;
999 it->pcache.tree_size = size;
3f9ac8d2
JH
1000}
1001
c323ac7d
LT
1002static void check_object(struct object_entry *entry)
1003{
5c49c116 1004 if (entry->in_pack) {
780e6e73 1005 struct packed_git *p = entry->in_pack;
03e79c88 1006 struct pack_window *w_curs = NULL;
5c49c116
NP
1007 const unsigned char *base_ref = NULL;
1008 struct object_entry *base_entry;
1009 unsigned long used, used_0;
6777a59f 1010 unsigned int avail;
5c49c116
NP
1011 off_t ofs;
1012 unsigned char *buf, c;
780e6e73 1013
6777a59f 1014 buf = use_pack(p, &w_curs, entry->in_pack_offset, &avail);
ab7cd7bb 1015
5c49c116 1016 /*
fa736f72
NP
1017 * We want in_pack_type even if we do not reuse delta
1018 * since non-delta representations could still be reused.
ab7cd7bb 1019 */
6777a59f 1020 used = unpack_object_header_gently(buf, avail,
5c49c116
NP
1021 &entry->in_pack_type,
1022 &entry->size);
ab7cd7bb 1023
5c49c116
NP
1024 /*
1025 * Determine if this is a delta and if so whether we can
1026 * reuse it or not. Otherwise let's find out as cheaply as
1027 * possible what the actual type and size for this object is.
3f9ac8d2 1028 */
5c49c116
NP
1029 switch (entry->in_pack_type) {
1030 default:
1031 /* Not a delta hence we've already got all we need. */
1032 entry->type = entry->in_pack_type;
1033 entry->in_pack_header_size = used;
1034 unuse_pack(&w_curs);
1035 return;
1036 case OBJ_REF_DELTA:
a7de7130 1037 if (reuse_delta && !entry->preferred_base)
5c49c116
NP
1038 base_ref = use_pack(p, &w_curs,
1039 entry->in_pack_offset + used, NULL);
1040 entry->in_pack_header_size = used + 20;
1041 break;
1042 case OBJ_OFS_DELTA:
1043 buf = use_pack(p, &w_curs,
1044 entry->in_pack_offset + used, NULL);
1045 used_0 = 0;
1046 c = buf[used_0++];
1047 ofs = c & 127;
1048 while (c & 128) {
1049 ofs += 1;
1050 if (!ofs || MSB(ofs, 7))
1051 die("delta base offset overflow in pack for %s",
aa7e44bf 1052 sha1_to_hex(entry->idx.sha1));
5c49c116
NP
1053 c = buf[used_0++];
1054 ofs = (ofs << 7) + (c & 127);
780e6e73 1055 }
5c49c116
NP
1056 if (ofs >= entry->in_pack_offset)
1057 die("delta base offset out of bound for %s",
aa7e44bf 1058 sha1_to_hex(entry->idx.sha1));
5c49c116 1059 ofs = entry->in_pack_offset - ofs;
a7de7130 1060 if (reuse_delta && !entry->preferred_base) {
3449f8c4
NP
1061 struct revindex_entry *revidx;
1062 revidx = find_pack_revindex(p, ofs);
1063 base_ref = nth_packed_object_sha1(p, revidx->nr);
1064 }
5c49c116
NP
1065 entry->in_pack_header_size = used + used_0;
1066 break;
780e6e73 1067 }
780e6e73 1068
5c49c116
NP
1069 if (base_ref && (base_entry = locate_object_entry(base_ref))) {
1070 /*
1071 * If base_ref was set above that means we wish to
1072 * reuse delta data, and we even found that base
1073 * in the list of objects we want to pack. Goodie!
1074 *
1075 * Depth value does not matter - find_deltas() will
1076 * never consider reused delta as the base object to
1077 * deltify other objects against, in order to avoid
1078 * circular deltas.
3f9ac8d2 1079 */
780e6e73 1080 entry->type = entry->in_pack_type;
5c49c116 1081 entry->delta = base_entry;
15b4d577
JH
1082 entry->delta_sibling = base_entry->delta_child;
1083 base_entry->delta_child = entry;
5c49c116
NP
1084 unuse_pack(&w_curs);
1085 return;
1086 }
ab7cd7bb 1087
5c49c116
NP
1088 if (entry->type) {
1089 /*
1090 * This must be a delta and we already know what the
1091 * final object type is. Let's extract the actual
1092 * object size from the delta header.
1093 */
1094 entry->size = get_size_from_delta(p, &w_curs,
1095 entry->in_pack_offset + entry->in_pack_header_size);
1096 unuse_pack(&w_curs);
3f9ac8d2
JH
1097 return;
1098 }
5c49c116
NP
1099
1100 /*
1101 * No choice but to fall back to the recursive delta walk
1102 * with sha1_object_info() to find about the object type
1103 * at this point...
1104 */
1105 unuse_pack(&w_curs);
36e4d74a 1106 }
3f9ac8d2 1107
aa7e44bf 1108 entry->type = sha1_object_info(entry->idx.sha1, &entry->size);
6d6f9cdd
SP
1109 /*
1110 * The error condition is checked in prepare_pack(). This is
1111 * to permit a missing preferred base object to be ignored
1112 * as a preferred base. Doing so can result in a larger
1113 * pack file, but the transfer will still take place.
1114 */
3f9ac8d2
JH
1115}
1116
5c49c116
NP
1117static int pack_offset_sort(const void *_a, const void *_b)
1118{
1119 const struct object_entry *a = *(struct object_entry **)_a;
1120 const struct object_entry *b = *(struct object_entry **)_b;
1121
1122 /* avoid filesystem trashing with loose objects */
1123 if (!a->in_pack && !b->in_pack)
aa7e44bf 1124 return hashcmp(a->idx.sha1, b->idx.sha1);
5c49c116
NP
1125
1126 if (a->in_pack < b->in_pack)
1127 return -1;
1128 if (a->in_pack > b->in_pack)
1129 return 1;
1130 return a->in_pack_offset < b->in_pack_offset ? -1 :
1131 (a->in_pack_offset > b->in_pack_offset);
1132}
1133
c323ac7d
LT
1134static void get_object_details(void)
1135{
7cadf491 1136 uint32_t i;
5c49c116
NP
1137 struct object_entry **sorted_by_offset;
1138
1139 sorted_by_offset = xcalloc(nr_objects, sizeof(struct object_entry *));
1140 for (i = 0; i < nr_objects; i++)
1141 sorted_by_offset[i] = objects + i;
1142 qsort(sorted_by_offset, nr_objects, sizeof(*sorted_by_offset), pack_offset_sort);
c323ac7d 1143
5c49c116
NP
1144 for (i = 0; i < nr_objects; i++)
1145 check_object(sorted_by_offset[i]);
3449f8c4 1146
5c49c116 1147 free(sorted_by_offset);
c323ac7d
LT
1148}
1149
b904166c
NP
1150/*
1151 * We search for deltas in a list sorted by type, by filename hash, and then
1152 * by size, so that we see progressively smaller and smaller files.
1153 * That's because we prefer deltas to be from the bigger file
1154 * to the smaller -- deletes are potentially cheaper, but perhaps
1155 * more importantly, the bigger file is likely the more recent
1156 * one. The deepest deltas are therefore the oldest objects which are
1157 * less susceptible to be accessed often.
1158 */
9668cf59 1159static int type_size_sort(const void *_a, const void *_b)
c323ac7d 1160{
9668cf59
NP
1161 const struct object_entry *a = *(struct object_entry **)_a;
1162 const struct object_entry *b = *(struct object_entry **)_b;
1163
c323ac7d 1164 if (a->type > b->type)
27225f2e 1165 return -1;
b904166c 1166 if (a->type < b->type)
27225f2e 1167 return 1;
b904166c 1168 if (a->hash > b->hash)
7a979d99 1169 return -1;
b904166c 1170 if (a->hash < b->hash)
7a979d99 1171 return 1;
b904166c 1172 if (a->preferred_base > b->preferred_base)
c323ac7d 1173 return -1;
b904166c
NP
1174 if (a->preferred_base < b->preferred_base)
1175 return 1;
c323ac7d 1176 if (a->size > b->size)
b904166c
NP
1177 return -1;
1178 if (a->size < b->size)
c323ac7d 1179 return 1;
b904166c 1180 return a < b ? -1 : (a > b); /* newest first */
c323ac7d
LT
1181}
1182
1183struct unpacked {
1184 struct object_entry *entry;
1185 void *data;
f6c7081a 1186 struct delta_index *index;
5a235b5e 1187 unsigned depth;
c323ac7d
LT
1188};
1189
d250626c
NP
1190static int delta_cacheable(unsigned long src_size, unsigned long trg_size,
1191 unsigned long delta_size)
074b2eea
MK
1192{
1193 if (max_delta_cache_size && delta_cache_size + delta_size > max_delta_cache_size)
1194 return 0;
1195
e3dfddb3
MK
1196 if (delta_size < cache_max_small_delta_size)
1197 return 1;
1198
074b2eea
MK
1199 /* cache delta, if objects are large enough compared to delta size */
1200 if ((src_size >> 20) + (trg_size >> 21) > (delta_size >> 10))
1201 return 1;
1202
1203 return 0;
1204}
1205
8ecce684
NP
1206#ifdef THREADED_DELTA_SEARCH
1207
1208static pthread_mutex_t read_mutex = PTHREAD_MUTEX_INITIALIZER;
1209#define read_lock() pthread_mutex_lock(&read_mutex)
1210#define read_unlock() pthread_mutex_unlock(&read_mutex)
1211
3c701839
NP
1212static pthread_mutex_t cache_mutex = PTHREAD_MUTEX_INITIALIZER;
1213#define cache_lock() pthread_mutex_lock(&cache_mutex)
1214#define cache_unlock() pthread_mutex_unlock(&cache_mutex)
1215
8ecce684
NP
1216static pthread_mutex_t progress_mutex = PTHREAD_MUTEX_INITIALIZER;
1217#define progress_lock() pthread_mutex_lock(&progress_mutex)
1218#define progress_unlock() pthread_mutex_unlock(&progress_mutex)
1219
1220#else
1221
e1ef8673
JH
1222#define read_lock() (void)0
1223#define read_unlock() (void)0
1224#define cache_lock() (void)0
1225#define cache_unlock() (void)0
1226#define progress_lock() (void)0
1227#define progress_unlock() (void)0
8ecce684
NP
1228
1229#endif
1230
f6c7081a 1231static int try_delta(struct unpacked *trg, struct unpacked *src,
ef0316fc 1232 unsigned max_depth, unsigned long *mem_usage)
c323ac7d 1233{
f6c7081a
NP
1234 struct object_entry *trg_entry = trg->entry;
1235 struct object_entry *src_entry = src->entry;
560b25a8 1236 unsigned long trg_size, src_size, delta_size, sizediff, max_size, sz;
c83f032e 1237 unsigned ref_depth;
21666f1a 1238 enum object_type type;
c323ac7d
LT
1239 void *delta_buf;
1240
1241 /* Don't bother doing diffs between different types */
f6c7081a 1242 if (trg_entry->type != src_entry->type)
c323ac7d
LT
1243 return -1;
1244
51d1e83f
LT
1245 /*
1246 * We do not bother to try a delta that we discarded
8dbbd14e 1247 * on an earlier try, but only when reusing delta data.
51d1e83f 1248 */
a7de7130 1249 if (reuse_delta && trg_entry->in_pack &&
e9195b58
JH
1250 trg_entry->in_pack == src_entry->in_pack &&
1251 trg_entry->in_pack_type != OBJ_REF_DELTA &&
1252 trg_entry->in_pack_type != OBJ_OFS_DELTA)
51d1e83f
LT
1253 return 0;
1254
898b14ce 1255 /* Let's not bust the allowed depth. */
5a235b5e 1256 if (src->depth >= max_depth)
d116a45a 1257 return 0;
c323ac7d 1258
c3b06a69 1259 /* Now some size filtering heuristics. */
560b25a8 1260 trg_size = trg_entry->size;
c83f032e
NP
1261 if (!trg_entry->delta) {
1262 max_size = trg_size/2 - 20;
1263 ref_depth = 1;
1264 } else {
1265 max_size = trg_entry->delta_size;
5a235b5e 1266 ref_depth = trg->depth;
c83f032e 1267 }
720fe22d 1268 max_size = (uint64_t)max_size * (max_depth - src->depth) /
c83f032e 1269 (max_depth - ref_depth + 1);
c3b06a69
NP
1270 if (max_size == 0)
1271 return 0;
f6c7081a 1272 src_size = src_entry->size;
560b25a8 1273 sizediff = src_size < trg_size ? trg_size - src_size : 0;
27225f2e 1274 if (sizediff >= max_size)
f527cb8c 1275 return 0;
a1dab41a
BD
1276 if (trg_size < src_size / 32)
1277 return 0;
f6c7081a 1278
560b25a8
NP
1279 /* Load data if not already done */
1280 if (!trg->data) {
8ecce684 1281 read_lock();
aa7e44bf 1282 trg->data = read_sha1_file(trg_entry->idx.sha1, &type, &sz);
8ecce684 1283 read_unlock();
2e3404c3
JH
1284 if (!trg->data)
1285 die("object %s cannot be read",
1286 sha1_to_hex(trg_entry->idx.sha1));
560b25a8
NP
1287 if (sz != trg_size)
1288 die("object %s inconsistent object length (%lu vs %lu)",
aa7e44bf 1289 sha1_to_hex(trg_entry->idx.sha1), sz, trg_size);
ef0316fc 1290 *mem_usage += sz;
560b25a8
NP
1291 }
1292 if (!src->data) {
8ecce684 1293 read_lock();
aa7e44bf 1294 src->data = read_sha1_file(src_entry->idx.sha1, &type, &sz);
8ecce684 1295 read_unlock();
2e3404c3
JH
1296 if (!src->data)
1297 die("object %s cannot be read",
1298 sha1_to_hex(src_entry->idx.sha1));
560b25a8
NP
1299 if (sz != src_size)
1300 die("object %s inconsistent object length (%lu vs %lu)",
aa7e44bf 1301 sha1_to_hex(src_entry->idx.sha1), sz, src_size);
ef0316fc 1302 *mem_usage += sz;
560b25a8
NP
1303 }
1304 if (!src->index) {
1305 src->index = create_delta_index(src->data, src_size);
a588d88a
MK
1306 if (!src->index) {
1307 static int warned = 0;
1308 if (!warned++)
1309 warning("suboptimal pack - out of memory");
1310 return 0;
1311 }
ef0316fc 1312 *mem_usage += sizeof_delta_index(src->index);
560b25a8
NP
1313 }
1314
1315 delta_buf = create_delta(src->index, trg->data, trg_size, &delta_size, max_size);
c323ac7d 1316 if (!delta_buf)
75c42d8c 1317 return 0;
f6c7081a 1318
9e2d57a0 1319 if (trg_entry->delta) {
848d732c
BD
1320 /* Prefer only shallower same-sized deltas. */
1321 if (delta_size == trg_entry->delta_size &&
5a235b5e 1322 src->depth + 1 >= trg->depth) {
848d732c
BD
1323 free(delta_buf);
1324 return 0;
1325 }
074b2eea 1326 }
9e2d57a0 1327
3c701839
NP
1328 /*
1329 * Handle memory allocation outside of the cache
1330 * accounting lock. Compiler will optimize the strangeness
1331 * away when THREADED_DELTA_SEARCH is not defined.
1332 */
8e0f7003 1333 free(trg_entry->delta_data);
3c701839 1334 cache_lock();
9e2d57a0
NP
1335 if (trg_entry->delta_data) {
1336 delta_cache_size -= trg_entry->delta_size;
9e2d57a0
NP
1337 trg_entry->delta_data = NULL;
1338 }
d250626c 1339 if (delta_cacheable(src_size, trg_size, delta_size)) {
b7a28f78 1340 delta_cache_size += delta_size;
3c701839
NP
1341 cache_unlock();
1342 trg_entry->delta_data = xrealloc(delta_buf, delta_size);
1343 } else {
1344 cache_unlock();
074b2eea 1345 free(delta_buf);
3c701839
NP
1346 }
1347
b7a28f78
NP
1348 trg_entry->delta = src_entry;
1349 trg_entry->delta_size = delta_size;
1350 trg->depth = src->depth + 1;
1351
f6c7081a 1352 return 1;
c323ac7d
LT
1353}
1354
898b14ce 1355static unsigned int check_delta_limit(struct object_entry *me, unsigned int n)
b2504a0d 1356{
898b14ce
NP
1357 struct object_entry *child = me->delta_child;
1358 unsigned int m = n;
1359 while (child) {
1360 unsigned int c = check_delta_limit(child, n + 1);
1361 if (m < c)
1362 m = c;
1363 child = child->delta_sibling;
1364 }
1365 return m;
b2504a0d
NP
1366}
1367
75ad235c 1368static unsigned long free_unpacked(struct unpacked *n)
a97773ce 1369{
ef0316fc 1370 unsigned long freed_mem = sizeof_delta_index(n->index);
a97773ce
BD
1371 free_delta_index(n->index);
1372 n->index = NULL;
1373 if (n->data) {
ef0316fc 1374 freed_mem += n->entry->size;
a97773ce
BD
1375 free(n->data);
1376 n->data = NULL;
a97773ce
BD
1377 }
1378 n->entry = NULL;
7d7baa5e 1379 n->depth = 0;
ef0316fc 1380 return freed_mem;
a97773ce
BD
1381}
1382
384b32c0 1383static void find_deltas(struct object_entry **list, unsigned *list_size,
e334977d 1384 int window, int depth, unsigned *processed)
c323ac7d 1385{
384b32c0 1386 uint32_t i, idx = 0, count = 0;
c323ac7d 1387 unsigned int array_size = window * sizeof(struct unpacked);
7cadf491 1388 struct unpacked *array;
ef0316fc 1389 unsigned long mem_usage = 0;
c323ac7d 1390
7cadf491 1391 array = xmalloc(array_size);
c323ac7d 1392 memset(array, 0, array_size);
21fcd1bd 1393
384b32c0 1394 for (;;) {
421b488a 1395 struct object_entry *entry;
c323ac7d 1396 struct unpacked *n = array + idx;
ef0316fc 1397 int j, max_depth, best_base = -1;
c323ac7d 1398
384b32c0
NP
1399 progress_lock();
1400 if (!*list_size) {
1401 progress_unlock();
1402 break;
1403 }
421b488a 1404 entry = *list++;
384b32c0
NP
1405 (*list_size)--;
1406 if (!entry->preferred_base) {
1407 (*processed)++;
1408 display_progress(progress_state, *processed);
1409 }
1410 progress_unlock();
1411
ef0316fc 1412 mem_usage -= free_unpacked(n);
c323ac7d 1413 n->entry = entry;
ab7cd7bb 1414
a97773ce 1415 while (window_memory_limit &&
ef0316fc 1416 mem_usage > window_memory_limit &&
a97773ce
BD
1417 count > 1) {
1418 uint32_t tail = (idx + window - count) % window;
75ad235c 1419 mem_usage -= free_unpacked(array + tail);
a97773ce
BD
1420 count--;
1421 }
1422
75d39853
NP
1423 /* We do not compute delta to *create* objects we are not
1424 * going to pack.
1425 */
1426 if (entry->preferred_base)
1427 goto next;
1428
898b14ce
NP
1429 /*
1430 * If the current object is at pack edge, take the depth the
1431 * objects that depend on the current object into account
1432 * otherwise they would become too deep.
1433 */
1434 max_depth = depth;
1435 if (entry->delta_child) {
1436 max_depth -= check_delta_limit(entry, 0);
1437 if (max_depth <= 0)
1438 goto next;
1439 }
1440
78817c15
LT
1441 j = window;
1442 while (--j > 0) {
77639870 1443 int ret;
7cadf491 1444 uint32_t other_idx = idx + j;
c323ac7d 1445 struct unpacked *m;
78817c15
LT
1446 if (other_idx >= window)
1447 other_idx -= window;
c323ac7d
LT
1448 m = array + other_idx;
1449 if (!m->entry)
1450 break;
ef0316fc 1451 ret = try_delta(n, m, max_depth, &mem_usage);
77639870 1452 if (ret < 0)
c323ac7d 1453 break;
77639870
JH
1454 else if (ret > 0)
1455 best_base = other_idx;
c323ac7d 1456 }
898b14ce 1457
ed4a9031
NP
1458 /*
1459 * If we decided to cache the delta data, then it is best
1460 * to compress it right away. First because we have to do
1461 * it anyway, and doing it here while we're threaded will
1462 * save a lot of time in the non threaded write phase,
1463 * as well as allow for caching more deltas within
1464 * the same cache size limit.
1465 * ...
1466 * But only if not writing to stdout, since in that case
1467 * the network is most likely throttling writes anyway,
1468 * and therefore it is best to go to the write phase ASAP
1469 * instead, as we can afford spending more time compressing
1470 * between writes at that moment.
1471 */
1472 if (entry->delta_data && !pack_to_stdout) {
1473 entry->z_delta_size = do_compress(&entry->delta_data,
1474 entry->delta_size);
1475 cache_lock();
1476 delta_cache_size -= entry->delta_size;
1477 delta_cache_size += entry->z_delta_size;
1478 cache_unlock();
1479 }
1480
70ca1a3f
JH
1481 /* if we made n a delta, and if n is already at max
1482 * depth, leaving it in the window is pointless. we
1483 * should evict it first.
70ca1a3f 1484 */
70baf5d4 1485 if (entry->delta && max_depth <= n->depth)
70ca1a3f 1486 continue;
ff45715c 1487
77639870
JH
1488 /*
1489 * Move the best delta base up in the window, after the
1490 * currently deltified object, to keep it longer. It will
1491 * be the first base object to be attempted next.
1492 */
1493 if (entry->delta) {
1494 struct unpacked swap = array[best_base];
1495 int dist = (window + idx - best_base) % window;
1496 int dst = best_base;
1497 while (dist--) {
1498 int src = (dst + 1) % window;
1499 array[dst] = array[src];
1500 dst = src;
1501 }
1502 array[dst] = swap;
1503 }
1504
898b14ce 1505 next:
521a4f4c 1506 idx++;
a97773ce
BD
1507 if (count + 1 < window)
1508 count++;
521a4f4c
LT
1509 if (idx >= window)
1510 idx = 0;
384b32c0 1511 }
adee7bdf 1512
f6c7081a 1513 for (i = 0; i < window; ++i) {
ff45715c 1514 free_delta_index(array[i].index);
adee7bdf 1515 free(array[i].data);
f6c7081a 1516 }
adee7bdf 1517 free(array);
c323ac7d
LT
1518}
1519
8ecce684
NP
1520#ifdef THREADED_DELTA_SEARCH
1521
50f22ada
JS
1522/*
1523 * The main thread waits on the condition that (at least) one of the workers
1524 * has stopped working (which is indicated in the .working member of
1525 * struct thread_params).
1526 * When a work thread has completed its work, it sets .working to 0 and
1527 * signals the main thread and waits on the condition that .data_ready
1528 * becomes 1.
1529 */
1530
8ecce684
NP
1531struct thread_params {
1532 pthread_t thread;
1533 struct object_entry **list;
1534 unsigned list_size;
384b32c0 1535 unsigned remaining;
8ecce684
NP
1536 int window;
1537 int depth;
50f22ada
JS
1538 int working;
1539 int data_ready;
1540 pthread_mutex_t mutex;
1541 pthread_cond_t cond;
8ecce684
NP
1542 unsigned *processed;
1543};
1544
50f22ada 1545static pthread_cond_t progress_cond = PTHREAD_COND_INITIALIZER;
c2a33679 1546
8ecce684
NP
1547static void *threaded_find_deltas(void *arg)
1548{
c2a33679
NP
1549 struct thread_params *me = arg;
1550
50f22ada 1551 while (me->remaining) {
384b32c0 1552 find_deltas(me->list, &me->remaining,
c2a33679 1553 me->window, me->depth, me->processed);
50f22ada
JS
1554
1555 progress_lock();
1556 me->working = 0;
1557 pthread_cond_signal(&progress_cond);
1558 progress_unlock();
1559
1560 /*
1561 * We must not set ->data_ready before we wait on the
1562 * condition because the main thread may have set it to 1
1563 * before we get here. In order to be sure that new
1564 * work is available if we see 1 in ->data_ready, it
1565 * was initialized to 0 before this thread was spawned
1566 * and we reset it to 0 right away.
1567 */
1568 pthread_mutex_lock(&me->mutex);
1569 while (!me->data_ready)
1570 pthread_cond_wait(&me->cond, &me->mutex);
1571 me->data_ready = 0;
1572 pthread_mutex_unlock(&me->mutex);
c2a33679 1573 }
50f22ada
JS
1574 /* leave ->working 1 so that this doesn't get more work assigned */
1575 return NULL;
8ecce684
NP
1576}
1577
8ecce684
NP
1578static void ll_find_deltas(struct object_entry **list, unsigned list_size,
1579 int window, int depth, unsigned *processed)
1580{
50f22ada 1581 struct thread_params p[delta_search_threads];
384b32c0 1582 int i, ret, active_threads = 0;
c2a33679 1583
367f4a43 1584 if (delta_search_threads <= 1) {
384b32c0 1585 find_deltas(list, &list_size, window, depth, processed);
367f4a43
NP
1586 return;
1587 }
1588
50f22ada 1589 /* Partition the work amongst work threads. */
367f4a43 1590 for (i = 0; i < delta_search_threads; i++) {
50f22ada
JS
1591 unsigned sub_size = list_size / (delta_search_threads - i);
1592
8ecce684
NP
1593 p[i].window = window;
1594 p[i].depth = depth;
1595 p[i].processed = processed;
50f22ada
JS
1596 p[i].working = 1;
1597 p[i].data_ready = 0;
c2a33679 1598
59921b4b 1599 /* try to split chunks on "path" boundaries */
6fc74703
NP
1600 while (sub_size && sub_size < list_size &&
1601 list[sub_size]->hash &&
384b32c0
NP
1602 list[sub_size]->hash == list[sub_size-1]->hash)
1603 sub_size++;
1604
50f22ada
JS
1605 p[i].list = list;
1606 p[i].list_size = sub_size;
1607 p[i].remaining = sub_size;
59921b4b 1608
384b32c0
NP
1609 list += sub_size;
1610 list_size -= sub_size;
1611 }
1612
50f22ada
JS
1613 /* Start work threads. */
1614 for (i = 0; i < delta_search_threads; i++) {
1615 if (!p[i].list_size)
1616 continue;
68e6a4f8
JS
1617 pthread_mutex_init(&p[i].mutex, NULL);
1618 pthread_cond_init(&p[i].cond, NULL);
50f22ada
JS
1619 ret = pthread_create(&p[i].thread, NULL,
1620 threaded_find_deltas, &p[i]);
1621 if (ret)
1622 die("unable to create thread: %s", strerror(ret));
1623 active_threads++;
1624 }
1625
384b32c0
NP
1626 /*
1627 * Now let's wait for work completion. Each time a thread is done
1628 * with its work, we steal half of the remaining work from the
1629 * thread with the largest number of unprocessed objects and give
1630 * it to that newly idle thread. This ensure good load balancing
1631 * until the remaining object list segments are simply too short
1632 * to be worth splitting anymore.
1633 */
50f22ada
JS
1634 while (active_threads) {
1635 struct thread_params *target = NULL;
384b32c0
NP
1636 struct thread_params *victim = NULL;
1637 unsigned sub_size = 0;
384b32c0
NP
1638
1639 progress_lock();
50f22ada
JS
1640 for (;;) {
1641 for (i = 0; !target && i < delta_search_threads; i++)
1642 if (!p[i].working)
1643 target = &p[i];
1644 if (target)
1645 break;
1646 pthread_cond_wait(&progress_cond, &progress_mutex);
1647 }
1648
384b32c0
NP
1649 for (i = 0; i < delta_search_threads; i++)
1650 if (p[i].remaining > 2*window &&
1651 (!victim || victim->remaining < p[i].remaining))
1652 victim = &p[i];
1653 if (victim) {
1654 sub_size = victim->remaining / 2;
1655 list = victim->list + victim->list_size - sub_size;
1656 while (sub_size && list[0]->hash &&
1657 list[0]->hash == list[-1]->hash) {
1658 list++;
1659 sub_size--;
1660 }
eb9688ff
NP
1661 if (!sub_size) {
1662 /*
1663 * It is possible for some "paths" to have
1664 * so many objects that no hash boundary
1665 * might be found. Let's just steal the
1666 * exact half in that case.
1667 */
1668 sub_size = victim->remaining / 2;
1669 list -= sub_size;
1670 }
384b32c0
NP
1671 target->list = list;
1672 victim->list_size -= sub_size;
1673 victim->remaining -= sub_size;
1674 }
384b32c0
NP
1675 target->list_size = sub_size;
1676 target->remaining = sub_size;
50f22ada
JS
1677 target->working = 1;
1678 progress_unlock();
1679
1680 pthread_mutex_lock(&target->mutex);
1681 target->data_ready = 1;
1682 pthread_cond_signal(&target->cond);
1683 pthread_mutex_unlock(&target->mutex);
c2a33679 1684
384b32c0 1685 if (!sub_size) {
b81d9af7 1686 pthread_join(target->thread, NULL);
50f22ada
JS
1687 pthread_cond_destroy(&target->cond);
1688 pthread_mutex_destroy(&target->mutex);
384b32c0 1689 active_threads--;
c2a33679 1690 }
50f22ada 1691 }
8ecce684
NP
1692}
1693
1694#else
384b32c0 1695#define ll_find_deltas(l, s, w, d, p) find_deltas(l, &s, w, d, p)
8ecce684
NP
1696#endif
1697
f0a24aa5
SP
1698static int add_ref_tag(const char *path, const unsigned char *sha1, int flag, void *cb_data)
1699{
1700 unsigned char peeled[20];
1701
1702 if (!prefixcmp(path, "refs/tags/") && /* is a tag? */
1703 !peel_ref(path, peeled) && /* peelable? */
1704 !is_null_sha1(peeled) && /* annotated tag? */
1705 locate_object_entry(peeled)) /* object packed? */
1706 add_object_entry(sha1, OBJ_TAG, NULL, 0);
1707 return 0;
1708}
1709
f3123c4a
JH
1710static void prepare_pack(int window, int depth)
1711{
9668cf59 1712 struct object_entry **delta_list;
6e1c2344
RJ
1713 uint32_t i, nr_deltas;
1714 unsigned n;
9668cf59 1715
3f9ac8d2 1716 get_object_details();
9668cf59 1717
75d39853 1718 if (!nr_objects || !window || !depth)
9668cf59
NP
1719 return;
1720
1721 delta_list = xmalloc(nr_objects * sizeof(*delta_list));
75d39853
NP
1722 nr_deltas = n = 0;
1723
1724 for (i = 0; i < nr_objects; i++) {
1725 struct object_entry *entry = objects + i;
1726
1727 if (entry->delta)
1728 /* This happens if we decided to reuse existing
a7de7130 1729 * delta from a pack. "reuse_delta &&" is implied.
75d39853
NP
1730 */
1731 continue;
1732
1733 if (entry->size < 50)
1734 continue;
1735
1736 if (entry->no_try_delta)
1737 continue;
1738
6d6f9cdd 1739 if (!entry->preferred_base) {
75d39853 1740 nr_deltas++;
6d6f9cdd
SP
1741 if (entry->type < 0)
1742 die("unable to get type of object %s",
1743 sha1_to_hex(entry->idx.sha1));
1744 }
75d39853
NP
1745
1746 delta_list[n++] = entry;
1747 }
1748
2f8b8947 1749 if (nr_deltas && n > 1) {
e334977d
NP
1750 unsigned nr_done = 0;
1751 if (progress)
dc6a0757
NP
1752 progress_state = start_progress("Compressing objects",
1753 nr_deltas);
75d39853 1754 qsort(delta_list, n, sizeof(*delta_list), type_size_sort);
8ecce684 1755 ll_find_deltas(delta_list, n, window+1, depth, &nr_done);
4d4fcc54 1756 stop_progress(&progress_state);
e334977d
NP
1757 if (nr_done != nr_deltas)
1758 die("inconsistency with delta count");
75d39853 1759 }
9668cf59 1760 free(delta_list);
f3123c4a
JH
1761}
1762
ef90d6d4 1763static int git_pack_config(const char *k, const char *v, void *cb)
4812a93a
JK
1764{
1765 if(!strcmp(k, "pack.window")) {
1766 window = git_config_int(k, v);
1767 return 0;
1768 }
a97773ce
BD
1769 if (!strcmp(k, "pack.windowmemory")) {
1770 window_memory_limit = git_config_ulong(k, v);
1771 return 0;
1772 }
1773 if (!strcmp(k, "pack.depth")) {
842aaf93
TT
1774 depth = git_config_int(k, v);
1775 return 0;
1776 }
960ccca6
DH
1777 if (!strcmp(k, "pack.compression")) {
1778 int level = git_config_int(k, v);
1779 if (level == -1)
1780 level = Z_DEFAULT_COMPRESSION;
1781 else if (level < 0 || level > Z_BEST_COMPRESSION)
1782 die("bad pack compression level %d", level);
1783 pack_compression_level = level;
1784 pack_compression_seen = 1;
1785 return 0;
1786 }
074b2eea
MK
1787 if (!strcmp(k, "pack.deltacachesize")) {
1788 max_delta_cache_size = git_config_int(k, v);
1789 return 0;
1790 }
e3dfddb3
MK
1791 if (!strcmp(k, "pack.deltacachelimit")) {
1792 cache_max_small_delta_size = git_config_int(k, v);
1793 return 0;
1794 }
693b86ff
NP
1795 if (!strcmp(k, "pack.threads")) {
1796 delta_search_threads = git_config_int(k, v);
833e3df1 1797 if (delta_search_threads < 0)
693b86ff
NP
1798 die("invalid number of threads specified (%d)",
1799 delta_search_threads);
1800#ifndef THREADED_DELTA_SEARCH
833e3df1 1801 if (delta_search_threads != 1)
693b86ff
NP
1802 warning("no threads support, ignoring %s", k);
1803#endif
1804 return 0;
1805 }
4d00bda2
NP
1806 if (!strcmp(k, "pack.indexversion")) {
1807 pack_idx_default_version = git_config_int(k, v);
1808 if (pack_idx_default_version > 2)
6e1c2344
RJ
1809 die("bad pack.indexversion=%"PRIu32,
1810 pack_idx_default_version);
4d00bda2
NP
1811 return 0;
1812 }
2b84b5a8
JS
1813 if (!strcmp(k, "pack.packsizelimit")) {
1814 pack_size_limit_cfg = git_config_ulong(k, v);
1815 return 0;
1816 }
ef90d6d4 1817 return git_default_config(k, v, cb);
4812a93a
JK
1818}
1819
b5d97e6b 1820static void read_object_list_from_stdin(void)
c323ac7d 1821{
b5d97e6b
JH
1822 char line[40 + 1 + PATH_MAX + 2];
1823 unsigned char sha1[20];
b2504a0d 1824
da93d12b 1825 for (;;) {
da93d12b
LT
1826 if (!fgets(line, sizeof(line), stdin)) {
1827 if (feof(stdin))
1828 break;
1829 if (!ferror(stdin))
1830 die("fgets returned NULL, not EOF, not error!");
687dd75c
JH
1831 if (errno != EINTR)
1832 die("fgets: %s", strerror(errno));
1833 clearerr(stdin);
1834 continue;
da93d12b 1835 }
7a979d99
JH
1836 if (line[0] == '-') {
1837 if (get_sha1_hex(line+1, sha1))
1838 die("expected edge sha1, got garbage:\n %s",
b5d97e6b 1839 line);
8d1d8f83 1840 add_preferred_base(sha1);
7a979d99 1841 continue;
21fcd1bd 1842 }
c323ac7d 1843 if (get_sha1_hex(line, sha1))
ef07618f 1844 die("expected sha1, got garbage:\n %s", line);
b5d97e6b 1845
bc32fed5
JH
1846 add_preferred_base_object(line+41);
1847 add_object_entry(sha1, 0, line+41, 0);
c323ac7d 1848 }
b5d97e6b
JH
1849}
1850
08cdfb13
JH
1851#define OBJECT_ADDED (1u<<20)
1852
b5d97e6b
JH
1853static void show_commit(struct commit *commit)
1854{
bc32fed5 1855 add_object_entry(commit->object.sha1, OBJ_COMMIT, NULL, 0);
08cdfb13 1856 commit->object.flags |= OBJECT_ADDED;
b5d97e6b
JH
1857}
1858
8d2dfc49 1859static void show_object(struct object *obj, const char *name)
b5d97e6b 1860{
8d2dfc49
LT
1861 add_preferred_base_object(name);
1862 add_object_entry(obj->sha1, obj->type, name, 0);
1863 obj->flags |= OBJECT_ADDED;
1864
1865 /*
1866 * We will have generated the hash from the name,
1867 * but not saved a pointer to it - we can free it
1868 */
1869 free((char *)name);
b5d97e6b
JH
1870}
1871
8d1d8f83
JH
1872static void show_edge(struct commit *commit)
1873{
1874 add_preferred_base(commit->object.sha1);
1875}
1876
08cdfb13
JH
1877struct in_pack_object {
1878 off_t offset;
1879 struct object *object;
1880};
1881
1882struct in_pack {
1883 int alloc;
1884 int nr;
1885 struct in_pack_object *array;
1886};
1887
1888static void mark_in_pack_object(struct object *object, struct packed_git *p, struct in_pack *in_pack)
1889{
1890 in_pack->array[in_pack->nr].offset = find_pack_entry_one(object->sha1, p);
1891 in_pack->array[in_pack->nr].object = object;
1892 in_pack->nr++;
1893}
1894
1895/*
1896 * Compare the objects in the offset order, in order to emulate the
f18d244a 1897 * "git rev-list --objects" output that produced the pack originally.
08cdfb13
JH
1898 */
1899static int ofscmp(const void *a_, const void *b_)
1900{
1901 struct in_pack_object *a = (struct in_pack_object *)a_;
1902 struct in_pack_object *b = (struct in_pack_object *)b_;
1903
1904 if (a->offset < b->offset)
1905 return -1;
1906 else if (a->offset > b->offset)
1907 return 1;
1908 else
1909 return hashcmp(a->object->sha1, b->object->sha1);
1910}
1911
1912static void add_objects_in_unpacked_packs(struct rev_info *revs)
1913{
1914 struct packed_git *p;
1915 struct in_pack in_pack;
1916 uint32_t i;
1917
1918 memset(&in_pack, 0, sizeof(in_pack));
1919
1920 for (p = packed_git; p; p = p->next) {
1921 const unsigned char *sha1;
1922 struct object *o;
1923
1924 for (i = 0; i < revs->num_ignore_packed; i++) {
1925 if (matches_pack_name(p, revs->ignore_packed[i]))
1926 break;
1927 }
1928 if (revs->num_ignore_packed <= i)
1929 continue;
1930 if (open_pack_index(p))
1931 die("cannot open pack index");
1932
1933 ALLOC_GROW(in_pack.array,
1934 in_pack.nr + p->num_objects,
1935 in_pack.alloc);
1936
1937 for (i = 0; i < p->num_objects; i++) {
1938 sha1 = nth_packed_object_sha1(p, i);
1939 o = lookup_unknown_object(sha1);
1940 if (!(o->flags & OBJECT_ADDED))
1941 mark_in_pack_object(o, p, &in_pack);
1942 o->flags |= OBJECT_ADDED;
1943 }
1944 }
1945
1946 if (in_pack.nr) {
1947 qsort(in_pack.array, in_pack.nr, sizeof(in_pack.array[0]),
1948 ofscmp);
1949 for (i = 0; i < in_pack.nr; i++) {
1950 struct object *o = in_pack.array[i].object;
1951 add_object_entry(o->sha1, o->type, "", 0);
1952 }
1953 }
1954 free(in_pack.array);
1955}
1956
ca11b212
NP
1957static void loosen_unused_packed_objects(struct rev_info *revs)
1958{
1959 struct packed_git *p;
1960 uint32_t i;
1961 const unsigned char *sha1;
1962
1963 for (p = packed_git; p; p = p->next) {
1964 for (i = 0; i < revs->num_ignore_packed; i++) {
1965 if (matches_pack_name(p, revs->ignore_packed[i]))
1966 break;
1967 }
1968 if (revs->num_ignore_packed <= i)
1969 continue;
1970
1971 if (open_pack_index(p))
1972 die("cannot open pack index");
1973
1974 for (i = 0; i < p->num_objects; i++) {
1975 sha1 = nth_packed_object_sha1(p, i);
1976 if (!locate_object_entry(sha1))
1977 if (force_object_loose(sha1, p->mtime))
1978 die("unable to force loose object");
1979 }
1980 }
1981}
1982
8d1d8f83 1983static void get_object_list(int ac, const char **av)
b5d97e6b
JH
1984{
1985 struct rev_info revs;
1986 char line[1000];
b5d97e6b
JH
1987 int flags = 0;
1988
b5d97e6b
JH
1989 init_revisions(&revs, NULL);
1990 save_commit_buffer = 0;
b5d97e6b
JH
1991 setup_revisions(ac, av, &revs, NULL);
1992
b5d97e6b
JH
1993 while (fgets(line, sizeof(line), stdin) != NULL) {
1994 int len = strlen(line);
872c930d 1995 if (len && line[len - 1] == '\n')
b5d97e6b
JH
1996 line[--len] = 0;
1997 if (!len)
1998 break;
1999 if (*line == '-') {
2000 if (!strcmp(line, "--not")) {
2001 flags ^= UNINTERESTING;
2002 continue;
2003 }
2004 die("not a rev '%s'", line);
2005 }
2006 if (handle_revision_arg(line, &revs, flags, 1))
2007 die("bad revision '%s'", line);
2008 }
2009
3d51e1b5
MK
2010 if (prepare_revision_walk(&revs))
2011 die("revision walk setup failed");
8d1d8f83 2012 mark_edges_uninteresting(revs.commits, &revs, show_edge);
b5d97e6b 2013 traverse_commit_list(&revs, show_commit, show_object);
08cdfb13
JH
2014
2015 if (keep_unreachable)
2016 add_objects_in_unpacked_packs(&revs);
ca11b212
NP
2017 if (unpack_unreachable)
2018 loosen_unused_packed_objects(&revs);
b5d97e6b
JH
2019}
2020
b6b32ccb
JH
2021static int adjust_perm(const char *path, mode_t mode)
2022{
2023 if (chmod(path, mode))
2024 return -1;
2025 return adjust_shared_perm(path);
2026}
2027
b5d97e6b
JH
2028int cmd_pack_objects(int argc, const char **argv, const char *prefix)
2029{
b5d97e6b 2030 int use_internal_rev_list = 0;
8d1d8f83 2031 int thin = 0;
7cadf491 2032 uint32_t i;
ffa84ffb
RD
2033 const char **rp_av;
2034 int rp_ac_alloc = 64;
8d1d8f83
JH
2035 int rp_ac;
2036
ffa84ffb
RD
2037 rp_av = xcalloc(rp_ac_alloc, sizeof(*rp_av));
2038
8d1d8f83
JH
2039 rp_av[0] = "pack-objects";
2040 rp_av[1] = "--objects"; /* --thin will make it --objects-edge */
2041 rp_ac = 2;
b5d97e6b 2042
ef90d6d4 2043 git_config(git_pack_config, NULL);
960ccca6
DH
2044 if (!pack_compression_seen && core_compression_seen)
2045 pack_compression_level = core_compression_level;
b5d97e6b
JH
2046
2047 progress = isatty(2);
2048 for (i = 1; i < argc; i++) {
2049 const char *arg = argv[i];
2050
2051 if (*arg != '-')
2052 break;
2053
2054 if (!strcmp("--non-empty", arg)) {
2055 non_empty = 1;
2056 continue;
2057 }
2058 if (!strcmp("--local", arg)) {
2059 local = 1;
2060 continue;
2061 }
b5d97e6b
JH
2062 if (!strcmp("--incremental", arg)) {
2063 incremental = 1;
2064 continue;
2065 }
e96fb9b8
BC
2066 if (!strcmp("--honor-pack-keep", arg)) {
2067 ignore_packed_keep = 1;
2068 continue;
2069 }
960ccca6
DH
2070 if (!prefixcmp(arg, "--compression=")) {
2071 char *end;
2072 int level = strtoul(arg+14, &end, 0);
2073 if (!arg[14] || *end)
2074 usage(pack_usage);
2075 if (level == -1)
2076 level = Z_DEFAULT_COMPRESSION;
2077 else if (level < 0 || level > Z_BEST_COMPRESSION)
2078 die("bad pack compression level %d", level);
2079 pack_compression_level = level;
2080 continue;
2081 }
6b94b1a0
DH
2082 if (!prefixcmp(arg, "--max-pack-size=")) {
2083 char *end;
2b84b5a8 2084 pack_size_limit_cfg = 0;
6b94b1a0
DH
2085 pack_size_limit = strtoul(arg+16, &end, 0) * 1024 * 1024;
2086 if (!arg[16] || *end)
2087 usage(pack_usage);
2088 continue;
2089 }
599065a3 2090 if (!prefixcmp(arg, "--window=")) {
b5d97e6b
JH
2091 char *end;
2092 window = strtoul(arg+9, &end, 0);
2093 if (!arg[9] || *end)
2094 usage(pack_usage);
2095 continue;
2096 }
a97773ce
BD
2097 if (!prefixcmp(arg, "--window-memory=")) {
2098 if (!git_parse_ulong(arg+16, &window_memory_limit))
2099 usage(pack_usage);
2100 continue;
2101 }
367f4a43
NP
2102 if (!prefixcmp(arg, "--threads=")) {
2103 char *end;
2104 delta_search_threads = strtoul(arg+10, &end, 0);
833e3df1 2105 if (!arg[10] || *end || delta_search_threads < 0)
367f4a43
NP
2106 usage(pack_usage);
2107#ifndef THREADED_DELTA_SEARCH
833e3df1 2108 if (delta_search_threads != 1)
367f4a43
NP
2109 warning("no threads support, "
2110 "ignoring %s", arg);
2111#endif
2112 continue;
2113 }
599065a3 2114 if (!prefixcmp(arg, "--depth=")) {
b5d97e6b
JH
2115 char *end;
2116 depth = strtoul(arg+8, &end, 0);
2117 if (!arg[8] || *end)
2118 usage(pack_usage);
2119 continue;
2120 }
2121 if (!strcmp("--progress", arg)) {
2122 progress = 1;
2123 continue;
2124 }
231f240b
NP
2125 if (!strcmp("--all-progress", arg)) {
2126 progress = 2;
2127 continue;
2128 }
b5d97e6b
JH
2129 if (!strcmp("-q", arg)) {
2130 progress = 0;
2131 continue;
2132 }
2133 if (!strcmp("--no-reuse-delta", arg)) {
a7de7130 2134 reuse_delta = 0;
b5d97e6b
JH
2135 continue;
2136 }
fa736f72 2137 if (!strcmp("--no-reuse-object", arg)) {
a7de7130 2138 reuse_object = reuse_delta = 0;
fa736f72
NP
2139 continue;
2140 }
be6b1914 2141 if (!strcmp("--delta-base-offset", arg)) {
780e6e73 2142 allow_ofs_delta = 1;
be6b1914
NP
2143 continue;
2144 }
b5d97e6b
JH
2145 if (!strcmp("--stdout", arg)) {
2146 pack_to_stdout = 1;
2147 continue;
2148 }
2149 if (!strcmp("--revs", arg)) {
2150 use_internal_rev_list = 1;
2151 continue;
2152 }
08cdfb13
JH
2153 if (!strcmp("--keep-unreachable", arg)) {
2154 keep_unreachable = 1;
2155 continue;
2156 }
ca11b212
NP
2157 if (!strcmp("--unpack-unreachable", arg)) {
2158 unpack_unreachable = 1;
2159 continue;
2160 }
f0a24aa5
SP
2161 if (!strcmp("--include-tag", arg)) {
2162 include_tag = 1;
2163 continue;
2164 }
8d1d8f83 2165 if (!strcmp("--unpacked", arg) ||
599065a3 2166 !prefixcmp(arg, "--unpacked=") ||
63049292 2167 !strcmp("--reflog", arg) ||
8d1d8f83
JH
2168 !strcmp("--all", arg)) {
2169 use_internal_rev_list = 1;
ffa84ffb
RD
2170 if (rp_ac >= rp_ac_alloc - 1) {
2171 rp_ac_alloc = alloc_nr(rp_ac_alloc);
2172 rp_av = xrealloc(rp_av,
2173 rp_ac_alloc * sizeof(*rp_av));
2174 }
8d1d8f83 2175 rp_av[rp_ac++] = arg;
b5d97e6b
JH
2176 continue;
2177 }
8d1d8f83
JH
2178 if (!strcmp("--thin", arg)) {
2179 use_internal_rev_list = 1;
2180 thin = 1;
2181 rp_av[1] = "--objects-edge";
b5d97e6b 2182 continue;
4ba7d711
NP
2183 }
2184 if (!prefixcmp(arg, "--index-version=")) {
2185 char *c;
aa7e44bf
GB
2186 pack_idx_default_version = strtoul(arg + 16, &c, 10);
2187 if (pack_idx_default_version > 2)
4ba7d711
NP
2188 die("bad %s", arg);
2189 if (*c == ',')
aa7e44bf
GB
2190 pack_idx_off32_limit = strtoul(c+1, &c, 0);
2191 if (*c || pack_idx_off32_limit & 0x80000000)
4ba7d711
NP
2192 die("bad %s", arg);
2193 continue;
b5d97e6b
JH
2194 }
2195 usage(pack_usage);
2196 }
2197
2198 /* Traditionally "pack-objects [options] base extra" failed;
2199 * we would however want to take refs parameter that would
2200 * have been given to upstream rev-list ourselves, which means
2201 * we somehow want to say what the base name is. So the
2202 * syntax would be:
2203 *
2204 * pack-objects [options] base <refs...>
2205 *
2206 * in other words, we would treat the first non-option as the
2207 * base_name and send everything else to the internal revision
2208 * walker.
2209 */
2210
2211 if (!pack_to_stdout)
2212 base_name = argv[i++];
2213
2214 if (pack_to_stdout != !base_name)
2215 usage(pack_usage);
2216
2b84b5a8
JS
2217 if (!pack_to_stdout && !pack_size_limit)
2218 pack_size_limit = pack_size_limit_cfg;
2219
01c12a23
DH
2220 if (pack_to_stdout && pack_size_limit)
2221 die("--max-pack-size cannot be used to build a pack for transfer.");
2222
8d1d8f83
JH
2223 if (!pack_to_stdout && thin)
2224 die("--thin cannot be used to build an indexable pack.");
b5d97e6b 2225
ca11b212
NP
2226 if (keep_unreachable && unpack_unreachable)
2227 die("--keep-unreachable and --unpack-unreachable are incompatible.");
2228
833e3df1
AE
2229#ifdef THREADED_DELTA_SEARCH
2230 if (!delta_search_threads) /* --threads=0 means autodetect */
2231 delta_search_threads = online_cpus();
2232#endif
2233
b5d97e6b
JH
2234 prepare_packed_git();
2235
13aaf148 2236 if (progress)
dc6a0757 2237 progress_state = start_progress("Counting objects", 0);
b5d97e6b
JH
2238 if (!use_internal_rev_list)
2239 read_object_list_from_stdin();
8d1d8f83
JH
2240 else {
2241 rp_av[rp_ac] = NULL;
2242 get_object_list(rp_ac, rp_av);
2243 }
f0a24aa5
SP
2244 if (include_tag && nr_result)
2245 for_each_ref(add_ref_tag, NULL);
4d4fcc54 2246 stop_progress(&progress_state);
96a02f8f 2247
f0b0af1b 2248 if (non_empty && !nr_result)
1c4a2912 2249 return 0;
f7ae6a93
NP
2250 if (nr_result)
2251 prepare_pack(window, depth);
d01fb92f 2252 write_pack_file();
ab7cd7bb 2253 if (progress)
6e1c2344
RJ
2254 fprintf(stderr, "Total %"PRIu32" (delta %"PRIu32"),"
2255 " reused %"PRIu32" (delta %"PRIu32")\n",
67c08ce1 2256 written, written_delta, reused, reused_delta);
c323ac7d
LT
2257 return 0;
2258}