diff options
| author | Rickard Green <[email protected]> | 2016-09-01 15:38:13 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-09-01 15:38:13 +0200 |
| commit | a58f6dd61a4df4b5f5b869279bfc1175a50a4e8c (patch) | |
| tree | 12091074e0be74515e77ecb4e23d819ad95b80df /erts/emulator/beam/erl_init.c | |
| parent | 0bbc77b13d97e061221078798ec7019819814597 (diff) | |
| parent | 7be8e2309d87dbb6e922cb0ca56f031f9e4ec12b (diff) | |
| download | otp-a58f6dd61a4df4b5f5b869279bfc1175a50a4e8c.tar.gz otp-a58f6dd61a4df4b5f5b869279bfc1175a50a4e8c.tar.bz2 otp-a58f6dd61a4df4b5f5b869279bfc1175a50a4e8c.zip | |
Merge branch 'rickard/remove-old-purge-strategy/OTP-13844'
* rickard/remove-old-purge-strategy/OTP-13844:
Avoid selective receive in code-purger process
Remove old purge strategy
Conflicts:
erts/emulator/beam/beam_bif_load.c
erts/emulator/beam/global.h
Diffstat (limited to 'erts/emulator/beam/erl_init.c')
| -rw-r--r-- | erts/emulator/beam/erl_init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index 781bf024dd..fb85bbff34 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -2264,7 +2264,6 @@ erl_start(int argc, char **argv) ASSERT(erts_code_purger && erts_code_purger->common.id == pid); erts_proc_inc_refc(erts_code_purger); -#ifdef ERTS_NEW_PURGE_STRATEGY pid = erl_system_process_otp(otp_ring0_pid, "erts_literal_area_collector"); erts_literal_area_collector = (Process *) erts_ptab_pix2intptr_ddrb(&erts_proc, @@ -2272,7 +2271,6 @@ erl_start(int argc, char **argv) ASSERT(erts_literal_area_collector && erts_literal_area_collector->common.id == pid); erts_proc_inc_refc(erts_literal_area_collector); -#endif #ifdef ERTS_DIRTY_SCHEDULERS pid = erl_system_process_otp(otp_ring0_pid, "erts_dirty_process_code_checker"); |