10 #include "tree-walk.h"
13 #include "list-objects.h"
17 #include "pack-bitmap.h"
18 #include "pack-objects.h"
19 #include "delta-islands.h"
20 #include "oid-array.h"
23 KHASH_INIT(str
, const char *, void *, 1, kh_str_hash_func
, kh_str_hash_equal
)
25 static kh_oid_map_t
*island_marks
;
26 static unsigned island_counter
;
27 static unsigned island_counter_core
;
29 struct remote_island
{
31 struct oid_array oids
;
34 struct island_bitmap
{
36 uint32_t bits
[FLEX_ARRAY
];
39 static uint32_t island_bitmap_size
;
42 * Allocate a new bitmap; if "old" is not NULL, the new bitmap will be a copy
43 * of "old". Otherwise, the new bitmap is empty.
45 static struct island_bitmap
*island_bitmap_new(const struct island_bitmap
*old
)
47 size_t size
= sizeof(struct island_bitmap
) + (island_bitmap_size
* 4);
48 struct island_bitmap
*b
= xcalloc(1, size
);
57 static void island_bitmap_or(struct island_bitmap
*a
, const struct island_bitmap
*b
)
61 for (i
= 0; i
< island_bitmap_size
; ++i
)
62 a
->bits
[i
] |= b
->bits
[i
];
65 static int island_bitmap_is_subset(struct island_bitmap
*self
,
66 struct island_bitmap
*super
)
73 for (i
= 0; i
< island_bitmap_size
; ++i
) {
74 if ((self
->bits
[i
] & super
->bits
[i
]) != self
->bits
[i
])
81 #define ISLAND_BITMAP_BLOCK(x) (x / 32)
82 #define ISLAND_BITMAP_MASK(x) (1 << (x % 32))
84 static void island_bitmap_set(struct island_bitmap
*self
, uint32_t i
)
86 self
->bits
[ISLAND_BITMAP_BLOCK(i
)] |= ISLAND_BITMAP_MASK(i
);
89 static int island_bitmap_get(struct island_bitmap
*self
, uint32_t i
)
91 return (self
->bits
[ISLAND_BITMAP_BLOCK(i
)] & ISLAND_BITMAP_MASK(i
)) != 0;
94 int in_same_island(const struct object_id
*trg_oid
, const struct object_id
*src_oid
)
96 khiter_t trg_pos
, src_pos
;
98 /* If we aren't using islands, assume everything goes together. */
103 * If we don't have a bitmap for the target, we can delta it
104 * against anything -- it's not an important object
106 trg_pos
= kh_get_oid_map(island_marks
, *trg_oid
);
107 if (trg_pos
>= kh_end(island_marks
))
111 * if the source (our delta base) doesn't have a bitmap,
112 * we don't want to base any deltas on it!
114 src_pos
= kh_get_oid_map(island_marks
, *src_oid
);
115 if (src_pos
>= kh_end(island_marks
))
118 return island_bitmap_is_subset(kh_value(island_marks
, trg_pos
),
119 kh_value(island_marks
, src_pos
));
122 int island_delta_cmp(const struct object_id
*a
, const struct object_id
*b
)
124 khiter_t a_pos
, b_pos
;
125 struct island_bitmap
*a_bitmap
= NULL
, *b_bitmap
= NULL
;
130 a_pos
= kh_get_oid_map(island_marks
, *a
);
131 if (a_pos
< kh_end(island_marks
))
132 a_bitmap
= kh_value(island_marks
, a_pos
);
134 b_pos
= kh_get_oid_map(island_marks
, *b
);
135 if (b_pos
< kh_end(island_marks
))
136 b_bitmap
= kh_value(island_marks
, b_pos
);
139 if (!b_bitmap
|| !island_bitmap_is_subset(a_bitmap
, b_bitmap
))
143 if (!a_bitmap
|| !island_bitmap_is_subset(b_bitmap
, a_bitmap
))
150 static struct island_bitmap
*create_or_get_island_marks(struct object
*obj
)
155 pos
= kh_put_oid_map(island_marks
, obj
->oid
, &hash_ret
);
157 kh_value(island_marks
, pos
) = island_bitmap_new(NULL
);
159 return kh_value(island_marks
, pos
);
162 static void set_island_marks(struct object
*obj
, struct island_bitmap
*marks
)
164 struct island_bitmap
*b
;
168 pos
= kh_put_oid_map(island_marks
, obj
->oid
, &hash_ret
);
171 * We don't have one yet; make a copy-on-write of the
175 kh_value(island_marks
, pos
) = marks
;
180 * We do have it. Make sure we split any copy-on-write before
183 b
= kh_value(island_marks
, pos
);
184 if (b
->refcount
> 1) {
186 b
= kh_value(island_marks
, pos
) = island_bitmap_new(b
);
188 island_bitmap_or(b
, marks
);
191 static void mark_remote_island_1(struct repository
*r
,
192 struct remote_island
*rl
,
197 for (i
= 0; i
< rl
->oids
.nr
; ++i
) {
198 struct island_bitmap
*marks
;
199 struct object
*obj
= parse_object(r
, &rl
->oids
.oid
[i
]);
204 marks
= create_or_get_island_marks(obj
);
205 island_bitmap_set(marks
, island_counter
);
207 if (is_core_island
&& obj
->type
== OBJ_COMMIT
)
208 obj
->flags
|= NEEDS_BITMAP
;
210 /* If it was a tag, also make sure we hit the underlying object. */
211 while (obj
&& obj
->type
== OBJ_TAG
) {
212 obj
= ((struct tag
*)obj
)->tagged
;
214 parse_object(r
, &obj
->oid
);
215 marks
= create_or_get_island_marks(obj
);
216 island_bitmap_set(marks
, island_counter
);
222 island_counter_core
= island_counter
;
227 struct tree_islands_todo
{
228 struct object_entry
*entry
;
232 static int tree_depth_compare(const void *a
, const void *b
)
234 const struct tree_islands_todo
*todo_a
= a
;
235 const struct tree_islands_todo
*todo_b
= b
;
237 return todo_a
->depth
- todo_b
->depth
;
240 void resolve_tree_islands(struct repository
*r
,
242 struct packing_data
*to_pack
)
244 struct progress
*progress_state
= NULL
;
245 struct tree_islands_todo
*todo
;
253 * We process only trees, as commits and tags have already been handled
254 * (and passed their marks on to root trees, as well. We must make sure
255 * to process them in descending tree-depth order so that marks
256 * propagate down the tree properly, even if a sub-tree is found in
257 * multiple parent trees.
259 ALLOC_ARRAY(todo
, to_pack
->nr_objects
);
260 for (i
= 0; i
< to_pack
->nr_objects
; i
++) {
261 if (oe_type(&to_pack
->objects
[i
]) == OBJ_TREE
) {
262 todo
[nr
].entry
= &to_pack
->objects
[i
];
263 todo
[nr
].depth
= oe_tree_depth(to_pack
, &to_pack
->objects
[i
]);
267 QSORT(todo
, nr
, tree_depth_compare
);
270 progress_state
= start_progress(_("Propagating island marks"), nr
);
272 for (i
= 0; i
< nr
; i
++) {
273 struct object_entry
*ent
= todo
[i
].entry
;
274 struct island_bitmap
*root_marks
;
276 struct tree_desc desc
;
277 struct name_entry entry
;
280 pos
= kh_get_oid_map(island_marks
, ent
->idx
.oid
);
281 if (pos
>= kh_end(island_marks
))
284 root_marks
= kh_value(island_marks
, pos
);
286 tree
= lookup_tree(r
, &ent
->idx
.oid
);
287 if (!tree
|| parse_tree(tree
) < 0)
288 die(_("bad tree object %s"), oid_to_hex(&ent
->idx
.oid
));
290 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
291 while (tree_entry(&desc
, &entry
)) {
294 if (S_ISGITLINK(entry
.mode
))
297 obj
= lookup_object(r
, &entry
.oid
);
301 set_island_marks(obj
, root_marks
);
304 free_tree_buffer(tree
);
306 display_progress(progress_state
, i
+1);
309 stop_progress(&progress_state
);
313 struct island_load_data
{
314 kh_str_t
*remote_islands
;
319 static const char *core_island_name
;
321 static void free_config_regexes(struct island_load_data
*ild
)
323 for (size_t i
= 0; i
< ild
->nr
; i
++)
324 regfree(&ild
->rx
[i
]);
328 static void free_remote_islands(kh_str_t
*remote_islands
)
330 const char *island_name
;
331 struct remote_island
*rl
;
333 kh_foreach(remote_islands
, island_name
, rl
, {
334 free((void *)island_name
);
335 oid_array_clear(&rl
->oids
);
338 kh_destroy_str(remote_islands
);
341 static int island_config_callback(const char *k
, const char *v
, void *cb
)
343 struct island_load_data
*ild
= cb
;
345 if (!strcmp(k
, "pack.island")) {
346 struct strbuf re
= STRBUF_INIT
;
349 return config_error_nonbool(k
);
351 ALLOC_GROW(ild
->rx
, ild
->nr
+ 1, ild
->alloc
);
354 strbuf_addch(&re
, '^');
355 strbuf_addstr(&re
, v
);
357 if (regcomp(&ild
->rx
[ild
->nr
], re
.buf
, REG_EXTENDED
))
358 die(_("failed to load island regex for '%s': %s"), k
, re
.buf
);
365 if (!strcmp(k
, "pack.islandcore"))
366 return git_config_string(&core_island_name
, k
, v
);
371 static void add_ref_to_island(kh_str_t
*remote_islands
, const char *island_name
,
372 const struct object_id
*oid
)
375 struct remote_island
*rl
= NULL
;
378 khiter_t pos
= kh_put_str(remote_islands
, island_name
, &hash_ret
);
381 kh_key(remote_islands
, pos
) = xstrdup(island_name
);
382 kh_value(remote_islands
, pos
) = xcalloc(1, sizeof(struct remote_island
));
385 rl
= kh_value(remote_islands
, pos
);
386 oid_array_append(&rl
->oids
, oid
);
388 memcpy(&sha_core
, oid
->hash
, sizeof(uint64_t));
389 rl
->hash
+= sha_core
;
392 static int find_island_for_ref(const char *refname
, const struct object_id
*oid
,
393 int flags UNUSED
, void *cb
)
395 struct island_load_data
*ild
= cb
;
398 * We should advertise 'ARRAY_SIZE(matches) - 2' as the max,
399 * so we can diagnose below a config with more capture groups
402 regmatch_t matches
[16];
404 struct strbuf island_name
= STRBUF_INIT
;
406 /* walk backwards to get last-one-wins ordering */
407 for (i
= ild
->nr
- 1; i
>= 0; i
--) {
408 if (!regexec(&ild
->rx
[i
], refname
,
409 ARRAY_SIZE(matches
), matches
, 0))
416 if (matches
[ARRAY_SIZE(matches
) - 1].rm_so
!= -1)
417 warning(_("island regex from config has "
418 "too many capture groups (max=%d)"),
419 (int)ARRAY_SIZE(matches
) - 2);
421 for (m
= 1; m
< ARRAY_SIZE(matches
); m
++) {
422 regmatch_t
*match
= &matches
[m
];
424 if (match
->rm_so
== -1)
428 strbuf_addch(&island_name
, '-');
430 strbuf_add(&island_name
, refname
+ match
->rm_so
, match
->rm_eo
- match
->rm_so
);
433 add_ref_to_island(ild
->remote_islands
, island_name
.buf
, oid
);
434 strbuf_release(&island_name
);
438 static struct remote_island
*get_core_island(kh_str_t
*remote_islands
)
440 if (core_island_name
) {
441 khiter_t pos
= kh_get_str(remote_islands
, core_island_name
);
442 if (pos
< kh_end(remote_islands
))
443 return kh_value(remote_islands
, pos
);
449 static void deduplicate_islands(kh_str_t
*remote_islands
, struct repository
*r
)
451 struct remote_island
*island
, *core
= NULL
, **list
;
452 unsigned int island_count
, dst
, src
, ref
, i
= 0;
454 island_count
= kh_size(remote_islands
);
455 ALLOC_ARRAY(list
, island_count
);
457 kh_foreach_value(remote_islands
, island
, {
461 for (ref
= 0; ref
+ 1 < island_count
; ref
++) {
462 for (src
= ref
+ 1, dst
= src
; src
< island_count
; src
++) {
463 if (list
[ref
]->hash
== list
[src
]->hash
)
467 list
[dst
] = list
[src
];
474 island_bitmap_size
= (island_count
/ 32) + 1;
475 core
= get_core_island(remote_islands
);
477 for (i
= 0; i
< island_count
; ++i
) {
478 mark_remote_island_1(r
, list
[i
], core
&& list
[i
]->hash
== core
->hash
);
484 void load_delta_islands(struct repository
*r
, int progress
)
486 struct island_load_data ild
= { 0 };
488 island_marks
= kh_init_oid_map();
490 git_config(island_config_callback
, &ild
);
491 ild
.remote_islands
= kh_init_str();
492 for_each_ref(find_island_for_ref
, &ild
);
493 free_config_regexes(&ild
);
494 deduplicate_islands(ild
.remote_islands
, r
);
495 free_remote_islands(ild
.remote_islands
);
498 fprintf(stderr
, _("Marked %d islands, done.\n"), island_counter
);
501 void propagate_island_marks(struct commit
*commit
)
503 khiter_t pos
= kh_get_oid_map(island_marks
, commit
->object
.oid
);
505 if (pos
< kh_end(island_marks
)) {
506 struct commit_list
*p
;
507 struct island_bitmap
*root_marks
= kh_value(island_marks
, pos
);
509 parse_commit(commit
);
510 set_island_marks(&get_commit_tree(commit
)->object
, root_marks
);
511 for (p
= commit
->parents
; p
; p
= p
->next
)
512 set_island_marks(&p
->item
->object
, root_marks
);
516 void free_island_marks(void)
518 struct island_bitmap
*bitmap
;
521 kh_foreach_value(island_marks
, bitmap
, {
522 if (!--bitmap
->refcount
)
525 kh_destroy_oid_map(island_marks
);
528 /* detect use-after-free with a an address which is never valid: */
529 island_marks
= (void *)-1;
532 int compute_pack_layers(struct packing_data
*to_pack
)
536 if (!core_island_name
|| !island_marks
)
539 for (i
= 0; i
< to_pack
->nr_objects
; ++i
) {
540 struct object_entry
*entry
= &to_pack
->objects
[i
];
541 khiter_t pos
= kh_get_oid_map(island_marks
, entry
->idx
.oid
);
543 oe_set_layer(to_pack
, entry
, 1);
545 if (pos
< kh_end(island_marks
)) {
546 struct island_bitmap
*bitmap
= kh_value(island_marks
, pos
);
548 if (island_bitmap_get(bitmap
, island_counter_core
))
549 oe_set_layer(to_pack
, entry
, 0);