?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Merge branch 'bw/remote-curl-compressed-responses'
[git/git-svn.git] / builtin / index-pack.c
blob4ab31ed388bb860110f5bd33ddf6d707f0cfa41f
1 #include "builtin.h"
2 #include "config.h"
3 #include "delta.h"
4 #include "pack.h"
5 #include "csum-file.h"
6 #include "blob.h"
7 #include "commit.h"
8 #include "tag.h"
9 #include "tree.h"
10 #include "progress.h"
11 #include "fsck.h"
12 #include "exec-cmd.h"
13 #include "streaming.h"
14 #include "thread-utils.h"
15 #include "packfile.h"
16 #include "object-store.h"
17
18 static const char index_pack_usage[] =
19 "git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
20
21 struct object_entry {
22 struct pack_idx_entry idx;
23 unsigned long size;
24 unsigned char hdr_size;
25 signed char type;
26 signed char real_type;
27 };
28
29 struct object_stat {
30 unsigned delta_depth;
31 int base_object_no;
32 };
33
34 struct base_data {
35 struct base_data *base;
36 struct base_data *child;
37 struct object_entry *obj;
38 void *data;
39 unsigned long size;
40 int ref_first, ref_last;
41 int ofs_first, ofs_last;
42 };
43
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;
50 int pack_fd;
51 };
52
53 /* Remember to update object flag allocation in object.h */
54 #define FLAG_LINK (1u<<20)
55 #define FLAG_CHECKED (1u<<21)
56
57 struct ofs_delta_entry {
58 off_t offset;
59 int obj_no;
60 };
61
62 struct ref_delta_entry {
63 struct object_id oid;
64 int obj_no;
65 };
66
67 static struct object_entry *objects;
68 static struct object_stat *obj_stat;
69 static struct ofs_delta_entry *ofs_deltas;
70 static struct ref_delta_entry *ref_deltas;
71 static struct thread_local nothread_data;
72 static int nr_objects;
73 static int nr_ofs_deltas;
74 static int nr_ref_deltas;
75 static int ref_deltas_alloc;
76 static int nr_resolved_deltas;
77 static int nr_threads;
78
79 static int from_stdin;
80 static int strict;
81 static int do_fsck_object;
82 static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT;
83 static int verbose;
84 static int show_resolving_progress;
85 static int show_stat;
86 static int check_self_contained_and_connected;
87
88 static struct progress *progress;
89
90 /* We always read in 4kB chunks. */
91 static unsigned char input_buffer[4096];
92 static unsigned int input_offset, input_len;
93 static off_t consumed_bytes;
94 static off_t max_input_size;
95 static unsigned deepest_delta;
96 static git_hash_ctx input_ctx;
97 static uint32_t input_crc32;
98 static int input_fd, output_fd;
99 static const char *curr_pack;
100
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
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
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
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 {
146 int i;
147 init_recursive_mutex(&read_mutex);
148 pthread_mutex_init(&counter_mutex, NULL);
149 pthread_mutex_init(&work_mutex, NULL);
150 pthread_mutex_init(&type_cas_mutex, NULL);
151 if (show_stat)
152 pthread_mutex_init(&deepest_delta_mutex, NULL);
153 pthread_key_create(&key, NULL);
154 thread_data = xcalloc(nr_threads, sizeof(*thread_data));
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
161 threads_active = 1;
162 }
163
164 static void cleanup_thread(void)
165 {
166 int i;
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);
173 pthread_mutex_destroy(&type_cas_mutex);
174 if (show_stat)
175 pthread_mutex_destroy(&deepest_delta_mutex);
176 for (i = 0; i < nr_threads; i++)
177 close(thread_data[i].pack_fd);
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
193 #define deepest_delta_lock()
194 #define deepest_delta_unlock()
195
196 #define type_cas_lock()
197 #define type_cas_unlock()
198
199 #endif
200
201
202 static int mark_link(struct object *obj, int type, void *data, struct fsck_options *options)
203 {
204 if (!obj)
205 return -1;
206
207 if (type != OBJ_ANY && obj->type != type)
208 die(_("object type mismatch at %s"), oid_to_hex(&obj->oid));
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 */
216 static unsigned check_object(struct object *obj)
217 {
218 if (!obj)
219 return 0;
220
221 if (!(obj->flags & FLAG_LINK))
222 return 0;
223
224 if (!(obj->flags & FLAG_CHECKED)) {
225 unsigned long size;
226 int type = oid_object_info(the_repository, &obj->oid, &size);
227 if (type <= 0)
228 die(_("did not receive expected object %s"),
229 oid_to_hex(&obj->oid));
230 if (type != obj->type)
231 die(_("object %s: expected type %s, found %s"),
232 oid_to_hex(&obj->oid),
233 type_name(obj->type), type_name(type));
234 obj->flags |= FLAG_CHECKED;
235 return 1;
236 }
237
238 return 0;
239 }
240
241 static unsigned check_objects(void)
242 {
243 unsigned i, max, foreign_nr = 0;
244
245 max = get_max_object_index();
246 for (i = 0; i < max; i++)
247 foreign_nr += check_object(get_indexed_object(i));
248 return foreign_nr;
249 }
250
251
252 /* Discard current buffer used content. */
253 static void flush(void)
254 {
255 if (input_offset) {
256 if (output_fd >= 0)
257 write_or_die(output_fd, input_buffer, input_offset);
258 the_hash_algo->update_fn(&input_ctx, input_buffer, input_offset);
259 memmove(input_buffer, input_buffer + input_offset, input_len);
260 input_offset = 0;
261 }
262 }
263
264 /*
265 * Make sure at least "min" bytes are available in the buffer, and
266 * return the pointer to the buffer.
267 */
268 static void *fill(int min)
269 {
270 if (min <= input_len)
271 return input_buffer + input_offset;
272 if (min > sizeof(input_buffer))
273 die(Q_("cannot fill %d byte",
274 "cannot fill %d bytes",
275 min),
276 min);
277 flush();
278 do {
279 ssize_t ret = xread(input_fd, input_buffer + input_len,
280 sizeof(input_buffer) - input_len);
281 if (ret <= 0) {
282 if (!ret)
283 die(_("early EOF"));
284 die_errno(_("read error on input"));
285 }
286 input_len += ret;
287 if (from_stdin)
288 display_throughput(progress, consumed_bytes + input_len);
289 } while (input_len < min);
290 return input_buffer;
291 }
292
293 static void use(int bytes)
294 {
295 if (bytes > input_len)
296 die(_("used more bytes than were available"));
297 input_crc32 = crc32(input_crc32, input_buffer + input_offset, bytes);
298 input_len -= bytes;
299 input_offset += bytes;
300
301 /* make sure off_t is sufficiently large not to wrap */
302 if (signed_add_overflows(consumed_bytes, bytes))
303 die(_("pack too large for current definition of off_t"));
304 consumed_bytes += bytes;
305 if (max_input_size && consumed_bytes > max_input_size)
306 die(_("pack exceeds maximum allowed size"));
307 }
308
309 static const char *open_pack_file(const char *pack_name)
310 {
311 if (from_stdin) {
312 input_fd = 0;
313 if (!pack_name) {
314 struct strbuf tmp_file = STRBUF_INIT;
315 output_fd = odb_mkstemp(&tmp_file,
316 "pack/tmp_pack_XXXXXX");
317 pack_name = strbuf_detach(&tmp_file, NULL);
318 } else {
319 output_fd = open(pack_name, O_CREAT|O_EXCL|O_RDWR, 0600);
320 if (output_fd < 0)
321 die_errno(_("unable to create '%s'"), pack_name);
322 }
323 nothread_data.pack_fd = output_fd;
324 } else {
325 input_fd = open(pack_name, O_RDONLY);
326 if (input_fd < 0)
327 die_errno(_("cannot open packfile '%s'"), pack_name);
328 output_fd = -1;
329 nothread_data.pack_fd = input_fd;
330 }
331 the_hash_algo->init_fn(&input_ctx);
332 return pack_name;
333 }
334
335 static void parse_pack_header(void)
336 {
337 struct pack_header *hdr = fill(sizeof(struct pack_header));
338
339 /* Header consistency check */
340 if (hdr->hdr_signature != htonl(PACK_SIGNATURE))
341 die(_("pack signature mismatch"));
342 if (!pack_version_ok(hdr->hdr_version))
343 die(_("pack version %"PRIu32" unsupported"),
344 ntohl(hdr->hdr_version));
345
346 nr_objects = ntohl(hdr->hdr_entries);
347 use(sizeof(struct pack_header));
348 }
349
350 static NORETURN void bad_object(off_t offset, const char *format,
351 ...) __attribute__((format (printf, 2, 3)));
352
353 static NORETURN void bad_object(off_t offset, const char *format, ...)
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);
361 die(_("pack has bad object at offset %"PRIuMAX": %s"),
362 (uintmax_t)offset, buf);
363 }
364
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 &nothread_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
384 static struct base_data *alloc_base_data(void)
385 {
386 struct base_data *base = xcalloc(1, sizeof(struct base_data));
387 base->ref_last = -1;
388 base->ofs_last = -1;
389 return base;
390 }
391
392 static void free_base_data(struct base_data *c)
393 {
394 if (c->data) {
395 FREE_AND_NULL(c->data);
396 get_thread_data()->base_cache_used -= c->size;
397 }
398 }
399
400 static void prune_base_data(struct base_data *retain)
401 {
402 struct base_data *b;
403 struct thread_local *data = get_thread_data();
404 for (b = data->base_cache;
405 data->base_cache_used > delta_base_cache_limit && b;
406 b = b->child) {
407 if (b->data && b != retain)
408 free_base_data(b);
409 }
410 }
411
412 static void link_base_data(struct base_data *base, struct base_data *c)
413 {
414 if (base)
415 base->child = c;
416 else
417 get_thread_data()->base_cache = c;
418
419 c->base = base;
420 c->child = NULL;
421 if (c->data)
422 get_thread_data()->base_cache_used += c->size;
423 prune_base_data(c);
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
432 get_thread_data()->base_cache = NULL;
433 free_base_data(c);
434 }
435
436 static int is_delta_type(enum object_type type)
437 {
438 return (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA);
439 }
440
441 static void *unpack_entry_data(off_t offset, unsigned long size,
442 enum object_type type, struct object_id *oid)
443 {
444 static char fixed_buf[8192];
445 int status;
446 git_zstream stream;
447 void *buf;
448 git_hash_ctx c;
449 char hdr[32];
450 int hdrlen;
451
452 if (!is_delta_type(type)) {
453 hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", type_name(type), size) + 1;
454 the_hash_algo->init_fn(&c);
455 the_hash_algo->update_fn(&c, hdr, hdrlen);
456 } else
457 oid = NULL;
458 if (type == OBJ_BLOB && size > big_file_threshold)
459 buf = fixed_buf;
460 else
461 buf = xmallocz(size);
462
463 memset(&stream, 0, sizeof(stream));
464 git_inflate_init(&stream);
465 stream.next_out = buf;
466 stream.avail_out = buf == fixed_buf ? sizeof(fixed_buf) : size;
467
468 do {
469 unsigned char *last_out = stream.next_out;
470 stream.next_in = fill(1);
471 stream.avail_in = input_len;
472 status = git_inflate(&stream, 0);
473 use(input_len - stream.avail_in);
474 if (oid)
475 the_hash_algo->update_fn(&c, last_out, stream.next_out - last_out);
476 if (buf == fixed_buf) {
477 stream.next_out = buf;
478 stream.avail_out = sizeof(fixed_buf);
479 }
480 } while (status == Z_OK);
481 if (stream.total_out != size || status != Z_STREAM_END)
482 bad_object(offset, _("inflate returned %d"), status);
483 git_inflate_end(&stream);
484 if (oid)
485 the_hash_algo->final_fn(oid->hash, &c);
486 return buf == fixed_buf ? NULL : buf;
487 }
488
489 static void *unpack_raw_entry(struct object_entry *obj,
490 off_t *ofs_offset,
491 struct object_id *ref_oid,
492 struct object_id *oid)
493 {
494 unsigned char *p;
495 unsigned long size, c;
496 off_t base_offset;
497 unsigned shift;
498 void *data;
499
500 obj->idx.offset = consumed_bytes;
501 input_crc32 = crc32(0, NULL, 0);
502
503 p = fill(1);
504 c = *p;
505 use(1);
506 obj->type = (c >> 4) & 7;
507 size = (c & 15);
508 shift = 4;
509 while (c & 0x80) {
510 p = fill(1);
511 c = *p;
512 use(1);
513 size += (c & 0x7f) << shift;
514 shift += 7;
515 }
516 obj->size = size;
517
518 switch (obj->type) {
519 case OBJ_REF_DELTA:
520 hashcpy(ref_oid->hash, fill(the_hash_algo->rawsz));
521 use(the_hash_algo->rawsz);
522 break;
523 case OBJ_OFS_DELTA:
524 p = fill(1);
525 c = *p;
526 use(1);
527 base_offset = c & 127;
528 while (c & 128) {
529 base_offset += 1;
530 if (!base_offset || MSB(base_offset, 7))
531 bad_object(obj->idx.offset, _("offset value overflow for delta base object"));
532 p = fill(1);
533 c = *p;
534 use(1);
535 base_offset = (base_offset << 7) + (c & 127);
536 }
537 *ofs_offset = obj->idx.offset - base_offset;
538 if (*ofs_offset <= 0 || *ofs_offset >= obj->idx.offset)
539 bad_object(obj->idx.offset, _("delta base offset is out of bound"));
540 break;
541 case OBJ_COMMIT:
542 case OBJ_TREE:
543 case OBJ_BLOB:
544 case OBJ_TAG:
545 break;
546 default:
547 bad_object(obj->idx.offset, _("unknown object type %d"), obj->type);
548 }
549 obj->hdr_size = consumed_bytes - obj->idx.offset;
550
551 data = unpack_entry_data(obj->idx.offset, obj->size, obj->type, oid);
552 obj->idx.crc32 = input_crc32;
553 return data;
554 }
555
556 static void *unpack_data(struct object_entry *obj,
557 int (*consume)(const unsigned char *, unsigned long, void *),
558 void *cb_data)
559 {
560 off_t from = obj[0].idx.offset + obj[0].hdr_size;
561 off_t len = obj[1].idx.offset - from;
562 unsigned char *data, *inbuf;
563 git_zstream stream;
564 int status;
565
566 data = xmallocz(consume ? 64*1024 : obj->size);
567 inbuf = xmalloc((len < 64*1024) ? (int)len : 64*1024);
568
569 memset(&stream, 0, sizeof(stream));
570 git_inflate_init(&stream);
571 stream.next_out = data;
572 stream.avail_out = consume ? 64*1024 : obj->size;
573
574 do {
575 ssize_t n = (len < 64*1024) ? (ssize_t)len : 64*1024;
576 n = xpread(get_thread_data()->pack_fd, inbuf, n, from);
577 if (n < 0)
578 die_errno(_("cannot pread pack file"));
579 if (!n)
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);
584 from += n;
585 len -= n;
586 stream.next_in = inbuf;
587 stream.avail_in = n;
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);
601 }
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)
606 die(_("serious inflate inconsistency"));
607
608 git_inflate_end(&stream);
609 free(inbuf);
610 if (consume) {
611 FREE_AND_NULL(data);
612 }
613 return data;
614 }
615
616 static void *get_data_from_pack(struct object_entry *obj)
617 {
618 return unpack_data(obj, NULL, NULL);
619 }
620
621 static int compare_ofs_delta_bases(off_t offset1, off_t offset2,
622 enum object_type type1,
623 enum object_type type2)
624 {
625 int cmp = type1 - type2;
626 if (cmp)
627 return cmp;
628 return offset1 < offset2 ? -1 :
629 offset1 > offset2 ? 1 :
630 0;
631 }
632
633 static int find_ofs_delta(const off_t offset, enum object_type type)
634 {
635 int first = 0, last = nr_ofs_deltas;
636
637 while (first < last) {
638 int next = first + (last - first) / 2;
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;
653 }
654
655 static void find_ofs_delta_children(off_t offset,
656 int *first_index, int *last_index,
657 enum object_type type)
658 {
659 int first = find_ofs_delta(offset, type);
660 int last = first;
661 int end = nr_ofs_deltas - 1;
662
663 if (first < 0) {
664 *first_index = 0;
665 *last_index = -1;
666 return;
667 }
668 while (first > 0 && ofs_deltas[first - 1].offset == offset)
669 --first;
670 while (last < end && ofs_deltas[last + 1].offset == offset)
671 ++last;
672 *first_index = first;
673 *last_index = last;
674 }
675
676 static int compare_ref_delta_bases(const struct object_id *oid1,
677 const struct object_id *oid2,
678 enum object_type type1,
679 enum object_type type2)
680 {
681 int cmp = type1 - type2;
682 if (cmp)
683 return cmp;
684 return oidcmp(oid1, oid2);
685 }
686
687 static int find_ref_delta(const struct object_id *oid, enum object_type type)
688 {
689 int first = 0, last = nr_ref_deltas;
690
691 while (first < last) {
692 int next = first + (last - first) / 2;
693 struct ref_delta_entry *delta = &ref_deltas[next];
694 int cmp;
695
696 cmp = compare_ref_delta_bases(oid, &delta->oid,
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
709 static void find_ref_delta_children(const struct object_id *oid,
710 int *first_index, int *last_index,
711 enum object_type type)
712 {
713 int first = find_ref_delta(oid, type);
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 }
722 while (first > 0 && !oidcmp(&ref_deltas[first - 1].oid, oid))
723 --first;
724 while (last < end && !oidcmp(&ref_deltas[last + 1].oid, oid))
725 ++last;
726 *first_index = first;
727 *last_index = last;
728 }
729
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 !"),
752 oid_to_hex(&data->entry->idx.oid));
753 if (len < 0)
754 die(_("unable to read %s"),
755 oid_to_hex(&data->entry->idx.oid));
756 if (memcmp(buf, data->buf, len))
757 die(_("SHA1 COLLISION FOUND WITH %s !"),
758 oid_to_hex(&data->entry->idx.oid));
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;
776 data.st = open_istream(&entry->idx.oid, &type, &size, NULL);
777 if (!data.st)
778 return -1;
779 if (size != entry->size || type != entry->type)
780 die(_("SHA1 COLLISION FOUND WITH %s !"),
781 oid_to_hex(&entry->idx.oid));
782 unpack_data(entry, compare_objects, &data);
783 close_istream(data.st);
784 free(data.buf);
785 return 0;
786 }
787
788 static void sha1_object(const void *data, struct object_entry *obj_entry,
789 unsigned long size, enum object_type type,
790 const struct object_id *oid)
791 {
792 void *new_data = NULL;
793 int collision_test_needed = 0;
794
795 assert(data || obj_entry);
796
797 if (startup_info->have_repository) {
798 read_lock();
799 collision_test_needed =
800 has_sha1_file_with_flags(oid->hash, OBJECT_INFO_QUICK);
801 read_unlock();
802 }
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) {
811 void *has_data;
812 enum object_type has_type;
813 unsigned long has_size;
814 read_lock();
815 has_type = oid_object_info(the_repository, oid, &has_size);
816 if (has_type < 0)
817 die(_("cannot read existing object info %s"), oid_to_hex(oid));
818 if (has_type != type || has_size != size)
819 die(_("SHA1 COLLISION FOUND WITH %s !"), oid_to_hex(oid));
820 has_data = read_object_file(oid, &has_type, &has_size);
821 read_unlock();
822 if (!data)
823 data = new_data = get_data_from_pack(obj_entry);
824 if (!has_data)
825 die(_("cannot read existing object %s"), oid_to_hex(oid));
826 if (size != has_size || type != has_type ||
827 memcmp(data, has_data, size) != 0)
828 die(_("SHA1 COLLISION FOUND WITH %s !"), oid_to_hex(oid));
829 free(has_data);
830 }
831
832 if (strict || do_fsck_object) {
833 read_lock();
834 if (type == OBJ_BLOB) {
835 struct blob *blob = lookup_blob(oid);
836 if (blob)
837 blob->object.flags |= FLAG_CHECKED;
838 else
839 die(_("invalid blob object %s"), oid_to_hex(oid));
840 if (do_fsck_object &&
841 fsck_object(&blob->object, (void *)data, size, &fsck_options))
842 die(_("fsck error in packed object"));
843 } else {
844 struct object *obj;
845 int eaten;
846 void *buf = (void *) data;
847
848 assert(data && "data can only be NULL for large _blobs_");
849
850 /*
851 * we do not need to free the memory here, as the
852 * buf is deleted by the caller.
853 */
854 obj = parse_object_buffer(oid, type, size, buf,
855 &eaten);
856 if (!obj)
857 die(_("invalid %s"), type_name(type));
858 if (do_fsck_object &&
859 fsck_object(obj, buf, size, &fsck_options))
860 die(_("fsck error in packed object"));
861 if (strict && fsck_walk(obj, NULL, &fsck_options))
862 die(_("Not all child objects of %s are reachable"), oid_to_hex(&obj->oid));
863
864 if (obj->type == OBJ_TREE) {
865 struct tree *item = (struct tree *) obj;
866 item->buffer = NULL;
867 obj->parsed = 0;
868 }
869 if (obj->type == OBJ_COMMIT) {
870 struct commit *commit = (struct commit *) obj;
871 if (detach_commit_buffer(commit, NULL) != data)
872 BUG("parse_object_buffer transmogrified our buffer");
873 }
874 obj->flags |= FLAG_CHECKED;
875 }
876 read_unlock();
877 }
878
879 free(new_data);
880 }
881
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 */
904 static void *get_base_data(struct base_data *c)
905 {
906 if (!c->data) {
907 struct object_entry *obj = c->obj;
908 struct base_data **delta = NULL;
909 int delta_nr = 0, delta_alloc = 0;
910
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;
919 get_thread_data()->base_cache_used += c->size;
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);
928 c->data = patch_delta(
929 base, c->base->size,
930 raw, obj->size,
931 &c->size);
932 free(raw);
933 if (!c->data)
934 bad_object(obj->idx.offset, _("failed to apply delta"));
935 get_thread_data()->base_cache_used += c->size;
936 prune_base_data(c);
937 }
938 free(delta);
939 }
940 return c->data;
941 }
942
943 static void resolve_delta(struct object_entry *delta_obj,
944 struct base_data *base, struct base_data *result)
945 {
946 void *base_data, *delta_data;
947
948 if (show_stat) {
949 int i = delta_obj - objects;
950 int j = base->obj - objects;
951 obj_stat[i].delta_depth = obj_stat[j].delta_depth + 1;
952 deepest_delta_lock();
953 if (deepest_delta < obj_stat[i].delta_depth)
954 deepest_delta = obj_stat[i].delta_depth;
955 deepest_delta_unlock();
956 obj_stat[i].base_object_no = j;
957 }
958 delta_data = get_data_from_pack(delta_obj);
959 base_data = get_base_data(base);
960 result->obj = delta_obj;
961 result->data = patch_delta(base_data, base->size,
962 delta_data, delta_obj->size, &result->size);
963 free(delta_data);
964 if (!result->data)
965 bad_object(delta_obj->idx.offset, _("failed to apply delta"));
966 hash_object_file(result->data, result->size,
967 type_name(delta_obj->real_type), &delta_obj->idx.oid);
968 sha1_object(result->data, NULL, result->size, delta_obj->real_type,
969 &delta_obj->idx.oid);
970 counter_lock();
971 nr_resolved_deltas++;
972 counter_unlock();
973 }
974
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 */
980 static int compare_and_swap_type(signed char *type,
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
995 static struct base_data *find_unresolved_deltas_1(struct base_data *base,
996 struct base_data *prev_base)
997 {
998 if (base->ref_last == -1 && base->ofs_last == -1) {
999 find_ref_delta_children(&base->obj->idx.oid,
1000 &base->ref_first, &base->ref_last,
1001 OBJ_REF_DELTA);
1002
1003 find_ofs_delta_children(base->obj->idx.offset,
1004 &base->ofs_first, &base->ofs_last,
1005 OBJ_OFS_DELTA);
1006
1007 if (base->ref_last == -1 && base->ofs_last == -1) {
1008 free(base->data);
1009 return NULL;
1010 }
1011
1012 link_base_data(prev_base, base);
1013 }
1014
1015 if (base->ref_first <= base->ref_last) {
1016 struct object_entry *child = objects + ref_deltas[base->ref_first].obj_no;
1017 struct base_data *result = alloc_base_data();
1018
1019 if (!compare_and_swap_type(&child->real_type, OBJ_REF_DELTA,
1020 base->obj->real_type))
1021 BUG("child->real_type != OBJ_REF_DELTA");
1022
1023 resolve_delta(child, base, result);
1024 if (base->ref_first == base->ref_last && base->ofs_last == -1)
1025 free_base_data(base);
1026
1027 base->ref_first++;
1028 return result;
1029 }
1030
1031 if (base->ofs_first <= base->ofs_last) {
1032 struct object_entry *child = objects + ofs_deltas[base->ofs_first].obj_no;
1033 struct base_data *result = alloc_base_data();
1034
1035 assert(child->real_type == OBJ_OFS_DELTA);
1036 child->real_type = base->obj->real_type;
1037 resolve_delta(child, base, result);
1038 if (base->ofs_first == base->ofs_last)
1039 free_base_data(base);
1040
1041 base->ofs_first++;
1042 return result;
1043 }
1044
1045 unlink_base_data(base);
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 }
1066 }
1067
1068 static int compare_ofs_delta_entry(const void *a, const void *b)
1069 {
1070 const struct ofs_delta_entry *delta_a = a;
1071 const struct ofs_delta_entry *delta_b = b;
1072
1073 return delta_a->offset < delta_b->offset ? -1 :
1074 delta_a->offset > delta_b->offset ? 1 :
1075 0;
1076 }
1077
1078 static int compare_ref_delta_entry(const void *a, const void *b)
1079 {
1080 const struct ref_delta_entry *delta_a = a;
1081 const struct ref_delta_entry *delta_b = b;
1082
1083 return oidcmp(&delta_a->oid, &delta_b->oid);
1084 }
1085
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
1094 #ifndef NO_PTHREADS
1095 static void *threaded_second_pass(void *data)
1096 {
1097 set_thread_data(data);
1098 for (;;) {
1099 int i;
1100 counter_lock();
1101 display_progress(progress, nr_resolved_deltas);
1102 counter_unlock();
1103 work_lock();
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
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 */
1126 static void parse_pack_objects(unsigned char *hash)
1127 {
1128 int i, nr_delays = 0;
1129 struct ofs_delta_entry *ofs_delta = ofs_deltas;
1130 struct object_id ref_delta_oid;
1131 struct stat st;
1132
1133 if (verbose)
1134 progress = start_progress(
1135 from_stdin ? _("Receiving objects") : _("Indexing objects"),
1136 nr_objects);
1137 for (i = 0; i < nr_objects; i++) {
1138 struct object_entry *obj = &objects[i];
1139 void *data = unpack_raw_entry(obj, &ofs_delta->offset,
1140 &ref_delta_oid,
1141 &obj->idx.oid);
1142 obj->real_type = obj->type;
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);
1149 oidcpy(&ref_deltas[nr_ref_deltas].oid, &ref_delta_oid);
1150 ref_deltas[nr_ref_deltas].obj_no = i;
1151 nr_ref_deltas++;
1152 } else if (!data) {
1153 /* large blobs, check later */
1154 obj->real_type = OBJ_BAD;
1155 nr_delays++;
1156 } else
1157 sha1_object(data, NULL, obj->size, obj->type,
1158 &obj->idx.oid);
1159 free(data);
1160 display_progress(progress, i+1);
1161 }
1162 objects[i].idx.offset = consumed_bytes;
1163 stop_progress(&progress);
1164
1165 /* Check pack integrity */
1166 flush();
1167 the_hash_algo->final_fn(hash, &input_ctx);
1168 if (hashcmp(fill(the_hash_algo->rawsz), hash))
1169 die(_("pack is corrupted (SHA1 mismatch)"));
1170 use(the_hash_algo->rawsz);
1171
1172 /* If input_fd is a file, we should have reached its end now. */
1173 if (fstat(input_fd, &st))
1174 die_errno(_("cannot fstat packfile"));
1175 if (S_ISREG(st.st_mode) &&
1176 lseek(input_fd, 0, SEEK_CUR) - input_len != st.st_size)
1177 die(_("pack has junk at the end"));
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;
1184 sha1_object(NULL, obj, obj->size, obj->type,
1185 &obj->idx.oid);
1186 nr_delays--;
1187 }
1188 if (nr_delays)
1189 die(_("confusion beyond insanity in parse_pack_objects()"));
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;
1203
1204 if (!nr_ofs_deltas && !nr_ref_deltas)
1205 return;
1206
1207 /* Sort deltas by base SHA1/offset for fast searching */
1208 QSORT(ofs_deltas, nr_ofs_deltas, compare_ofs_delta_entry);
1209 QSORT(ref_deltas, nr_ref_deltas, compare_ref_delta_entry);
1210
1211 if (verbose || show_resolving_progress)
1212 progress = start_progress(_("Resolving deltas"),
1213 nr_ref_deltas + nr_ofs_deltas);
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)
1223 die(_("unable to create thread: %s"),
1224 strerror(ret));
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
1233 for (i = 0; i < nr_objects; i++) {
1234 struct object_entry *obj = &objects[i];
1235
1236 if (is_delta_type(obj->type))
1237 continue;
1238 resolve_base(obj);
1239 display_progress(progress, nr_resolved_deltas);
1240 }
1241 }
1242
1243 /*
1244 * Third pass:
1245 * - append objects to convert thin pack to full pack if required
1246 * - write the final pack hash
1247 */
1248 static void fix_unresolved_deltas(struct hashfile *f);
1249 static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned char *pack_hash)
1250 {
1251 if (nr_ref_deltas + nr_ofs_deltas == nr_resolved_deltas) {
1252 stop_progress(&progress);
1253 /* Flush remaining pack final hash. */
1254 flush();
1255 return;
1256 }
1257
1258 if (fix_thin_pack) {
1259 struct hashfile *f;
1260 unsigned char read_hash[GIT_MAX_RAWSZ], tail_hash[GIT_MAX_RAWSZ];
1261 struct strbuf msg = STRBUF_INIT;
1262 int nr_unresolved = nr_ofs_deltas + nr_ref_deltas - nr_resolved_deltas;
1263 int nr_objects_initial = nr_objects;
1264 if (nr_unresolved <= 0)
1265 die(_("confusion beyond insanity"));
1266 REALLOC_ARRAY(objects, nr_objects + nr_unresolved + 1);
1267 memset(objects + nr_objects + 1, 0,
1268 nr_unresolved * sizeof(*objects));
1269 f = hashfd(output_fd, curr_pack);
1270 fix_unresolved_deltas(f);
1271 strbuf_addf(&msg, Q_("completed with %d local object",
1272 "completed with %d local objects",
1273 nr_objects - nr_objects_initial),
1274 nr_objects - nr_objects_initial);
1275 stop_progress_msg(&progress, msg.buf);
1276 strbuf_release(&msg);
1277 finalize_hashfile(f, tail_hash, 0);
1278 hashcpy(read_hash, pack_hash);
1279 fixup_pack_header_footer(output_fd, pack_hash,
1280 curr_pack, nr_objects,
1281 read_hash, consumed_bytes-the_hash_algo->rawsz);
1282 if (hashcmp(read_hash, tail_hash) != 0)
1283 die(_("Unexpected tail checksum for %s "
1284 "(disk corruption?)"), curr_pack);
1285 }
1286 if (nr_ofs_deltas + nr_ref_deltas != nr_resolved_deltas)
1287 die(Q_("pack has %d unresolved delta",
1288 "pack has %d unresolved deltas",
1289 nr_ofs_deltas + nr_ref_deltas - nr_resolved_deltas),
1290 nr_ofs_deltas + nr_ref_deltas - nr_resolved_deltas);
1291 }
1292
1293 static int write_compressed(struct hashfile *f, void *in, unsigned int size)
1294 {
1295 git_zstream stream;
1296 int status;
1297 unsigned char outbuf[4096];
1298
1299 git_deflate_init(&stream, zlib_compression_level);
1300 stream.next_in = in;
1301 stream.avail_in = size;
1302
1303 do {
1304 stream.next_out = outbuf;
1305 stream.avail_out = sizeof(outbuf);
1306 status = git_deflate(&stream, Z_FINISH);
1307 hashwrite(f, outbuf, sizeof(outbuf) - stream.avail_out);
1308 } while (status == Z_OK);
1309
1310 if (status != Z_STREAM_END)
1311 die(_("unable to deflate appended object (%d)"), status);
1312 size = stream.total_out;
1313 git_deflate_end(&stream);
1314 return size;
1315 }
1316
1317 static struct object_entry *append_obj_to_pack(struct hashfile *f,
1318 const unsigned char *sha1, void *buf,
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;
1333 crc32_begin(f);
1334 hashwrite(f, header, n);
1335 obj[0].size = size;
1336 obj[0].hdr_size = n;
1337 obj[0].type = type;
1338 obj[0].real_type = type;
1339 obj[1].idx.offset = obj[0].idx.offset + n;
1340 obj[1].idx.offset += write_compressed(f, buf, size);
1341 obj[0].idx.crc32 = crc32_end(f);
1342 hashflush(f);
1343 hashcpy(obj->idx.oid.hash, sha1);
1344 return obj;
1345 }
1346
1347 static int delta_pos_compare(const void *_a, const void *_b)
1348 {
1349 struct ref_delta_entry *a = *(struct ref_delta_entry **)_a;
1350 struct ref_delta_entry *b = *(struct ref_delta_entry **)_b;
1351 return a->obj_no - b->obj_no;
1352 }
1353
1354 static void fix_unresolved_deltas(struct hashfile *f)
1355 {
1356 struct ref_delta_entry **sorted_by_pos;
1357 int i;
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 */
1369 ALLOC_ARRAY(sorted_by_pos, nr_ref_deltas);
1370 for (i = 0; i < nr_ref_deltas; i++)
1371 sorted_by_pos[i] = &ref_deltas[i];
1372 QSORT(sorted_by_pos, nr_ref_deltas, delta_pos_compare);
1373
1374 for (i = 0; i < nr_ref_deltas; i++) {
1375 struct ref_delta_entry *d = sorted_by_pos[i];
1376 enum object_type type;
1377 struct base_data *base_obj = alloc_base_data();
1378
1379 if (objects[d->obj_no].real_type != OBJ_REF_DELTA)
1380 continue;
1381 base_obj->data = read_object_file(&d->oid, &type,
1382 &base_obj->size);
1383 if (!base_obj->data)
1384 continue;
1385
1386 if (check_object_signature(&d->oid, base_obj->data,
1387 base_obj->size, type_name(type)))
1388 die(_("local object %s is corrupt"), oid_to_hex(&d->oid));
1389 base_obj->obj = append_obj_to_pack(f, d->oid.hash,
1390 base_obj->data, base_obj->size, type);
1391 find_unresolved_deltas(base_obj);
1392 display_progress(progress, nr_resolved_deltas);
1393 }
1394 free(sorted_by_pos);
1395 }
1396
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,
1411 const char *pack_name, const unsigned char *hash,
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
1422 filename = odb_pack_name(&name_buf, hash, suffix);
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);
1437 if (report)
1438 *report = suffix;
1439 }
1440 strbuf_release(&name_buf);
1441 }
1442
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,
1445 const char *keep_msg, const char *promisor_msg,
1446 unsigned char *hash)
1447 {
1448 const char *report = "pack";
1449 struct strbuf pack_name = STRBUF_INIT;
1450 struct strbuf index_name = STRBUF_INIT;
1451 int err;
1452
1453 if (!from_stdin) {
1454 close(input_fd);
1455 } else {
1456 fsync_or_die(output_fd, curr_pack_name);
1457 err = close(output_fd);
1458 if (err)
1459 die_errno(_("error while closing pack file"));
1460 }
1461
1462 if (keep_msg)
1463 write_special_file("keep", keep_msg, final_pack_name, hash,
1464 &report);
1465 if (promisor_msg)
1466 write_special_file("promisor", promisor_msg, final_pack_name,
1467 hash, NULL);
1468
1469 if (final_pack_name != curr_pack_name) {
1470 if (!final_pack_name)
1471 final_pack_name = odb_pack_name(&pack_name, hash, "pack");
1472 if (finalize_object_file(curr_pack_name, final_pack_name))
1473 die(_("cannot store pack file"));
1474 } else if (from_stdin)
1475 chmod(final_pack_name, 0444);
1476
1477 if (final_index_name != curr_index_name) {
1478 if (!final_index_name)
1479 final_index_name = odb_pack_name(&index_name, hash, "idx");
1480 if (finalize_object_file(curr_index_name, final_index_name))
1481 die(_("cannot store index file"));
1482 } else
1483 chmod(final_index_name, 0444);
1484
1485 if (do_fsck_object)
1486 add_packed_git(final_index_name, strlen(final_index_name), 0);
1487
1488 if (!from_stdin) {
1489 printf("%s\n", sha1_to_hex(hash));
1490 } else {
1491 struct strbuf buf = STRBUF_INIT;
1492
1493 strbuf_addf(&buf, "%s\t%s\n", report, sha1_to_hex(hash));
1494 write_or_die(1, buf.buf, buf.len);
1495 strbuf_release(&buf);
1496
1497 /*
1498 * Let's just mimic git-unpack-objects here and write
1499 * the last part of the input buffer to stdout.
1500 */
1501 while (input_len) {
1502 err = xwrite(1, input_buffer + input_offset, input_len);
1503 if (err <= 0)
1504 break;
1505 input_len -= err;
1506 input_offset += err;
1507 }
1508 }
1509
1510 strbuf_release(&index_name);
1511 strbuf_release(&pack_name);
1512 }
1513
1514 static int git_index_pack_config(const char *k, const char *v, void *cb)
1515 {
1516 struct pack_idx_option *opts = cb;
1517
1518 if (!strcmp(k, "pack.indexversion")) {
1519 opts->version = git_config_int(k, v);
1520 if (opts->version > 2)
1521 die(_("bad pack.indexversion=%"PRIu32), opts->version);
1522 return 0;
1523 }
1524 if (!strcmp(k, "pack.threads")) {
1525 nr_threads = git_config_int(k, v);
1526 if (nr_threads < 0)
1527 die(_("invalid number of threads specified (%d)"),
1528 nr_threads);
1529 #ifdef NO_PTHREADS
1530 if (nr_threads != 1)
1531 warning(_("no threads support, ignoring %s"), k);
1532 nr_threads = 1;
1533 #endif
1534 return 0;
1535 }
1536 return git_default_config(k, v, cb);
1537 }
1538
1539 static int cmp_uint32(const void *a_, const void *b_)
1540 {
1541 uint32_t a = *((uint32_t *)a_);
1542 uint32_t b = *((uint32_t *)b_);
1543
1544 return (a < b) ? -1 : (a != b);
1545 }
1546
1547 static void read_v2_anomalous_offsets(struct packed_git *p,
1548 struct pack_idx_option *opts)
1549 {
1550 const uint32_t *idx1, *idx2;
1551 uint32_t i;
1552 const uint32_t hashwords = the_hash_algo->rawsz / sizeof(uint32_t);
1553
1554 /* The address of the 4-byte offset table */
1555 idx1 = (((const uint32_t *)p->index_data)
1556 + 2 /* 8-byte header */
1557 + 256 /* fan out */
1558 + hashwords * p->num_objects /* object ID table */
1559 + p->num_objects /* CRC32 table */
1560 );
1561
1562 /* The address of the 8-byte offset table */
1563 idx2 = idx1 + p->num_objects;
1564
1565 for (i = 0; i < p->num_objects; i++) {
1566 uint32_t off = ntohl(idx1[i]);
1567 if (!(off & 0x80000000))
1568 continue;
1569 off = off & 0x7fffffff;
1570 check_pack_index_ptr(p, &idx2[off * 2]);
1571 if (idx2[off * 2])
1572 continue;
1573 /*
1574 * The real offset is ntohl(idx2[off * 2]) in high 4
1575 * octets, and ntohl(idx2[off * 2 + 1]) in low 4
1576 * octets. But idx2[off * 2] is Zero!!!
1577 */
1578 ALLOC_GROW(opts->anomaly, opts->anomaly_nr + 1, opts->anomaly_alloc);
1579 opts->anomaly[opts->anomaly_nr++] = ntohl(idx2[off * 2 + 1]);
1580 }
1581
1582 QSORT(opts->anomaly, opts->anomaly_nr, cmp_uint32);
1583 }
1584
1585 static void read_idx_option(struct pack_idx_option *opts, const char *pack_name)
1586 {
1587 struct packed_git *p = add_packed_git(pack_name, strlen(pack_name), 1);
1588
1589 if (!p)
1590 die(_("Cannot open existing pack file '%s'"), pack_name);
1591 if (open_pack_index(p))
1592 die(_("Cannot open existing pack idx file for '%s'"), pack_name);
1593
1594 /* Read the attributes from the existing idx file */
1595 opts->version = p->index_version;
1596
1597 if (opts->version == 2)
1598 read_v2_anomalous_offsets(p, opts);
1599
1600 /*
1601 * Get rid of the idx file as we do not need it anymore.
1602 * NEEDSWORK: extract this bit from free_pack_by_name() in
1603 * sha1-file.c, perhaps? It shouldn't matter very much as we
1604 * know we haven't installed this pack (hence we never have
1605 * read anything from it).
1606 */
1607 close_pack_index(p);
1608 free(p);
1609 }
1610
1611 static void show_pack_info(int stat_only)
1612 {
1613 int i, baseobjects = nr_objects - nr_ref_deltas - nr_ofs_deltas;
1614 unsigned long *chain_histogram = NULL;
1615
1616 if (deepest_delta)
1617 chain_histogram = xcalloc(deepest_delta, sizeof(unsigned long));
1618
1619 for (i = 0; i < nr_objects; i++) {
1620 struct object_entry *obj = &objects[i];
1621
1622 if (is_delta_type(obj->type))
1623 chain_histogram[obj_stat[i].delta_depth - 1]++;
1624 if (stat_only)
1625 continue;
1626 printf("%s %-6s %lu %lu %"PRIuMAX,
1627 oid_to_hex(&obj->idx.oid),
1628 type_name(obj->real_type), obj->size,
1629 (unsigned long)(obj[1].idx.offset - obj->idx.offset),
1630 (uintmax_t)obj->idx.offset);
1631 if (is_delta_type(obj->type)) {
1632 struct object_entry *bobj = &objects[obj_stat[i].base_object_no];
1633 printf(" %u %s", obj_stat[i].delta_depth,
1634 oid_to_hex(&bobj->idx.oid));
1635 }
1636 putchar('\n');
1637 }
1638
1639 if (baseobjects)
1640 printf_ln(Q_("non delta: %d object",
1641 "non delta: %d objects",
1642 baseobjects),
1643 baseobjects);
1644 for (i = 0; i < deepest_delta; i++) {
1645 if (!chain_histogram[i])
1646 continue;
1647 printf_ln(Q_("chain length = %d: %lu object",
1648 "chain length = %d: %lu objects",
1649 chain_histogram[i]),
1650 i + 1,
1651 chain_histogram[i]);
1652 }
1653 }
1654
1655 int cmd_index_pack(int argc, const char **argv, const char *prefix)
1656 {
1657 int i, fix_thin_pack = 0, verify = 0, stat_only = 0;
1658 const char *curr_index;
1659 const char *index_name = NULL, *pack_name = NULL;
1660 const char *keep_msg = NULL;
1661 const char *promisor_msg = NULL;
1662 struct strbuf index_name_buf = STRBUF_INIT;
1663 struct pack_idx_entry **idx_objects;
1664 struct pack_idx_option opts;
1665 unsigned char pack_hash[GIT_MAX_RAWSZ];
1666 unsigned foreign_nr = 1; /* zero is a "good" value, assume bad */
1667 int report_end_of_input = 0;
1668
1669 /*
1670 * index-pack never needs to fetch missing objects, since it only
1671 * accesses the repo to do hash collision checks
1672 */
1673 fetch_if_missing = 0;
1674
1675 if (argc == 2 && !strcmp(argv[1], "-h"))
1676 usage(index_pack_usage);
1677
1678 check_replace_refs = 0;
1679 fsck_options.walk = mark_link;
1680
1681 reset_pack_idx_option(&opts);
1682 git_config(git_index_pack_config, &opts);
1683 if (prefix && chdir(prefix))
1684 die(_("Cannot come back to cwd"));
1685
1686 for (i = 1; i < argc; i++) {
1687 const char *arg = argv[i];
1688
1689 if (*arg == '-') {
1690 if (!strcmp(arg, "--stdin")) {
1691 from_stdin = 1;
1692 } else if (!strcmp(arg, "--fix-thin")) {
1693 fix_thin_pack = 1;
1694 } else if (skip_to_optional_arg(arg, "--strict", &arg)) {
1695 strict = 1;
1696 do_fsck_object = 1;
1697 fsck_set_msg_types(&fsck_options, arg);
1698 } else if (!strcmp(arg, "--check-self-contained-and-connected")) {
1699 strict = 1;
1700 check_self_contained_and_connected = 1;
1701 } else if (!strcmp(arg, "--fsck-objects")) {
1702 do_fsck_object = 1;
1703 } else if (!strcmp(arg, "--verify")) {
1704 verify = 1;
1705 } else if (!strcmp(arg, "--verify-stat")) {
1706 verify = 1;
1707 show_stat = 1;
1708 } else if (!strcmp(arg, "--verify-stat-only")) {
1709 verify = 1;
1710 show_stat = 1;
1711 stat_only = 1;
1712 } else if (skip_to_optional_arg(arg, "--keep", &keep_msg)) {
1713 ; /* nothing to do */
1714 } else if (skip_to_optional_arg(arg, "--promisor", &promisor_msg)) {
1715 ; /* already parsed */
1716 } else if (starts_with(arg, "--threads=")) {
1717 char *end;
1718 nr_threads = strtoul(arg+10, &end, 0);
1719 if (!arg[10] || *end || nr_threads < 0)
1720 usage(index_pack_usage);
1721 #ifdef NO_PTHREADS
1722 if (nr_threads != 1)
1723 warning(_("no threads support, "
1724 "ignoring %s"), arg);
1725 nr_threads = 1;
1726 #endif
1727 } else if (starts_with(arg, "--pack_header=")) {
1728 struct pack_header *hdr;
1729 char *c;
1730
1731 hdr = (struct pack_header *)input_buffer;
1732 hdr->hdr_signature = htonl(PACK_SIGNATURE);
1733 hdr->hdr_version = htonl(strtoul(arg + 14, &c, 10));
1734 if (*c != ',')
1735 die(_("bad %s"), arg);
1736 hdr->hdr_entries = htonl(strtoul(c + 1, &c, 10));
1737 if (*c)
1738 die(_("bad %s"), arg);
1739 input_len = sizeof(*hdr);
1740 } else if (!strcmp(arg, "-v")) {
1741 verbose = 1;
1742 } else if (!strcmp(arg, "--show-resolving-progress")) {
1743 show_resolving_progress = 1;
1744 } else if (!strcmp(arg, "--report-end-of-input")) {
1745 report_end_of_input = 1;
1746 } else if (!strcmp(arg, "-o")) {
1747 if (index_name || (i+1) >= argc)
1748 usage(index_pack_usage);
1749 index_name = argv[++i];
1750 } else if (starts_with(arg, "--index-version=")) {
1751 char *c;
1752 opts.version = strtoul(arg + 16, &c, 10);
1753 if (opts.version > 2)
1754 die(_("bad %s"), arg);
1755 if (*c == ',')
1756 opts.off32_limit = strtoul(c+1, &c, 0);
1757 if (*c || opts.off32_limit & 0x80000000)
1758 die(_("bad %s"), arg);
1759 } else if (skip_prefix(arg, "--max-input-size=", &arg)) {
1760 max_input_size = strtoumax(arg, NULL, 10);
1761 } else
1762 usage(index_pack_usage);
1763 continue;
1764 }
1765
1766 if (pack_name)
1767 usage(index_pack_usage);
1768 pack_name = arg;
1769 }
1770
1771 if (!pack_name && !from_stdin)
1772 usage(index_pack_usage);
1773 if (fix_thin_pack && !from_stdin)
1774 die(_("--fix-thin cannot be used without --stdin"));
1775 if (from_stdin && !startup_info->have_repository)
1776 die(_("--stdin requires a git repository"));
1777 if (!index_name && pack_name)
1778 index_name = derive_filename(pack_name, "idx", &index_name_buf);
1779
1780 if (verify) {
1781 if (!index_name)
1782 die(_("--verify with no packfile name given"));
1783 read_idx_option(&opts, index_name);
1784 opts.flags |= WRITE_IDX_VERIFY | WRITE_IDX_STRICT;
1785 }
1786 if (strict)
1787 opts.flags |= WRITE_IDX_STRICT;
1788
1789 #ifndef NO_PTHREADS
1790 if (!nr_threads) {
1791 nr_threads = online_cpus();
1792 /* An experiment showed that more threads does not mean faster */
1793 if (nr_threads > 3)
1794 nr_threads = 3;
1795 }
1796 #endif
1797
1798 curr_pack = open_pack_file(pack_name);
1799 parse_pack_header();
1800 objects = xcalloc(st_add(nr_objects, 1), sizeof(struct object_entry));
1801 if (show_stat)
1802 obj_stat = xcalloc(st_add(nr_objects, 1), sizeof(struct object_stat));
1803 ofs_deltas = xcalloc(nr_objects, sizeof(struct ofs_delta_entry));
1804 parse_pack_objects(pack_hash);
1805 if (report_end_of_input)
1806 write_in_full(2, "\0", 1);
1807 resolve_deltas();
1808 conclude_pack(fix_thin_pack, curr_pack, pack_hash);
1809 free(ofs_deltas);
1810 free(ref_deltas);
1811 if (strict)
1812 foreign_nr = check_objects();
1813
1814 if (show_stat)
1815 show_pack_info(stat_only);
1816
1817 ALLOC_ARRAY(idx_objects, nr_objects);
1818 for (i = 0; i < nr_objects; i++)
1819 idx_objects[i] = &objects[i].idx;
1820 curr_index = write_idx_file(index_name, idx_objects, nr_objects, &opts, pack_hash);
1821 free(idx_objects);
1822
1823 if (!verify)
1824 final(pack_name, curr_pack,
1825 index_name, curr_index,
1826 keep_msg, promisor_msg,
1827 pack_hash);
1828 else
1829 close(input_fd);
1830
1831 if (do_fsck_object && fsck_finish(&fsck_options))
1832 die(_("fsck error in pack objects"));
1833
1834 free(objects);
1835 strbuf_release(&index_name_buf);
1836 if (pack_name == NULL)
1837 free((void *) curr_pack);
1838 if (index_name == NULL)
1839 free((void *) curr_index);
1840
1841 /*
1842 * Let the caller know this pack is not self contained
1843 */
1844 if (check_self_contained_and_connected && foreign_nr)
1845 return 1;
1846
1847 return 0;
1848 }
Eric Wong's git-svn branch