From 5c2dad487e6af1a48fa3a1f3d985b6b891788bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?=
Date: Thu, 10 May 2012 12:09:07 +0200
Subject: Remove stale code for hybrid heap and incremental GC
The hybrid heap emulator was last working in the non-SMP R11B
run-time system. When the constant pools were introduced in R12B,
the hybrid heap emulator was not updated to handle them.
At this point, the harm from reduced readability of the code is
greater than any potential usefulness of keeping the code.
---
erts/doc/src/erl.xml | 6 +-----
erts/doc/src/erlang.xml | 25 +------------------------
erts/doc/src/erlc.xml | 6 ------
3 files changed, 2 insertions(+), 35 deletions(-)
(limited to 'erts/doc/src')
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 72cbf1f3b2..f8a92e1ec4 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -442,11 +442,7 @@
system with SMP support is available. -smp auto starts
the Erlang runtime system with SMP support enabled if it is
available and more than one logical processor are detected.
- -smp disable starts a runtime system without SMP support.
- By default -smp auto will be used unless a conflicting
- parameter has been passed, then -smp disable will be
- used. Currently only the -hybrid parameter conflicts
- with -smp auto.
+ -smp disable starts a runtime system without SMP support.
NOTE: The runtime system with SMP support will not
be available on all supported platforms. See also the
+S flag.
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index cfc7fff3af..e4f245975b 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -4009,14 +4009,6 @@ os_prompt%
Size is the size in bytes of the process. This
includes call stack, heap and internal structures.
- {message_binary, BinInfo}
- -
-
BinInfo is a list containing miscellaneous information
- about binaries currently being referred to by the message
- area. This InfoTuple is only valid on an emulator
- using the hybrid heap type. This InfoTuple may be
- changed or removed without prior notice.
-
{message_queue_len, MessageQueueLen}
-
MessageQueueLen is the number of messages
@@ -5803,10 +5795,6 @@ ok
can spawn a process that does not use the default
settings.
- global_heaps_size
- -
-
Returns the current size of the shared (global) heap.
-
heap_sizes
-
Returns a list of integers representing valid heap sizes
@@ -5816,7 +5804,7 @@ ok
heap_type
-
Returns the heap type used by the current emulator.
- Currently the following heap types exist:
+ Currently only the following heap type exists:
private
-
@@ -5825,17 +5813,6 @@ ok
allowed. Messages passed between processes are copied
between heaps.
- shared
- -
-
One heap for use by all processes. Messages passed
- between processes are passed by reference.
-
- hybrid
- -
-
A hybrid of the private and shared heap
- types. A shared heap as well as private heaps are
- used.
-
info
diff --git a/erts/doc/src/erlc.xml b/erts/doc/src/erlc.xml
index ebf76a2afe..3358b8f115 100644
--- a/erts/doc/src/erlc.xml
+++ b/erts/doc/src/erlc.xml
@@ -129,12 +129,6 @@
This option will be ignored by compilers that have a
a single output format.
- -hybrid
- -
-
Compile using the hybrid-heap emulator. This is mainly useful
- for compiling native code, which needs to be compiled with the same
- run-time system that it should be run on.
-
-smp
-
Compile using the SMP emulator. This is mainly useful
--
cgit v1.2.3