7 #include "list-objects.h"
9 #include "pack-bitmap.h"
10 #include "pack-revindex.h"
11 #include "pack-objects.h"
14 * An entry on the bitmap index, representing the bitmap for a given
17 struct stored_bitmap
{
18 unsigned char sha1
[20];
19 struct ewah_bitmap
*root
;
20 struct stored_bitmap
*xor;
25 * The currently active bitmap index. By design, repositories only have
26 * a single bitmap index available (the index for the biggest packfile in
27 * the repository), since bitmap indexes need full closure.
29 * If there is more than one bitmap index available (e.g. because of alternates),
30 * the active bitmap index is the largest one.
32 static struct bitmap_index
{
33 /* Packfile to which this bitmap index belongs to */
34 struct packed_git
*pack
;
36 /* reverse index for the packfile */
37 struct pack_revindex
*reverse_index
;
40 * Mark the first `reuse_objects` in the packfile as reused:
41 * they will be sent as-is without using them for repacking
44 uint32_t reuse_objects
;
46 /* mmapped buffer of the whole bitmap index */
48 size_t map_size
; /* size of the mmaped buffer */
49 size_t map_pos
; /* current position when loading the index */
54 * Each bitmap marks which objects in the packfile are of the given
55 * type. This provides type information when yielding the objects from
56 * the packfile during a walk, which allows for better delta bases.
58 struct ewah_bitmap
*commits
;
59 struct ewah_bitmap
*trees
;
60 struct ewah_bitmap
*blobs
;
61 struct ewah_bitmap
*tags
;
63 /* Map from SHA1 -> `stored_bitmap` for all the bitmapped commits */
66 /* Number of bitmapped commits */
69 /* Name-hash cache (or NULL if not present). */
75 * When trying to perform bitmap operations with objects that are not
76 * packed in `pack`, these objects are added to this "fake index" and
77 * are assumed to appear at the end of the packfile for all operations
80 struct object
**objects
;
82 uint32_t count
, alloc
;
83 khash_sha1_pos
*positions
;
86 /* Bitmap result of the last performed walk */
87 struct bitmap
*result
;
89 /* Version of the bitmap index */
96 static struct ewah_bitmap
*lookup_stored_bitmap(struct stored_bitmap
*st
)
98 struct ewah_bitmap
*parent
;
99 struct ewah_bitmap
*composed
;
104 composed
= ewah_pool_new();
105 parent
= lookup_stored_bitmap(st
->xor);
106 ewah_xor(st
->root
, parent
, composed
);
108 ewah_pool_free(st
->root
);
116 * Read a bitmap from the current read position on the mmaped
117 * index, and increase the read position accordingly
119 static struct ewah_bitmap
*read_bitmap_1(struct bitmap_index
*index
)
121 struct ewah_bitmap
*b
= ewah_pool_new();
123 int bitmap_size
= ewah_read_mmap(b
,
124 index
->map
+ index
->map_pos
,
125 index
->map_size
- index
->map_pos
);
127 if (bitmap_size
< 0) {
128 error("Failed to load bitmap index (corrupted?)");
133 index
->map_pos
+= bitmap_size
;
137 static int load_bitmap_header(struct bitmap_index
*index
)
139 struct bitmap_disk_header
*header
= (void *)index
->map
;
141 if (index
->map_size
< sizeof(*header
) + 20)
142 return error("Corrupted bitmap index (missing header data)");
144 if (memcmp(header
->magic
, BITMAP_IDX_SIGNATURE
, sizeof(BITMAP_IDX_SIGNATURE
)) != 0)
145 return error("Corrupted bitmap index file (wrong header)");
147 index
->version
= ntohs(header
->version
);
148 if (index
->version
!= 1)
149 return error("Unsupported version for bitmap index file (%d)", index
->version
);
151 /* Parse known bitmap format options */
153 uint32_t flags
= ntohs(header
->options
);
155 if ((flags
& BITMAP_OPT_FULL_DAG
) == 0)
156 return error("Unsupported options for bitmap index file "
157 "(Git requires BITMAP_OPT_FULL_DAG)");
159 if (flags
& BITMAP_OPT_HASH_CACHE
) {
160 unsigned char *end
= index
->map
+ index
->map_size
- 20;
161 index
->hashes
= ((uint32_t *)end
) - index
->pack
->num_objects
;
165 index
->entry_count
= ntohl(header
->entry_count
);
166 index
->map_pos
+= sizeof(*header
);
170 static struct stored_bitmap
*store_bitmap(struct bitmap_index
*index
,
171 struct ewah_bitmap
*root
,
172 const unsigned char *sha1
,
173 struct stored_bitmap
*xor_with
,
176 struct stored_bitmap
*stored
;
180 stored
= xmalloc(sizeof(struct stored_bitmap
));
182 stored
->xor = xor_with
;
183 stored
->flags
= flags
;
184 hashcpy(stored
->sha1
, sha1
);
186 hash_pos
= kh_put_sha1(index
->bitmaps
, stored
->sha1
, &ret
);
188 /* a 0 return code means the insertion succeeded with no changes,
189 * because the SHA1 already existed on the map. this is bad, there
190 * shouldn't be duplicated commits in the index */
192 error("Duplicate entry in bitmap index: %s", sha1_to_hex(sha1
));
196 kh_value(index
->bitmaps
, hash_pos
) = stored
;
200 static inline uint32_t read_be32(const unsigned char *buffer
, size_t *pos
)
202 uint32_t result
= get_be32(buffer
+ *pos
);
203 (*pos
) += sizeof(result
);
207 static inline uint8_t read_u8(const unsigned char *buffer
, size_t *pos
)
209 return buffer
[(*pos
)++];
212 #define MAX_XOR_OFFSET 160
214 static int load_bitmap_entries_v1(struct bitmap_index
*index
)
217 struct stored_bitmap
*recent_bitmaps
[MAX_XOR_OFFSET
] = { NULL
};
219 for (i
= 0; i
< index
->entry_count
; ++i
) {
220 int xor_offset
, flags
;
221 struct ewah_bitmap
*bitmap
= NULL
;
222 struct stored_bitmap
*xor_bitmap
= NULL
;
223 uint32_t commit_idx_pos
;
224 const unsigned char *sha1
;
226 commit_idx_pos
= read_be32(index
->map
, &index
->map_pos
);
227 xor_offset
= read_u8(index
->map
, &index
->map_pos
);
228 flags
= read_u8(index
->map
, &index
->map_pos
);
230 sha1
= nth_packed_object_sha1(index
->pack
, commit_idx_pos
);
232 bitmap
= read_bitmap_1(index
);
236 if (xor_offset
> MAX_XOR_OFFSET
|| xor_offset
> i
)
237 return error("Corrupted bitmap pack index");
239 if (xor_offset
> 0) {
240 xor_bitmap
= recent_bitmaps
[(i
- xor_offset
) % MAX_XOR_OFFSET
];
242 if (xor_bitmap
== NULL
)
243 return error("Invalid XOR offset in bitmap pack index");
246 recent_bitmaps
[i
% MAX_XOR_OFFSET
] = store_bitmap(
247 index
, bitmap
, sha1
, xor_bitmap
, flags
);
253 static char *pack_bitmap_filename(struct packed_git
*p
)
257 if (!strip_suffix(p
->pack_name
, ".pack", &len
))
258 die("BUG: pack_name does not end in .pack");
259 return xstrfmt("%.*s.bitmap", (int)len
, p
->pack_name
);
262 static int open_pack_bitmap_1(struct packed_git
*packfile
)
268 if (open_pack_index(packfile
))
271 idx_name
= pack_bitmap_filename(packfile
);
272 fd
= git_open_noatime(idx_name
);
278 if (fstat(fd
, &st
)) {
283 if (bitmap_git
.pack
) {
284 warning("ignoring extra bitmap file: %s", packfile
->pack_name
);
289 bitmap_git
.pack
= packfile
;
290 bitmap_git
.map_size
= xsize_t(st
.st_size
);
291 bitmap_git
.map
= xmmap(NULL
, bitmap_git
.map_size
, PROT_READ
, MAP_PRIVATE
, fd
, 0);
292 bitmap_git
.map_pos
= 0;
295 if (load_bitmap_header(&bitmap_git
) < 0) {
296 munmap(bitmap_git
.map
, bitmap_git
.map_size
);
297 bitmap_git
.map
= NULL
;
298 bitmap_git
.map_size
= 0;
305 static int load_pack_bitmap(void)
307 assert(bitmap_git
.map
&& !bitmap_git
.loaded
);
309 bitmap_git
.bitmaps
= kh_init_sha1();
310 bitmap_git
.ext_index
.positions
= kh_init_sha1_pos();
311 bitmap_git
.reverse_index
= revindex_for_pack(bitmap_git
.pack
);
313 if (!(bitmap_git
.commits
= read_bitmap_1(&bitmap_git
)) ||
314 !(bitmap_git
.trees
= read_bitmap_1(&bitmap_git
)) ||
315 !(bitmap_git
.blobs
= read_bitmap_1(&bitmap_git
)) ||
316 !(bitmap_git
.tags
= read_bitmap_1(&bitmap_git
)))
319 if (load_bitmap_entries_v1(&bitmap_git
) < 0)
322 bitmap_git
.loaded
= 1;
326 munmap(bitmap_git
.map
, bitmap_git
.map_size
);
327 bitmap_git
.map
= NULL
;
328 bitmap_git
.map_size
= 0;
332 static int open_pack_bitmap(void)
334 struct packed_git
*p
;
337 assert(!bitmap_git
.map
&& !bitmap_git
.loaded
);
339 prepare_packed_git();
340 for (p
= packed_git
; p
; p
= p
->next
) {
341 if (open_pack_bitmap_1(p
) == 0)
348 int prepare_bitmap_git(void)
350 if (bitmap_git
.loaded
)
353 if (!open_pack_bitmap())
354 return load_pack_bitmap();
359 struct include_data
{
364 static inline int bitmap_position_extended(const unsigned char *sha1
)
366 khash_sha1_pos
*positions
= bitmap_git
.ext_index
.positions
;
367 khiter_t pos
= kh_get_sha1_pos(positions
, sha1
);
369 if (pos
< kh_end(positions
)) {
370 int bitmap_pos
= kh_value(positions
, pos
);
371 return bitmap_pos
+ bitmap_git
.pack
->num_objects
;
377 static inline int bitmap_position_packfile(const unsigned char *sha1
)
379 off_t offset
= find_pack_entry_one(sha1
, bitmap_git
.pack
);
383 return find_revindex_position(bitmap_git
.reverse_index
, offset
);
386 static int bitmap_position(const unsigned char *sha1
)
388 int pos
= bitmap_position_packfile(sha1
);
389 return (pos
>= 0) ? pos
: bitmap_position_extended(sha1
);
392 static int ext_index_add_object(struct object
*object
, const char *name
)
394 struct eindex
*eindex
= &bitmap_git
.ext_index
;
400 hash_pos
= kh_put_sha1_pos(eindex
->positions
, object
->oid
.hash
, &hash_ret
);
402 if (eindex
->count
>= eindex
->alloc
) {
403 eindex
->alloc
= (eindex
->alloc
+ 16) * 3 / 2;
404 REALLOC_ARRAY(eindex
->objects
, eindex
->alloc
);
405 REALLOC_ARRAY(eindex
->hashes
, eindex
->alloc
);
408 bitmap_pos
= eindex
->count
;
409 eindex
->objects
[eindex
->count
] = object
;
410 eindex
->hashes
[eindex
->count
] = pack_name_hash(name
);
411 kh_value(eindex
->positions
, hash_pos
) = bitmap_pos
;
414 bitmap_pos
= kh_value(eindex
->positions
, hash_pos
);
417 return bitmap_pos
+ bitmap_git
.pack
->num_objects
;
420 static void show_object(struct object
*object
, const char *name
, void *data
)
422 struct bitmap
*base
= data
;
425 bitmap_pos
= bitmap_position(object
->oid
.hash
);
428 bitmap_pos
= ext_index_add_object(object
, name
);
430 bitmap_set(base
, bitmap_pos
);
433 static void show_commit(struct commit
*commit
, void *data
)
437 static int add_to_include_set(struct include_data
*data
,
438 const unsigned char *sha1
,
443 if (data
->seen
&& bitmap_get(data
->seen
, bitmap_pos
))
446 if (bitmap_get(data
->base
, bitmap_pos
))
449 hash_pos
= kh_get_sha1(bitmap_git
.bitmaps
, sha1
);
450 if (hash_pos
< kh_end(bitmap_git
.bitmaps
)) {
451 struct stored_bitmap
*st
= kh_value(bitmap_git
.bitmaps
, hash_pos
);
452 bitmap_or_ewah(data
->base
, lookup_stored_bitmap(st
));
456 bitmap_set(data
->base
, bitmap_pos
);
460 static int should_include(struct commit
*commit
, void *_data
)
462 struct include_data
*data
= _data
;
465 bitmap_pos
= bitmap_position(commit
->object
.oid
.hash
);
467 bitmap_pos
= ext_index_add_object((struct object
*)commit
, NULL
);
469 if (!add_to_include_set(data
, commit
->object
.oid
.hash
, bitmap_pos
)) {
470 struct commit_list
*parent
= commit
->parents
;
473 parent
->item
->object
.flags
|= SEEN
;
474 parent
= parent
->next
;
483 static struct bitmap
*find_objects(struct rev_info
*revs
,
484 struct object_list
*roots
,
487 struct bitmap
*base
= NULL
;
490 struct object_list
*not_mapped
= NULL
;
493 * Go through all the roots for the walk. The ones that have bitmaps
494 * on the bitmap index will be `or`ed together to form an initial
495 * global reachability analysis.
497 * The ones without bitmaps in the index will be stored in the
498 * `not_mapped_list` for further processing.
501 struct object
*object
= roots
->item
;
504 if (object
->type
== OBJ_COMMIT
) {
505 khiter_t pos
= kh_get_sha1(bitmap_git
.bitmaps
, object
->oid
.hash
);
507 if (pos
< kh_end(bitmap_git
.bitmaps
)) {
508 struct stored_bitmap
*st
= kh_value(bitmap_git
.bitmaps
, pos
);
509 struct ewah_bitmap
*or_with
= lookup_stored_bitmap(st
);
512 base
= ewah_to_bitmap(or_with
);
514 bitmap_or_ewah(base
, or_with
);
516 object
->flags
|= SEEN
;
521 object_list_insert(object
, ¬_mapped
);
525 * Best case scenario: We found bitmaps for all the roots,
526 * so the resulting `or` bitmap has the full reachability analysis
528 if (not_mapped
== NULL
)
534 * Let's iterate through all the roots that don't have bitmaps to
535 * check if we can determine them to be reachable from the existing
538 * If we cannot find them in the existing global bitmap, we'll need
539 * to push them to an actual walk and run it until we can confirm
543 struct object
*object
= roots
->item
;
547 pos
= bitmap_position(object
->oid
.hash
);
549 if (pos
< 0 || base
== NULL
|| !bitmap_get(base
, pos
)) {
550 object
->flags
&= ~UNINTERESTING
;
551 add_pending_object(revs
, object
, "");
554 object
->flags
|= SEEN
;
559 struct include_data incdata
;
567 revs
->include_check
= should_include
;
568 revs
->include_check_data
= &incdata
;
570 if (prepare_revision_walk(revs
))
571 die("revision walk setup failed");
573 traverse_commit_list(revs
, show_commit
, show_object
, base
);
579 static void show_extended_objects(struct bitmap
*objects
,
580 show_reachable_fn show_reach
)
582 struct eindex
*eindex
= &bitmap_git
.ext_index
;
585 for (i
= 0; i
< eindex
->count
; ++i
) {
588 if (!bitmap_get(objects
, bitmap_git
.pack
->num_objects
+ i
))
591 obj
= eindex
->objects
[i
];
592 show_reach(obj
->oid
.hash
, obj
->type
, 0, eindex
->hashes
[i
], NULL
, 0);
596 static void show_objects_for_type(
597 struct bitmap
*objects
,
598 struct ewah_bitmap
*type_filter
,
599 enum object_type object_type
,
600 show_reachable_fn show_reach
)
602 size_t pos
= 0, i
= 0;
605 struct ewah_iterator it
;
608 if (bitmap_git
.reuse_objects
== bitmap_git
.pack
->num_objects
)
611 ewah_iterator_init(&it
, type_filter
);
613 while (i
< objects
->word_alloc
&& ewah_iterator_next(&filter
, &it
)) {
614 eword_t word
= objects
->words
[i
] & filter
;
616 for (offset
= 0; offset
< BITS_IN_EWORD
; ++offset
) {
617 const unsigned char *sha1
;
618 struct revindex_entry
*entry
;
621 if ((word
>> offset
) == 0)
624 offset
+= ewah_bit_ctz64(word
>> offset
);
626 if (pos
+ offset
< bitmap_git
.reuse_objects
)
629 entry
= &bitmap_git
.reverse_index
->revindex
[pos
+ offset
];
630 sha1
= nth_packed_object_sha1(bitmap_git
.pack
, entry
->nr
);
632 if (bitmap_git
.hashes
)
633 hash
= ntohl(bitmap_git
.hashes
[entry
->nr
]);
635 show_reach(sha1
, object_type
, 0, hash
, bitmap_git
.pack
, entry
->offset
);
638 pos
+= BITS_IN_EWORD
;
643 static int in_bitmapped_pack(struct object_list
*roots
)
646 struct object
*object
= roots
->item
;
649 if (find_pack_entry_one(object
->oid
.hash
, bitmap_git
.pack
) > 0)
656 int prepare_bitmap_walk(struct rev_info
*revs
)
659 unsigned int pending_nr
= revs
->pending
.nr
;
660 struct object_array_entry
*pending_e
= revs
->pending
.objects
;
662 struct object_list
*wants
= NULL
;
663 struct object_list
*haves
= NULL
;
665 struct bitmap
*wants_bitmap
= NULL
;
666 struct bitmap
*haves_bitmap
= NULL
;
668 if (!bitmap_git
.loaded
) {
669 /* try to open a bitmapped pack, but don't parse it yet
670 * because we may not need to use it */
671 if (open_pack_bitmap() < 0)
675 for (i
= 0; i
< pending_nr
; ++i
) {
676 struct object
*object
= pending_e
[i
].item
;
678 if (object
->type
== OBJ_NONE
)
679 parse_object_or_die(object
->oid
.hash
, NULL
);
681 while (object
->type
== OBJ_TAG
) {
682 struct tag
*tag
= (struct tag
*) object
;
684 if (object
->flags
& UNINTERESTING
)
685 object_list_insert(object
, &haves
);
687 object_list_insert(object
, &wants
);
691 object
= parse_object_or_die(tag
->tagged
->oid
.hash
, NULL
);
694 if (object
->flags
& UNINTERESTING
)
695 object_list_insert(object
, &haves
);
697 object_list_insert(object
, &wants
);
701 * if we have a HAVES list, but none of those haves is contained
702 * in the packfile that has a bitmap, we don't have anything to
705 if (haves
&& !in_bitmapped_pack(haves
))
708 /* if we don't want anything, we're done here */
713 * now we're going to use bitmaps, so load the actual bitmap entries
714 * from disk. this is the point of no return; after this the rev_list
715 * becomes invalidated and we must perform the revwalk through bitmaps
717 if (!bitmap_git
.loaded
&& load_pack_bitmap() < 0)
720 revs
->pending
.nr
= 0;
721 revs
->pending
.alloc
= 0;
722 revs
->pending
.objects
= NULL
;
725 revs
->ignore_missing_links
= 1;
726 haves_bitmap
= find_objects(revs
, haves
, NULL
);
727 reset_revision_walk();
728 revs
->ignore_missing_links
= 0;
730 if (haves_bitmap
== NULL
)
731 die("BUG: failed to perform bitmap walk");
734 wants_bitmap
= find_objects(revs
, wants
, haves_bitmap
);
737 die("BUG: failed to perform bitmap walk");
740 bitmap_and_not(wants_bitmap
, haves_bitmap
);
742 bitmap_git
.result
= wants_bitmap
;
744 bitmap_free(haves_bitmap
);
748 int reuse_partial_packfile_from_bitmap(struct packed_git
**packfile
,
753 * Reuse the packfile content if we need more than
756 static const double REUSE_PERCENT
= 0.9;
758 struct bitmap
*result
= bitmap_git
.result
;
759 uint32_t reuse_threshold
;
760 uint32_t i
, reuse_objects
= 0;
764 for (i
= 0; i
< result
->word_alloc
; ++i
) {
765 if (result
->words
[i
] != (eword_t
)~0) {
766 reuse_objects
+= ewah_bit_ctz64(~result
->words
[i
]);
770 reuse_objects
+= BITS_IN_EWORD
;
773 #ifdef GIT_BITMAP_DEBUG
775 const unsigned char *sha1
;
776 struct revindex_entry
*entry
;
778 entry
= &bitmap_git
.reverse_index
->revindex
[reuse_objects
];
779 sha1
= nth_packed_object_sha1(bitmap_git
.pack
, entry
->nr
);
781 fprintf(stderr
, "Failed to reuse at %d (%016llx)\n",
782 reuse_objects
, result
->words
[i
]);
783 fprintf(stderr
, " %s\n", sha1_to_hex(sha1
));
790 if (reuse_objects
>= bitmap_git
.pack
->num_objects
) {
791 bitmap_git
.reuse_objects
= *entries
= bitmap_git
.pack
->num_objects
;
792 *up_to
= -1; /* reuse the full pack */
793 *packfile
= bitmap_git
.pack
;
797 reuse_threshold
= bitmap_popcount(bitmap_git
.result
) * REUSE_PERCENT
;
799 if (reuse_objects
< reuse_threshold
)
802 bitmap_git
.reuse_objects
= *entries
= reuse_objects
;
803 *up_to
= bitmap_git
.reverse_index
->revindex
[reuse_objects
].offset
;
804 *packfile
= bitmap_git
.pack
;
809 void traverse_bitmap_commit_list(show_reachable_fn show_reachable
)
811 assert(bitmap_git
.result
);
813 show_objects_for_type(bitmap_git
.result
, bitmap_git
.commits
,
814 OBJ_COMMIT
, show_reachable
);
815 show_objects_for_type(bitmap_git
.result
, bitmap_git
.trees
,
816 OBJ_TREE
, show_reachable
);
817 show_objects_for_type(bitmap_git
.result
, bitmap_git
.blobs
,
818 OBJ_BLOB
, show_reachable
);
819 show_objects_for_type(bitmap_git
.result
, bitmap_git
.tags
,
820 OBJ_TAG
, show_reachable
);
822 show_extended_objects(bitmap_git
.result
, show_reachable
);
824 bitmap_free(bitmap_git
.result
);
825 bitmap_git
.result
= NULL
;
828 static uint32_t count_object_type(struct bitmap
*objects
,
829 enum object_type type
)
831 struct eindex
*eindex
= &bitmap_git
.ext_index
;
833 uint32_t i
= 0, count
= 0;
834 struct ewah_iterator it
;
839 ewah_iterator_init(&it
, bitmap_git
.commits
);
843 ewah_iterator_init(&it
, bitmap_git
.trees
);
847 ewah_iterator_init(&it
, bitmap_git
.blobs
);
851 ewah_iterator_init(&it
, bitmap_git
.tags
);
858 while (i
< objects
->word_alloc
&& ewah_iterator_next(&filter
, &it
)) {
859 eword_t word
= objects
->words
[i
++] & filter
;
860 count
+= ewah_bit_popcount64(word
);
863 for (i
= 0; i
< eindex
->count
; ++i
) {
864 if (eindex
->objects
[i
]->type
== type
&&
865 bitmap_get(objects
, bitmap_git
.pack
->num_objects
+ i
))
872 void count_bitmap_commit_list(uint32_t *commits
, uint32_t *trees
,
873 uint32_t *blobs
, uint32_t *tags
)
875 assert(bitmap_git
.result
);
878 *commits
= count_object_type(bitmap_git
.result
, OBJ_COMMIT
);
881 *trees
= count_object_type(bitmap_git
.result
, OBJ_TREE
);
884 *blobs
= count_object_type(bitmap_git
.result
, OBJ_BLOB
);
887 *tags
= count_object_type(bitmap_git
.result
, OBJ_TAG
);
890 struct bitmap_test_data
{
892 struct progress
*prg
;
896 static void test_show_object(struct object
*object
, const char *name
,
899 struct bitmap_test_data
*tdata
= data
;
902 bitmap_pos
= bitmap_position(object
->oid
.hash
);
904 die("Object not in bitmap: %s\n", oid_to_hex(&object
->oid
));
906 bitmap_set(tdata
->base
, bitmap_pos
);
907 display_progress(tdata
->prg
, ++tdata
->seen
);
910 static void test_show_commit(struct commit
*commit
, void *data
)
912 struct bitmap_test_data
*tdata
= data
;
915 bitmap_pos
= bitmap_position(commit
->object
.oid
.hash
);
917 die("Object not in bitmap: %s\n", oid_to_hex(&commit
->object
.oid
));
919 bitmap_set(tdata
->base
, bitmap_pos
);
920 display_progress(tdata
->prg
, ++tdata
->seen
);
923 void test_bitmap_walk(struct rev_info
*revs
)
926 struct bitmap
*result
= NULL
;
928 size_t result_popcnt
;
929 struct bitmap_test_data tdata
;
931 if (prepare_bitmap_git())
932 die("failed to load bitmap indexes");
934 if (revs
->pending
.nr
!= 1)
935 die("you must specify exactly one commit to test");
937 fprintf(stderr
, "Bitmap v%d test (%d entries loaded)\n",
938 bitmap_git
.version
, bitmap_git
.entry_count
);
940 root
= revs
->pending
.objects
[0].item
;
941 pos
= kh_get_sha1(bitmap_git
.bitmaps
, root
->oid
.hash
);
943 if (pos
< kh_end(bitmap_git
.bitmaps
)) {
944 struct stored_bitmap
*st
= kh_value(bitmap_git
.bitmaps
, pos
);
945 struct ewah_bitmap
*bm
= lookup_stored_bitmap(st
);
947 fprintf(stderr
, "Found bitmap for %s. %d bits / %08x checksum\n",
948 oid_to_hex(&root
->oid
), (int)bm
->bit_size
, ewah_checksum(bm
));
950 result
= ewah_to_bitmap(bm
);
954 die("Commit %s doesn't have an indexed bitmap", oid_to_hex(&root
->oid
));
956 revs
->tag_objects
= 1;
957 revs
->tree_objects
= 1;
958 revs
->blob_objects
= 1;
960 result_popcnt
= bitmap_popcount(result
);
962 if (prepare_revision_walk(revs
))
963 die("revision walk setup failed");
965 tdata
.base
= bitmap_new();
966 tdata
.prg
= start_progress("Verifying bitmap entries", result_popcnt
);
969 traverse_commit_list(revs
, &test_show_commit
, &test_show_object
, &tdata
);
971 stop_progress(&tdata
.prg
);
973 if (bitmap_equals(result
, tdata
.base
))
974 fprintf(stderr
, "OK!\n");
976 fprintf(stderr
, "Mismatch!\n");
981 static int rebuild_bitmap(uint32_t *reposition
,
982 struct ewah_bitmap
*source
,
986 struct ewah_iterator it
;
989 ewah_iterator_init(&it
, source
);
991 while (ewah_iterator_next(&word
, &it
)) {
992 uint32_t offset
, bit_pos
;
994 for (offset
= 0; offset
< BITS_IN_EWORD
; ++offset
) {
995 if ((word
>> offset
) == 0)
998 offset
+= ewah_bit_ctz64(word
>> offset
);
1000 bit_pos
= reposition
[pos
+ offset
];
1002 bitmap_set(dest
, bit_pos
- 1);
1003 else /* can't reuse, we don't have the object */
1007 pos
+= BITS_IN_EWORD
;
1012 int rebuild_existing_bitmaps(struct packing_data
*mapping
,
1013 khash_sha1
*reused_bitmaps
,
1016 uint32_t i
, num_objects
;
1017 uint32_t *reposition
;
1018 struct bitmap
*rebuild
;
1019 struct stored_bitmap
*stored
;
1020 struct progress
*progress
= NULL
;
1025 if (prepare_bitmap_git() < 0)
1028 num_objects
= bitmap_git
.pack
->num_objects
;
1029 reposition
= xcalloc(num_objects
, sizeof(uint32_t));
1031 for (i
= 0; i
< num_objects
; ++i
) {
1032 const unsigned char *sha1
;
1033 struct revindex_entry
*entry
;
1034 struct object_entry
*oe
;
1036 entry
= &bitmap_git
.reverse_index
->revindex
[i
];
1037 sha1
= nth_packed_object_sha1(bitmap_git
.pack
, entry
->nr
);
1038 oe
= packlist_find(mapping
, sha1
, NULL
);
1041 reposition
[i
] = oe
->in_pack_pos
+ 1;
1044 rebuild
= bitmap_new();
1048 progress
= start_progress("Reusing bitmaps", 0);
1050 kh_foreach_value(bitmap_git
.bitmaps
, stored
, {
1051 if (stored
->flags
& BITMAP_FLAG_REUSE
) {
1052 if (!rebuild_bitmap(reposition
,
1053 lookup_stored_bitmap(stored
),
1055 hash_pos
= kh_put_sha1(reused_bitmaps
,
1058 kh_value(reused_bitmaps
, hash_pos
) =
1059 bitmap_to_ewah(rebuild
);
1061 bitmap_reset(rebuild
);
1062 display_progress(progress
, ++i
);
1066 stop_progress(&progress
);
1069 bitmap_free(rebuild
);