12 #include "streaming.h"
13 #include "thread-utils.h"
15 static const char index_pack_usage
[] =
16 "git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
19 struct pack_idx_entry idx
;
21 unsigned int hdr_size
;
22 enum object_type type
;
23 enum object_type real_type
;
29 unsigned char sha1
[20];
34 struct base_data
*base
;
35 struct base_data
*child
;
36 struct object_entry
*obj
;
39 int ref_first
, ref_last
;
40 int ofs_first
, ofs_last
;
47 struct base_data
*base_cache
;
48 size_t base_cache_used
;
53 * Even if sizeof(union delta_base) == 24 on 64-bit archs, we really want
54 * to memcmp() only the first 20 bytes.
56 #define UNION_BASE_SZ 20
58 #define FLAG_LINK (1u<<20)
59 #define FLAG_CHECKED (1u<<21)
62 union delta_base base
;
66 static struct object_entry
*objects
;
67 static struct delta_entry
*deltas
;
68 static struct thread_local nothread_data
;
69 static int nr_objects
;
71 static int nr_resolved_deltas
;
72 static int nr_threads
;
74 static int from_stdin
;
76 static int do_fsck_object
;
79 static int check_self_contained_and_connected
;
81 static struct progress
*progress
;
83 /* We always read in 4kB chunks. */
84 static unsigned char input_buffer
[4096];
85 static unsigned int input_offset
, input_len
;
86 static off_t consumed_bytes
;
87 static unsigned deepest_delta
;
88 static git_SHA_CTX input_ctx
;
89 static uint32_t input_crc32
;
90 static int input_fd
, output_fd
;
91 static const char *curr_pack
;
95 static struct thread_local
*thread_data
;
96 static int nr_dispatched
;
97 static int threads_active
;
99 static pthread_mutex_t read_mutex
;
100 #define read_lock() lock_mutex(&read_mutex)
101 #define read_unlock() unlock_mutex(&read_mutex)
103 static pthread_mutex_t counter_mutex
;
104 #define counter_lock() lock_mutex(&counter_mutex)
105 #define counter_unlock() unlock_mutex(&counter_mutex)
107 static pthread_mutex_t work_mutex
;
108 #define work_lock() lock_mutex(&work_mutex)
109 #define work_unlock() unlock_mutex(&work_mutex)
111 static pthread_mutex_t deepest_delta_mutex
;
112 #define deepest_delta_lock() lock_mutex(&deepest_delta_mutex)
113 #define deepest_delta_unlock() unlock_mutex(&deepest_delta_mutex)
115 static pthread_key_t key
;
117 static inline void lock_mutex(pthread_mutex_t
*mutex
)
120 pthread_mutex_lock(mutex
);
123 static inline void unlock_mutex(pthread_mutex_t
*mutex
)
126 pthread_mutex_unlock(mutex
);
130 * Mutex and conditional variable can't be statically-initialized on Windows.
132 static void init_thread(void)
135 init_recursive_mutex(&read_mutex
);
136 pthread_mutex_init(&counter_mutex
, NULL
);
137 pthread_mutex_init(&work_mutex
, NULL
);
139 pthread_mutex_init(&deepest_delta_mutex
, NULL
);
140 pthread_key_create(&key
, NULL
);
141 thread_data
= xcalloc(nr_threads
, sizeof(*thread_data
));
142 for (i
= 0; i
< nr_threads
; i
++) {
143 thread_data
[i
].pack_fd
= open(curr_pack
, O_RDONLY
);
144 if (thread_data
[i
].pack_fd
== -1)
145 die_errno(_("unable to open %s"), curr_pack
);
151 static void cleanup_thread(void)
157 pthread_mutex_destroy(&read_mutex
);
158 pthread_mutex_destroy(&counter_mutex
);
159 pthread_mutex_destroy(&work_mutex
);
161 pthread_mutex_destroy(&deepest_delta_mutex
);
162 for (i
= 0; i
< nr_threads
; i
++)
163 close(thread_data
[i
].pack_fd
);
164 pthread_key_delete(key
);
171 #define read_unlock()
173 #define counter_lock()
174 #define counter_unlock()
177 #define work_unlock()
179 #define deepest_delta_lock()
180 #define deepest_delta_unlock()
185 static int mark_link(struct object
*obj
, int type
, void *data
)
190 if (type
!= OBJ_ANY
&& obj
->type
!= type
)
191 die(_("object type mismatch at %s"), sha1_to_hex(obj
->sha1
));
193 obj
->flags
|= FLAG_LINK
;
197 /* The content of each linked object must have been checked
198 or it must be already present in the object database */
199 static unsigned check_object(struct object
*obj
)
204 if (!(obj
->flags
& FLAG_LINK
))
207 if (!(obj
->flags
& FLAG_CHECKED
)) {
209 int type
= sha1_object_info(obj
->sha1
, &size
);
211 die(_("did not receive expected object %s"),
212 sha1_to_hex(obj
->sha1
));
213 if (type
!= obj
->type
)
214 die(_("object %s: expected type %s, found %s"),
215 sha1_to_hex(obj
->sha1
),
216 typename(obj
->type
), typename(type
));
217 obj
->flags
|= FLAG_CHECKED
;
224 static unsigned check_objects(void)
226 unsigned i
, max
, foreign_nr
= 0;
228 max
= get_max_object_index();
229 for (i
= 0; i
< max
; i
++)
230 foreign_nr
+= check_object(get_indexed_object(i
));
235 /* Discard current buffer used content. */
236 static void flush(void)
240 write_or_die(output_fd
, input_buffer
, input_offset
);
241 git_SHA1_Update(&input_ctx
, input_buffer
, input_offset
);
242 memmove(input_buffer
, input_buffer
+ input_offset
, input_len
);
248 * Make sure at least "min" bytes are available in the buffer, and
249 * return the pointer to the buffer.
251 static void *fill(int min
)
253 if (min
<= input_len
)
254 return input_buffer
+ input_offset
;
255 if (min
> sizeof(input_buffer
))
256 die(Q_("cannot fill %d byte",
257 "cannot fill %d bytes",
262 ssize_t ret
= xread(input_fd
, input_buffer
+ input_len
,
263 sizeof(input_buffer
) - input_len
);
267 die_errno(_("read error on input"));
271 display_throughput(progress
, consumed_bytes
+ input_len
);
272 } while (input_len
< min
);
276 static void use(int bytes
)
278 if (bytes
> input_len
)
279 die(_("used more bytes than were available"));
280 input_crc32
= crc32(input_crc32
, input_buffer
+ input_offset
, bytes
);
282 input_offset
+= bytes
;
284 /* make sure off_t is sufficiently large not to wrap */
285 if (signed_add_overflows(consumed_bytes
, bytes
))
286 die(_("pack too large for current definition of off_t"));
287 consumed_bytes
+= bytes
;
290 static const char *open_pack_file(const char *pack_name
)
295 static char tmp_file
[PATH_MAX
];
296 output_fd
= odb_mkstemp(tmp_file
, sizeof(tmp_file
),
297 "pack/tmp_pack_XXXXXX");
298 pack_name
= xstrdup(tmp_file
);
300 output_fd
= open(pack_name
, O_CREAT
|O_EXCL
|O_RDWR
, 0600);
302 die_errno(_("unable to create '%s'"), pack_name
);
303 nothread_data
.pack_fd
= output_fd
;
305 input_fd
= open(pack_name
, O_RDONLY
);
307 die_errno(_("cannot open packfile '%s'"), pack_name
);
309 nothread_data
.pack_fd
= input_fd
;
311 git_SHA1_Init(&input_ctx
);
315 static void parse_pack_header(void)
317 struct pack_header
*hdr
= fill(sizeof(struct pack_header
));
319 /* Header consistency check */
320 if (hdr
->hdr_signature
!= htonl(PACK_SIGNATURE
))
321 die(_("pack signature mismatch"));
322 if (!pack_version_ok(hdr
->hdr_version
))
323 die(_("pack version %"PRIu32
" unsupported"),
324 ntohl(hdr
->hdr_version
));
326 nr_objects
= ntohl(hdr
->hdr_entries
);
327 use(sizeof(struct pack_header
));
330 static NORETURN
void bad_object(unsigned long offset
, const char *format
,
331 ...) __attribute__((format (printf
, 2, 3)));
333 static NORETURN
void bad_object(unsigned long offset
, const char *format
, ...)
338 va_start(params
, format
);
339 vsnprintf(buf
, sizeof(buf
), format
, params
);
341 die(_("pack has bad object at offset %lu: %s"), offset
, buf
);
344 static inline struct thread_local
*get_thread_data(void)
348 return pthread_getspecific(key
);
349 assert(!threads_active
&&
350 "This should only be reached when all threads are gone");
352 return ¬hread_data
;
356 static void set_thread_data(struct thread_local
*data
)
359 pthread_setspecific(key
, data
);
363 static struct base_data
*alloc_base_data(void)
365 struct base_data
*base
= xmalloc(sizeof(struct base_data
));
366 memset(base
, 0, sizeof(*base
));
372 static void free_base_data(struct base_data
*c
)
377 get_thread_data()->base_cache_used
-= c
->size
;
381 static void prune_base_data(struct base_data
*retain
)
384 struct thread_local
*data
= get_thread_data();
385 for (b
= data
->base_cache
;
386 data
->base_cache_used
> delta_base_cache_limit
&& b
;
388 if (b
->data
&& b
!= retain
)
393 static void link_base_data(struct base_data
*base
, struct base_data
*c
)
398 get_thread_data()->base_cache
= c
;
403 get_thread_data()->base_cache_used
+= c
->size
;
407 static void unlink_base_data(struct base_data
*c
)
409 struct base_data
*base
= c
->base
;
413 get_thread_data()->base_cache
= NULL
;
417 static int is_delta_type(enum object_type type
)
419 return (type
== OBJ_REF_DELTA
|| type
== OBJ_OFS_DELTA
);
422 static void *unpack_entry_data(unsigned long offset
, unsigned long size
,
423 enum object_type type
, unsigned char *sha1
)
425 static char fixed_buf
[8192];
433 if (!is_delta_type(type
)) {
434 hdrlen
= sprintf(hdr
, "%s %lu", typename(type
), size
) + 1;
436 git_SHA1_Update(&c
, hdr
, hdrlen
);
439 if (type
== OBJ_BLOB
&& size
> big_file_threshold
)
444 memset(&stream
, 0, sizeof(stream
));
445 git_inflate_init(&stream
);
446 stream
.next_out
= buf
;
447 stream
.avail_out
= buf
== fixed_buf
? sizeof(fixed_buf
) : size
;
450 unsigned char *last_out
= stream
.next_out
;
451 stream
.next_in
= fill(1);
452 stream
.avail_in
= input_len
;
453 status
= git_inflate(&stream
, 0);
454 use(input_len
- stream
.avail_in
);
456 git_SHA1_Update(&c
, last_out
, stream
.next_out
- last_out
);
457 if (buf
== fixed_buf
) {
458 stream
.next_out
= buf
;
459 stream
.avail_out
= sizeof(fixed_buf
);
461 } while (status
== Z_OK
);
462 if (stream
.total_out
!= size
|| status
!= Z_STREAM_END
)
463 bad_object(offset
, _("inflate returned %d"), status
);
464 git_inflate_end(&stream
);
466 git_SHA1_Final(sha1
, &c
);
467 return buf
== fixed_buf
? NULL
: buf
;
470 static void *unpack_raw_entry(struct object_entry
*obj
,
471 union delta_base
*delta_base
,
475 unsigned long size
, c
;
480 obj
->idx
.offset
= consumed_bytes
;
481 input_crc32
= crc32(0, NULL
, 0);
486 obj
->type
= (c
>> 4) & 7;
493 size
+= (c
& 0x7f) << shift
;
500 hashcpy(delta_base
->sha1
, fill(20));
504 memset(delta_base
, 0, sizeof(*delta_base
));
508 base_offset
= c
& 127;
511 if (!base_offset
|| MSB(base_offset
, 7))
512 bad_object(obj
->idx
.offset
, _("offset value overflow for delta base object"));
516 base_offset
= (base_offset
<< 7) + (c
& 127);
518 delta_base
->offset
= obj
->idx
.offset
- base_offset
;
519 if (delta_base
->offset
<= 0 || delta_base
->offset
>= obj
->idx
.offset
)
520 bad_object(obj
->idx
.offset
, _("delta base offset is out of bound"));
528 bad_object(obj
->idx
.offset
, _("unknown object type %d"), obj
->type
);
530 obj
->hdr_size
= consumed_bytes
- obj
->idx
.offset
;
532 data
= unpack_entry_data(obj
->idx
.offset
, obj
->size
, obj
->type
, sha1
);
533 obj
->idx
.crc32
= input_crc32
;
537 static void *unpack_data(struct object_entry
*obj
,
538 int (*consume
)(const unsigned char *, unsigned long, void *),
541 off_t from
= obj
[0].idx
.offset
+ obj
[0].hdr_size
;
542 unsigned long len
= obj
[1].idx
.offset
- from
;
543 unsigned char *data
, *inbuf
;
547 data
= xmalloc(consume
? 64*1024 : obj
->size
);
548 inbuf
= xmalloc((len
< 64*1024) ? len
: 64*1024);
550 memset(&stream
, 0, sizeof(stream
));
551 git_inflate_init(&stream
);
552 stream
.next_out
= data
;
553 stream
.avail_out
= consume
? 64*1024 : obj
->size
;
556 ssize_t n
= (len
< 64*1024) ? len
: 64*1024;
557 n
= pread(get_thread_data()->pack_fd
, inbuf
, n
, from
);
559 die_errno(_("cannot pread pack file"));
561 die(Q_("premature end of pack file, %lu byte missing",
562 "premature end of pack file, %lu bytes missing",
567 stream
.next_in
= inbuf
;
570 status
= git_inflate(&stream
, 0);
573 status
= git_inflate(&stream
, 0);
574 if (consume(data
, stream
.next_out
- data
, cb_data
)) {
579 stream
.next_out
= data
;
580 stream
.avail_out
= 64*1024;
581 } while (status
== Z_OK
&& stream
.avail_in
);
583 } while (len
&& status
== Z_OK
&& !stream
.avail_in
);
585 /* This has been inflated OK when first encountered, so... */
586 if (status
!= Z_STREAM_END
|| stream
.total_out
!= obj
->size
)
587 die(_("serious inflate inconsistency"));
589 git_inflate_end(&stream
);
598 static void *get_data_from_pack(struct object_entry
*obj
)
600 return unpack_data(obj
, NULL
, NULL
);
603 static int compare_delta_bases(const union delta_base
*base1
,
604 const union delta_base
*base2
,
605 enum object_type type1
,
606 enum object_type type2
)
608 int cmp
= type1
- type2
;
611 return memcmp(base1
, base2
, UNION_BASE_SZ
);
614 static int find_delta(const union delta_base
*base
, enum object_type type
)
616 int first
= 0, last
= nr_deltas
;
618 while (first
< last
) {
619 int next
= (first
+ last
) / 2;
620 struct delta_entry
*delta
= &deltas
[next
];
623 cmp
= compare_delta_bases(base
, &delta
->base
,
624 type
, objects
[delta
->obj_no
].type
);
636 static void find_delta_children(const union delta_base
*base
,
637 int *first_index
, int *last_index
,
638 enum object_type type
)
640 int first
= find_delta(base
, type
);
642 int end
= nr_deltas
- 1;
649 while (first
> 0 && !memcmp(&deltas
[first
- 1].base
, base
, UNION_BASE_SZ
))
651 while (last
< end
&& !memcmp(&deltas
[last
+ 1].base
, base
, UNION_BASE_SZ
))
653 *first_index
= first
;
657 struct compare_data
{
658 struct object_entry
*entry
;
659 struct git_istream
*st
;
661 unsigned long buf_size
;
664 static int compare_objects(const unsigned char *buf
, unsigned long size
,
667 struct compare_data
*data
= cb_data
;
669 if (data
->buf_size
< size
) {
671 data
->buf
= xmalloc(size
);
672 data
->buf_size
= size
;
676 ssize_t len
= read_istream(data
->st
, data
->buf
, size
);
678 die(_("SHA1 COLLISION FOUND WITH %s !"),
679 sha1_to_hex(data
->entry
->idx
.sha1
));
681 die(_("unable to read %s"),
682 sha1_to_hex(data
->entry
->idx
.sha1
));
683 if (memcmp(buf
, data
->buf
, len
))
684 die(_("SHA1 COLLISION FOUND WITH %s !"),
685 sha1_to_hex(data
->entry
->idx
.sha1
));
692 static int check_collison(struct object_entry
*entry
)
694 struct compare_data data
;
695 enum object_type type
;
698 if (entry
->size
<= big_file_threshold
|| entry
->type
!= OBJ_BLOB
)
701 memset(&data
, 0, sizeof(data
));
703 data
.st
= open_istream(entry
->idx
.sha1
, &type
, &size
, NULL
);
706 if (size
!= entry
->size
|| type
!= entry
->type
)
707 die(_("SHA1 COLLISION FOUND WITH %s !"),
708 sha1_to_hex(entry
->idx
.sha1
));
709 unpack_data(entry
, compare_objects
, &data
);
710 close_istream(data
.st
);
715 static void sha1_object(const void *data
, struct object_entry
*obj_entry
,
716 unsigned long size
, enum object_type type
,
717 const unsigned char *sha1
)
719 void *new_data
= NULL
;
720 int collision_test_needed
;
722 assert(data
|| obj_entry
);
725 collision_test_needed
= has_sha1_file(sha1
);
728 if (collision_test_needed
&& !data
) {
730 if (!check_collison(obj_entry
))
731 collision_test_needed
= 0;
734 if (collision_test_needed
) {
736 enum object_type has_type
;
737 unsigned long has_size
;
739 has_type
= sha1_object_info(sha1
, &has_size
);
740 if (has_type
!= type
|| has_size
!= size
)
741 die(_("SHA1 COLLISION FOUND WITH %s !"), sha1_to_hex(sha1
));
742 has_data
= read_sha1_file(sha1
, &has_type
, &has_size
);
745 data
= new_data
= get_data_from_pack(obj_entry
);
747 die(_("cannot read existing object %s"), sha1_to_hex(sha1
));
748 if (size
!= has_size
|| type
!= has_type
||
749 memcmp(data
, has_data
, size
) != 0)
750 die(_("SHA1 COLLISION FOUND WITH %s !"), sha1_to_hex(sha1
));
756 if (type
== OBJ_BLOB
) {
757 struct blob
*blob
= lookup_blob(sha1
);
759 blob
->object
.flags
|= FLAG_CHECKED
;
761 die(_("invalid blob object %s"), sha1_to_hex(sha1
));
765 void *buf
= (void *) data
;
767 assert(data
&& "data can only be NULL for large _blobs_");
770 * we do not need to free the memory here, as the
771 * buf is deleted by the caller.
773 obj
= parse_object_buffer(sha1
, type
, size
, buf
, &eaten
);
775 die(_("invalid %s"), typename(type
));
776 if (do_fsck_object
&&
777 fsck_object(obj
, 1, fsck_error_function
))
778 die(_("Error in object"));
779 if (fsck_walk(obj
, mark_link
, NULL
))
780 die(_("Not all child objects of %s are reachable"), sha1_to_hex(obj
->sha1
));
782 if (obj
->type
== OBJ_TREE
) {
783 struct tree
*item
= (struct tree
*) obj
;
787 if (obj
->type
== OBJ_COMMIT
) {
788 struct commit
*commit
= (struct commit
*) obj
;
789 commit
->buffer
= NULL
;
791 obj
->flags
|= FLAG_CHECKED
;
800 * This function is part of find_unresolved_deltas(). There are two
801 * walkers going in the opposite ways.
803 * The first one in find_unresolved_deltas() traverses down from
804 * parent node to children, deflating nodes along the way. However,
805 * memory for deflated nodes is limited by delta_base_cache_limit, so
806 * at some point parent node's deflated content may be freed.
808 * The second walker is this function, which goes from current node up
809 * to top parent if necessary to deflate the node. In normal
810 * situation, its parent node would be already deflated, so it just
811 * needs to apply delta.
813 * In the worst case scenario, parent node is no longer deflated because
814 * we're running out of delta_base_cache_limit; we need to re-deflate
815 * parents, possibly up to the top base.
817 * All deflated objects here are subject to be freed if we exceed
818 * delta_base_cache_limit, just like in find_unresolved_deltas(), we
819 * just need to make sure the last node is not freed.
821 static void *get_base_data(struct base_data
*c
)
824 struct object_entry
*obj
= c
->obj
;
825 struct base_data
**delta
= NULL
;
826 int delta_nr
= 0, delta_alloc
= 0;
828 while (is_delta_type(c
->obj
->type
) && !c
->data
) {
829 ALLOC_GROW(delta
, delta_nr
+ 1, delta_alloc
);
830 delta
[delta_nr
++] = c
;
834 c
->data
= get_data_from_pack(obj
);
836 get_thread_data()->base_cache_used
+= c
->size
;
839 for (; delta_nr
> 0; delta_nr
--) {
841 c
= delta
[delta_nr
- 1];
843 base
= get_base_data(c
->base
);
844 raw
= get_data_from_pack(obj
);
845 c
->data
= patch_delta(
851 bad_object(obj
->idx
.offset
, _("failed to apply delta"));
852 get_thread_data()->base_cache_used
+= c
->size
;
860 static void resolve_delta(struct object_entry
*delta_obj
,
861 struct base_data
*base
, struct base_data
*result
)
863 void *base_data
, *delta_data
;
865 delta_obj
->real_type
= base
->obj
->real_type
;
867 delta_obj
->delta_depth
= base
->obj
->delta_depth
+ 1;
868 deepest_delta_lock();
869 if (deepest_delta
< delta_obj
->delta_depth
)
870 deepest_delta
= delta_obj
->delta_depth
;
871 deepest_delta_unlock();
873 delta_obj
->base_object_no
= base
->obj
- objects
;
874 delta_data
= get_data_from_pack(delta_obj
);
875 base_data
= get_base_data(base
);
876 result
->obj
= delta_obj
;
877 result
->data
= patch_delta(base_data
, base
->size
,
878 delta_data
, delta_obj
->size
, &result
->size
);
881 bad_object(delta_obj
->idx
.offset
, _("failed to apply delta"));
882 hash_sha1_file(result
->data
, result
->size
,
883 typename(delta_obj
->real_type
), delta_obj
->idx
.sha1
);
884 sha1_object(result
->data
, NULL
, result
->size
, delta_obj
->real_type
,
885 delta_obj
->idx
.sha1
);
887 nr_resolved_deltas
++;
891 static struct base_data
*find_unresolved_deltas_1(struct base_data
*base
,
892 struct base_data
*prev_base
)
894 if (base
->ref_last
== -1 && base
->ofs_last
== -1) {
895 union delta_base base_spec
;
897 hashcpy(base_spec
.sha1
, base
->obj
->idx
.sha1
);
898 find_delta_children(&base_spec
,
899 &base
->ref_first
, &base
->ref_last
, OBJ_REF_DELTA
);
901 memset(&base_spec
, 0, sizeof(base_spec
));
902 base_spec
.offset
= base
->obj
->idx
.offset
;
903 find_delta_children(&base_spec
,
904 &base
->ofs_first
, &base
->ofs_last
, OBJ_OFS_DELTA
);
906 if (base
->ref_last
== -1 && base
->ofs_last
== -1) {
911 link_base_data(prev_base
, base
);
914 if (base
->ref_first
<= base
->ref_last
) {
915 struct object_entry
*child
= objects
+ deltas
[base
->ref_first
].obj_no
;
916 struct base_data
*result
= alloc_base_data();
918 assert(child
->real_type
== OBJ_REF_DELTA
);
919 resolve_delta(child
, base
, result
);
920 if (base
->ref_first
== base
->ref_last
&& base
->ofs_last
== -1)
921 free_base_data(base
);
927 if (base
->ofs_first
<= base
->ofs_last
) {
928 struct object_entry
*child
= objects
+ deltas
[base
->ofs_first
].obj_no
;
929 struct base_data
*result
= alloc_base_data();
931 assert(child
->real_type
== OBJ_OFS_DELTA
);
932 resolve_delta(child
, base
, result
);
933 if (base
->ofs_first
== base
->ofs_last
)
934 free_base_data(base
);
940 unlink_base_data(base
);
944 static void find_unresolved_deltas(struct base_data
*base
)
946 struct base_data
*new_base
, *prev_base
= NULL
;
948 new_base
= find_unresolved_deltas_1(base
, prev_base
);
958 prev_base
= base
->base
;
963 static int compare_delta_entry(const void *a
, const void *b
)
965 const struct delta_entry
*delta_a
= a
;
966 const struct delta_entry
*delta_b
= b
;
968 /* group by type (ref vs ofs) and then by value (sha-1 or offset) */
969 return compare_delta_bases(&delta_a
->base
, &delta_b
->base
,
970 objects
[delta_a
->obj_no
].type
,
971 objects
[delta_b
->obj_no
].type
);
974 static void resolve_base(struct object_entry
*obj
)
976 struct base_data
*base_obj
= alloc_base_data();
978 base_obj
->data
= NULL
;
979 find_unresolved_deltas(base_obj
);
983 static void *threaded_second_pass(void *data
)
985 set_thread_data(data
);
989 display_progress(progress
, nr_resolved_deltas
);
992 while (nr_dispatched
< nr_objects
&&
993 is_delta_type(objects
[nr_dispatched
].type
))
995 if (nr_dispatched
>= nr_objects
) {
1002 resolve_base(&objects
[i
]);
1010 * - find locations of all objects;
1011 * - calculate SHA1 of all non-delta objects;
1012 * - remember base (SHA1 or offset) for all deltas.
1014 static void parse_pack_objects(unsigned char *sha1
)
1016 int i
, nr_delays
= 0;
1017 struct delta_entry
*delta
= deltas
;
1021 progress
= start_progress(
1022 from_stdin
? _("Receiving objects") : _("Indexing objects"),
1024 for (i
= 0; i
< nr_objects
; i
++) {
1025 struct object_entry
*obj
= &objects
[i
];
1026 void *data
= unpack_raw_entry(obj
, &delta
->base
, obj
->idx
.sha1
);
1027 obj
->real_type
= obj
->type
;
1028 if (is_delta_type(obj
->type
)) {
1033 /* large blobs, check later */
1034 obj
->real_type
= OBJ_BAD
;
1037 sha1_object(data
, NULL
, obj
->size
, obj
->type
, obj
->idx
.sha1
);
1039 display_progress(progress
, i
+1);
1041 objects
[i
].idx
.offset
= consumed_bytes
;
1042 stop_progress(&progress
);
1044 /* Check pack integrity */
1046 git_SHA1_Final(sha1
, &input_ctx
);
1047 if (hashcmp(fill(20), sha1
))
1048 die(_("pack is corrupted (SHA1 mismatch)"));
1051 /* If input_fd is a file, we should have reached its end now. */
1052 if (fstat(input_fd
, &st
))
1053 die_errno(_("cannot fstat packfile"));
1054 if (S_ISREG(st
.st_mode
) &&
1055 lseek(input_fd
, 0, SEEK_CUR
) - input_len
!= st
.st_size
)
1056 die(_("pack has junk at the end"));
1058 for (i
= 0; i
< nr_objects
; i
++) {
1059 struct object_entry
*obj
= &objects
[i
];
1060 if (obj
->real_type
!= OBJ_BAD
)
1062 obj
->real_type
= obj
->type
;
1063 sha1_object(NULL
, obj
, obj
->size
, obj
->type
, obj
->idx
.sha1
);
1067 die(_("confusion beyond insanity in parse_pack_objects()"));
1072 * - for all non-delta objects, look if it is used as a base for
1074 * - if used as a base, uncompress the object and apply all deltas,
1075 * recursively checking if the resulting object is used as a base
1076 * for some more deltas.
1078 static void resolve_deltas(void)
1085 /* Sort deltas by base SHA1/offset for fast searching */
1086 qsort(deltas
, nr_deltas
, sizeof(struct delta_entry
),
1087 compare_delta_entry
);
1090 progress
= start_progress(_("Resolving deltas"), nr_deltas
);
1094 if (nr_threads
> 1 || getenv("GIT_FORCE_THREADS")) {
1096 for (i
= 0; i
< nr_threads
; i
++) {
1097 int ret
= pthread_create(&thread_data
[i
].thread
, NULL
,
1098 threaded_second_pass
, thread_data
+ i
);
1100 die(_("unable to create thread: %s"),
1103 for (i
= 0; i
< nr_threads
; i
++)
1104 pthread_join(thread_data
[i
].thread
, NULL
);
1110 for (i
= 0; i
< nr_objects
; i
++) {
1111 struct object_entry
*obj
= &objects
[i
];
1113 if (is_delta_type(obj
->type
))
1116 display_progress(progress
, nr_resolved_deltas
);
1122 * - append objects to convert thin pack to full pack if required
1123 * - write the final 20-byte SHA-1
1125 static void fix_unresolved_deltas(struct sha1file
*f
, int nr_unresolved
);
1126 static void conclude_pack(int fix_thin_pack
, const char *curr_pack
, unsigned char *pack_sha1
)
1128 if (nr_deltas
== nr_resolved_deltas
) {
1129 stop_progress(&progress
);
1130 /* Flush remaining pack final 20-byte SHA1. */
1135 if (fix_thin_pack
) {
1137 unsigned char read_sha1
[20], tail_sha1
[20];
1138 struct strbuf msg
= STRBUF_INIT
;
1139 int nr_unresolved
= nr_deltas
- nr_resolved_deltas
;
1140 int nr_objects_initial
= nr_objects
;
1141 if (nr_unresolved
<= 0)
1142 die(_("confusion beyond insanity"));
1143 objects
= xrealloc(objects
,
1144 (nr_objects
+ nr_unresolved
+ 1)
1145 * sizeof(*objects
));
1146 memset(objects
+ nr_objects
+ 1, 0,
1147 nr_unresolved
* sizeof(*objects
));
1148 f
= sha1fd(output_fd
, curr_pack
);
1149 fix_unresolved_deltas(f
, nr_unresolved
);
1150 strbuf_addf(&msg
, _("completed with %d local objects"),
1151 nr_objects
- nr_objects_initial
);
1152 stop_progress_msg(&progress
, msg
.buf
);
1153 strbuf_release(&msg
);
1154 sha1close(f
, tail_sha1
, 0);
1155 hashcpy(read_sha1
, pack_sha1
);
1156 fixup_pack_header_footer(output_fd
, pack_sha1
,
1157 curr_pack
, nr_objects
,
1158 read_sha1
, consumed_bytes
-20);
1159 if (hashcmp(read_sha1
, tail_sha1
) != 0)
1160 die(_("Unexpected tail checksum for %s "
1161 "(disk corruption?)"), curr_pack
);
1163 if (nr_deltas
!= nr_resolved_deltas
)
1164 die(Q_("pack has %d unresolved delta",
1165 "pack has %d unresolved deltas",
1166 nr_deltas
- nr_resolved_deltas
),
1167 nr_deltas
- nr_resolved_deltas
);
1170 static int write_compressed(struct sha1file
*f
, void *in
, unsigned int size
)
1174 unsigned char outbuf
[4096];
1176 memset(&stream
, 0, sizeof(stream
));
1177 git_deflate_init(&stream
, zlib_compression_level
);
1178 stream
.next_in
= in
;
1179 stream
.avail_in
= size
;
1182 stream
.next_out
= outbuf
;
1183 stream
.avail_out
= sizeof(outbuf
);
1184 status
= git_deflate(&stream
, Z_FINISH
);
1185 sha1write(f
, outbuf
, sizeof(outbuf
) - stream
.avail_out
);
1186 } while (status
== Z_OK
);
1188 if (status
!= Z_STREAM_END
)
1189 die(_("unable to deflate appended object (%d)"), status
);
1190 size
= stream
.total_out
;
1191 git_deflate_end(&stream
);
1195 static struct object_entry
*append_obj_to_pack(struct sha1file
*f
,
1196 const unsigned char *sha1
, void *buf
,
1197 unsigned long size
, enum object_type type
)
1199 struct object_entry
*obj
= &objects
[nr_objects
++];
1200 unsigned char header
[10];
1201 unsigned long s
= size
;
1203 unsigned char c
= (type
<< 4) | (s
& 15);
1206 header
[n
++] = c
| 0x80;
1212 sha1write(f
, header
, n
);
1214 obj
[0].hdr_size
= n
;
1216 obj
[0].real_type
= type
;
1217 obj
[1].idx
.offset
= obj
[0].idx
.offset
+ n
;
1218 obj
[1].idx
.offset
+= write_compressed(f
, buf
, size
);
1219 obj
[0].idx
.crc32
= crc32_end(f
);
1221 hashcpy(obj
->idx
.sha1
, sha1
);
1225 static int delta_pos_compare(const void *_a
, const void *_b
)
1227 struct delta_entry
*a
= *(struct delta_entry
**)_a
;
1228 struct delta_entry
*b
= *(struct delta_entry
**)_b
;
1229 return a
->obj_no
- b
->obj_no
;
1232 static void fix_unresolved_deltas(struct sha1file
*f
, int nr_unresolved
)
1234 struct delta_entry
**sorted_by_pos
;
1238 * Since many unresolved deltas may well be themselves base objects
1239 * for more unresolved deltas, we really want to include the
1240 * smallest number of base objects that would cover as much delta
1241 * as possible by picking the
1242 * trunc deltas first, allowing for other deltas to resolve without
1243 * additional base objects. Since most base objects are to be found
1244 * before deltas depending on them, a good heuristic is to start
1245 * resolving deltas in the same order as their position in the pack.
1247 sorted_by_pos
= xmalloc(nr_unresolved
* sizeof(*sorted_by_pos
));
1248 for (i
= 0; i
< nr_deltas
; i
++) {
1249 if (objects
[deltas
[i
].obj_no
].real_type
!= OBJ_REF_DELTA
)
1251 sorted_by_pos
[n
++] = &deltas
[i
];
1253 qsort(sorted_by_pos
, n
, sizeof(*sorted_by_pos
), delta_pos_compare
);
1255 for (i
= 0; i
< n
; i
++) {
1256 struct delta_entry
*d
= sorted_by_pos
[i
];
1257 enum object_type type
;
1258 struct base_data
*base_obj
= alloc_base_data();
1260 if (objects
[d
->obj_no
].real_type
!= OBJ_REF_DELTA
)
1262 base_obj
->data
= read_sha1_file(d
->base
.sha1
, &type
, &base_obj
->size
);
1263 if (!base_obj
->data
)
1266 if (check_sha1_signature(d
->base
.sha1
, base_obj
->data
,
1267 base_obj
->size
, typename(type
)))
1268 die(_("local object %s is corrupt"), sha1_to_hex(d
->base
.sha1
));
1269 base_obj
->obj
= append_obj_to_pack(f
, d
->base
.sha1
,
1270 base_obj
->data
, base_obj
->size
, type
);
1271 find_unresolved_deltas(base_obj
);
1272 display_progress(progress
, nr_resolved_deltas
);
1274 free(sorted_by_pos
);
1277 static void final(const char *final_pack_name
, const char *curr_pack_name
,
1278 const char *final_index_name
, const char *curr_index_name
,
1279 const char *keep_name
, const char *keep_msg
,
1280 unsigned char *sha1
)
1282 const char *report
= "pack";
1283 char name
[PATH_MAX
];
1289 fsync_or_die(output_fd
, curr_pack_name
);
1290 err
= close(output_fd
);
1292 die_errno(_("error while closing pack file"));
1296 int keep_fd
, keep_msg_len
= strlen(keep_msg
);
1299 keep_fd
= odb_pack_keep(name
, sizeof(name
), sha1
);
1301 keep_fd
= open(keep_name
, O_RDWR
|O_CREAT
|O_EXCL
, 0600);
1304 if (errno
!= EEXIST
)
1305 die_errno(_("cannot write keep file '%s'"),
1306 keep_name
? keep_name
: name
);
1308 if (keep_msg_len
> 0) {
1309 write_or_die(keep_fd
, keep_msg
, keep_msg_len
);
1310 write_or_die(keep_fd
, "\n", 1);
1312 if (close(keep_fd
) != 0)
1313 die_errno(_("cannot close written keep file '%s'"),
1314 keep_name
? keep_name
: name
);
1319 if (final_pack_name
!= curr_pack_name
) {
1320 if (!final_pack_name
) {
1321 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.pack",
1322 get_object_directory(), sha1_to_hex(sha1
));
1323 final_pack_name
= name
;
1325 if (move_temp_to_file(curr_pack_name
, final_pack_name
))
1326 die(_("cannot store pack file"));
1327 } else if (from_stdin
)
1328 chmod(final_pack_name
, 0444);
1330 if (final_index_name
!= curr_index_name
) {
1331 if (!final_index_name
) {
1332 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.idx",
1333 get_object_directory(), sha1_to_hex(sha1
));
1334 final_index_name
= name
;
1336 if (move_temp_to_file(curr_index_name
, final_index_name
))
1337 die(_("cannot store index file"));
1339 chmod(final_index_name
, 0444);
1342 printf("%s\n", sha1_to_hex(sha1
));
1345 int len
= snprintf(buf
, sizeof(buf
), "%s\t%s\n",
1346 report
, sha1_to_hex(sha1
));
1347 write_or_die(1, buf
, len
);
1350 * Let's just mimic git-unpack-objects here and write
1351 * the last part of the input buffer to stdout.
1354 err
= xwrite(1, input_buffer
+ input_offset
, input_len
);
1358 input_offset
+= err
;
1363 static int git_index_pack_config(const char *k
, const char *v
, void *cb
)
1365 struct pack_idx_option
*opts
= cb
;
1367 if (!strcmp(k
, "pack.indexversion")) {
1368 opts
->version
= git_config_int(k
, v
);
1369 if (opts
->version
> 2)
1370 die(_("bad pack.indexversion=%"PRIu32
), opts
->version
);
1373 if (!strcmp(k
, "pack.threads")) {
1374 nr_threads
= git_config_int(k
, v
);
1376 die(_("invalid number of threads specified (%d)"),
1379 if (nr_threads
!= 1)
1380 warning(_("no threads support, ignoring %s"), k
);
1385 return git_default_config(k
, v
, cb
);
1388 static int cmp_uint32(const void *a_
, const void *b_
)
1390 uint32_t a
= *((uint32_t *)a_
);
1391 uint32_t b
= *((uint32_t *)b_
);
1393 return (a
< b
) ? -1 : (a
!= b
);
1396 static void read_v2_anomalous_offsets(struct packed_git
*p
,
1397 struct pack_idx_option
*opts
)
1399 const uint32_t *idx1
, *idx2
;
1402 /* The address of the 4-byte offset table */
1403 idx1
= (((const uint32_t *)p
->index_data
)
1404 + 2 /* 8-byte header */
1406 + 5 * p
->num_objects
/* 20-byte SHA-1 table */
1407 + p
->num_objects
/* CRC32 table */
1410 /* The address of the 8-byte offset table */
1411 idx2
= idx1
+ p
->num_objects
;
1413 for (i
= 0; i
< p
->num_objects
; i
++) {
1414 uint32_t off
= ntohl(idx1
[i
]);
1415 if (!(off
& 0x80000000))
1417 off
= off
& 0x7fffffff;
1421 * The real offset is ntohl(idx2[off * 2]) in high 4
1422 * octets, and ntohl(idx2[off * 2 + 1]) in low 4
1423 * octets. But idx2[off * 2] is Zero!!!
1425 ALLOC_GROW(opts
->anomaly
, opts
->anomaly_nr
+ 1, opts
->anomaly_alloc
);
1426 opts
->anomaly
[opts
->anomaly_nr
++] = ntohl(idx2
[off
* 2 + 1]);
1429 if (1 < opts
->anomaly_nr
)
1430 qsort(opts
->anomaly
, opts
->anomaly_nr
, sizeof(uint32_t), cmp_uint32
);
1433 static void read_idx_option(struct pack_idx_option
*opts
, const char *pack_name
)
1435 struct packed_git
*p
= add_packed_git(pack_name
, strlen(pack_name
), 1);
1438 die(_("Cannot open existing pack file '%s'"), pack_name
);
1439 if (open_pack_index(p
))
1440 die(_("Cannot open existing pack idx file for '%s'"), pack_name
);
1442 /* Read the attributes from the existing idx file */
1443 opts
->version
= p
->index_version
;
1445 if (opts
->version
== 2)
1446 read_v2_anomalous_offsets(p
, opts
);
1449 * Get rid of the idx file as we do not need it anymore.
1450 * NEEDSWORK: extract this bit from free_pack_by_name() in
1451 * sha1_file.c, perhaps? It shouldn't matter very much as we
1452 * know we haven't installed this pack (hence we never have
1453 * read anything from it).
1455 close_pack_index(p
);
1459 static void show_pack_info(int stat_only
)
1461 int i
, baseobjects
= nr_objects
- nr_deltas
;
1462 unsigned long *chain_histogram
= NULL
;
1465 chain_histogram
= xcalloc(deepest_delta
, sizeof(unsigned long));
1467 for (i
= 0; i
< nr_objects
; i
++) {
1468 struct object_entry
*obj
= &objects
[i
];
1470 if (is_delta_type(obj
->type
))
1471 chain_histogram
[obj
->delta_depth
- 1]++;
1474 printf("%s %-6s %lu %lu %"PRIuMAX
,
1475 sha1_to_hex(obj
->idx
.sha1
),
1476 typename(obj
->real_type
), obj
->size
,
1477 (unsigned long)(obj
[1].idx
.offset
- obj
->idx
.offset
),
1478 (uintmax_t)obj
->idx
.offset
);
1479 if (is_delta_type(obj
->type
)) {
1480 struct object_entry
*bobj
= &objects
[obj
->base_object_no
];
1481 printf(" %u %s", obj
->delta_depth
, sha1_to_hex(bobj
->idx
.sha1
));
1487 printf_ln(Q_("non delta: %d object",
1488 "non delta: %d objects",
1491 for (i
= 0; i
< deepest_delta
; i
++) {
1492 if (!chain_histogram
[i
])
1494 printf_ln(Q_("chain length = %d: %lu object",
1495 "chain length = %d: %lu objects",
1496 chain_histogram
[i
]),
1498 chain_histogram
[i
]);
1502 int cmd_index_pack(int argc
, const char **argv
, const char *prefix
)
1504 int i
, fix_thin_pack
= 0, verify
= 0, stat_only
= 0;
1505 const char *curr_index
;
1506 const char *index_name
= NULL
, *pack_name
= NULL
;
1507 const char *keep_name
= NULL
, *keep_msg
= NULL
;
1508 char *index_name_buf
= NULL
, *keep_name_buf
= NULL
;
1509 struct pack_idx_entry
**idx_objects
;
1510 struct pack_idx_option opts
;
1511 unsigned char pack_sha1
[20];
1512 unsigned foreign_nr
= 1; /* zero is a "good" value, assume bad */
1514 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1515 usage(index_pack_usage
);
1517 check_replace_refs
= 0;
1519 reset_pack_idx_option(&opts
);
1520 git_config(git_index_pack_config
, &opts
);
1521 if (prefix
&& chdir(prefix
))
1522 die(_("Cannot come back to cwd"));
1524 for (i
= 1; i
< argc
; i
++) {
1525 const char *arg
= argv
[i
];
1528 if (!strcmp(arg
, "--stdin")) {
1530 } else if (!strcmp(arg
, "--fix-thin")) {
1532 } else if (!strcmp(arg
, "--strict")) {
1535 } else if (!strcmp(arg
, "--check-self-contained-and-connected")) {
1537 check_self_contained_and_connected
= 1;
1538 } else if (!strcmp(arg
, "--verify")) {
1540 } else if (!strcmp(arg
, "--verify-stat")) {
1543 } else if (!strcmp(arg
, "--verify-stat-only")) {
1547 } else if (!strcmp(arg
, "--keep")) {
1549 } else if (starts_with(arg
, "--keep=")) {
1551 } else if (starts_with(arg
, "--threads=")) {
1553 nr_threads
= strtoul(arg
+10, &end
, 0);
1554 if (!arg
[10] || *end
|| nr_threads
< 0)
1555 usage(index_pack_usage
);
1557 if (nr_threads
!= 1)
1558 warning(_("no threads support, "
1559 "ignoring %s"), arg
);
1562 } else if (starts_with(arg
, "--pack_header=")) {
1563 struct pack_header
*hdr
;
1566 hdr
= (struct pack_header
*)input_buffer
;
1567 hdr
->hdr_signature
= htonl(PACK_SIGNATURE
);
1568 hdr
->hdr_version
= htonl(strtoul(arg
+ 14, &c
, 10));
1570 die(_("bad %s"), arg
);
1571 hdr
->hdr_entries
= htonl(strtoul(c
+ 1, &c
, 10));
1573 die(_("bad %s"), arg
);
1574 input_len
= sizeof(*hdr
);
1575 } else if (!strcmp(arg
, "-v")) {
1577 } else if (!strcmp(arg
, "-o")) {
1578 if (index_name
|| (i
+1) >= argc
)
1579 usage(index_pack_usage
);
1580 index_name
= argv
[++i
];
1581 } else if (starts_with(arg
, "--index-version=")) {
1583 opts
.version
= strtoul(arg
+ 16, &c
, 10);
1584 if (opts
.version
> 2)
1585 die(_("bad %s"), arg
);
1587 opts
.off32_limit
= strtoul(c
+1, &c
, 0);
1588 if (*c
|| opts
.off32_limit
& 0x80000000)
1589 die(_("bad %s"), arg
);
1591 usage(index_pack_usage
);
1596 usage(index_pack_usage
);
1600 if (!pack_name
&& !from_stdin
)
1601 usage(index_pack_usage
);
1602 if (fix_thin_pack
&& !from_stdin
)
1603 die(_("--fix-thin cannot be used without --stdin"));
1604 if (!index_name
&& pack_name
) {
1605 int len
= strlen(pack_name
);
1606 if (!has_extension(pack_name
, ".pack"))
1607 die(_("packfile name '%s' does not end with '.pack'"),
1609 index_name_buf
= xmalloc(len
);
1610 memcpy(index_name_buf
, pack_name
, len
- 5);
1611 strcpy(index_name_buf
+ len
- 5, ".idx");
1612 index_name
= index_name_buf
;
1614 if (keep_msg
&& !keep_name
&& pack_name
) {
1615 int len
= strlen(pack_name
);
1616 if (!has_extension(pack_name
, ".pack"))
1617 die(_("packfile name '%s' does not end with '.pack'"),
1619 keep_name_buf
= xmalloc(len
);
1620 memcpy(keep_name_buf
, pack_name
, len
- 5);
1621 strcpy(keep_name_buf
+ len
- 5, ".keep");
1622 keep_name
= keep_name_buf
;
1626 die(_("--verify with no packfile name given"));
1627 read_idx_option(&opts
, index_name
);
1628 opts
.flags
|= WRITE_IDX_VERIFY
| WRITE_IDX_STRICT
;
1631 opts
.flags
|= WRITE_IDX_STRICT
;
1635 nr_threads
= online_cpus();
1636 /* An experiment showed that more threads does not mean faster */
1642 curr_pack
= open_pack_file(pack_name
);
1643 parse_pack_header();
1644 objects
= xcalloc(nr_objects
+ 1, sizeof(struct object_entry
));
1645 deltas
= xcalloc(nr_objects
, sizeof(struct delta_entry
));
1646 parse_pack_objects(pack_sha1
);
1648 conclude_pack(fix_thin_pack
, curr_pack
, pack_sha1
);
1651 foreign_nr
= check_objects();
1654 show_pack_info(stat_only
);
1656 idx_objects
= xmalloc((nr_objects
) * sizeof(struct pack_idx_entry
*));
1657 for (i
= 0; i
< nr_objects
; i
++)
1658 idx_objects
[i
] = &objects
[i
].idx
;
1659 curr_index
= write_idx_file(index_name
, idx_objects
, nr_objects
, &opts
, pack_sha1
);
1663 final(pack_name
, curr_pack
,
1664 index_name
, curr_index
,
1665 keep_name
, keep_msg
,
1670 free(index_name_buf
);
1671 free(keep_name_buf
);
1672 if (pack_name
== NULL
)
1673 free((void *) curr_pack
);
1674 if (index_name
== NULL
)
1675 free((void *) curr_index
);
1678 * Let the caller know this pack is not self contained
1680 if (check_self_contained_and_connected
&& foreign_nr
)