]>
Commit | Line | Data |
---|---|---|
2ad9d4cb | 1 | #include "builtin.h" |
b2141fc1 | 2 | #include "config.h" |
9cf6d335 SV |
3 | #include "delta.h" |
4 | #include "pack.h" | |
5 | #include "csum-file.h" | |
8e440259 PE |
6 | #include "blob.h" |
7 | #include "commit.h" | |
8 | #include "tag.h" | |
9 | #include "tree.h" | |
96a02f8f | 10 | #include "progress.h" |
0153be05 | 11 | #include "fsck.h" |
2fb3f6db | 12 | #include "exec_cmd.h" |
4614043c | 13 | #include "streaming.h" |
b8a2486f | 14 | #include "thread-utils.h" |
4f39cd82 | 15 | #include "packfile.h" |
9cf6d335 SV |
16 | |
17 | static const char index_pack_usage[] = | |
e337a04d | 18 | "git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])"; |
9cf6d335 | 19 | |
9cba13ca | 20 | struct object_entry { |
aa7e44bf | 21 | struct pack_idx_entry idx; |
2d477051 | 22 | unsigned long size; |
41730576 NTND |
23 | unsigned char hdr_size; |
24 | signed char type; | |
25 | signed char real_type; | |
9cf6d335 SV |
26 | }; |
27 | ||
41730576 | 28 | struct object_stat { |
38a45561 JH |
29 | unsigned delta_depth; |
30 | int base_object_no; | |
53dda6ff NP |
31 | }; |
32 | ||
f41aebd4 | 33 | struct base_data { |
4a438cab SP |
34 | struct base_data *base; |
35 | struct base_data *child; | |
03993e13 | 36 | struct object_entry *obj; |
f41aebd4 SP |
37 | void *data; |
38 | unsigned long size; | |
2baad220 NTND |
39 | int ref_first, ref_last; |
40 | int ofs_first, ofs_last; | |
f41aebd4 SP |
41 | }; |
42 | ||
b8a2486f NTND |
43 | struct thread_local { |
44 | #ifndef NO_PTHREADS | |
45 | pthread_t thread; | |
46 | #endif | |
47 | struct base_data *base_cache; | |
48 | size_t base_cache_used; | |
39539495 | 49 | int pack_fd; |
b8a2486f NTND |
50 | }; |
51 | ||
0153be05 MK |
52 | #define FLAG_LINK (1u<<20) |
53 | #define FLAG_CHECKED (1u<<21) | |
54 | ||
c6458e60 NTND |
55 | struct ofs_delta_entry { |
56 | off_t offset; | |
57 | int obj_no; | |
58 | }; | |
59 | ||
60 | struct ref_delta_entry { | |
61 | unsigned char sha1[20]; | |
636171cb | 62 | int obj_no; |
9cf6d335 SV |
63 | }; |
64 | ||
9cf6d335 | 65 | static struct object_entry *objects; |
41730576 | 66 | static struct object_stat *obj_stat; |
c6458e60 NTND |
67 | static struct ofs_delta_entry *ofs_deltas; |
68 | static struct ref_delta_entry *ref_deltas; | |
b8a2486f | 69 | static struct thread_local nothread_data; |
9cf6d335 | 70 | static int nr_objects; |
c6458e60 NTND |
71 | static int nr_ofs_deltas; |
72 | static int nr_ref_deltas; | |
73 | static int ref_deltas_alloc; | |
636171cb | 74 | static int nr_resolved_deltas; |
b8a2486f | 75 | static int nr_threads; |
9cf6d335 | 76 | |
e42797f5 | 77 | static int from_stdin; |
0153be05 | 78 | static int strict; |
c6807a40 | 79 | static int do_fsck_object; |
22410549 | 80 | static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT; |
3c9af366 | 81 | static int verbose; |
e376f17f | 82 | static int show_resolving_progress; |
3aba2fdd | 83 | static int show_stat; |
c6807a40 | 84 | static int check_self_contained_and_connected; |
3c9af366 | 85 | |
dc6a0757 | 86 | static struct progress *progress; |
e42797f5 | 87 | |
2d477051 NP |
88 | /* We always read in 4kB chunks. */ |
89 | static unsigned char input_buffer[4096]; | |
d7dd0223 NP |
90 | static unsigned int input_offset, input_len; |
91 | static off_t consumed_bytes; | |
411481be | 92 | static off_t max_input_size; |
d1a0ed18 | 93 | static unsigned deepest_delta; |
454253f0 | 94 | static git_hash_ctx input_ctx; |
ee5743ce | 95 | static uint32_t input_crc32; |
39539495 NTND |
96 | static int input_fd, output_fd; |
97 | static const char *curr_pack; | |
2d477051 | 98 | |
b8a2486f NTND |
99 | #ifndef NO_PTHREADS |
100 | ||
101 | static struct thread_local *thread_data; | |
102 | static int nr_dispatched; | |
103 | static int threads_active; | |
104 | ||
105 | static pthread_mutex_t read_mutex; | |
106 | #define read_lock() lock_mutex(&read_mutex) | |
107 | #define read_unlock() unlock_mutex(&read_mutex) | |
108 | ||
109 | static pthread_mutex_t counter_mutex; | |
110 | #define counter_lock() lock_mutex(&counter_mutex) | |
111 | #define counter_unlock() unlock_mutex(&counter_mutex) | |
112 | ||
113 | static pthread_mutex_t work_mutex; | |
114 | #define work_lock() lock_mutex(&work_mutex) | |
115 | #define work_unlock() unlock_mutex(&work_mutex) | |
116 | ||
3aba2fdd NTND |
117 | static pthread_mutex_t deepest_delta_mutex; |
118 | #define deepest_delta_lock() lock_mutex(&deepest_delta_mutex) | |
119 | #define deepest_delta_unlock() unlock_mutex(&deepest_delta_mutex) | |
120 | ||
ab791dd1 JK |
121 | static pthread_mutex_t type_cas_mutex; |
122 | #define type_cas_lock() lock_mutex(&type_cas_mutex) | |
123 | #define type_cas_unlock() unlock_mutex(&type_cas_mutex) | |
124 | ||
b8a2486f NTND |
125 | static pthread_key_t key; |
126 | ||
127 | static inline void lock_mutex(pthread_mutex_t *mutex) | |
128 | { | |
129 | if (threads_active) | |
130 | pthread_mutex_lock(mutex); | |
131 | } | |
132 | ||
133 | static inline void unlock_mutex(pthread_mutex_t *mutex) | |
134 | { | |
135 | if (threads_active) | |
136 | pthread_mutex_unlock(mutex); | |
137 | } | |
138 | ||
139 | /* | |
140 | * Mutex and conditional variable can't be statically-initialized on Windows. | |
141 | */ | |
142 | static void init_thread(void) | |
143 | { | |
39539495 | 144 | int i; |
b8a2486f NTND |
145 | init_recursive_mutex(&read_mutex); |
146 | pthread_mutex_init(&counter_mutex, NULL); | |
147 | pthread_mutex_init(&work_mutex, NULL); | |
ab791dd1 | 148 | pthread_mutex_init(&type_cas_mutex, NULL); |
3aba2fdd NTND |
149 | if (show_stat) |
150 | pthread_mutex_init(&deepest_delta_mutex, NULL); | |
b8a2486f NTND |
151 | pthread_key_create(&key, NULL); |
152 | thread_data = xcalloc(nr_threads, sizeof(*thread_data)); | |
39539495 NTND |
153 | for (i = 0; i < nr_threads; i++) { |
154 | thread_data[i].pack_fd = open(curr_pack, O_RDONLY); | |
155 | if (thread_data[i].pack_fd == -1) | |
156 | die_errno(_("unable to open %s"), curr_pack); | |
157 | } | |
158 | ||
b8a2486f NTND |
159 | threads_active = 1; |
160 | } | |
161 | ||
162 | static void cleanup_thread(void) | |
163 | { | |
39539495 | 164 | int i; |
b8a2486f NTND |
165 | if (!threads_active) |
166 | return; | |
167 | threads_active = 0; | |
168 | pthread_mutex_destroy(&read_mutex); | |
169 | pthread_mutex_destroy(&counter_mutex); | |
170 | pthread_mutex_destroy(&work_mutex); | |
ab791dd1 | 171 | pthread_mutex_destroy(&type_cas_mutex); |
3aba2fdd NTND |
172 | if (show_stat) |
173 | pthread_mutex_destroy(&deepest_delta_mutex); | |
39539495 NTND |
174 | for (i = 0; i < nr_threads; i++) |
175 | close(thread_data[i].pack_fd); | |
b8a2486f NTND |
176 | pthread_key_delete(key); |
177 | free(thread_data); | |
178 | } | |
179 | ||
180 | #else | |
181 | ||
182 | #define read_lock() | |
183 | #define read_unlock() | |
184 | ||
185 | #define counter_lock() | |
186 | #define counter_unlock() | |
187 | ||
188 | #define work_lock() | |
189 | #define work_unlock() | |
190 | ||
3aba2fdd NTND |
191 | #define deepest_delta_lock() |
192 | #define deepest_delta_unlock() | |
193 | ||
e0e21283 EB |
194 | #define type_cas_lock() |
195 | #define type_cas_unlock() | |
196 | ||
b8a2486f NTND |
197 | #endif |
198 | ||
199 | ||
22410549 | 200 | static int mark_link(struct object *obj, int type, void *data, struct fsck_options *options) |
0153be05 MK |
201 | { |
202 | if (!obj) | |
203 | return -1; | |
204 | ||
205 | if (type != OBJ_ANY && obj->type != type) | |
f2fd0760 | 206 | die(_("object type mismatch at %s"), oid_to_hex(&obj->oid)); |
0153be05 MK |
207 | |
208 | obj->flags |= FLAG_LINK; | |
209 | return 0; | |
210 | } | |
211 | ||
212 | /* The content of each linked object must have been checked | |
213 | or it must be already present in the object database */ | |
c6807a40 | 214 | static unsigned check_object(struct object *obj) |
0153be05 MK |
215 | { |
216 | if (!obj) | |
c6807a40 | 217 | return 0; |
0153be05 MK |
218 | |
219 | if (!(obj->flags & FLAG_LINK)) | |
c6807a40 | 220 | return 0; |
0153be05 MK |
221 | |
222 | if (!(obj->flags & FLAG_CHECKED)) { | |
223 | unsigned long size; | |
ed1c9977 | 224 | int type = sha1_object_info(obj->oid.hash, &size); |
77583e77 JK |
225 | if (type <= 0) |
226 | die(_("did not receive expected object %s"), | |
f2fd0760 | 227 | oid_to_hex(&obj->oid)); |
77583e77 JK |
228 | if (type != obj->type) |
229 | die(_("object %s: expected type %s, found %s"), | |
f2fd0760 | 230 | oid_to_hex(&obj->oid), |
77583e77 | 231 | typename(obj->type), typename(type)); |
0153be05 | 232 | obj->flags |= FLAG_CHECKED; |
c6807a40 | 233 | return 1; |
0153be05 | 234 | } |
c6807a40 NTND |
235 | |
236 | return 0; | |
0153be05 MK |
237 | } |
238 | ||
c6807a40 | 239 | static unsigned check_objects(void) |
0153be05 | 240 | { |
c6807a40 | 241 | unsigned i, max, foreign_nr = 0; |
0153be05 MK |
242 | |
243 | max = get_max_object_index(); | |
244 | for (i = 0; i < max; i++) | |
c6807a40 NTND |
245 | foreign_nr += check_object(get_indexed_object(i)); |
246 | return foreign_nr; | |
0153be05 MK |
247 | } |
248 | ||
249 | ||
636171cb | 250 | /* Discard current buffer used content. */ |
a6e8a767 | 251 | static void flush(void) |
636171cb NP |
252 | { |
253 | if (input_offset) { | |
254 | if (output_fd >= 0) | |
255 | write_or_die(output_fd, input_buffer, input_offset); | |
454253f0 | 256 | the_hash_algo->update_fn(&input_ctx, input_buffer, input_offset); |
554a2636 | 257 | memmove(input_buffer, input_buffer + input_offset, input_len); |
636171cb NP |
258 | input_offset = 0; |
259 | } | |
260 | } | |
261 | ||
2d477051 NP |
262 | /* |
263 | * Make sure at least "min" bytes are available in the buffer, and | |
264 | * return the pointer to the buffer. | |
265 | */ | |
b89c4e93 | 266 | static void *fill(int min) |
9cf6d335 | 267 | { |
2d477051 NP |
268 | if (min <= input_len) |
269 | return input_buffer + input_offset; | |
270 | if (min > sizeof(input_buffer)) | |
c2b97ecf NTND |
271 | die(Q_("cannot fill %d byte", |
272 | "cannot fill %d bytes", | |
273 | min), | |
274 | min); | |
636171cb | 275 | flush(); |
2d477051 | 276 | do { |
8a912bcb | 277 | ssize_t ret = xread(input_fd, input_buffer + input_len, |
2d477051 NP |
278 | sizeof(input_buffer) - input_len); |
279 | if (ret <= 0) { | |
280 | if (!ret) | |
c2b97ecf NTND |
281 | die(_("early EOF")); |
282 | die_errno(_("read error on input")); | |
2d477051 NP |
283 | } |
284 | input_len += ret; | |
218558af NP |
285 | if (from_stdin) |
286 | display_throughput(progress, consumed_bytes + input_len); | |
2d477051 NP |
287 | } while (input_len < min); |
288 | return input_buffer; | |
289 | } | |
290 | ||
291 | static void use(int bytes) | |
292 | { | |
293 | if (bytes > input_len) | |
c2b97ecf | 294 | die(_("used more bytes than were available")); |
ee5743ce | 295 | input_crc32 = crc32(input_crc32, input_buffer + input_offset, bytes); |
2d477051 NP |
296 | input_len -= bytes; |
297 | input_offset += bytes; | |
d7dd0223 NP |
298 | |
299 | /* make sure off_t is sufficiently large not to wrap */ | |
c03c8315 | 300 | if (signed_add_overflows(consumed_bytes, bytes)) |
c2b97ecf | 301 | die(_("pack too large for current definition of off_t")); |
2d477051 | 302 | consumed_bytes += bytes; |
411481be JK |
303 | if (max_input_size && consumed_bytes > max_input_size) |
304 | die(_("pack exceeds maximum allowed size")); | |
2d477051 | 305 | } |
9cf6d335 | 306 | |
3bb72562 | 307 | static const char *open_pack_file(const char *pack_name) |
2d477051 | 308 | { |
e42797f5 NP |
309 | if (from_stdin) { |
310 | input_fd = 0; | |
311 | if (!pack_name) { | |
594fa999 JK |
312 | struct strbuf tmp_file = STRBUF_INIT; |
313 | output_fd = odb_mkstemp(&tmp_file, | |
6e180cdc | 314 | "pack/tmp_pack_XXXXXX"); |
594fa999 | 315 | pack_name = strbuf_detach(&tmp_file, NULL); |
892e723a | 316 | } else { |
e42797f5 | 317 | output_fd = open(pack_name, O_CREAT|O_EXCL|O_RDWR, 0600); |
892e723a JK |
318 | if (output_fd < 0) |
319 | die_errno(_("unable to create '%s'"), pack_name); | |
320 | } | |
39539495 | 321 | nothread_data.pack_fd = output_fd; |
e42797f5 NP |
322 | } else { |
323 | input_fd = open(pack_name, O_RDONLY); | |
324 | if (input_fd < 0) | |
c2b97ecf | 325 | die_errno(_("cannot open packfile '%s'"), pack_name); |
e42797f5 | 326 | output_fd = -1; |
39539495 | 327 | nothread_data.pack_fd = input_fd; |
e42797f5 | 328 | } |
454253f0 | 329 | the_hash_algo->init_fn(&input_ctx); |
e42797f5 | 330 | return pack_name; |
9cf6d335 SV |
331 | } |
332 | ||
333 | static void parse_pack_header(void) | |
334 | { | |
2d477051 | 335 | struct pack_header *hdr = fill(sizeof(struct pack_header)); |
9cf6d335 SV |
336 | |
337 | /* Header consistency check */ | |
9cf6d335 | 338 | if (hdr->hdr_signature != htonl(PACK_SIGNATURE)) |
c2b97ecf | 339 | die(_("pack signature mismatch")); |
d60fc1c8 | 340 | if (!pack_version_ok(hdr->hdr_version)) |
f350df42 | 341 | die(_("pack version %"PRIu32" unsupported"), |
6e1c2344 | 342 | ntohl(hdr->hdr_version)); |
9cf6d335 SV |
343 | |
344 | nr_objects = ntohl(hdr->hdr_entries); | |
2d477051 | 345 | use(sizeof(struct pack_header)); |
9cf6d335 SV |
346 | } |
347 | ||
fd3e6747 | 348 | static NORETURN void bad_object(off_t offset, const char *format, |
a4f3131c | 349 | ...) __attribute__((format (printf, 2, 3))); |
9cf6d335 | 350 | |
fd3e6747 | 351 | static NORETURN void bad_object(off_t offset, const char *format, ...) |
9cf6d335 SV |
352 | { |
353 | va_list params; | |
354 | char buf[1024]; | |
355 | ||
356 | va_start(params, format); | |
357 | vsnprintf(buf, sizeof(buf), format, params); | |
358 | va_end(params); | |
fd3e6747 NTND |
359 | die(_("pack has bad object at offset %"PRIuMAX": %s"), |
360 | (uintmax_t)offset, buf); | |
9cf6d335 SV |
361 | } |
362 | ||
b8a2486f NTND |
363 | static inline struct thread_local *get_thread_data(void) |
364 | { | |
365 | #ifndef NO_PTHREADS | |
366 | if (threads_active) | |
367 | return pthread_getspecific(key); | |
368 | assert(!threads_active && | |
369 | "This should only be reached when all threads are gone"); | |
370 | #endif | |
371 | return ¬hread_data; | |
372 | } | |
373 | ||
374 | #ifndef NO_PTHREADS | |
375 | static void set_thread_data(struct thread_local *data) | |
376 | { | |
377 | if (threads_active) | |
378 | pthread_setspecific(key, data); | |
379 | } | |
380 | #endif | |
381 | ||
2baad220 NTND |
382 | static struct base_data *alloc_base_data(void) |
383 | { | |
51a60f5b | 384 | struct base_data *base = xcalloc(1, sizeof(struct base_data)); |
2baad220 NTND |
385 | base->ref_last = -1; |
386 | base->ofs_last = -1; | |
387 | return base; | |
388 | } | |
389 | ||
6a87ed97 NP |
390 | static void free_base_data(struct base_data *c) |
391 | { | |
392 | if (c->data) { | |
6a83d902 | 393 | FREE_AND_NULL(c->data); |
b8a2486f | 394 | get_thread_data()->base_cache_used -= c->size; |
6a87ed97 NP |
395 | } |
396 | } | |
397 | ||
92392b4a SP |
398 | static void prune_base_data(struct base_data *retain) |
399 | { | |
8e24cbae | 400 | struct base_data *b; |
b8a2486f NTND |
401 | struct thread_local *data = get_thread_data(); |
402 | for (b = data->base_cache; | |
403 | data->base_cache_used > delta_base_cache_limit && b; | |
92392b4a | 404 | b = b->child) { |
6a87ed97 NP |
405 | if (b->data && b != retain) |
406 | free_base_data(b); | |
92392b4a SP |
407 | } |
408 | } | |
409 | ||
4a438cab SP |
410 | static void link_base_data(struct base_data *base, struct base_data *c) |
411 | { | |
412 | if (base) | |
413 | base->child = c; | |
414 | else | |
b8a2486f | 415 | get_thread_data()->base_cache = c; |
4a438cab SP |
416 | |
417 | c->base = base; | |
418 | c->child = NULL; | |
9441b61d | 419 | if (c->data) |
b8a2486f | 420 | get_thread_data()->base_cache_used += c->size; |
92392b4a | 421 | prune_base_data(c); |
4a438cab SP |
422 | } |
423 | ||
424 | static void unlink_base_data(struct base_data *c) | |
425 | { | |
426 | struct base_data *base = c->base; | |
427 | if (base) | |
428 | base->child = NULL; | |
429 | else | |
b8a2486f | 430 | get_thread_data()->base_cache = NULL; |
6a87ed97 | 431 | free_base_data(c); |
4a438cab SP |
432 | } |
433 | ||
681b07de NTND |
434 | static int is_delta_type(enum object_type type) |
435 | { | |
436 | return (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA); | |
437 | } | |
438 | ||
da49a7da | 439 | static void *unpack_entry_data(off_t offset, unsigned long size, |
454253f0 | 440 | enum object_type type, struct object_id *oid) |
9cf6d335 | 441 | { |
9ec2dde9 | 442 | static char fixed_buf[8192]; |
7ce4721a | 443 | int status; |
ef49a7a0 | 444 | git_zstream stream; |
9ec2dde9 | 445 | void *buf; |
454253f0 | 446 | git_hash_ctx c; |
681b07de NTND |
447 | char hdr[32]; |
448 | int hdrlen; | |
449 | ||
450 | if (!is_delta_type(type)) { | |
ef1286d3 | 451 | hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", typename(type), size) + 1; |
454253f0 | 452 | the_hash_algo->init_fn(&c); |
453 | the_hash_algo->update_fn(&c, hdr, hdrlen); | |
681b07de | 454 | } else |
454253f0 | 455 | oid = NULL; |
9ec2dde9 NTND |
456 | if (type == OBJ_BLOB && size > big_file_threshold) |
457 | buf = fixed_buf; | |
458 | else | |
a1e920a0 | 459 | buf = xmallocz(size); |
9cf6d335 SV |
460 | |
461 | memset(&stream, 0, sizeof(stream)); | |
7ce4721a | 462 | git_inflate_init(&stream); |
9cf6d335 | 463 | stream.next_out = buf; |
9ec2dde9 | 464 | stream.avail_out = buf == fixed_buf ? sizeof(fixed_buf) : size; |
9cf6d335 | 465 | |
7ce4721a | 466 | do { |
681b07de | 467 | unsigned char *last_out = stream.next_out; |
2d477051 NP |
468 | stream.next_in = fill(1); |
469 | stream.avail_in = input_len; | |
7ce4721a NP |
470 | status = git_inflate(&stream, 0); |
471 | use(input_len - stream.avail_in); | |
454253f0 | 472 | if (oid) |
473 | the_hash_algo->update_fn(&c, last_out, stream.next_out - last_out); | |
9ec2dde9 NTND |
474 | if (buf == fixed_buf) { |
475 | stream.next_out = buf; | |
476 | stream.avail_out = sizeof(fixed_buf); | |
477 | } | |
7ce4721a NP |
478 | } while (status == Z_OK); |
479 | if (stream.total_out != size || status != Z_STREAM_END) | |
c2b97ecf | 480 | bad_object(offset, _("inflate returned %d"), status); |
39c68542 | 481 | git_inflate_end(&stream); |
454253f0 | 482 | if (oid) |
483 | the_hash_algo->final_fn(oid->hash, &c); | |
9ec2dde9 | 484 | return buf == fixed_buf ? NULL : buf; |
9cf6d335 SV |
485 | } |
486 | ||
681b07de | 487 | static void *unpack_raw_entry(struct object_entry *obj, |
c6458e60 | 488 | off_t *ofs_offset, |
454253f0 | 489 | struct object_id *ref_oid, |
490 | struct object_id *oid) | |
9cf6d335 | 491 | { |
48fb7deb LT |
492 | unsigned char *p; |
493 | unsigned long size, c; | |
d7dd0223 | 494 | off_t base_offset; |
9cf6d335 | 495 | unsigned shift; |
ee5743ce | 496 | void *data; |
9cf6d335 | 497 | |
aa7e44bf | 498 | obj->idx.offset = consumed_bytes; |
1e4cd68c | 499 | input_crc32 = crc32(0, NULL, 0); |
2d477051 NP |
500 | |
501 | p = fill(1); | |
502 | c = *p; | |
503 | use(1); | |
504 | obj->type = (c >> 4) & 7; | |
9cf6d335 SV |
505 | size = (c & 15); |
506 | shift = 4; | |
507 | while (c & 0x80) { | |
2d477051 NP |
508 | p = fill(1); |
509 | c = *p; | |
510 | use(1); | |
48fb7deb | 511 | size += (c & 0x7f) << shift; |
9cf6d335 SV |
512 | shift += 7; |
513 | } | |
2d477051 | 514 | obj->size = size; |
9cf6d335 | 515 | |
2d477051 | 516 | switch (obj->type) { |
eb32d236 | 517 | case OBJ_REF_DELTA: |
454253f0 | 518 | hashcpy(ref_oid->hash, fill(the_hash_algo->rawsz)); |
519 | use(the_hash_algo->rawsz); | |
53dda6ff NP |
520 | break; |
521 | case OBJ_OFS_DELTA: | |
2d477051 NP |
522 | p = fill(1); |
523 | c = *p; | |
524 | use(1); | |
53dda6ff NP |
525 | base_offset = c & 127; |
526 | while (c & 128) { | |
527 | base_offset += 1; | |
8723f216 | 528 | if (!base_offset || MSB(base_offset, 7)) |
c2b97ecf | 529 | bad_object(obj->idx.offset, _("offset value overflow for delta base object")); |
2d477051 NP |
530 | p = fill(1); |
531 | c = *p; | |
532 | use(1); | |
53dda6ff NP |
533 | base_offset = (base_offset << 7) + (c & 127); |
534 | } | |
c6458e60 NTND |
535 | *ofs_offset = obj->idx.offset - base_offset; |
536 | if (*ofs_offset <= 0 || *ofs_offset >= obj->idx.offset) | |
c2b97ecf | 537 | bad_object(obj->idx.offset, _("delta base offset is out of bound")); |
53dda6ff | 538 | break; |
9cf6d335 SV |
539 | case OBJ_COMMIT: |
540 | case OBJ_TREE: | |
541 | case OBJ_BLOB: | |
542 | case OBJ_TAG: | |
9cf6d335 SV |
543 | break; |
544 | default: | |
c2b97ecf | 545 | bad_object(obj->idx.offset, _("unknown object type %d"), obj->type); |
9cf6d335 | 546 | } |
aa7e44bf | 547 | obj->hdr_size = consumed_bytes - obj->idx.offset; |
2d477051 | 548 | |
454253f0 | 549 | data = unpack_entry_data(obj->idx.offset, obj->size, obj->type, oid); |
aa7e44bf | 550 | obj->idx.crc32 = input_crc32; |
ee5743ce | 551 | return data; |
2d477051 NP |
552 | } |
553 | ||
8a2e163c NTND |
554 | static void *unpack_data(struct object_entry *obj, |
555 | int (*consume)(const unsigned char *, unsigned long, void *), | |
556 | void *cb_data) | |
2d477051 | 557 | { |
a91ef6e7 | 558 | off_t from = obj[0].idx.offset + obj[0].hdr_size; |
7171a0b0 | 559 | off_t len = obj[1].idx.offset - from; |
776ea370 | 560 | unsigned char *data, *inbuf; |
ef49a7a0 | 561 | git_zstream stream; |
776ea370 | 562 | int status; |
9cf6d335 | 563 | |
a1e920a0 | 564 | data = xmallocz(consume ? 64*1024 : obj->size); |
7171a0b0 | 565 | inbuf = xmalloc((len < 64*1024) ? (int)len : 64*1024); |
776ea370 | 566 | |
2d477051 | 567 | memset(&stream, 0, sizeof(stream)); |
776ea370 | 568 | git_inflate_init(&stream); |
2d477051 | 569 | stream.next_out = data; |
8a2e163c | 570 | stream.avail_out = consume ? 64*1024 : obj->size; |
776ea370 NP |
571 | |
572 | do { | |
7171a0b0 | 573 | ssize_t n = (len < 64*1024) ? (ssize_t)len : 64*1024; |
53f52cd9 | 574 | n = xpread(get_thread_data()->pack_fd, inbuf, n, from); |
776ea370 | 575 | if (n < 0) |
c2b97ecf | 576 | die_errno(_("cannot pread pack file")); |
776ea370 | 577 | if (!n) |
7171a0b0 NTND |
578 | die(Q_("premature end of pack file, %"PRIuMAX" byte missing", |
579 | "premature end of pack file, %"PRIuMAX" bytes missing", | |
580 | (unsigned int)len), | |
581 | (uintmax_t)len); | |
776ea370 NP |
582 | from += n; |
583 | len -= n; | |
584 | stream.next_in = inbuf; | |
585 | stream.avail_in = n; | |
f8b09038 JK |
586 | if (!consume) |
587 | status = git_inflate(&stream, 0); | |
588 | else { | |
589 | do { | |
590 | status = git_inflate(&stream, 0); | |
591 | if (consume(data, stream.next_out - data, cb_data)) { | |
592 | free(inbuf); | |
593 | free(data); | |
594 | return NULL; | |
595 | } | |
596 | stream.next_out = data; | |
597 | stream.avail_out = 64*1024; | |
598 | } while (status == Z_OK && stream.avail_in); | |
8a2e163c | 599 | } |
776ea370 NP |
600 | } while (len && status == Z_OK && !stream.avail_in); |
601 | ||
602 | /* This has been inflated OK when first encountered, so... */ | |
603 | if (status != Z_STREAM_END || stream.total_out != obj->size) | |
c2b97ecf | 604 | die(_("serious inflate inconsistency")); |
776ea370 NP |
605 | |
606 | git_inflate_end(&stream); | |
607 | free(inbuf); | |
8a2e163c | 608 | if (consume) { |
6a83d902 | 609 | FREE_AND_NULL(data); |
8a2e163c | 610 | } |
9cf6d335 SV |
611 | return data; |
612 | } | |
613 | ||
8a2e163c NTND |
614 | static void *get_data_from_pack(struct object_entry *obj) |
615 | { | |
616 | return unpack_data(obj, NULL, NULL); | |
617 | } | |
618 | ||
c6458e60 NTND |
619 | static int compare_ofs_delta_bases(off_t offset1, off_t offset2, |
620 | enum object_type type1, | |
621 | enum object_type type2) | |
7218a215 JH |
622 | { |
623 | int cmp = type1 - type2; | |
624 | if (cmp) | |
625 | return cmp; | |
f0e7f11d JK |
626 | return offset1 < offset2 ? -1 : |
627 | offset1 > offset2 ? 1 : | |
628 | 0; | |
7218a215 JH |
629 | } |
630 | ||
c6458e60 | 631 | static int find_ofs_delta(const off_t offset, enum object_type type) |
9cf6d335 | 632 | { |
c6458e60 NTND |
633 | int first = 0, last = nr_ofs_deltas; |
634 | ||
635 | while (first < last) { | |
19716b21 | 636 | int next = first + (last - first) / 2; |
c6458e60 NTND |
637 | struct ofs_delta_entry *delta = &ofs_deltas[next]; |
638 | int cmp; | |
639 | ||
640 | cmp = compare_ofs_delta_bases(offset, delta->offset, | |
641 | type, objects[delta->obj_no].type); | |
642 | if (!cmp) | |
643 | return next; | |
644 | if (cmp < 0) { | |
645 | last = next; | |
646 | continue; | |
647 | } | |
648 | first = next+1; | |
649 | } | |
650 | return -first-1; | |
9cf6d335 SV |
651 | } |
652 | ||
c6458e60 NTND |
653 | static void find_ofs_delta_children(off_t offset, |
654 | int *first_index, int *last_index, | |
655 | enum object_type type) | |
9cf6d335 | 656 | { |
c6458e60 | 657 | int first = find_ofs_delta(offset, type); |
9cf6d335 | 658 | int last = first; |
c6458e60 | 659 | int end = nr_ofs_deltas - 1; |
9cf6d335 | 660 | |
6a87ed97 NP |
661 | if (first < 0) { |
662 | *first_index = 0; | |
663 | *last_index = -1; | |
664 | return; | |
665 | } | |
c6458e60 | 666 | while (first > 0 && ofs_deltas[first - 1].offset == offset) |
9cf6d335 | 667 | --first; |
c6458e60 NTND |
668 | while (last < end && ofs_deltas[last + 1].offset == offset) |
669 | ++last; | |
670 | *first_index = first; | |
671 | *last_index = last; | |
672 | } | |
673 | ||
674 | static int compare_ref_delta_bases(const unsigned char *sha1, | |
675 | const unsigned char *sha2, | |
676 | enum object_type type1, | |
677 | enum object_type type2) | |
678 | { | |
679 | int cmp = type1 - type2; | |
680 | if (cmp) | |
681 | return cmp; | |
682 | return hashcmp(sha1, sha2); | |
683 | } | |
684 | ||
685 | static int find_ref_delta(const unsigned char *sha1, enum object_type type) | |
686 | { | |
687 | int first = 0, last = nr_ref_deltas; | |
688 | ||
689 | while (first < last) { | |
19716b21 | 690 | int next = first + (last - first) / 2; |
c6458e60 NTND |
691 | struct ref_delta_entry *delta = &ref_deltas[next]; |
692 | int cmp; | |
693 | ||
694 | cmp = compare_ref_delta_bases(sha1, delta->sha1, | |
695 | type, objects[delta->obj_no].type); | |
696 | if (!cmp) | |
697 | return next; | |
698 | if (cmp < 0) { | |
699 | last = next; | |
700 | continue; | |
701 | } | |
702 | first = next+1; | |
703 | } | |
704 | return -first-1; | |
705 | } | |
706 | ||
707 | static void find_ref_delta_children(const unsigned char *sha1, | |
708 | int *first_index, int *last_index, | |
709 | enum object_type type) | |
710 | { | |
711 | int first = find_ref_delta(sha1, type); | |
712 | int last = first; | |
713 | int end = nr_ref_deltas - 1; | |
714 | ||
715 | if (first < 0) { | |
716 | *first_index = 0; | |
717 | *last_index = -1; | |
718 | return; | |
719 | } | |
720 | while (first > 0 && !hashcmp(ref_deltas[first - 1].sha1, sha1)) | |
721 | --first; | |
722 | while (last < end && !hashcmp(ref_deltas[last + 1].sha1, sha1)) | |
9cf6d335 SV |
723 | ++last; |
724 | *first_index = first; | |
725 | *last_index = last; | |
9cf6d335 SV |
726 | } |
727 | ||
4614043c NTND |
728 | struct compare_data { |
729 | struct object_entry *entry; | |
730 | struct git_istream *st; | |
731 | unsigned char *buf; | |
732 | unsigned long buf_size; | |
733 | }; | |
734 | ||
735 | static int compare_objects(const unsigned char *buf, unsigned long size, | |
736 | void *cb_data) | |
737 | { | |
738 | struct compare_data *data = cb_data; | |
739 | ||
740 | if (data->buf_size < size) { | |
741 | free(data->buf); | |
742 | data->buf = xmalloc(size); | |
743 | data->buf_size = size; | |
744 | } | |
745 | ||
746 | while (size) { | |
747 | ssize_t len = read_istream(data->st, data->buf, size); | |
748 | if (len == 0) | |
749 | die(_("SHA1 COLLISION FOUND WITH %s !"), | |
e6a492b7 | 750 | oid_to_hex(&data->entry->idx.oid)); |
4614043c NTND |
751 | if (len < 0) |
752 | die(_("unable to read %s"), | |
e6a492b7 | 753 | oid_to_hex(&data->entry->idx.oid)); |
4614043c NTND |
754 | if (memcmp(buf, data->buf, len)) |
755 | die(_("SHA1 COLLISION FOUND WITH %s !"), | |
e6a492b7 | 756 | oid_to_hex(&data->entry->idx.oid)); |
4614043c NTND |
757 | size -= len; |
758 | buf += len; | |
759 | } | |
760 | return 0; | |
761 | } | |
762 | ||
763 | static int check_collison(struct object_entry *entry) | |
764 | { | |
765 | struct compare_data data; | |
766 | enum object_type type; | |
767 | unsigned long size; | |
768 | ||
769 | if (entry->size <= big_file_threshold || entry->type != OBJ_BLOB) | |
770 | return -1; | |
771 | ||
772 | memset(&data, 0, sizeof(data)); | |
773 | data.entry = entry; | |
e6a492b7 | 774 | data.st = open_istream(entry->idx.oid.hash, &type, &size, NULL); |
4614043c NTND |
775 | if (!data.st) |
776 | return -1; | |
777 | if (size != entry->size || type != entry->type) | |
778 | die(_("SHA1 COLLISION FOUND WITH %s !"), | |
e6a492b7 | 779 | oid_to_hex(&entry->idx.oid)); |
4614043c NTND |
780 | unpack_data(entry, compare_objects, &data); |
781 | close_istream(data.st); | |
782 | free(data.buf); | |
783 | return 0; | |
784 | } | |
785 | ||
9ec2dde9 NTND |
786 | static void sha1_object(const void *data, struct object_entry *obj_entry, |
787 | unsigned long size, enum object_type type, | |
3e930981 | 788 | const struct object_id *oid) |
9cf6d335 | 789 | { |
9ec2dde9 | 790 | void *new_data = NULL; |
29401e15 | 791 | int collision_test_needed = 0; |
9ec2dde9 NTND |
792 | |
793 | assert(data || obj_entry); | |
794 | ||
29401e15 JK |
795 | if (startup_info->have_repository) { |
796 | read_lock(); | |
e83e71c5 JT |
797 | collision_test_needed = |
798 | has_sha1_file_with_flags(oid->hash, OBJECT_INFO_QUICK); | |
29401e15 JK |
799 | read_unlock(); |
800 | } | |
4614043c NTND |
801 | |
802 | if (collision_test_needed && !data) { | |
803 | read_lock(); | |
804 | if (!check_collison(obj_entry)) | |
805 | collision_test_needed = 0; | |
806 | read_unlock(); | |
807 | } | |
808 | if (collision_test_needed) { | |
8685da42 NP |
809 | void *has_data; |
810 | enum object_type has_type; | |
811 | unsigned long has_size; | |
4614043c | 812 | read_lock(); |
3e930981 | 813 | has_type = sha1_object_info(oid->hash, &has_size); |
51054177 | 814 | if (has_type < 0) |
3e930981 | 815 | die(_("cannot read existing object info %s"), oid_to_hex(oid)); |
4614043c | 816 | if (has_type != type || has_size != size) |
3e930981 | 817 | die(_("SHA1 COLLISION FOUND WITH %s !"), oid_to_hex(oid)); |
818 | has_data = read_sha1_file(oid->hash, &has_type, &has_size); | |
b8a2486f | 819 | read_unlock(); |
4614043c NTND |
820 | if (!data) |
821 | data = new_data = get_data_from_pack(obj_entry); | |
8685da42 | 822 | if (!has_data) |
3e930981 | 823 | die(_("cannot read existing object %s"), oid_to_hex(oid)); |
8685da42 NP |
824 | if (size != has_size || type != has_type || |
825 | memcmp(data, has_data, size) != 0) | |
3e930981 | 826 | die(_("SHA1 COLLISION FOUND WITH %s !"), oid_to_hex(oid)); |
bbf4b41b | 827 | free(has_data); |
4614043c | 828 | } |
b8a2486f | 829 | |
0153be05 | 830 | if (strict) { |
b8a2486f | 831 | read_lock(); |
0153be05 | 832 | if (type == OBJ_BLOB) { |
3aca1fc6 | 833 | struct blob *blob = lookup_blob(oid); |
0153be05 MK |
834 | if (blob) |
835 | blob->object.flags |= FLAG_CHECKED; | |
836 | else | |
3e930981 | 837 | die(_("invalid blob object %s"), oid_to_hex(oid)); |
0153be05 MK |
838 | } else { |
839 | struct object *obj; | |
840 | int eaten; | |
841 | void *buf = (void *) data; | |
842 | ||
920734b0 | 843 | assert(data && "data can only be NULL for large _blobs_"); |
9ec2dde9 | 844 | |
0153be05 MK |
845 | /* |
846 | * we do not need to free the memory here, as the | |
847 | * buf is deleted by the caller. | |
848 | */ | |
c251c83d | 849 | obj = parse_object_buffer(oid, type, size, buf, |
850 | &eaten); | |
0153be05 | 851 | if (!obj) |
c2b97ecf | 852 | die(_("invalid %s"), typename(type)); |
c6807a40 | 853 | if (do_fsck_object && |
22410549 | 854 | fsck_object(obj, buf, size, &fsck_options)) |
c2b97ecf | 855 | die(_("Error in object")); |
22410549 | 856 | if (fsck_walk(obj, NULL, &fsck_options)) |
f2fd0760 | 857 | die(_("Not all child objects of %s are reachable"), oid_to_hex(&obj->oid)); |
0153be05 MK |
858 | |
859 | if (obj->type == OBJ_TREE) { | |
860 | struct tree *item = (struct tree *) obj; | |
861 | item->buffer = NULL; | |
6e454b9a | 862 | obj->parsed = 0; |
0153be05 MK |
863 | } |
864 | if (obj->type == OBJ_COMMIT) { | |
865 | struct commit *commit = (struct commit *) obj; | |
8597ea3a | 866 | if (detach_commit_buffer(commit, NULL) != data) |
0fb370da | 867 | die("BUG: parse_object_buffer transmogrified our buffer"); |
0153be05 MK |
868 | } |
869 | obj->flags |= FLAG_CHECKED; | |
870 | } | |
b8a2486f | 871 | read_unlock(); |
0153be05 | 872 | } |
9ec2dde9 NTND |
873 | |
874 | free(new_data); | |
9cf6d335 SV |
875 | } |
876 | ||
20e95d0a NTND |
877 | /* |
878 | * This function is part of find_unresolved_deltas(). There are two | |
879 | * walkers going in the opposite ways. | |
880 | * | |
881 | * The first one in find_unresolved_deltas() traverses down from | |
882 | * parent node to children, deflating nodes along the way. However, | |
883 | * memory for deflated nodes is limited by delta_base_cache_limit, so | |
884 | * at some point parent node's deflated content may be freed. | |
885 | * | |
886 | * The second walker is this function, which goes from current node up | |
887 | * to top parent if necessary to deflate the node. In normal | |
888 | * situation, its parent node would be already deflated, so it just | |
889 | * needs to apply delta. | |
890 | * | |
891 | * In the worst case scenario, parent node is no longer deflated because | |
892 | * we're running out of delta_base_cache_limit; we need to re-deflate | |
893 | * parents, possibly up to the top base. | |
894 | * | |
895 | * All deflated objects here are subject to be freed if we exceed | |
896 | * delta_base_cache_limit, just like in find_unresolved_deltas(), we | |
897 | * just need to make sure the last node is not freed. | |
898 | */ | |
92392b4a SP |
899 | static void *get_base_data(struct base_data *c) |
900 | { | |
901 | if (!c->data) { | |
902 | struct object_entry *obj = c->obj; | |
20e95d0a NTND |
903 | struct base_data **delta = NULL; |
904 | int delta_nr = 0, delta_alloc = 0; | |
92392b4a | 905 | |
20e95d0a NTND |
906 | while (is_delta_type(c->obj->type) && !c->data) { |
907 | ALLOC_GROW(delta, delta_nr + 1, delta_alloc); | |
908 | delta[delta_nr++] = c; | |
909 | c = c->base; | |
910 | } | |
911 | if (!delta_nr) { | |
912 | c->data = get_data_from_pack(obj); | |
913 | c->size = obj->size; | |
b8a2486f | 914 | get_thread_data()->base_cache_used += c->size; |
20e95d0a NTND |
915 | prune_base_data(c); |
916 | } | |
917 | for (; delta_nr > 0; delta_nr--) { | |
918 | void *base, *raw; | |
919 | c = delta[delta_nr - 1]; | |
920 | obj = c->obj; | |
921 | base = get_base_data(c->base); | |
922 | raw = get_data_from_pack(obj); | |
92392b4a SP |
923 | c->data = patch_delta( |
924 | base, c->base->size, | |
925 | raw, obj->size, | |
926 | &c->size); | |
927 | free(raw); | |
928 | if (!c->data) | |
c2b97ecf | 929 | bad_object(obj->idx.offset, _("failed to apply delta")); |
b8a2486f | 930 | get_thread_data()->base_cache_used += c->size; |
20e95d0a | 931 | prune_base_data(c); |
9441b61d | 932 | } |
20e95d0a | 933 | free(delta); |
92392b4a SP |
934 | } |
935 | return c->data; | |
936 | } | |
937 | ||
f41aebd4 | 938 | static void resolve_delta(struct object_entry *delta_obj, |
9441b61d | 939 | struct base_data *base, struct base_data *result) |
9cf6d335 | 940 | { |
ce3f6dc6 | 941 | void *base_data, *delta_data; |
9cf6d335 | 942 | |
3aba2fdd | 943 | if (show_stat) { |
41730576 NTND |
944 | int i = delta_obj - objects; |
945 | int j = base->obj - objects; | |
946 | obj_stat[i].delta_depth = obj_stat[j].delta_depth + 1; | |
3aba2fdd | 947 | deepest_delta_lock(); |
41730576 NTND |
948 | if (deepest_delta < obj_stat[i].delta_depth) |
949 | deepest_delta = obj_stat[i].delta_depth; | |
3aba2fdd | 950 | deepest_delta_unlock(); |
41730576 | 951 | obj_stat[i].base_object_no = j; |
3aba2fdd | 952 | } |
636171cb | 953 | delta_data = get_data_from_pack(delta_obj); |
ce3f6dc6 | 954 | base_data = get_base_data(base); |
9441b61d | 955 | result->obj = delta_obj; |
ce3f6dc6 NP |
956 | result->data = patch_delta(base_data, base->size, |
957 | delta_data, delta_obj->size, &result->size); | |
9cf6d335 | 958 | free(delta_data); |
9441b61d | 959 | if (!result->data) |
c2b97ecf | 960 | bad_object(delta_obj->idx.offset, _("failed to apply delta")); |
f070facc PO |
961 | hash_object_file(result->data, result->size, |
962 | typename(delta_obj->real_type), &delta_obj->idx.oid); | |
9ec2dde9 | 963 | sha1_object(result->data, NULL, result->size, delta_obj->real_type, |
3e930981 | 964 | &delta_obj->idx.oid); |
b8a2486f | 965 | counter_lock(); |
636171cb | 966 | nr_resolved_deltas++; |
b8a2486f | 967 | counter_unlock(); |
9441b61d NP |
968 | } |
969 | ||
ab791dd1 JK |
970 | /* |
971 | * Standard boolean compare-and-swap: atomically check whether "*type" is | |
972 | * "want"; if so, swap in "set" and return true. Otherwise, leave it untouched | |
973 | * and return false. | |
974 | */ | |
41730576 | 975 | static int compare_and_swap_type(signed char *type, |
ab791dd1 JK |
976 | enum object_type want, |
977 | enum object_type set) | |
978 | { | |
979 | enum object_type old; | |
980 | ||
981 | type_cas_lock(); | |
982 | old = *type; | |
983 | if (old == want) | |
984 | *type = set; | |
985 | type_cas_unlock(); | |
986 | ||
987 | return old == want; | |
988 | } | |
989 | ||
2baad220 NTND |
990 | static struct base_data *find_unresolved_deltas_1(struct base_data *base, |
991 | struct base_data *prev_base) | |
9441b61d | 992 | { |
2baad220 | 993 | if (base->ref_last == -1 && base->ofs_last == -1) { |
e6a492b7 | 994 | find_ref_delta_children(base->obj->idx.oid.hash, |
c6458e60 NTND |
995 | &base->ref_first, &base->ref_last, |
996 | OBJ_REF_DELTA); | |
9441b61d | 997 | |
c6458e60 NTND |
998 | find_ofs_delta_children(base->obj->idx.offset, |
999 | &base->ofs_first, &base->ofs_last, | |
1000 | OBJ_OFS_DELTA); | |
4a438cab | 1001 | |
2baad220 NTND |
1002 | if (base->ref_last == -1 && base->ofs_last == -1) { |
1003 | free(base->data); | |
1004 | return NULL; | |
1005 | } | |
53dda6ff | 1006 | |
2baad220 NTND |
1007 | link_base_data(prev_base, base); |
1008 | } | |
4a438cab | 1009 | |
2baad220 | 1010 | if (base->ref_first <= base->ref_last) { |
c6458e60 | 1011 | struct object_entry *child = objects + ref_deltas[base->ref_first].obj_no; |
2baad220 | 1012 | struct base_data *result = alloc_base_data(); |
7218a215 | 1013 | |
ab791dd1 JK |
1014 | if (!compare_and_swap_type(&child->real_type, OBJ_REF_DELTA, |
1015 | base->obj->real_type)) | |
1016 | die("BUG: child->real_type != OBJ_REF_DELTA"); | |
1017 | ||
2baad220 NTND |
1018 | resolve_delta(child, base, result); |
1019 | if (base->ref_first == base->ref_last && base->ofs_last == -1) | |
7218a215 | 1020 | free_base_data(base); |
2baad220 NTND |
1021 | |
1022 | base->ref_first++; | |
1023 | return result; | |
53dda6ff NP |
1024 | } |
1025 | ||
2baad220 | 1026 | if (base->ofs_first <= base->ofs_last) { |
c6458e60 | 1027 | struct object_entry *child = objects + ofs_deltas[base->ofs_first].obj_no; |
2baad220 | 1028 | struct base_data *result = alloc_base_data(); |
7218a215 JH |
1029 | |
1030 | assert(child->real_type == OBJ_OFS_DELTA); | |
ab791dd1 | 1031 | child->real_type = base->obj->real_type; |
2baad220 NTND |
1032 | resolve_delta(child, base, result); |
1033 | if (base->ofs_first == base->ofs_last) | |
7218a215 | 1034 | free_base_data(base); |
2baad220 NTND |
1035 | |
1036 | base->ofs_first++; | |
1037 | return result; | |
9cf6d335 | 1038 | } |
53dda6ff | 1039 | |
9441b61d | 1040 | unlink_base_data(base); |
2baad220 NTND |
1041 | return NULL; |
1042 | } | |
1043 | ||
1044 | static void find_unresolved_deltas(struct base_data *base) | |
1045 | { | |
1046 | struct base_data *new_base, *prev_base = NULL; | |
1047 | for (;;) { | |
1048 | new_base = find_unresolved_deltas_1(base, prev_base); | |
1049 | ||
1050 | if (new_base) { | |
1051 | prev_base = base; | |
1052 | base = new_base; | |
1053 | } else { | |
1054 | free(base); | |
1055 | base = prev_base; | |
1056 | if (!base) | |
1057 | return; | |
1058 | prev_base = base->base; | |
1059 | } | |
1060 | } | |
9cf6d335 SV |
1061 | } |
1062 | ||
c6458e60 | 1063 | static int compare_ofs_delta_entry(const void *a, const void *b) |
9cf6d335 | 1064 | { |
c6458e60 NTND |
1065 | const struct ofs_delta_entry *delta_a = a; |
1066 | const struct ofs_delta_entry *delta_b = b; | |
7218a215 | 1067 | |
f0e7f11d JK |
1068 | return delta_a->offset < delta_b->offset ? -1 : |
1069 | delta_a->offset > delta_b->offset ? 1 : | |
1070 | 0; | |
c6458e60 NTND |
1071 | } |
1072 | ||
1073 | static int compare_ref_delta_entry(const void *a, const void *b) | |
9cf6d335 | 1074 | { |
c6458e60 NTND |
1075 | const struct ref_delta_entry *delta_a = a; |
1076 | const struct ref_delta_entry *delta_b = b; | |
7218a215 | 1077 | |
c6458e60 | 1078 | return hashcmp(delta_a->sha1, delta_b->sha1); |
9cf6d335 SV |
1079 | } |
1080 | ||
5272f755 NTND |
1081 | static void resolve_base(struct object_entry *obj) |
1082 | { | |
1083 | struct base_data *base_obj = alloc_base_data(); | |
1084 | base_obj->obj = obj; | |
1085 | base_obj->data = NULL; | |
1086 | find_unresolved_deltas(base_obj); | |
1087 | } | |
1088 | ||
b8a2486f NTND |
1089 | #ifndef NO_PTHREADS |
1090 | static void *threaded_second_pass(void *data) | |
1091 | { | |
1092 | set_thread_data(data); | |
1093 | for (;;) { | |
1094 | int i; | |
8f82aad4 | 1095 | counter_lock(); |
b8a2486f | 1096 | display_progress(progress, nr_resolved_deltas); |
8f82aad4 TR |
1097 | counter_unlock(); |
1098 | work_lock(); | |
b8a2486f NTND |
1099 | while (nr_dispatched < nr_objects && |
1100 | is_delta_type(objects[nr_dispatched].type)) | |
1101 | nr_dispatched++; | |
1102 | if (nr_dispatched >= nr_objects) { | |
1103 | work_unlock(); | |
1104 | break; | |
1105 | } | |
1106 | i = nr_dispatched++; | |
1107 | work_unlock(); | |
1108 | ||
1109 | resolve_base(&objects[i]); | |
1110 | } | |
1111 | return NULL; | |
1112 | } | |
1113 | #endif | |
1114 | ||
5272f755 NTND |
1115 | /* |
1116 | * First pass: | |
1117 | * - find locations of all objects; | |
1118 | * - calculate SHA1 of all non-delta objects; | |
1119 | * - remember base (SHA1 or offset) for all deltas. | |
1120 | */ | |
454253f0 | 1121 | static void parse_pack_objects(unsigned char *hash) |
9cf6d335 | 1122 | { |
9ec2dde9 | 1123 | int i, nr_delays = 0; |
c6458e60 | 1124 | struct ofs_delta_entry *ofs_delta = ofs_deltas; |
454253f0 | 1125 | struct object_id ref_delta_oid; |
2d477051 | 1126 | struct stat st; |
9cf6d335 | 1127 | |
13aaf148 | 1128 | if (verbose) |
29e63ed3 | 1129 | progress = start_progress( |
c2b97ecf | 1130 | from_stdin ? _("Receiving objects") : _("Indexing objects"), |
29e63ed3 | 1131 | nr_objects); |
9cf6d335 SV |
1132 | for (i = 0; i < nr_objects; i++) { |
1133 | struct object_entry *obj = &objects[i]; | |
c6458e60 | 1134 | void *data = unpack_raw_entry(obj, &ofs_delta->offset, |
454253f0 | 1135 | &ref_delta_oid, |
1136 | &obj->idx.oid); | |
9cf6d335 | 1137 | obj->real_type = obj->type; |
c6458e60 NTND |
1138 | if (obj->type == OBJ_OFS_DELTA) { |
1139 | nr_ofs_deltas++; | |
1140 | ofs_delta->obj_no = i; | |
1141 | ofs_delta++; | |
1142 | } else if (obj->type == OBJ_REF_DELTA) { | |
1143 | ALLOC_GROW(ref_deltas, nr_ref_deltas + 1, ref_deltas_alloc); | |
454253f0 | 1144 | hashcpy(ref_deltas[nr_ref_deltas].sha1, ref_delta_oid.hash); |
c6458e60 NTND |
1145 | ref_deltas[nr_ref_deltas].obj_no = i; |
1146 | nr_ref_deltas++; | |
9ec2dde9 NTND |
1147 | } else if (!data) { |
1148 | /* large blobs, check later */ | |
1149 | obj->real_type = OBJ_BAD; | |
1150 | nr_delays++; | |
9cf6d335 | 1151 | } else |
e6a492b7 | 1152 | sha1_object(data, NULL, obj->size, obj->type, |
3e930981 | 1153 | &obj->idx.oid); |
9cf6d335 | 1154 | free(data); |
4d4fcc54 | 1155 | display_progress(progress, i+1); |
9cf6d335 | 1156 | } |
aa7e44bf | 1157 | objects[i].idx.offset = consumed_bytes; |
4d4fcc54 | 1158 | stop_progress(&progress); |
2d477051 NP |
1159 | |
1160 | /* Check pack integrity */ | |
636171cb | 1161 | flush(); |
454253f0 | 1162 | the_hash_algo->final_fn(hash, &input_ctx); |
1163 | if (hashcmp(fill(the_hash_algo->rawsz), hash)) | |
c2b97ecf | 1164 | die(_("pack is corrupted (SHA1 mismatch)")); |
454253f0 | 1165 | use(the_hash_algo->rawsz); |
2d477051 NP |
1166 | |
1167 | /* If input_fd is a file, we should have reached its end now. */ | |
1168 | if (fstat(input_fd, &st)) | |
c2b97ecf | 1169 | die_errno(_("cannot fstat packfile")); |
fa257b05 JS |
1170 | if (S_ISREG(st.st_mode) && |
1171 | lseek(input_fd, 0, SEEK_CUR) - input_len != st.st_size) | |
c2b97ecf | 1172 | die(_("pack has junk at the end")); |
9ec2dde9 NTND |
1173 | |
1174 | for (i = 0; i < nr_objects; i++) { | |
1175 | struct object_entry *obj = &objects[i]; | |
1176 | if (obj->real_type != OBJ_BAD) | |
1177 | continue; | |
1178 | obj->real_type = obj->type; | |
e6a492b7 | 1179 | sha1_object(NULL, obj, obj->size, obj->type, |
3e930981 | 1180 | &obj->idx.oid); |
9ec2dde9 NTND |
1181 | nr_delays--; |
1182 | } | |
1183 | if (nr_delays) | |
1184 | die(_("confusion beyond insanity in parse_pack_objects()")); | |
5272f755 NTND |
1185 | } |
1186 | ||
1187 | /* | |
1188 | * Second pass: | |
1189 | * - for all non-delta objects, look if it is used as a base for | |
1190 | * deltas; | |
1191 | * - if used as a base, uncompress the object and apply all deltas, | |
1192 | * recursively checking if the resulting object is used as a base | |
1193 | * for some more deltas. | |
1194 | */ | |
1195 | static void resolve_deltas(void) | |
1196 | { | |
1197 | int i; | |
9cf6d335 | 1198 | |
c6458e60 | 1199 | if (!nr_ofs_deltas && !nr_ref_deltas) |
3c9af366 NP |
1200 | return; |
1201 | ||
53dda6ff | 1202 | /* Sort deltas by base SHA1/offset for fast searching */ |
9ed0d8d6 RS |
1203 | QSORT(ofs_deltas, nr_ofs_deltas, compare_ofs_delta_entry); |
1204 | QSORT(ref_deltas, nr_ref_deltas, compare_ref_delta_entry); | |
9cf6d335 | 1205 | |
e376f17f | 1206 | if (verbose || show_resolving_progress) |
c6458e60 NTND |
1207 | progress = start_progress(_("Resolving deltas"), |
1208 | nr_ref_deltas + nr_ofs_deltas); | |
b8a2486f NTND |
1209 | |
1210 | #ifndef NO_PTHREADS | |
1211 | nr_dispatched = 0; | |
1212 | if (nr_threads > 1 || getenv("GIT_FORCE_THREADS")) { | |
1213 | init_thread(); | |
1214 | for (i = 0; i < nr_threads; i++) { | |
1215 | int ret = pthread_create(&thread_data[i].thread, NULL, | |
1216 | threaded_second_pass, thread_data + i); | |
1217 | if (ret) | |
f350df42 NTND |
1218 | die(_("unable to create thread: %s"), |
1219 | strerror(ret)); | |
b8a2486f NTND |
1220 | } |
1221 | for (i = 0; i < nr_threads; i++) | |
1222 | pthread_join(thread_data[i].thread, NULL); | |
1223 | cleanup_thread(); | |
1224 | return; | |
1225 | } | |
1226 | #endif | |
1227 | ||
9cf6d335 SV |
1228 | for (i = 0; i < nr_objects; i++) { |
1229 | struct object_entry *obj = &objects[i]; | |
9cf6d335 | 1230 | |
4f8ec74e | 1231 | if (is_delta_type(obj->type)) |
9cf6d335 | 1232 | continue; |
5272f755 | 1233 | resolve_base(obj); |
4d4fcc54 | 1234 | display_progress(progress, nr_resolved_deltas); |
9cf6d335 | 1235 | } |
636171cb NP |
1236 | } |
1237 | ||
5272f755 NTND |
1238 | /* |
1239 | * Third pass: | |
1240 | * - append objects to convert thin pack to full pack if required | |
454253f0 | 1241 | * - write the final pack hash |
5272f755 | 1242 | */ |
98a3beab | 1243 | static void fix_unresolved_deltas(struct hashfile *f); |
454253f0 | 1244 | static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned char *pack_hash) |
5272f755 | 1245 | { |
c6458e60 | 1246 | if (nr_ref_deltas + nr_ofs_deltas == nr_resolved_deltas) { |
5272f755 | 1247 | stop_progress(&progress); |
454253f0 | 1248 | /* Flush remaining pack final hash. */ |
5272f755 NTND |
1249 | flush(); |
1250 | return; | |
1251 | } | |
1252 | ||
1253 | if (fix_thin_pack) { | |
98a3beab | 1254 | struct hashfile *f; |
454253f0 | 1255 | unsigned char read_hash[GIT_MAX_RAWSZ], tail_hash[GIT_MAX_RAWSZ]; |
5c3459fc | 1256 | struct strbuf msg = STRBUF_INIT; |
c6458e60 | 1257 | int nr_unresolved = nr_ofs_deltas + nr_ref_deltas - nr_resolved_deltas; |
5272f755 NTND |
1258 | int nr_objects_initial = nr_objects; |
1259 | if (nr_unresolved <= 0) | |
cc13431a | 1260 | die(_("confusion beyond insanity")); |
2756ca43 | 1261 | REALLOC_ARRAY(objects, nr_objects + nr_unresolved + 1); |
57165db0 JK |
1262 | memset(objects + nr_objects + 1, 0, |
1263 | nr_unresolved * sizeof(*objects)); | |
98a3beab | 1264 | f = hashfd(output_fd, curr_pack); |
781d9306 | 1265 | fix_unresolved_deltas(f); |
71d99b81 VA |
1266 | strbuf_addf(&msg, Q_("completed with %d local object", |
1267 | "completed with %d local objects", | |
1268 | nr_objects - nr_objects_initial), | |
5c3459fc NTND |
1269 | nr_objects - nr_objects_initial); |
1270 | stop_progress_msg(&progress, msg.buf); | |
1271 | strbuf_release(&msg); | |
98a3beab | 1272 | hashclose(f, tail_hash, 0); |
454253f0 | 1273 | hashcpy(read_hash, pack_hash); |
1274 | fixup_pack_header_footer(output_fd, pack_hash, | |
5272f755 | 1275 | curr_pack, nr_objects, |
454253f0 | 1276 | read_hash, consumed_bytes-the_hash_algo->rawsz); |
1277 | if (hashcmp(read_hash, tail_hash) != 0) | |
f350df42 NTND |
1278 | die(_("Unexpected tail checksum for %s " |
1279 | "(disk corruption?)"), curr_pack); | |
5272f755 | 1280 | } |
c6458e60 | 1281 | if (nr_ofs_deltas + nr_ref_deltas != nr_resolved_deltas) |
cc13431a JH |
1282 | die(Q_("pack has %d unresolved delta", |
1283 | "pack has %d unresolved deltas", | |
c6458e60 NTND |
1284 | nr_ofs_deltas + nr_ref_deltas - nr_resolved_deltas), |
1285 | nr_ofs_deltas + nr_ref_deltas - nr_resolved_deltas); | |
5272f755 NTND |
1286 | } |
1287 | ||
98a3beab | 1288 | static int write_compressed(struct hashfile *f, void *in, unsigned int size) |
636171cb | 1289 | { |
ef49a7a0 | 1290 | git_zstream stream; |
7734d7f2 NP |
1291 | int status; |
1292 | unsigned char outbuf[4096]; | |
636171cb | 1293 | |
55bb5c91 | 1294 | git_deflate_init(&stream, zlib_compression_level); |
636171cb NP |
1295 | stream.next_in = in; |
1296 | stream.avail_in = size; | |
636171cb | 1297 | |
7734d7f2 NP |
1298 | do { |
1299 | stream.next_out = outbuf; | |
1300 | stream.avail_out = sizeof(outbuf); | |
55bb5c91 | 1301 | status = git_deflate(&stream, Z_FINISH); |
98a3beab | 1302 | hashwrite(f, outbuf, sizeof(outbuf) - stream.avail_out); |
7734d7f2 NP |
1303 | } while (status == Z_OK); |
1304 | ||
1305 | if (status != Z_STREAM_END) | |
c2b97ecf | 1306 | die(_("unable to deflate appended object (%d)"), status); |
636171cb | 1307 | size = stream.total_out; |
55bb5c91 | 1308 | git_deflate_end(&stream); |
636171cb NP |
1309 | return size; |
1310 | } | |
1311 | ||
98a3beab | 1312 | static struct object_entry *append_obj_to_pack(struct hashfile *f, |
03993e13 | 1313 | const unsigned char *sha1, void *buf, |
636171cb NP |
1314 | unsigned long size, enum object_type type) |
1315 | { | |
1316 | struct object_entry *obj = &objects[nr_objects++]; | |
1317 | unsigned char header[10]; | |
1318 | unsigned long s = size; | |
1319 | int n = 0; | |
1320 | unsigned char c = (type << 4) | (s & 15); | |
1321 | s >>= 4; | |
1322 | while (s) { | |
1323 | header[n++] = c | 0x80; | |
1324 | c = s & 0x7f; | |
1325 | s >>= 7; | |
1326 | } | |
1327 | header[n++] = c; | |
8522148f | 1328 | crc32_begin(f); |
98a3beab | 1329 | hashwrite(f, header, n); |
72de2883 BS |
1330 | obj[0].size = size; |
1331 | obj[0].hdr_size = n; | |
1332 | obj[0].type = type; | |
1333 | obj[0].real_type = type; | |
aa7e44bf | 1334 | obj[1].idx.offset = obj[0].idx.offset + n; |
8522148f NP |
1335 | obj[1].idx.offset += write_compressed(f, buf, size); |
1336 | obj[0].idx.crc32 = crc32_end(f); | |
98a3beab | 1337 | hashflush(f); |
e6a492b7 | 1338 | hashcpy(obj->idx.oid.hash, sha1); |
03993e13 | 1339 | return obj; |
636171cb NP |
1340 | } |
1341 | ||
1342 | static int delta_pos_compare(const void *_a, const void *_b) | |
1343 | { | |
c6458e60 NTND |
1344 | struct ref_delta_entry *a = *(struct ref_delta_entry **)_a; |
1345 | struct ref_delta_entry *b = *(struct ref_delta_entry **)_b; | |
636171cb NP |
1346 | return a->obj_no - b->obj_no; |
1347 | } | |
9cf6d335 | 1348 | |
98a3beab | 1349 | static void fix_unresolved_deltas(struct hashfile *f) |
636171cb | 1350 | { |
c6458e60 | 1351 | struct ref_delta_entry **sorted_by_pos; |
781d9306 | 1352 | int i; |
636171cb NP |
1353 | |
1354 | /* | |
1355 | * Since many unresolved deltas may well be themselves base objects | |
1356 | * for more unresolved deltas, we really want to include the | |
1357 | * smallest number of base objects that would cover as much delta | |
1358 | * as possible by picking the | |
1359 | * trunc deltas first, allowing for other deltas to resolve without | |
1360 | * additional base objects. Since most base objects are to be found | |
1361 | * before deltas depending on them, a good heuristic is to start | |
1362 | * resolving deltas in the same order as their position in the pack. | |
1363 | */ | |
b32fa95f | 1364 | ALLOC_ARRAY(sorted_by_pos, nr_ref_deltas); |
c6458e60 | 1365 | for (i = 0; i < nr_ref_deltas; i++) |
781d9306 | 1366 | sorted_by_pos[i] = &ref_deltas[i]; |
9ed0d8d6 | 1367 | QSORT(sorted_by_pos, nr_ref_deltas, delta_pos_compare); |
636171cb | 1368 | |
781d9306 | 1369 | for (i = 0; i < nr_ref_deltas; i++) { |
c6458e60 | 1370 | struct ref_delta_entry *d = sorted_by_pos[i]; |
21666f1a | 1371 | enum object_type type; |
2baad220 | 1372 | struct base_data *base_obj = alloc_base_data(); |
636171cb NP |
1373 | |
1374 | if (objects[d->obj_no].real_type != OBJ_REF_DELTA) | |
1375 | continue; | |
c6458e60 | 1376 | base_obj->data = read_sha1_file(d->sha1, &type, &base_obj->size); |
2baad220 | 1377 | if (!base_obj->data) |
636171cb | 1378 | continue; |
636171cb | 1379 | |
c6458e60 | 1380 | if (check_sha1_signature(d->sha1, base_obj->data, |
2baad220 | 1381 | base_obj->size, typename(type))) |
c6458e60 NTND |
1382 | die(_("local object %s is corrupt"), sha1_to_hex(d->sha1)); |
1383 | base_obj->obj = append_obj_to_pack(f, d->sha1, | |
2baad220 NTND |
1384 | base_obj->data, base_obj->size, type); |
1385 | find_unresolved_deltas(base_obj); | |
4d4fcc54 | 1386 | display_progress(progress, nr_resolved_deltas); |
636171cb NP |
1387 | } |
1388 | free(sorted_by_pos); | |
1389 | } | |
1390 | ||
8e29c7c3 JT |
1391 | static const char *derive_filename(const char *pack_name, const char *suffix, |
1392 | struct strbuf *buf) | |
1393 | { | |
1394 | size_t len; | |
1395 | if (!strip_suffix(pack_name, ".pack", &len)) | |
1396 | die(_("packfile name '%s' does not end with '.pack'"), | |
1397 | pack_name); | |
1398 | strbuf_add(buf, pack_name, len); | |
1399 | strbuf_addch(buf, '.'); | |
1400 | strbuf_addstr(buf, suffix); | |
1401 | return buf->buf; | |
1402 | } | |
1403 | ||
1404 | static void write_special_file(const char *suffix, const char *msg, | |
0fd90dab | 1405 | const char *pack_name, const unsigned char *hash, |
8e29c7c3 JT |
1406 | const char **report) |
1407 | { | |
1408 | struct strbuf name_buf = STRBUF_INIT; | |
1409 | const char *filename; | |
1410 | int fd; | |
1411 | int msg_len = strlen(msg); | |
1412 | ||
1413 | if (pack_name) | |
1414 | filename = derive_filename(pack_name, suffix, &name_buf); | |
1415 | else | |
0fd90dab | 1416 | filename = odb_pack_name(&name_buf, hash, suffix); |
8e29c7c3 JT |
1417 | |
1418 | fd = odb_pack_keep(filename); | |
1419 | if (fd < 0) { | |
1420 | if (errno != EEXIST) | |
1421 | die_errno(_("cannot write %s file '%s'"), | |
1422 | suffix, filename); | |
1423 | } else { | |
1424 | if (msg_len > 0) { | |
1425 | write_or_die(fd, msg, msg_len); | |
1426 | write_or_die(fd, "\n", 1); | |
1427 | } | |
1428 | if (close(fd) != 0) | |
1429 | die_errno(_("cannot close written %s file '%s'"), | |
1430 | suffix, filename); | |
88e2f9ed JT |
1431 | if (report) |
1432 | *report = suffix; | |
8e29c7c3 JT |
1433 | } |
1434 | strbuf_release(&name_buf); | |
1435 | } | |
1436 | ||
e42797f5 NP |
1437 | static void final(const char *final_pack_name, const char *curr_pack_name, |
1438 | const char *final_index_name, const char *curr_index_name, | |
88e2f9ed | 1439 | const char *keep_msg, const char *promisor_msg, |
454253f0 | 1440 | unsigned char *hash) |
e42797f5 | 1441 | { |
3a55602e | 1442 | const char *report = "pack"; |
f2075480 JK |
1443 | struct strbuf pack_name = STRBUF_INIT; |
1444 | struct strbuf index_name = STRBUF_INIT; | |
e42797f5 NP |
1445 | int err; |
1446 | ||
1447 | if (!from_stdin) { | |
1448 | close(input_fd); | |
1449 | } else { | |
4c81b03e | 1450 | fsync_or_die(output_fd, curr_pack_name); |
e42797f5 NP |
1451 | err = close(output_fd); |
1452 | if (err) | |
c2b97ecf | 1453 | die_errno(_("error while closing pack file")); |
e42797f5 NP |
1454 | } |
1455 | ||
8e29c7c3 | 1456 | if (keep_msg) |
0fd90dab | 1457 | write_special_file("keep", keep_msg, final_pack_name, hash, |
8e29c7c3 | 1458 | &report); |
88e2f9ed JT |
1459 | if (promisor_msg) |
1460 | write_special_file("promisor", promisor_msg, final_pack_name, | |
0fd90dab | 1461 | hash, NULL); |
b8077709 | 1462 | |
e42797f5 | 1463 | if (final_pack_name != curr_pack_name) { |
ba47a308 | 1464 | if (!final_pack_name) |
454253f0 | 1465 | final_pack_name = odb_pack_name(&pack_name, hash, "pack"); |
cb5add58 | 1466 | if (finalize_object_file(curr_pack_name, final_pack_name)) |
c2b97ecf | 1467 | die(_("cannot store pack file")); |
fb8b1936 | 1468 | } else if (from_stdin) |
33b65030 | 1469 | chmod(final_pack_name, 0444); |
e42797f5 | 1470 | |
e42797f5 | 1471 | if (final_index_name != curr_index_name) { |
ba47a308 | 1472 | if (!final_index_name) |
454253f0 | 1473 | final_index_name = odb_pack_name(&index_name, hash, "idx"); |
cb5add58 | 1474 | if (finalize_object_file(curr_index_name, final_index_name)) |
c2b97ecf | 1475 | die(_("cannot store index file")); |
fb8b1936 JH |
1476 | } else |
1477 | chmod(final_index_name, 0444); | |
576162a4 NP |
1478 | |
1479 | if (!from_stdin) { | |
454253f0 | 1480 | printf("%s\n", sha1_to_hex(hash)); |
576162a4 | 1481 | } else { |
5b1ef2ce JK |
1482 | struct strbuf buf = STRBUF_INIT; |
1483 | ||
454253f0 | 1484 | strbuf_addf(&buf, "%s\t%s\n", report, sha1_to_hex(hash)); |
5b1ef2ce JK |
1485 | write_or_die(1, buf.buf, buf.len); |
1486 | strbuf_release(&buf); | |
576162a4 NP |
1487 | |
1488 | /* | |
1489 | * Let's just mimic git-unpack-objects here and write | |
1490 | * the last part of the input buffer to stdout. | |
1491 | */ | |
1492 | while (input_len) { | |
1493 | err = xwrite(1, input_buffer + input_offset, input_len); | |
1494 | if (err <= 0) | |
1495 | break; | |
1496 | input_len -= err; | |
1497 | input_offset += err; | |
1498 | } | |
1499 | } | |
ba47a308 | 1500 | |
f2075480 JK |
1501 | strbuf_release(&index_name); |
1502 | strbuf_release(&pack_name); | |
9cf6d335 SV |
1503 | } |
1504 | ||
ef90d6d4 | 1505 | static int git_index_pack_config(const char *k, const char *v, void *cb) |
4d00bda2 | 1506 | { |
ebcfb379 JH |
1507 | struct pack_idx_option *opts = cb; |
1508 | ||
4d00bda2 | 1509 | if (!strcmp(k, "pack.indexversion")) { |
ebcfb379 JH |
1510 | opts->version = git_config_int(k, v); |
1511 | if (opts->version > 2) | |
f350df42 | 1512 | die(_("bad pack.indexversion=%"PRIu32), opts->version); |
4d00bda2 NP |
1513 | return 0; |
1514 | } | |
b8a2486f NTND |
1515 | if (!strcmp(k, "pack.threads")) { |
1516 | nr_threads = git_config_int(k, v); | |
1517 | if (nr_threads < 0) | |
f350df42 | 1518 | die(_("invalid number of threads specified (%d)"), |
b8a2486f NTND |
1519 | nr_threads); |
1520 | #ifdef NO_PTHREADS | |
1521 | if (nr_threads != 1) | |
f350df42 | 1522 | warning(_("no threads support, ignoring %s"), k); |
b8a2486f NTND |
1523 | nr_threads = 1; |
1524 | #endif | |
1525 | return 0; | |
1526 | } | |
ef90d6d4 | 1527 | return git_default_config(k, v, cb); |
4d00bda2 NP |
1528 | } |
1529 | ||
3c9fc074 JH |
1530 | static int cmp_uint32(const void *a_, const void *b_) |
1531 | { | |
1532 | uint32_t a = *((uint32_t *)a_); | |
1533 | uint32_t b = *((uint32_t *)b_); | |
1534 | ||
1535 | return (a < b) ? -1 : (a != b); | |
1536 | } | |
1537 | ||
1538 | static void read_v2_anomalous_offsets(struct packed_git *p, | |
1539 | struct pack_idx_option *opts) | |
1540 | { | |
1541 | const uint32_t *idx1, *idx2; | |
1542 | uint32_t i; | |
1543 | ||
1544 | /* The address of the 4-byte offset table */ | |
1545 | idx1 = (((const uint32_t *)p->index_data) | |
1546 | + 2 /* 8-byte header */ | |
1547 | + 256 /* fan out */ | |
1548 | + 5 * p->num_objects /* 20-byte SHA-1 table */ | |
1549 | + p->num_objects /* CRC32 table */ | |
1550 | ); | |
1551 | ||
1552 | /* The address of the 8-byte offset table */ | |
1553 | idx2 = idx1 + p->num_objects; | |
1554 | ||
1555 | for (i = 0; i < p->num_objects; i++) { | |
1556 | uint32_t off = ntohl(idx1[i]); | |
1557 | if (!(off & 0x80000000)) | |
1558 | continue; | |
1559 | off = off & 0x7fffffff; | |
47fe3f6e | 1560 | check_pack_index_ptr(p, &idx2[off * 2]); |
3c9fc074 JH |
1561 | if (idx2[off * 2]) |
1562 | continue; | |
1563 | /* | |
1564 | * The real offset is ntohl(idx2[off * 2]) in high 4 | |
1565 | * octets, and ntohl(idx2[off * 2 + 1]) in low 4 | |
1566 | * octets. But idx2[off * 2] is Zero!!! | |
1567 | */ | |
1568 | ALLOC_GROW(opts->anomaly, opts->anomaly_nr + 1, opts->anomaly_alloc); | |
1569 | opts->anomaly[opts->anomaly_nr++] = ntohl(idx2[off * 2 + 1]); | |
1570 | } | |
1571 | ||
1b5294de | 1572 | QSORT(opts->anomaly, opts->anomaly_nr, cmp_uint32); |
3c9fc074 JH |
1573 | } |
1574 | ||
e337a04d JH |
1575 | static void read_idx_option(struct pack_idx_option *opts, const char *pack_name) |
1576 | { | |
1577 | struct packed_git *p = add_packed_git(pack_name, strlen(pack_name), 1); | |
1578 | ||
1579 | if (!p) | |
c2b97ecf | 1580 | die(_("Cannot open existing pack file '%s'"), pack_name); |
e337a04d | 1581 | if (open_pack_index(p)) |
c2b97ecf | 1582 | die(_("Cannot open existing pack idx file for '%s'"), pack_name); |
e337a04d JH |
1583 | |
1584 | /* Read the attributes from the existing idx file */ | |
1585 | opts->version = p->index_version; | |
1586 | ||
3c9fc074 JH |
1587 | if (opts->version == 2) |
1588 | read_v2_anomalous_offsets(p, opts); | |
1589 | ||
e337a04d JH |
1590 | /* |
1591 | * Get rid of the idx file as we do not need it anymore. | |
1592 | * NEEDSWORK: extract this bit from free_pack_by_name() in | |
1593 | * sha1_file.c, perhaps? It shouldn't matter very much as we | |
1594 | * know we haven't installed this pack (hence we never have | |
1595 | * read anything from it). | |
1596 | */ | |
1597 | close_pack_index(p); | |
1598 | free(p); | |
1599 | } | |
1600 | ||
38a45561 JH |
1601 | static void show_pack_info(int stat_only) |
1602 | { | |
c6458e60 | 1603 | int i, baseobjects = nr_objects - nr_ref_deltas - nr_ofs_deltas; |
d1a0ed18 JH |
1604 | unsigned long *chain_histogram = NULL; |
1605 | ||
1606 | if (deepest_delta) | |
1607 | chain_histogram = xcalloc(deepest_delta, sizeof(unsigned long)); | |
1608 | ||
38a45561 JH |
1609 | for (i = 0; i < nr_objects; i++) { |
1610 | struct object_entry *obj = &objects[i]; | |
1611 | ||
d1a0ed18 | 1612 | if (is_delta_type(obj->type)) |
41730576 | 1613 | chain_histogram[obj_stat[i].delta_depth - 1]++; |
38a45561 JH |
1614 | if (stat_only) |
1615 | continue; | |
1616 | printf("%s %-6s %lu %lu %"PRIuMAX, | |
e6a492b7 | 1617 | oid_to_hex(&obj->idx.oid), |
38a45561 JH |
1618 | typename(obj->real_type), obj->size, |
1619 | (unsigned long)(obj[1].idx.offset - obj->idx.offset), | |
1620 | (uintmax_t)obj->idx.offset); | |
1621 | if (is_delta_type(obj->type)) { | |
41730576 | 1622 | struct object_entry *bobj = &objects[obj_stat[i].base_object_no]; |
e6a492b7 | 1623 | printf(" %u %s", obj_stat[i].delta_depth, |
1624 | oid_to_hex(&bobj->idx.oid)); | |
38a45561 JH |
1625 | } |
1626 | putchar('\n'); | |
1627 | } | |
d1a0ed18 JH |
1628 | |
1629 | if (baseobjects) | |
c2b97ecf NTND |
1630 | printf_ln(Q_("non delta: %d object", |
1631 | "non delta: %d objects", | |
1632 | baseobjects), | |
1633 | baseobjects); | |
d1a0ed18 JH |
1634 | for (i = 0; i < deepest_delta; i++) { |
1635 | if (!chain_histogram[i]) | |
1636 | continue; | |
c2b97ecf NTND |
1637 | printf_ln(Q_("chain length = %d: %lu object", |
1638 | "chain length = %d: %lu objects", | |
1639 | chain_histogram[i]), | |
1640 | i + 1, | |
1641 | chain_histogram[i]); | |
d1a0ed18 | 1642 | } |
38a45561 JH |
1643 | } |
1644 | ||
3bb72562 | 1645 | int cmd_index_pack(int argc, const char **argv, const char *prefix) |
9cf6d335 | 1646 | { |
3aba2fdd | 1647 | int i, fix_thin_pack = 0, verify = 0, stat_only = 0; |
39539495 | 1648 | const char *curr_index; |
3bb72562 | 1649 | const char *index_name = NULL, *pack_name = NULL; |
8e29c7c3 | 1650 | const char *keep_msg = NULL; |
88e2f9ed | 1651 | const char *promisor_msg = NULL; |
8e29c7c3 | 1652 | struct strbuf index_name_buf = STRBUF_INIT; |
aa7e44bf | 1653 | struct pack_idx_entry **idx_objects; |
ebcfb379 | 1654 | struct pack_idx_option opts; |
454253f0 | 1655 | unsigned char pack_hash[GIT_MAX_RAWSZ]; |
c6807a40 | 1656 | unsigned foreign_nr = 1; /* zero is a "good" value, assume bad */ |
83558686 | 1657 | int report_end_of_input = 0; |
9cf6d335 | 1658 | |
8b4c0103 JT |
1659 | /* |
1660 | * index-pack never needs to fetch missing objects, since it only | |
1661 | * accesses the repo to do hash collision checks | |
1662 | */ | |
1663 | fetch_if_missing = 0; | |
1664 | ||
99caeed0 JN |
1665 | if (argc == 2 && !strcmp(argv[1], "-h")) |
1666 | usage(index_pack_usage); | |
1667 | ||
afc711b8 | 1668 | check_replace_refs = 0; |
22410549 | 1669 | fsck_options.walk = mark_link; |
6e2a09d2 | 1670 | |
ebcfb379 JH |
1671 | reset_pack_idx_option(&opts); |
1672 | git_config(git_index_pack_config, &opts); | |
3f8099fc | 1673 | if (prefix && chdir(prefix)) |
c2b97ecf | 1674 | die(_("Cannot come back to cwd")); |
4d00bda2 | 1675 | |
9cf6d335 | 1676 | for (i = 1; i < argc; i++) { |
3bb72562 | 1677 | const char *arg = argv[i]; |
9cf6d335 SV |
1678 | |
1679 | if (*arg == '-') { | |
e42797f5 NP |
1680 | if (!strcmp(arg, "--stdin")) { |
1681 | from_stdin = 1; | |
636171cb NP |
1682 | } else if (!strcmp(arg, "--fix-thin")) { |
1683 | fix_thin_pack = 1; | |
72885a6d | 1684 | } else if (skip_to_optional_arg(arg, "--strict", &arg)) { |
5d477a33 JS |
1685 | strict = 1; |
1686 | do_fsck_object = 1; | |
1687 | fsck_set_msg_types(&fsck_options, arg); | |
c6807a40 NTND |
1688 | } else if (!strcmp(arg, "--check-self-contained-and-connected")) { |
1689 | strict = 1; | |
1690 | check_self_contained_and_connected = 1; | |
e337a04d JH |
1691 | } else if (!strcmp(arg, "--verify")) { |
1692 | verify = 1; | |
38a45561 JH |
1693 | } else if (!strcmp(arg, "--verify-stat")) { |
1694 | verify = 1; | |
3aba2fdd | 1695 | show_stat = 1; |
38a45561 JH |
1696 | } else if (!strcmp(arg, "--verify-stat-only")) { |
1697 | verify = 1; | |
3aba2fdd | 1698 | show_stat = 1; |
38a45561 | 1699 | stat_only = 1; |
72885a6d CC |
1700 | } else if (skip_to_optional_arg(arg, "--keep", &keep_msg)) { |
1701 | ; /* nothing to do */ | |
f3d618d2 JH |
1702 | } else if (skip_to_optional_arg(arg, "--promisor", &promisor_msg)) { |
1703 | ; /* already parsed */ | |
59556548 | 1704 | } else if (starts_with(arg, "--threads=")) { |
b8a2486f NTND |
1705 | char *end; |
1706 | nr_threads = strtoul(arg+10, &end, 0); | |
1707 | if (!arg[10] || *end || nr_threads < 0) | |
1708 | usage(index_pack_usage); | |
1709 | #ifdef NO_PTHREADS | |
1710 | if (nr_threads != 1) | |
f350df42 NTND |
1711 | warning(_("no threads support, " |
1712 | "ignoring %s"), arg); | |
b8a2486f NTND |
1713 | nr_threads = 1; |
1714 | #endif | |
59556548 | 1715 | } else if (starts_with(arg, "--pack_header=")) { |
bed006fb NP |
1716 | struct pack_header *hdr; |
1717 | char *c; | |
1718 | ||
1719 | hdr = (struct pack_header *)input_buffer; | |
1720 | hdr->hdr_signature = htonl(PACK_SIGNATURE); | |
1721 | hdr->hdr_version = htonl(strtoul(arg + 14, &c, 10)); | |
1722 | if (*c != ',') | |
c2b97ecf | 1723 | die(_("bad %s"), arg); |
bed006fb NP |
1724 | hdr->hdr_entries = htonl(strtoul(c + 1, &c, 10)); |
1725 | if (*c) | |
c2b97ecf | 1726 | die(_("bad %s"), arg); |
bed006fb | 1727 | input_len = sizeof(*hdr); |
3c9af366 NP |
1728 | } else if (!strcmp(arg, "-v")) { |
1729 | verbose = 1; | |
e376f17f JK |
1730 | } else if (!strcmp(arg, "--show-resolving-progress")) { |
1731 | show_resolving_progress = 1; | |
83558686 JK |
1732 | } else if (!strcmp(arg, "--report-end-of-input")) { |
1733 | report_end_of_input = 1; | |
e42797f5 | 1734 | } else if (!strcmp(arg, "-o")) { |
9cf6d335 SV |
1735 | if (index_name || (i+1) >= argc) |
1736 | usage(index_pack_usage); | |
1737 | index_name = argv[++i]; | |
59556548 | 1738 | } else if (starts_with(arg, "--index-version=")) { |
4ba7d711 | 1739 | char *c; |
ebcfb379 JH |
1740 | opts.version = strtoul(arg + 16, &c, 10); |
1741 | if (opts.version > 2) | |
c2b97ecf | 1742 | die(_("bad %s"), arg); |
4ba7d711 | 1743 | if (*c == ',') |
ebcfb379 JH |
1744 | opts.off32_limit = strtoul(c+1, &c, 0); |
1745 | if (*c || opts.off32_limit & 0x80000000) | |
c2b97ecf | 1746 | die(_("bad %s"), arg); |
411481be JK |
1747 | } else if (skip_prefix(arg, "--max-input-size=", &arg)) { |
1748 | max_input_size = strtoumax(arg, NULL, 10); | |
9cf6d335 SV |
1749 | } else |
1750 | usage(index_pack_usage); | |
1751 | continue; | |
1752 | } | |
1753 | ||
1754 | if (pack_name) | |
1755 | usage(index_pack_usage); | |
1756 | pack_name = arg; | |
1757 | } | |
1758 | ||
e42797f5 | 1759 | if (!pack_name && !from_stdin) |
9cf6d335 | 1760 | usage(index_pack_usage); |
636171cb | 1761 | if (fix_thin_pack && !from_stdin) |
c2b97ecf | 1762 | die(_("--fix-thin cannot be used without --stdin")); |
7176a314 JK |
1763 | if (from_stdin && !startup_info->have_repository) |
1764 | die(_("--stdin requires a git repository")); | |
bfee614a | 1765 | if (!index_name && pack_name) |
8e29c7c3 | 1766 | index_name = derive_filename(pack_name, "idx", &index_name_buf); |
bfee614a | 1767 | |
e337a04d JH |
1768 | if (verify) { |
1769 | if (!index_name) | |
c2b97ecf | 1770 | die(_("--verify with no packfile name given")); |
e337a04d | 1771 | read_idx_option(&opts, index_name); |
68be2fea | 1772 | opts.flags |= WRITE_IDX_VERIFY | WRITE_IDX_STRICT; |
e337a04d | 1773 | } |
68be2fea JH |
1774 | if (strict) |
1775 | opts.flags |= WRITE_IDX_STRICT; | |
9cf6d335 | 1776 | |
b8a2486f NTND |
1777 | #ifndef NO_PTHREADS |
1778 | if (!nr_threads) { | |
1779 | nr_threads = online_cpus(); | |
1780 | /* An experiment showed that more threads does not mean faster */ | |
1781 | if (nr_threads > 3) | |
1782 | nr_threads = 3; | |
1783 | } | |
1784 | #endif | |
1785 | ||
e42797f5 | 1786 | curr_pack = open_pack_file(pack_name); |
9cf6d335 | 1787 | parse_pack_header(); |
50a6c8ef | 1788 | objects = xcalloc(st_add(nr_objects, 1), sizeof(struct object_entry)); |
41730576 | 1789 | if (show_stat) |
50a6c8ef | 1790 | obj_stat = xcalloc(st_add(nr_objects, 1), sizeof(struct object_stat)); |
c6458e60 | 1791 | ofs_deltas = xcalloc(nr_objects, sizeof(struct ofs_delta_entry)); |
454253f0 | 1792 | parse_pack_objects(pack_hash); |
83558686 JK |
1793 | if (report_end_of_input) |
1794 | write_in_full(2, "\0", 1); | |
5272f755 | 1795 | resolve_deltas(); |
454253f0 | 1796 | conclude_pack(fix_thin_pack, curr_pack, pack_hash); |
c6458e60 NTND |
1797 | free(ofs_deltas); |
1798 | free(ref_deltas); | |
0153be05 | 1799 | if (strict) |
c6807a40 | 1800 | foreign_nr = check_objects(); |
aa7e44bf | 1801 | |
3aba2fdd | 1802 | if (show_stat) |
38a45561 JH |
1803 | show_pack_info(stat_only); |
1804 | ||
b32fa95f | 1805 | ALLOC_ARRAY(idx_objects, nr_objects); |
aa7e44bf GB |
1806 | for (i = 0; i < nr_objects; i++) |
1807 | idx_objects[i] = &objects[i].idx; | |
454253f0 | 1808 | curr_index = write_idx_file(index_name, idx_objects, nr_objects, &opts, pack_hash); |
aa7e44bf GB |
1809 | free(idx_objects); |
1810 | ||
e337a04d JH |
1811 | if (!verify) |
1812 | final(pack_name, curr_pack, | |
1813 | index_name, curr_index, | |
88e2f9ed | 1814 | keep_msg, promisor_msg, |
454253f0 | 1815 | pack_hash); |
e337a04d JH |
1816 | else |
1817 | close(input_fd); | |
9cf6d335 | 1818 | free(objects); |
592ce208 | 1819 | strbuf_release(&index_name_buf); |
c85228ed | 1820 | if (pack_name == NULL) |
3bb72562 | 1821 | free((void *) curr_pack); |
c85228ed | 1822 | if (index_name == NULL) |
3bb72562 | 1823 | free((void *) curr_index); |
9cf6d335 | 1824 | |
c6807a40 NTND |
1825 | /* |
1826 | * Let the caller know this pack is not self contained | |
1827 | */ | |
1828 | if (check_self_contained_and_connected && foreign_nr) | |
1829 | return 1; | |
1830 | ||
9cf6d335 SV |
1831 | return 0; |
1832 | } |