summaryrefslogtreecommitdiff
path: root/t/helper
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-09-19 10:47:54 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-19 10:47:54 +0900
commitb86e112056a5fb9515a28527a7c1976ec972b0db (patch)
treebe2a73c659ee4a23f37e7e582724950b33e61ac5 /t/helper
parentMerge branch 'bb/doc-eol-dirty' (diff)
parenthashmap: add API to disable item counting when threaded (diff)
downloadtgif-b86e112056a5fb9515a28527a7c1976ec972b0db.tar.xz
Merge branch 'jh/hashmap-disable-counting'
Our hashmap implementation in hashmap.[ch] is not thread-safe when adding a new item needs to expand the hashtable by rehashing; add an API to disable the automatic rehashing to work it around. * jh/hashmap-disable-counting: hashmap: add API to disable item counting when threaded
Diffstat (limited to 't/helper')
-rw-r--r--t/helper/test-hashmap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/helper/test-hashmap.c b/t/helper/test-hashmap.c
index 6004c81f0b..1145d51671 100644
--- a/t/helper/test-hashmap.c
+++ b/t/helper/test-hashmap.c
@@ -235,7 +235,8 @@ int cmd_main(int argc, const char **argv)
} else if (!strcmp("size", cmd)) {
/* print table sizes */
- printf("%u %u\n", map.tablesize, map.size);
+ printf("%u %u\n", map.tablesize,
+ hashmap_get_size(&map));
} else if (!strcmp("intern", cmd) && l1) {