diff options
| author | Lukas Larsson <[email protected]> | 2016-05-11 09:22:53 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-05-11 09:22:53 +0200 |
| commit | 76378f21242b8036bac1b187e895bcafa28201da (patch) | |
| tree | 7b4f7927292cb193854b3012573d17e371e4ed6a /erts/emulator/beam/erl_process.c | |
| parent | 8bc9c88cd98bbbcc18265a7aed830b73f5133cf6 (diff) | |
| parent | 36dd5c3dd86c91d04a7fc13fd2a89b10af64db5a (diff) | |
| download | otp-76378f21242b8036bac1b187e895bcafa28201da.tar.gz otp-76378f21242b8036bac1b187e895bcafa28201da.tar.bz2 otp-76378f21242b8036bac1b187e895bcafa28201da.zip | |
Merge branch 'lukas/erts/max_heap_size/OTP-13174'
* lukas/erts/max_heap_size/OTP-13174:
erts: Fix max heap size exit when in hipe mode
Update preloaded modules
erts: Fix pre-bif yield current_function
erts: Implement max_heap_size process flag
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index 36b0af0c1a..e2f14c23bf 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -11021,9 +11021,13 @@ erl_create_process(Process* parent, /* Parent of process (default group leader). p->min_heap_size = so->min_heap_size; p->min_vheap_size = so->min_vheap_size; p->max_gen_gcs = so->max_gen_gcs; + MAX_HEAP_SIZE_SET(p, so->max_heap_size); + MAX_HEAP_SIZE_FLAGS_SET(p, so->max_heap_flags); } else { p->min_heap_size = H_MIN_SIZE; p->min_vheap_size = BIN_VH_MIN_SIZE; + MAX_HEAP_SIZE_SET(p, H_MAX_SIZE); + MAX_HEAP_SIZE_FLAGS_SET(p, H_MAX_FLAGS); p->max_gen_gcs = (Uint16) erts_smp_atomic32_read_nob(&erts_max_gen_gcs); } p->schedule_count = 0; @@ -11600,7 +11604,8 @@ set_proc_exiting(Process *p, p->i = (BeamInstr *) beam_exit; #ifndef ERTS_SMP - if (state & (ERTS_PSFLG_RUNNING|ERTS_PSFLG_RUNNING_SYS)) { + if (state & (ERTS_PSFLG_RUNNING|ERTS_PSFLG_RUNNING_SYS) + && !(state & ERTS_PSFLG_GC)) { /* * I non smp case: * |