diff options
| author | Lukas Larsson <[email protected]> | 2012-06-04 11:51:03 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-06-04 11:59:03 +0200 |
| commit | 0374be0e7caf06a9d1af3daef2cea1f7b20a57ab (patch) | |
| tree | 23385b33daa358eaf0a7dc290257f82207d412c9 /erts/preloaded | |
| parent | 868f5446c1f133cc29fc2ef274697460886374c6 (diff) | |
| parent | 9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc (diff) | |
| download | otp-0374be0e7caf06a9d1af3daef2cea1f7b20a57ab.tar.gz otp-0374be0e7caf06a9d1af3daef2cea1f7b20a57ab.tar.bz2 otp-0374be0e7caf06a9d1af3daef2cea1f7b20a57ab.zip | |
Merge branch 'maint'
* maint:
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
Conflicts:
erts/doc/src/erlang.xml
erts/emulator/beam/erl_message.c
erts/emulator/beam/erl_process.c
erts/emulator/beam/erl_process.h
erts/emulator/hipe/hipe_bif2.tab
lib/hipe/cerl/erl_bif_types.erl
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 88612 -> 88536 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 5 |
2 files changed, 1 insertions, 4 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex f3a2170a9b..5e485948c6 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 614b6053fc..646acf5798 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -1800,7 +1800,6 @@ process_flag(_Flag, _Value) -> links | last_calls | memory | - message_binary | message_que_len | messages | min_heap_size | @@ -1840,7 +1839,6 @@ process_flag(_Flag, _Value) -> {links, Pids :: [pid()]} | {last_calls, false | (Calls :: [mfa()])} | {memory, Size :: non_neg_integer()} | - {message_binary, BinInfo :: term()} | {message_que_len, MessageQueueLen :: non_neg_integer()} | {messages, MessageQueue :: [term()]} | {min_heap_size, MinHeapSize :: non_neg_integer()} | @@ -2123,9 +2121,8 @@ tuple_to_list(_Tuple) -> (dist_buf_busy_limit) -> non_neg_integer(); (fullsweep_after) -> {fullsweep_after, non_neg_integer()}; (garbage_collection) -> [{atom(), integer()}]; - (global_heaps_size) -> non_neg_integer(); (heap_sizes) -> [non_neg_integer()]; - (heap_type) -> private | shared | hybrid; + (heap_type) -> private; (info) -> binary(); (kernel_poll) -> boolean(); (loaded) -> binary(); |