diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-06-27 17:03:54 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-03-12 17:16:05 +0100 |
| commit | 8d3dba44bc2ac5ff9e724e90aa832854280b7d1e (patch) | |
| tree | 7c5d414977da3901064e6de018f5420ca54bb9b9 /erts/emulator/beam/erl_gc.h | |
| parent | 6d521dae843ee098e823e1c4a3bb2e426409dcea (diff) | |
| download | otp-8d3dba44bc2ac5ff9e724e90aa832854280b7d1e.tar.gz otp-8d3dba44bc2ac5ff9e724e90aa832854280b7d1e.tar.bz2 otp-8d3dba44bc2ac5ff9e724e90aa832854280b7d1e.zip | |
Initial Persistent HAMT - Map framework
Conflicts:
erts/emulator/Makefile.in
erts/emulator/beam/bif.tab
erts/emulator/beam/erl_gc.c
erts/emulator/beam/erl_gc.h
erts/emulator/beam/erl_printf_term.c
erts/emulator/beam/erl_term.c
erts/emulator/beam/erl_term.h
Diffstat (limited to 'erts/emulator/beam/erl_gc.h')
| -rw-r--r-- | erts/emulator/beam/erl_gc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_gc.h b/erts/emulator/beam/erl_gc.h index bf0496c112..3fec553684 100644 --- a/erts/emulator/beam/erl_gc.h +++ b/erts/emulator/beam/erl_gc.h @@ -56,6 +56,8 @@ do { \ switch ((HDR) & _HEADER_SUBTAG_MASK) { \ case SUB_BINARY_SUBTAG: nelts++; break; \ case MAP_SUBTAG: nelts+=map_get_size(PTR) + 1; break; \ + case HASHMAP_SUBTAG: nelts=hashmap_bitcount(MAP_HEADER_VAL(HDR)); \ + nelts += is_hashmap_header_head(HDR) ? 1 : 0; break; \ case FUN_SUBTAG: nelts+=((ErlFunThing*)(PTR))->num_free+1; break; \ } \ gval = make_boxed(HTOP); \ @@ -63,7 +65,6 @@ do { \ *HTOP++ = HDR; \ *PTR++ = gval; \ while (nelts--) *HTOP++ = *PTR++; \ - \ } while(0) #define in_area(ptr,start,nbytes) \ |