Skip to content

Commit 87571c3

Browse files
Eric Wonggitster
Eric Wong
authored and
gitster
committed
hashmap: use *_entry APIs for iteration
Inspired by list_for_each_entry in the Linux kernel. Once again, these are somewhat compromised usability-wise by compilers lacking __typeof__ support. Signed-off-by: Eric Wong <e@80x24.org> Reviewed-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 939af16 commit 87571c3

File tree

13 files changed

+70
-47
lines changed

13 files changed

+70
-47
lines changed

‎attr.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,13 @@ static void all_attrs_init(struct attr_hashmap *map, struct attr_check *check)
163163
if (size != check->all_attrs_nr) {
164164
struct attr_hash_entry *e;
165165
struct hashmap_iter iter;
166-
hashmap_iter_init(&map->map, &iter);
167166

168167
REALLOC_ARRAY(check->all_attrs, size);
169168
check->all_attrs_nr = size;
170169

171-
while ((e = hashmap_iter_next(&iter))) {
170+
hashmap_for_each_entry(&map->map, &iter, e,
171+
struct attr_hash_entry,
172+
ent /* member name */) {
172173
const struct git_attr *a = e->value;
173174
check->all_attrs[a->attr_nr].attr = a;
174175
}

‎blame.c‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -450,9 +450,9 @@ static int fingerprint_similarity(struct fingerprint *a, struct fingerprint *b)
450450
struct hashmap_iter iter;
451451
const struct fingerprint_entry *entry_a, *entry_b;
452452

453-
hashmap_iter_init(&b->map, &iter);
454-
455-
while ((entry_b = hashmap_iter_next(&iter))) {
453+
hashmap_for_each_entry(&b->map, &iter, entry_b,
454+
const struct fingerprint_entry,
455+
entry /* member name */) {
456456
entry_a = hashmap_get_entry(&a->map, entry_b, NULL,
457457
struct fingerprint_entry, entry);
458458
if (entry_a) {
@@ -473,7 +473,9 @@ static void fingerprint_subtract(struct fingerprint *a, struct fingerprint *b)
473473

474474
hashmap_iter_init(&b->map, &iter);
475475

476-
while ((entry_b = hashmap_iter_next(&iter))) {
476+
hashmap_for_each_entry(&b->map, &iter, entry_b,
477+
const struct fingerprint_entry,
478+
entry /* member name */) {
477479
entry_a = hashmap_get_entry(&a->map, entry_b, NULL,
478480
struct fingerprint_entry, entry);
479481
if (entry_a) {

‎builtin/describe.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,8 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst)
333333
struct commit_name *n;
334334

335335
init_commit_names(&commit_names);
336-
n = hashmap_iter_first(&names, &iter);
337-
for (; n; n = hashmap_iter_next(&iter)) {
336+
hashmap_for_each_entry(&names, &iter, n, struct commit_name,
337+
entry /* member name */) {
338338
c = lookup_commit_reference_gently(the_repository,
339339
&n->peeled, 1);
340340
if (c)

‎builtin/difftool.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,8 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
538538
* temporary file to both the left and right directories to show the
539539
* change in the recorded SHA1 for the submodule.
540540
*/
541-
hashmap_iter_init(&submodules, &iter);
542-
while ((entry = hashmap_iter_next(&iter))) {
541+
hashmap_for_each_entry(&submodules, &iter, entry,
542+
struct pair_entry, entry /* member name */) {
543543
if (*entry->left) {
544544
add_path(&ldir, ldir_len, entry->path);
545545
ensure_leading_directories(ldir.buf);
@@ -557,8 +557,8 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
557557
* shows only the link itself, not the contents of the link target.
558558
* This loop replicates that behavior.
559559
*/
560-
hashmap_iter_init(&symlinks2, &iter);
561-
while ((entry = hashmap_iter_next(&iter))) {
560+
hashmap_for_each_entry(&symlinks2, &iter, entry,
561+
struct pair_entry, entry /* member name */) {
562562
if (*entry->left) {
563563
add_path(&ldir, ldir_len, entry->path);
564564
ensure_leading_directories(ldir.buf);

‎config.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1942,8 +1942,9 @@ void git_configset_clear(struct config_set *cs)
19421942
if (!cs->hash_initialized)
19431943
return;
19441944

1945-
hashmap_iter_init(&cs->config_hash, &iter);
1946-
while ((entry = hashmap_iter_next(&iter))) {
1945+
hashmap_for_each_entry(&cs->config_hash, &iter, entry,
1946+
struct config_set_element,
1947+
ent /* member name */) {
19471948
free(entry->key);
19481949
string_list_clear(&entry->value_list, 1);
19491950
}

‎hashmap.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ void hashmap_iter_init(struct hashmap *map, struct hashmap_iter *iter)
256256
iter->next = NULL;
257257
}
258258

259-
void *hashmap_iter_next(struct hashmap_iter *iter)
259+
struct hashmap_entry *hashmap_iter_next(struct hashmap_iter *iter)
260260
{
261261
struct hashmap_entry *current = iter->next;
262262
for (;;) {

‎hashmap.h‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,16 +382,27 @@ struct hashmap_iter {
382382
void hashmap_iter_init(struct hashmap *map, struct hashmap_iter *iter);
383383

384384
/* Returns the next hashmap_entry, or NULL if there are no more entries. */
385-
void *hashmap_iter_next(struct hashmap_iter *iter);
385+
struct hashmap_entry *hashmap_iter_next(struct hashmap_iter *iter);
386386

387387
/* Initializes the iterator and returns the first entry, if any. */
388-
static inline void *hashmap_iter_first(struct hashmap *map,
388+
static inline struct hashmap_entry *hashmap_iter_first(struct hashmap *map,
389389
struct hashmap_iter *iter)
390390
{
391391
hashmap_iter_init(map, iter);
392392
return hashmap_iter_next(iter);
393393
}
394394

395+
#define hashmap_iter_next_entry(iter, type, member) \
396+
container_of_or_null(hashmap_iter_next(iter), type, member)
397+
398+
#define hashmap_iter_first_entry(map, iter, type, member) \
399+
container_of_or_null(hashmap_iter_first(map, iter), type, member)
400+
401+
#define hashmap_for_each_entry(map, iter, var, type, member) \
402+
for (var = hashmap_iter_first_entry(map, iter, type, member); \
403+
var; \
404+
var = hashmap_iter_next_entry(iter, type, member))
405+
395406
/*
396407
* returns a @pointer of @type matching @keyvar, or NULL if nothing found.
397408
* @keyvar is a pointer of @type

‎merge-recursive.c‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2135,8 +2135,9 @@ static void handle_directory_level_conflicts(struct merge_options *opt,
21352135
struct string_list remove_from_head = STRING_LIST_INIT_NODUP;
21362136
struct string_list remove_from_merge = STRING_LIST_INIT_NODUP;
21372137

2138-
hashmap_iter_init(dir_re_head, &iter);
2139-
while ((head_ent = hashmap_iter_next(&iter))) {
2138+
hashmap_for_each_entry(dir_re_head, &iter, head_ent,
2139+
struct dir_rename_entry,
2140+
ent /* member name */) {
21402141
merge_ent = dir_rename_find_entry(dir_re_merge, head_ent->dir);
21412142
if (merge_ent &&
21422143
!head_ent->non_unique_new_dir &&
@@ -2160,8 +2161,9 @@ static void handle_directory_level_conflicts(struct merge_options *opt,
21602161
remove_hashmap_entries(dir_re_head, &remove_from_head);
21612162
remove_hashmap_entries(dir_re_merge, &remove_from_merge);
21622163

2163-
hashmap_iter_init(dir_re_merge, &iter);
2164-
while ((merge_ent = hashmap_iter_next(&iter))) {
2164+
hashmap_for_each_entry(dir_re_merge, &iter, merge_ent,
2165+
struct dir_rename_entry,
2166+
ent /* member name */) {
21652167
head_ent = dir_rename_find_entry(dir_re_head, merge_ent->dir);
21662168
if (tree_has_path(opt->repo, merge, merge_ent->dir)) {
21672169
/* 2. This wasn't a directory rename after all */
@@ -2265,8 +2267,9 @@ static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs)
22652267
* we set non_unique_new_dir. Once we've determined the winner (or
22662268
* that there is no winner), we no longer need possible_new_dirs.
22672269
*/
2268-
hashmap_iter_init(dir_renames, &iter);
2269-
while ((entry = hashmap_iter_next(&iter))) {
2270+
hashmap_for_each_entry(dir_renames, &iter, entry,
2271+
struct dir_rename_entry,
2272+
ent /* member name */) {
22702273
int max = 0;
22712274
int bad_max = 0;
22722275
char *best = NULL;
@@ -2624,8 +2627,9 @@ static struct string_list *get_renames(struct merge_options *opt,
26242627
entries);
26252628
}
26262629

2627-
hashmap_iter_init(&collisions, &iter);
2628-
while ((e = hashmap_iter_next(&iter))) {
2630+
hashmap_for_each_entry(&collisions, &iter, e,
2631+
struct collision_entry,
2632+
ent /* member name */) {
26292633
free(e->target_file);
26302634
string_list_clear(&e->source_files, 0);
26312635
}
@@ -2842,8 +2846,9 @@ static void initial_cleanup_rename(struct diff_queue_struct *pairs,
28422846
struct hashmap_iter iter;
28432847
struct dir_rename_entry *e;
28442848

2845-
hashmap_iter_init(dir_renames, &iter);
2846-
while ((e = hashmap_iter_next(&iter))) {
2849+
hashmap_for_each_entry(dir_renames, &iter, e,
2850+
struct dir_rename_entry,
2851+
ent /* member name */) {
28472852
free(e->dir);
28482853
strbuf_release(&e->new_dir);
28492854
/* possible_new_dirs already cleared in get_directory_renames */

‎oidmap.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,16 @@ static inline void oidmap_iter_init(struct oidmap *map, struct oidmap_iter *iter
7878

7979
static inline void *oidmap_iter_next(struct oidmap_iter *iter)
8080
{
81-
return hashmap_iter_next(&iter->h_iter);
81+
/* TODO: this API could be reworked to do compile-time type checks */
82+
return (void *)hashmap_iter_next(&iter->h_iter);
8283
}
8384

8485
static inline void *oidmap_iter_first(struct oidmap *map,
8586
struct oidmap_iter *iter)
8687
{
8788
oidmap_iter_init(map, iter);
88-
return oidmap_iter_next(iter);
89+
/* TODO: this API could be reworked to do compile-time type checks */
90+
return (void *)oidmap_iter_next(iter);
8991
}
9092

9193
#endif

‎revision.c‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,10 @@ static void paths_and_oids_clear(struct hashmap *map)
128128
{
129129
struct hashmap_iter iter;
130130
struct path_and_oids_entry *entry;
131-
hashmap_iter_init(map, &iter);
132131

133-
while ((entry = (struct path_and_oids_entry *)hashmap_iter_next(&iter))) {
132+
hashmap_for_each_entry(map, &iter, entry,
133+
struct path_and_oids_entry,
134+
ent /* member name */) {
134135
oidset_clear(&entry->trees);
135136
free(entry->path);
136137
}
@@ -242,8 +243,9 @@ void mark_trees_uninteresting_sparse(struct repository *r,
242243
add_children_by_path(r, tree, &map);
243244
}
244245

245-
hashmap_iter_init(&map, &map_iter);
246-
while ((entry = hashmap_iter_next(&map_iter)))
246+
hashmap_for_each_entry(&map, &map_iter, entry,
247+
struct path_and_oids_entry,
248+
ent /* member name */)
247249
mark_trees_uninteresting_sparse(r, &entry->trees);
248250

249251
paths_and_oids_clear(&map);

0 commit comments

Comments
 (0)