diff options
author | Lukas Larsson <lukas@erlang-solutions.com> | 2012-06-04 11:51:03 +0200 |
---|---|---|
committer | Lukas Larsson <lukas@erlang-solutions.com> | 2012-06-04 11:59:03 +0200 |
commit | 0374be0e7caf06a9d1af3daef2cea1f7b20a57ab (patch) | |
tree | 23385b33daa358eaf0a7dc290257f82207d412c9 /erts/doc/src/erlang.xml | |
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/doc/src/erlang.xml')
-rw-r--r-- | erts/doc/src/erlang.xml | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index e50dbe17f5..b5ddf0e17c 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -3544,14 +3544,6 @@ os_prompt% </pre> <p><c><anno>Size</anno></c> is the size in bytes of the process. This includes call stack, heap and internal structures.</p> </item> - <tag><c>{message_binary, <anno>BinInfo</anno>}</c></tag> - <item> - <p><c><anno>BinInfo</anno></c> is a list containing miscellaneous information - about binaries currently being referred to by the message - area. This <c><anno>InfoTuple</anno></c> is only valid on an emulator - using the hybrid heap type. This <c><anno>InfoTuple</anno></c> may be - changed or removed without prior notice.</p> - </item> <tag><c>{message_queue_len, <anno>MessageQueueLen</anno>}</c></tag> <item> <p><c><anno>MessageQueueLen</anno></c> is the number of messages @@ -5214,7 +5206,6 @@ ok <name name="system_info" arity="1" clause_i="49"/> <name name="system_info" arity="1" clause_i="50"/> <name name="system_info" arity="1" clause_i="51"/> - <name name="system_info" arity="1" clause_i="52"/> <fsummary>Information about the system</fsummary> <desc> <p>Returns various information about the current system @@ -5363,10 +5354,6 @@ ok can spawn a process that does not use the default settings.</p> </item> - <tag><c>global_heaps_size</c></tag> - <item> - <p>Returns the current size of the shared (global) heap.</p> - </item> <tag><c>heap_sizes</c></tag> <item> <p>Returns a list of integers representing valid heap sizes @@ -5376,7 +5363,7 @@ ok <tag><c>heap_type</c></tag> <item> <p>Returns the heap type used by the current emulator. - Currently the following heap types exist:</p> + Currently only the following heap type exists:</p> <taglist> <tag><c>private</c></tag> <item> @@ -5385,17 +5372,6 @@ ok allowed. Messages passed between processes are copied between heaps.</p> </item> - <tag><c>shared</c></tag> - <item> - <p>One heap for use by all processes. Messages passed - between processes are passed by reference.</p> - </item> - <tag><c>hybrid</c></tag> - <item> - <p>A hybrid of the <c>private</c> and <c>shared</c> heap - types. A shared heap as well as private heaps are - used.</p> - </item> </taglist> </item> <tag><c>info</c></tag> @@ -5613,7 +5589,7 @@ ok <seealso marker="#system_info_schedulers">erlang:system_info(schedulers)</seealso>, and <seealso marker="#system_flag_schedulers_online">erlang:system_flag(schedulers_online, SchedulersOnline)</seealso>. - </p> <name name="system_info" arity="1" clause_i="50"/> + </p> <name name="system_info" arity="1" clause_i="49"/> </item> <tag><c>smp_support</c></tag> |