diff options
| author | Lukas Larsson <[email protected]> | 2012-06-04 11:34:42 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-06-04 11:34:42 +0200 |
| commit | 9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc (patch) | |
| tree | 94058c8df73356197dca04da701d5b0402d12b59 /erts/emulator/beam/erl_alloc.types | |
| parent | 9d590cf3db1210882c82a82381a07ae8f9535f79 (diff) | |
| parent | 5c2dad487e6af1a48fa3a1f3d985b6b891788bde (diff) | |
| download | otp-9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc.tar.gz otp-9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc.tar.bz2 otp-9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc.zip | |
Merge branch 'bjorn/remove-hybrid-heap/OTP-10105' into maint
* bjorn/remove-hybrid-heap/OTP-10105:
Remove stale code for hybrid heap and incremental GC
Remove the hipe_bifs:show_message_area/0 BIF
Remove support for erlang:system_info(global_heaps_size)
Remove the erlang:garbage_collect_message_area/0 BIF
Remove workarounds for hybrid and shared heaps in test suites
Diffstat (limited to 'erts/emulator/beam/erl_alloc.types')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.types | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types index bba6b83ac6..d4ef9cc553 100644 --- a/erts/emulator/beam/erl_alloc.types +++ b/erts/emulator/beam/erl_alloc.types @@ -317,19 +317,6 @@ type ACTIVE_PROCS STANDARD PROCESSES active_procs +endif -+if hybrid - -type ACTIVE_PROCS STANDARD PROCESSES active_procs - -# Used for all memory involved in incremental gc of the message area -# that is, young (x2) and old generation, forwarding pointers and blackmap -type MESSAGE_AREA LONG_LIVED PROCESSES message_area - -# Used in MA_STACK (global.h) and INC_STORAGE (erl_nmgc.h) -type OBJECT_STACK STANDARD PROCESSES object_stack - -+endif - +if smp type SL_PTIMER SHORT_LIVED SYSTEM ptimer_sl type LL_PTIMER STANDARD SYSTEM ptimer_ll |