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