aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-01-21 18:48:57 +0100
committerBjörn-Egil Dahlberg <[email protected]>2015-03-12 18:56:41 +0100
commita97632afab52befd2e48f963f1c5e178e3871995 (patch)
treee52db98e733e2ff19718a8ab603f3a7e69260b59
parenta7a0bb29fd162cdfc6cdf6eb18cb5e2cf22a430e (diff)
downloadotp-a97632afab52befd2e48f963f1c5e178e3871995.tar.gz
otp-a97632afab52befd2e48f963f1c5e178e3871995.tar.bz2
otp-a97632afab52befd2e48f963f1c5e178e3871995.zip
erts: Add hashmap:update/3
-rw-r--r--erts/emulator/beam/bif.tab1
-rw-r--r--erts/emulator/beam/erl_hashmap.c34
2 files changed, 32 insertions, 3 deletions
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index c0fb1f8827..27ae8adcec 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -618,6 +618,7 @@ bif erlang:get_keys/0
bif hashmap:put/3
bif hashmap:get/2
bif hashmap:find/2
+bif hashmap:update/3
bif hashmap:remove/2
bif hashmap:info/1
bif hashmap:to_list/1
diff --git a/erts/emulator/beam/erl_hashmap.c b/erts/emulator/beam/erl_hashmap.c
index a5d6daadd7..9445a7db9a 100644
--- a/erts/emulator/beam/erl_hashmap.c
+++ b/erts/emulator/beam/erl_hashmap.c
@@ -64,7 +64,7 @@ static char *format_binary(Uint64 x, char *b) {
}
#endif
-static Eterm hashmap_insert(Process *p, Uint32 hx, Eterm key, Eterm value, Eterm node);
+static Eterm hashmap_insert(Process *p, Uint32 hx, Eterm key, Eterm value, Eterm node, int is_update);
static const Eterm *hashmap_get(Uint32 hx, Eterm key, Eterm node);
static Eterm hashmap_delete(Process *p, Uint32 hx, Eterm key, Eterm node);
static Eterm hashmap_to_list(Process *p, Eterm map);
@@ -102,13 +102,27 @@ BIF_RETTYPE hashmap_put_3(BIF_ALIST_3) {
Uint32 hx = make_hash2(BIF_ARG_1);
Eterm map;
- map = hashmap_insert(BIF_P, hx, BIF_ARG_1, BIF_ARG_2, BIF_ARG_3);
+ map = hashmap_insert(BIF_P, hx, BIF_ARG_1, BIF_ARG_2, BIF_ARG_3, 0);
ASSERT(is_hashmap(map));
BIF_RET(map);
}
BIF_ERROR(BIF_P, BADARG);
}
+/* hashmap:update/3 */
+
+BIF_RETTYPE hashmap_update_3(BIF_ALIST_3) {
+ if (is_hashmap(BIF_ARG_3)) {
+ Uint32 hx = make_hash2(BIF_ARG_1);
+ Eterm map;
+
+ map = hashmap_insert(BIF_P, hx, BIF_ARG_1, BIF_ARG_2, BIF_ARG_3, 1);
+ if (is_value(map))
+ BIF_RET(map);
+ }
+ BIF_ERROR(BIF_P, BADARG);
+}
+
/* hashmap:to_list/1 */
BIF_RETTYPE hashmap_to_list_1(BIF_ALIST_1) {
@@ -303,7 +317,8 @@ static const Eterm *hashmap_get(Uint32 hx, Eterm key, Eterm node) {
return NULL;
}
-static Eterm hashmap_insert(Process *p, Uint32 hx, Eterm key, Eterm value, Eterm node) {
+static Eterm hashmap_insert(Process *p, Uint32 hx, Eterm key, Eterm value,
+ Eterm node, int is_update) {
Eterm *hp = NULL, *nhp = NULL;
Eterm *ptr;
Eterm hdr,res,ckey,fake;
@@ -322,6 +337,10 @@ static Eterm hashmap_insert(Process *p, Uint32 hx, Eterm key, Eterm value, Eterm
update_size = 0;
goto unroll;
}
+ if (is_update) {
+ res = THE_NON_VALUE;
+ goto bail_out;
+ }
goto insert_subnodes;
case TAG_PRIMARY_BOXED:
ptr = boxed_val(node);
@@ -362,6 +381,10 @@ static Eterm hashmap_insert(Process *p, Uint32 hx, Eterm key, Eterm value, Eterm
break;
}
/* not occupied */
+ if (is_update) {
+ res = THE_NON_VALUE;
+ goto bail_out;
+ }
size += HAMT_NODE_BITMAP_SZ(n+1);
goto unroll;
case HAMT_SUBTAG_HEAD_BITMAP:
@@ -383,6 +406,10 @@ static Eterm hashmap_insert(Process *p, Uint32 hx, Eterm key, Eterm value, Eterm
break;
}
/* not occupied */
+ if (is_update) {
+ res = THE_NON_VALUE;
+ goto bail_out;
+ }
size += HAMT_HEAD_BITMAP_SZ(n+1);
goto unroll;
default:
@@ -515,6 +542,7 @@ unroll:
} while(!ESTACK_ISEMPTY(stack));
+bail_out:
DESTROY_ESTACK(stack);
ERTS_VERIFY_UNUSED_TEMP_ALLOC(p);
ERTS_HOLE_CHECK(p);