From d167c417a491e2d7d8a7f7b9d734cbc67e2ad65a Mon Sep 17 00:00:00 2001 From: Samy Al Bahra Date: Mon, 1 Sep 2014 19:40:19 -0400 Subject: [PATCH] ck_hs: Merge post-insertion logic into one function. --- src/ck_hs.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/ck_hs.c b/src/ck_hs.c index a4eb423..7db1354 100644 --- a/src/ck_hs.c +++ b/src/ck_hs.c @@ -369,6 +369,17 @@ restart: return true; } +static void +ck_hs_map_postinsert(struct ck_hs *hs, struct ck_hs_map *map) +{ + + map->n_entries++; + if ((map->n_entries << 1) > map->capacity) + ck_hs_grow(hs, map->capacity << 1); + + return; +} + bool ck_hs_rebuild(struct ck_hs *hs) { @@ -706,11 +717,8 @@ restart: ck_pr_store_ptr(slot, insert); } - if (object == NULL) { - map->n_entries++; - if ((map->n_entries << 1) > map->capacity) - ck_hs_grow(hs, map->capacity << 1); - } + if (object == NULL) + ck_hs_map_postinsert(hs, map); return true; } @@ -765,11 +773,8 @@ restart: ck_pr_store_ptr(slot, insert); } - if (object == NULL) { - map->n_entries++; - if ((map->n_entries << 1) > map->capacity) - ck_hs_grow(hs, map->capacity << 1); - } + if (object == NULL) + ck_hs_map_postinsert(hs, map); *previous = object; return true; @@ -813,10 +818,7 @@ restart: ck_pr_store_ptr(slot, insert); } - map->n_entries++; - if ((map->n_entries << 1) > map->capacity) - ck_hs_grow(hs, map->capacity << 1); - + ck_hs_map_postinsert(hs, map); return true; }