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