1 #define USE_THE_REPOSITORY_VARIABLE
3 #include "git-compat-util.h"
4 #include "environment.h"
7 #include "object-store-ll.h"
13 #include "pack-bitmap.h"
14 #include "hash-lookup.h"
15 #include "pack-objects.h"
17 #include "commit-reach.h"
18 #include "prio-queue.h"
21 #include "tree-walk.h"
22 #include "pseudo-merge.h"
23 #include "oid-array.h"
29 struct bitmapped_commit
{
30 struct commit
*commit
;
31 struct ewah_bitmap
*bitmap
;
32 struct ewah_bitmap
*write_as
;
36 unsigned pseudo_merge
: 1;
39 static inline int bitmap_writer_nr_selected_commits(struct bitmap_writer
*writer
)
41 return writer
->selected_nr
- writer
->pseudo_merges_nr
;
44 void bitmap_writer_init(struct bitmap_writer
*writer
, struct repository
*r
,
45 struct packing_data
*pdata
)
47 memset(writer
, 0, sizeof(struct bitmap_writer
));
49 BUG("bitmap writer already initialized");
50 writer
->bitmaps
= kh_init_oid_map();
51 writer
->pseudo_merge_commits
= kh_init_oid_map();
52 writer
->to_pack
= pdata
;
54 string_list_init_dup(&writer
->pseudo_merge_groups
);
56 load_pseudo_merges_from_config(r
, &writer
->pseudo_merge_groups
);
59 static void free_pseudo_merge_commit_idx(struct pseudo_merge_commit_idx
*idx
)
63 free(idx
->pseudo_merge
);
67 void bitmap_writer_free(struct bitmap_writer
*writer
)
70 struct pseudo_merge_commit_idx
*idx
;
75 ewah_free(writer
->commits
);
76 ewah_free(writer
->trees
);
77 ewah_free(writer
->blobs
);
78 ewah_free(writer
->tags
);
80 kh_destroy_oid_map(writer
->bitmaps
);
82 kh_foreach_value(writer
->pseudo_merge_commits
, idx
,
83 free_pseudo_merge_commit_idx(idx
));
84 kh_destroy_oid_map(writer
->pseudo_merge_commits
);
86 for (i
= 0; i
< writer
->selected_nr
; i
++) {
87 struct bitmapped_commit
*bc
= &writer
->selected
[i
];
88 if (bc
->write_as
!= bc
->bitmap
)
89 ewah_free(bc
->write_as
);
90 ewah_free(bc
->bitmap
);
92 free(writer
->selected
);
95 void bitmap_writer_show_progress(struct bitmap_writer
*writer
, int show
)
97 writer
->show_progress
= show
;
101 * Build the initial type index for the packfile or multi-pack-index
103 void bitmap_writer_build_type_index(struct bitmap_writer
*writer
,
104 struct pack_idx_entry
**index
)
108 writer
->commits
= ewah_new();
109 writer
->trees
= ewah_new();
110 writer
->blobs
= ewah_new();
111 writer
->tags
= ewah_new();
112 ALLOC_ARRAY(writer
->to_pack
->in_pack_pos
, writer
->to_pack
->nr_objects
);
114 for (i
= 0; i
< writer
->to_pack
->nr_objects
; ++i
) {
115 struct object_entry
*entry
= (struct object_entry
*)index
[i
];
116 enum object_type real_type
;
118 oe_set_in_pack_pos(writer
->to_pack
, entry
, i
);
120 switch (oe_type(entry
)) {
125 real_type
= oe_type(entry
);
129 real_type
= oid_object_info(writer
->to_pack
->repo
,
130 &entry
->idx
.oid
, NULL
);
136 ewah_set(writer
->commits
, i
);
140 ewah_set(writer
->trees
, i
);
144 ewah_set(writer
->blobs
, i
);
148 ewah_set(writer
->tags
, i
);
152 die("Missing type information for %s (%d/%d)",
153 oid_to_hex(&entry
->idx
.oid
), real_type
,
159 int bitmap_writer_has_bitmapped_object_id(struct bitmap_writer
*writer
,
160 const struct object_id
*oid
)
162 return kh_get_oid_map(writer
->bitmaps
, *oid
) != kh_end(writer
->bitmaps
);
166 * Compute the actual bitmaps
169 void bitmap_writer_push_commit(struct bitmap_writer
*writer
,
170 struct commit
*commit
, unsigned pseudo_merge
)
172 if (writer
->selected_nr
>= writer
->selected_alloc
) {
173 writer
->selected_alloc
= (writer
->selected_alloc
+ 32) * 2;
174 REALLOC_ARRAY(writer
->selected
, writer
->selected_alloc
);
179 khiter_t hash_pos
= kh_put_oid_map(writer
->bitmaps
,
184 die(_("duplicate entry when writing bitmap index: %s"),
185 oid_to_hex(&commit
->object
.oid
));
186 kh_value(writer
->bitmaps
, hash_pos
) = NULL
;
189 writer
->selected
[writer
->selected_nr
].commit
= commit
;
190 writer
->selected
[writer
->selected_nr
].bitmap
= NULL
;
191 writer
->selected
[writer
->selected_nr
].write_as
= NULL
;
192 writer
->selected
[writer
->selected_nr
].flags
= 0;
193 writer
->selected
[writer
->selected_nr
].pseudo_merge
= pseudo_merge
;
195 writer
->selected_nr
++;
198 static uint32_t find_object_pos(struct bitmap_writer
*writer
,
199 const struct object_id
*oid
, int *found
)
201 struct object_entry
*entry
= packlist_find(writer
->to_pack
, oid
);
206 warning("Failed to write bitmap index. Packfile doesn't have full closure "
207 "(object %s is missing)", oid_to_hex(oid
));
213 return oe_in_pack_pos(writer
->to_pack
, entry
);
216 static void compute_xor_offsets(struct bitmap_writer
*writer
)
218 static const int MAX_XOR_OFFSET_SEARCH
= 10;
222 while (next
< writer
->selected_nr
) {
223 struct bitmapped_commit
*stored
= &writer
->selected
[next
];
225 struct ewah_bitmap
*best_bitmap
= stored
->bitmap
;
226 struct ewah_bitmap
*test_xor
;
228 if (stored
->pseudo_merge
)
231 for (i
= 1; i
<= MAX_XOR_OFFSET_SEARCH
; ++i
) {
236 if (writer
->selected
[curr
].pseudo_merge
)
239 test_xor
= ewah_pool_new();
240 ewah_xor(writer
->selected
[curr
].bitmap
, stored
->bitmap
, test_xor
);
242 if (test_xor
->buffer_size
< best_bitmap
->buffer_size
) {
243 if (best_bitmap
!= stored
->bitmap
)
244 ewah_pool_free(best_bitmap
);
246 best_bitmap
= test_xor
;
249 ewah_pool_free(test_xor
);
254 stored
->xor_offset
= best_offset
;
255 stored
->write_as
= best_bitmap
;
262 struct commit_list
*reverse_edges
;
263 struct bitmap
*commit_mask
;
264 struct bitmap
*bitmap
;
268 unsigned idx
; /* within selected array */
271 static void clear_bb_commit(struct bb_commit
*commit
)
273 free_commit_list(commit
->reverse_edges
);
274 bitmap_free(commit
->commit_mask
);
275 bitmap_free(commit
->bitmap
);
278 define_commit_slab(bb_data
, struct bb_commit
);
280 struct bitmap_builder
{
282 struct commit
**commits
;
283 size_t commits_nr
, commits_alloc
;
286 static void bitmap_builder_init(struct bitmap_builder
*bb
,
287 struct bitmap_writer
*writer
,
288 struct bitmap_index
*old_bitmap
)
290 struct rev_info revs
;
291 struct commit
*commit
;
292 struct commit_list
*reusable
= NULL
;
293 struct commit_list
*r
;
294 unsigned int i
, num_maximal
= 0;
296 memset(bb
, 0, sizeof(*bb
));
297 init_bb_data(&bb
->data
);
299 reset_revision_walk();
300 repo_init_revisions(writer
->to_pack
->repo
, &revs
, NULL
);
302 revs
.first_parent_only
= 1;
304 for (i
= 0; i
< writer
->selected_nr
; i
++) {
305 struct bitmapped_commit
*bc
= &writer
->selected
[i
];
306 struct bb_commit
*ent
= bb_data_at(&bb
->data
, bc
->commit
);
310 ent
->pseudo_merge
= bc
->pseudo_merge
;
313 ent
->commit_mask
= bitmap_new();
314 bitmap_set(ent
->commit_mask
, i
);
316 add_pending_object(&revs
, &bc
->commit
->object
, "");
319 if (prepare_revision_walk(&revs
))
320 die("revision walk setup failed");
322 while ((commit
= get_revision(&revs
))) {
323 struct commit_list
*p
= commit
->parents
;
324 struct bb_commit
*c_ent
;
326 parse_commit_or_die(commit
);
328 c_ent
= bb_data_at(&bb
->data
, commit
);
331 * If there is no commit_mask, there is no reason to iterate
332 * over this commit; it is not selected (if it were, it would
333 * not have a blank commit mask) and all its children have
334 * existing bitmaps (see the comment starting with "This commit
335 * has an existing bitmap" below), so it does not contribute
336 * anything to the final bitmap file or its descendants.
338 if (!c_ent
->commit_mask
)
341 if (old_bitmap
&& bitmap_for_commit(old_bitmap
, commit
)) {
343 * This commit has an existing bitmap, so we can
344 * get its bits immediately without an object
345 * walk. That is, it is reusable as-is and there is no
346 * need to continue walking beyond it.
348 * Mark it as such and add it to bb->commits separately
349 * to avoid allocating a position in the commit mask.
351 commit_list_insert(commit
, &reusable
);
355 if (c_ent
->maximal
) {
357 ALLOC_GROW(bb
->commits
, bb
->commits_nr
+ 1, bb
->commits_alloc
);
358 bb
->commits
[bb
->commits_nr
++] = commit
;
362 struct bb_commit
*p_ent
= bb_data_at(&bb
->data
, p
->item
);
363 int c_not_p
, p_not_c
;
365 if (!p_ent
->commit_mask
) {
366 p_ent
->commit_mask
= bitmap_new();
370 c_not_p
= bitmap_is_subset(c_ent
->commit_mask
, p_ent
->commit_mask
);
371 p_not_c
= bitmap_is_subset(p_ent
->commit_mask
, c_ent
->commit_mask
);
377 bitmap_or(p_ent
->commit_mask
, c_ent
->commit_mask
);
383 free_commit_list(p_ent
->reverse_edges
);
384 p_ent
->reverse_edges
= NULL
;
387 if (c_ent
->maximal
) {
388 commit_list_insert(commit
, &p_ent
->reverse_edges
);
390 struct commit_list
*cc
= c_ent
->reverse_edges
;
392 for (; cc
; cc
= cc
->next
) {
393 if (!commit_list_contains(cc
->item
, p_ent
->reverse_edges
))
394 commit_list_insert(cc
->item
, &p_ent
->reverse_edges
);
400 bitmap_free(c_ent
->commit_mask
);
401 c_ent
->commit_mask
= NULL
;
404 for (r
= reusable
; r
; r
= r
->next
) {
405 ALLOC_GROW(bb
->commits
, bb
->commits_nr
+ 1, bb
->commits_alloc
);
406 bb
->commits
[bb
->commits_nr
++] = r
->item
;
409 trace2_data_intmax("pack-bitmap-write", the_repository
,
410 "num_selected_commits", writer
->selected_nr
);
411 trace2_data_intmax("pack-bitmap-write", the_repository
,
412 "num_maximal_commits", num_maximal
);
414 release_revisions(&revs
);
415 free_commit_list(reusable
);
418 static void bitmap_builder_clear(struct bitmap_builder
*bb
)
420 deep_clear_bb_data(&bb
->data
, clear_bb_commit
);
422 bb
->commits_nr
= bb
->commits_alloc
= 0;
425 static int fill_bitmap_tree(struct bitmap_writer
*writer
,
426 struct bitmap
*bitmap
,
431 struct tree_desc desc
;
432 struct name_entry entry
;
435 * If our bit is already set, then there is nothing to do. Both this
436 * tree and all of its children will be set.
438 pos
= find_object_pos(writer
, &tree
->object
.oid
, &found
);
441 if (bitmap_get(bitmap
, pos
))
443 bitmap_set(bitmap
, pos
);
445 if (parse_tree(tree
) < 0)
446 die("unable to load tree object %s",
447 oid_to_hex(&tree
->object
.oid
));
448 init_tree_desc(&desc
, &tree
->object
.oid
, tree
->buffer
, tree
->size
);
450 while (tree_entry(&desc
, &entry
)) {
451 switch (object_type(entry
.mode
)) {
453 if (fill_bitmap_tree(writer
, bitmap
,
454 lookup_tree(the_repository
, &entry
.oid
)) < 0)
458 pos
= find_object_pos(writer
, &entry
.oid
, &found
);
461 bitmap_set(bitmap
, pos
);
464 /* Gitlink, etc; not reachable */
469 free_tree_buffer(tree
);
473 static int reused_bitmaps_nr
;
474 static int reused_pseudo_merge_bitmaps_nr
;
476 static int fill_bitmap_commit(struct bitmap_writer
*writer
,
477 struct bb_commit
*ent
,
478 struct commit
*commit
,
479 struct prio_queue
*queue
,
480 struct prio_queue
*tree_queue
,
481 struct bitmap_index
*old_bitmap
,
482 const uint32_t *mapping
)
487 ent
->bitmap
= bitmap_new();
489 prio_queue_put(queue
, commit
);
492 struct commit_list
*p
;
493 struct commit
*c
= prio_queue_get(queue
);
495 if (old_bitmap
&& mapping
) {
496 struct ewah_bitmap
*old
;
497 struct bitmap
*remapped
= bitmap_new();
499 if (commit
->object
.flags
& BITMAP_PSEUDO_MERGE
)
500 old
= pseudo_merge_bitmap_for_commit(old_bitmap
, c
);
502 old
= bitmap_for_commit(old_bitmap
, c
);
504 * If this commit has an old bitmap, then translate that
505 * bitmap and add its bits to this one. No need to walk
506 * parents or the tree for this commit.
508 if (old
&& !rebuild_bitmap(mapping
, old
, remapped
)) {
509 bitmap_or(ent
->bitmap
, remapped
);
510 bitmap_free(remapped
);
511 if (commit
->object
.flags
& BITMAP_PSEUDO_MERGE
)
512 reused_pseudo_merge_bitmaps_nr
++;
517 bitmap_free(remapped
);
521 * Mark ourselves and queue our tree. The commit
522 * walk ensures we cover all parents.
524 if (!(c
->object
.flags
& BITMAP_PSEUDO_MERGE
)) {
525 pos
= find_object_pos(writer
, &c
->object
.oid
, &found
);
528 bitmap_set(ent
->bitmap
, pos
);
529 prio_queue_put(tree_queue
,
530 repo_get_commit_tree(the_repository
, c
));
533 for (p
= c
->parents
; p
; p
= p
->next
) {
534 pos
= find_object_pos(writer
, &p
->item
->object
.oid
,
538 if (!bitmap_get(ent
->bitmap
, pos
)) {
539 bitmap_set(ent
->bitmap
, pos
);
540 prio_queue_put(queue
, p
->item
);
545 while (tree_queue
->nr
) {
546 if (fill_bitmap_tree(writer
, ent
->bitmap
,
547 prio_queue_get(tree_queue
)) < 0)
553 static void store_selected(struct bitmap_writer
*writer
,
554 struct bb_commit
*ent
, struct commit
*commit
)
556 struct bitmapped_commit
*stored
= &writer
->selected
[ent
->idx
];
559 stored
->bitmap
= bitmap_to_ewah(ent
->bitmap
);
561 if (ent
->pseudo_merge
)
564 hash_pos
= kh_get_oid_map(writer
->bitmaps
, commit
->object
.oid
);
565 if (hash_pos
== kh_end(writer
->bitmaps
))
566 die(_("attempted to store non-selected commit: '%s'"),
567 oid_to_hex(&commit
->object
.oid
));
569 kh_value(writer
->bitmaps
, hash_pos
) = stored
;
572 int bitmap_writer_build(struct bitmap_writer
*writer
)
574 struct bitmap_builder bb
;
576 int nr_stored
= 0; /* for progress */
577 struct prio_queue queue
= { compare_commits_by_gen_then_commit_date
};
578 struct prio_queue tree_queue
= { NULL
};
579 struct bitmap_index
*old_bitmap
;
581 int closed
= 1; /* until proven otherwise */
583 if (writer
->show_progress
)
584 writer
->progress
= start_progress("Building bitmaps",
585 writer
->selected_nr
);
586 trace2_region_enter("pack-bitmap-write", "building_bitmaps_total",
589 old_bitmap
= prepare_bitmap_git(writer
->to_pack
->repo
);
591 mapping
= create_bitmap_mapping(old_bitmap
, writer
->to_pack
);
595 bitmap_builder_init(&bb
, writer
, old_bitmap
);
596 for (i
= bb
.commits_nr
; i
> 0; i
--) {
597 struct commit
*commit
= bb
.commits
[i
-1];
598 struct bb_commit
*ent
= bb_data_at(&bb
.data
, commit
);
599 struct commit
*child
;
602 if (fill_bitmap_commit(writer
, ent
, commit
, &queue
, &tree_queue
,
603 old_bitmap
, mapping
) < 0) {
609 store_selected(writer
, ent
, commit
);
611 display_progress(writer
->progress
, nr_stored
);
614 while ((child
= pop_commit(&ent
->reverse_edges
))) {
615 struct bb_commit
*child_ent
=
616 bb_data_at(&bb
.data
, child
);
618 if (child_ent
->bitmap
)
619 bitmap_or(child_ent
->bitmap
, ent
->bitmap
);
621 child_ent
->bitmap
= bitmap_dup(ent
->bitmap
);
623 child_ent
->bitmap
= ent
->bitmap
;
628 bitmap_free(ent
->bitmap
);
631 clear_prio_queue(&queue
);
632 clear_prio_queue(&tree_queue
);
633 bitmap_builder_clear(&bb
);
634 free_bitmap_index(old_bitmap
);
637 trace2_region_leave("pack-bitmap-write", "building_bitmaps_total",
639 trace2_data_intmax("pack-bitmap-write", the_repository
,
640 "building_bitmaps_reused", reused_bitmaps_nr
);
641 trace2_data_intmax("pack-bitmap-write", the_repository
,
642 "building_bitmaps_pseudo_merge_reused",
643 reused_pseudo_merge_bitmaps_nr
);
645 stop_progress(&writer
->progress
);
648 compute_xor_offsets(writer
);
649 return closed
? 0 : -1;
653 * Select the commits that will be bitmapped
655 static inline unsigned int next_commit_index(unsigned int idx
)
657 static const unsigned int MIN_COMMITS
= 100;
658 static const unsigned int MAX_COMMITS
= 5000;
660 static const unsigned int MUST_REGION
= 100;
661 static const unsigned int MIN_REGION
= 20000;
663 unsigned int offset
, next
;
665 if (idx
<= MUST_REGION
)
668 if (idx
<= MIN_REGION
) {
669 offset
= idx
- MUST_REGION
;
670 return (offset
< MIN_COMMITS
) ? offset
: MIN_COMMITS
;
673 offset
= idx
- MIN_REGION
;
674 next
= (offset
< MAX_COMMITS
) ? offset
: MAX_COMMITS
;
676 return (next
> MIN_COMMITS
) ? next
: MIN_COMMITS
;
679 static int date_compare(const void *_a
, const void *_b
)
681 struct commit
*a
= *(struct commit
**)_a
;
682 struct commit
*b
= *(struct commit
**)_b
;
683 return (long)b
->date
- (long)a
->date
;
686 void bitmap_writer_select_commits(struct bitmap_writer
*writer
,
687 struct commit
**indexed_commits
,
688 unsigned int indexed_commits_nr
)
690 unsigned int i
= 0, j
, next
;
692 QSORT(indexed_commits
, indexed_commits_nr
, date_compare
);
694 if (indexed_commits_nr
< 100) {
695 for (i
= 0; i
< indexed_commits_nr
; ++i
)
696 bitmap_writer_push_commit(writer
, indexed_commits
[i
], 0);
698 select_pseudo_merges(writer
);
703 if (writer
->show_progress
)
704 writer
->progress
= start_progress("Selecting bitmap commits", 0);
707 struct commit
*chosen
= NULL
;
709 next
= next_commit_index(i
);
711 if (i
+ next
>= indexed_commits_nr
)
715 chosen
= indexed_commits
[i
];
717 chosen
= indexed_commits
[i
+ next
];
719 for (j
= 0; j
<= next
; ++j
) {
720 struct commit
*cm
= indexed_commits
[i
+ j
];
722 if ((cm
->object
.flags
& NEEDS_BITMAP
) != 0) {
727 if (cm
->parents
&& cm
->parents
->next
)
732 bitmap_writer_push_commit(writer
, chosen
, 0);
735 display_progress(writer
->progress
, i
);
738 stop_progress(&writer
->progress
);
740 select_pseudo_merges(writer
);
744 static int hashwrite_ewah_helper(void *f
, const void *buf
, size_t len
)
746 /* hashwrite will die on error */
747 hashwrite(f
, buf
, len
);
752 * Write the bitmap index to disk
754 static inline void dump_bitmap(struct hashfile
*f
, struct ewah_bitmap
*bitmap
)
756 if (ewah_serialize_to(bitmap
, hashwrite_ewah_helper
, f
) < 0)
757 die("Failed to write bitmap index");
760 static const struct object_id
*oid_access(size_t pos
, const void *table
)
762 const struct pack_idx_entry
* const *index
= table
;
763 return &index
[pos
]->oid
;
766 static void write_selected_commits_v1(struct bitmap_writer
*writer
,
767 struct hashfile
*f
, off_t
*offsets
)
771 for (i
= 0; i
< bitmap_writer_nr_selected_commits(writer
); ++i
) {
772 struct bitmapped_commit
*stored
= &writer
->selected
[i
];
773 if (stored
->pseudo_merge
)
774 BUG("unexpected pseudo-merge among selected: %s",
775 oid_to_hex(&stored
->commit
->object
.oid
));
778 offsets
[i
] = hashfile_total(f
);
780 hashwrite_be32(f
, stored
->commit_pos
);
781 hashwrite_u8(f
, stored
->xor_offset
);
782 hashwrite_u8(f
, stored
->flags
);
784 dump_bitmap(f
, stored
->write_as
);
788 static void write_pseudo_merges(struct bitmap_writer
*writer
,
791 struct oid_array commits
= OID_ARRAY_INIT
;
792 struct bitmap
**commits_bitmap
= NULL
;
793 off_t
*pseudo_merge_ofs
= NULL
;
794 off_t start
, table_start
, next_ext
;
796 uint32_t base
= bitmap_writer_nr_selected_commits(writer
);
799 CALLOC_ARRAY(commits_bitmap
, writer
->pseudo_merges_nr
);
800 CALLOC_ARRAY(pseudo_merge_ofs
, writer
->pseudo_merges_nr
);
802 for (i
= 0; i
< writer
->pseudo_merges_nr
; i
++) {
803 struct bitmapped_commit
*merge
= &writer
->selected
[base
+ i
];
804 struct commit_list
*p
;
806 if (!merge
->pseudo_merge
)
807 BUG("found non-pseudo merge commit at %"PRIuMAX
, (uintmax_t)i
);
809 commits_bitmap
[i
] = bitmap_new();
811 for (p
= merge
->commit
->parents
; p
; p
= p
->next
)
812 bitmap_set(commits_bitmap
[i
],
813 find_object_pos(writer
, &p
->item
->object
.oid
,
817 start
= hashfile_total(f
);
819 for (i
= 0; i
< writer
->pseudo_merges_nr
; i
++) {
820 struct ewah_bitmap
*commits_ewah
= bitmap_to_ewah(commits_bitmap
[i
]);
822 pseudo_merge_ofs
[i
] = hashfile_total(f
);
824 dump_bitmap(f
, commits_ewah
);
825 dump_bitmap(f
, writer
->selected
[base
+i
].write_as
);
827 ewah_free(commits_ewah
);
830 next_ext
= st_add(hashfile_total(f
),
831 st_mult(kh_size(writer
->pseudo_merge_commits
),
834 table_start
= hashfile_total(f
);
836 commits
.alloc
= kh_size(writer
->pseudo_merge_commits
);
837 CALLOC_ARRAY(commits
.oid
, commits
.alloc
);
839 for (i
= kh_begin(writer
->pseudo_merge_commits
); i
!= kh_end(writer
->pseudo_merge_commits
); i
++) {
840 if (!kh_exist(writer
->pseudo_merge_commits
, i
))
842 oid_array_append(&commits
, &kh_key(writer
->pseudo_merge_commits
, i
));
845 oid_array_sort(&commits
);
847 /* write lookup table (non-extended) */
848 for (i
= 0; i
< commits
.nr
; i
++) {
850 struct pseudo_merge_commit_idx
*c
;
852 hash_pos
= kh_get_oid_map(writer
->pseudo_merge_commits
,
854 if (hash_pos
== kh_end(writer
->pseudo_merge_commits
))
855 BUG("could not find pseudo-merge commit %s",
856 oid_to_hex(&commits
.oid
[i
]));
858 c
= kh_value(writer
->pseudo_merge_commits
, hash_pos
);
860 hashwrite_be32(f
, find_object_pos(writer
, &commits
.oid
[i
],
863 hashwrite_be64(f
, pseudo_merge_ofs
[c
->pseudo_merge
[0]]);
864 else if (c
->nr
> 1) {
865 if (next_ext
& ((uint64_t)1<<63))
866 die(_("too many pseudo-merges"));
867 hashwrite_be64(f
, next_ext
| ((uint64_t)1<<63));
868 next_ext
= st_add3(next_ext
,
870 st_mult(c
->nr
, sizeof(uint64_t)));
872 BUG("expected commit '%s' to have at least one "
873 "pseudo-merge", oid_to_hex(&commits
.oid
[i
]));
876 /* write lookup table (extended) */
877 for (i
= 0; i
< commits
.nr
; i
++) {
879 struct pseudo_merge_commit_idx
*c
;
881 hash_pos
= kh_get_oid_map(writer
->pseudo_merge_commits
,
883 if (hash_pos
== kh_end(writer
->pseudo_merge_commits
))
884 BUG("could not find pseudo-merge commit %s",
885 oid_to_hex(&commits
.oid
[i
]));
887 c
= kh_value(writer
->pseudo_merge_commits
, hash_pos
);
891 hashwrite_be32(f
, c
->nr
);
892 for (j
= 0; j
< c
->nr
; j
++)
893 hashwrite_be64(f
, pseudo_merge_ofs
[c
->pseudo_merge
[j
]]);
896 /* write positions for all pseudo merges */
897 for (i
= 0; i
< writer
->pseudo_merges_nr
; i
++)
898 hashwrite_be64(f
, pseudo_merge_ofs
[i
]);
900 hashwrite_be32(f
, writer
->pseudo_merges_nr
);
901 hashwrite_be32(f
, kh_size(writer
->pseudo_merge_commits
));
902 hashwrite_be64(f
, table_start
- start
);
903 hashwrite_be64(f
, hashfile_total(f
) - start
+ sizeof(uint64_t));
905 for (i
= 0; i
< writer
->pseudo_merges_nr
; i
++)
906 bitmap_free(commits_bitmap
[i
]);
908 free(pseudo_merge_ofs
);
909 free(commits_bitmap
);
912 static int table_cmp(const void *_va
, const void *_vb
, void *_data
)
914 struct bitmap_writer
*writer
= _data
;
915 struct bitmapped_commit
*a
= &writer
->selected
[*(uint32_t *)_va
];
916 struct bitmapped_commit
*b
= &writer
->selected
[*(uint32_t *)_vb
];
918 if (a
->commit_pos
< b
->commit_pos
)
920 else if (a
->commit_pos
> b
->commit_pos
)
926 static void write_lookup_table(struct bitmap_writer
*writer
, struct hashfile
*f
,
930 uint32_t *table
, *table_inv
;
932 ALLOC_ARRAY(table
, bitmap_writer_nr_selected_commits(writer
));
933 ALLOC_ARRAY(table_inv
, bitmap_writer_nr_selected_commits(writer
));
935 for (i
= 0; i
< bitmap_writer_nr_selected_commits(writer
); i
++)
939 * At the end of this sort table[j] = i means that the i'th
940 * bitmap corresponds to j'th bitmapped commit (among the selected
941 * commits) in lex order of OIDs.
943 QSORT_S(table
, bitmap_writer_nr_selected_commits(writer
), table_cmp
, writer
);
945 /* table_inv helps us discover that relationship (i'th bitmap
946 * to j'th commit by j = table_inv[i])
948 for (i
= 0; i
< bitmap_writer_nr_selected_commits(writer
); i
++)
949 table_inv
[table
[i
]] = i
;
951 trace2_region_enter("pack-bitmap-write", "writing_lookup_table", the_repository
);
952 for (i
= 0; i
< bitmap_writer_nr_selected_commits(writer
); i
++) {
953 struct bitmapped_commit
*selected
= &writer
->selected
[table
[i
]];
954 uint32_t xor_offset
= selected
->xor_offset
;
959 * xor_index stores the index (in the bitmap entries)
960 * of the corresponding xor bitmap. But we need to convert
961 * this index into lookup table's index. So, table_inv[xor_index]
962 * gives us the index position w.r.t. the lookup table.
964 * If "k = table[i] - xor_offset" then the xor base is the k'th
965 * bitmap. `table_inv[k]` gives us the position of that bitmap
966 * in the lookup table.
968 uint32_t xor_index
= table
[i
] - xor_offset
;
969 xor_row
= table_inv
[xor_index
];
971 xor_row
= 0xffffffff;
974 hashwrite_be32(f
, writer
->selected
[table
[i
]].commit_pos
);
975 hashwrite_be64(f
, (uint64_t)offsets
[table
[i
]]);
976 hashwrite_be32(f
, xor_row
);
978 trace2_region_leave("pack-bitmap-write", "writing_lookup_table", the_repository
);
984 static void write_hash_cache(struct hashfile
*f
,
985 struct pack_idx_entry
**index
,
990 for (i
= 0; i
< index_nr
; ++i
) {
991 struct object_entry
*entry
= (struct object_entry
*)index
[i
];
992 hashwrite_be32(f
, entry
->hash
);
996 void bitmap_writer_set_checksum(struct bitmap_writer
*writer
,
997 const unsigned char *sha1
)
999 hashcpy(writer
->pack_checksum
, sha1
, the_repository
->hash_algo
);
1002 void bitmap_writer_finish(struct bitmap_writer
*writer
,
1003 struct pack_idx_entry
**index
,
1004 const char *filename
,
1007 static uint16_t default_version
= 1;
1008 static uint16_t flags
= BITMAP_OPT_FULL_DAG
;
1009 struct strbuf tmp_file
= STRBUF_INIT
;
1011 off_t
*offsets
= NULL
;
1014 struct bitmap_disk_header header
;
1016 int fd
= odb_mkstemp(&tmp_file
, "pack/tmp_bitmap_XXXXXX");
1018 if (writer
->pseudo_merges_nr
)
1019 options
|= BITMAP_OPT_PSEUDO_MERGES
;
1021 f
= hashfd(fd
, tmp_file
.buf
);
1023 memcpy(header
.magic
, BITMAP_IDX_SIGNATURE
, sizeof(BITMAP_IDX_SIGNATURE
));
1024 header
.version
= htons(default_version
);
1025 header
.options
= htons(flags
| options
);
1026 header
.entry_count
= htonl(bitmap_writer_nr_selected_commits(writer
));
1027 hashcpy(header
.checksum
, writer
->pack_checksum
, the_repository
->hash_algo
);
1029 hashwrite(f
, &header
, sizeof(header
) - GIT_MAX_RAWSZ
+ the_hash_algo
->rawsz
);
1030 dump_bitmap(f
, writer
->commits
);
1031 dump_bitmap(f
, writer
->trees
);
1032 dump_bitmap(f
, writer
->blobs
);
1033 dump_bitmap(f
, writer
->tags
);
1035 if (options
& BITMAP_OPT_LOOKUP_TABLE
)
1036 CALLOC_ARRAY(offsets
, writer
->to_pack
->nr_objects
);
1038 for (i
= 0; i
< bitmap_writer_nr_selected_commits(writer
); i
++) {
1039 struct bitmapped_commit
*stored
= &writer
->selected
[i
];
1040 int commit_pos
= oid_pos(&stored
->commit
->object
.oid
, index
,
1041 writer
->to_pack
->nr_objects
,
1045 BUG(_("trying to write commit not in index"));
1046 stored
->commit_pos
= commit_pos
;
1049 write_selected_commits_v1(writer
, f
, offsets
);
1051 if (options
& BITMAP_OPT_PSEUDO_MERGES
)
1052 write_pseudo_merges(writer
, f
);
1054 if (options
& BITMAP_OPT_LOOKUP_TABLE
)
1055 write_lookup_table(writer
, f
, offsets
);
1057 if (options
& BITMAP_OPT_HASH_CACHE
)
1058 write_hash_cache(f
, index
, writer
->to_pack
->nr_objects
);
1060 finalize_hashfile(f
, NULL
, FSYNC_COMPONENT_PACK_METADATA
,
1061 CSUM_HASH_IN_STREAM
| CSUM_FSYNC
| CSUM_CLOSE
);
1063 if (adjust_shared_perm(tmp_file
.buf
))
1064 die_errno("unable to make temporary bitmap file readable");
1066 if (rename(tmp_file
.buf
, filename
))
1067 die_errno("unable to rename temporary bitmap file to '%s'", filename
);
1069 strbuf_release(&tmp_file
);