aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-12-08 19:02:04 +0100
committerSverker Eriksson <[email protected]>2017-12-20 15:14:46 +0100
commit97152092fd4e5fe827a4dac42f3b51ae634ba1ff (patch)
treed3aff784f35766fceca5faa98a0bef9110c0366d /erts/emulator/beam
parentabb61a8b4039bb9059cb6a8cf78feaad5f2cdc28 (diff)
downloadotp-97152092fd4e5fe827a4dac42f3b51ae634ba1ff.tar.gz
otp-97152092fd4e5fe827a4dac42f3b51ae634ba1ff.tar.bz2
otp-97152092fd4e5fe827a4dac42f3b51ae634ba1ff.zip
erts: Improve alloc_SUITE:migration
to mix it up with some realloc calls.
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/erl_alloc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index 214fb1f2af..b3522a9dbf 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -3722,7 +3722,9 @@ UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3)
case 0xf15: erts_free(ERTS_ALC_T_TEST, (void*)a1); return 0;
- case 0xf16: {
+ case 0xf16: return (UWord) erts_realloc(ERTS_ALC_T_TEST, (void*)a1, (Uint)a2);
+
+ case 0xf17: {
Uint extra_hdr_sz = UNIT_CEILING((Uint)a1);
ErtsAllocatorThrSpec_t* ts = &erts_allctr_thr_spec[ERTS_ALC_A_TEST];
Uint offset = ts->allctr[0]->mbc_header_size;
@@ -3749,7 +3751,7 @@ UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3)
*(void**)a3 = orig_destroying_mbc;
return offset;
}
- case 0xf17: {
+ case 0xf18: {
ErtsAllocatorThrSpec_t* ts = &erts_allctr_thr_spec[ERTS_ALC_A_TEST];
return ts->allctr[0]->largest_mbc_size;
}