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/global.h | |
| 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/global.h')
| -rw-r--r-- | erts/emulator/beam/global.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index 1cafa48158..586c01b15b 100644 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -1000,12 +1000,8 @@ Eterm erl_send(Process *p, Eterm to, Eterm msg); Eterm erl_is_function(Process* p, Eterm arg1, Eterm arg2); /* beam_bif_load.c */ -#define ERTS_CPC_ALLOW_GC (1 << 0) -#define ERTS_CPC_ALL ERTS_CPC_ALLOW_GC -Eterm erts_check_process_code(Process *c_p, Eterm module, Uint flags, int *redsp, int fcalls); -#ifdef ERTS_NEW_PURGE_STRATEGY +Eterm erts_check_process_code(Process *c_p, Eterm module, int *redsp, int fcalls); Eterm erts_proc_copy_literal_area(Process *c_p, int *redsp, int fcalls, int gc_allowed); -#endif typedef struct ErtsLiteralArea_ { struct erl_off_heap_header *off_heap; @@ -1019,10 +1015,7 @@ typedef struct ErtsLiteralArea_ { extern erts_smp_atomic_t erts_copy_literal_area__; #define ERTS_COPY_LITERAL_AREA() \ ((ErtsLiteralArea *) erts_smp_atomic_read_nob(&erts_copy_literal_area__)) - -#ifdef ERTS_NEW_PURGE_STRATEGY extern Process *erts_literal_area_collector; -#endif #ifdef ERTS_DIRTY_SCHEDULERS extern Process *erts_dirty_process_code_checker; #endif |