diff options
| author | Lukas Larsson <[email protected]> | 2016-05-11 15:04:38 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-05-11 15:04:38 +0200 |
| commit | e1ad5319f0b76460d9147ef04640c469f5a180d6 (patch) | |
| tree | 4d7928132e2d302a4704bf79f06ec67619b41039 /erts/emulator | |
| parent | 8420cbc23f2f2d26e235bcff3fbd94e688bb34f8 (diff) | |
| parent | cedf53ed9d29e7a7cf8ebaf77dea971a025205e1 (diff) | |
| download | otp-e1ad5319f0b76460d9147ef04640c469f5a180d6.tar.gz otp-e1ad5319f0b76460d9147ef04640c469f5a180d6.tar.bz2 otp-e1ad5319f0b76460d9147ef04640c469f5a180d6.zip | |
Merge branch 'lukas/erts/max_heap_size/OTP-13174'
* lukas/erts/max_heap_size/OTP-13174:
erts: Fix non-smp max_heap_size assert
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/erl_gc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c index fa0782867d..bd238d0f45 100644 --- a/erts/emulator/beam/erl_gc.c +++ b/erts/emulator/beam/erl_gc.c @@ -664,8 +664,6 @@ do_major_collection: ErtsGcQuickSanityCheck(p); - erts_smp_atomic32_read_band_nob(&p->state, ~ERTS_PSFLG_GC); - /* Max heap size has been reached and the process was configured to be killed, so we kill it and set it in a delayed garbage collecting state. There should be no gc_end trace or @@ -3176,8 +3174,8 @@ reached_max_heap_size(Process *p, Uint total_heap_size, if (alive) erts_dsprintf(dsbufp, "on node ~p"); erts_dsprintf(dsbufp, "~n Context: maximum heap size reached~n"); - erts_dsprintf(dsbufp, " Max heap size: ~p~n"); - erts_dsprintf(dsbufp, " Total heap size: ~p~n"); + erts_dsprintf(dsbufp, " Max Heap Size: ~p~n"); + erts_dsprintf(dsbufp, " Total Heap Size: ~p~n"); erts_dsprintf(dsbufp, " Kill: ~p~n"); erts_dsprintf(dsbufp, " Error Logger: ~p~n"); erts_dsprintf(dsbufp, " GC Info: ~p~n"); |