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