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