File 2411-Drop-remnants-of-elib_malloc-removed-in-R15.patch of Package erlang
From 5405747c65e48c1159b9134ac1ffefa9f3a9898c Mon Sep 17 00:00:00 2001
From: Richard Carlsson <carlsson.richard@gmail.com>
Date: Wed, 13 May 2020 11:38:07 +0200
Subject: [PATCH 1/2] Drop remnants of elib_malloc (removed in R15)
Also fix wrong clause id for system_info(normal_multi_scheduling_blockers)
---
erts/doc/src/erlang.xml | 182 ++++++++++++++----------------
erts/emulator/beam/atom.names | 1 -
erts/emulator/beam/erl_bif_info.c | 4 -
erts/preloaded/src/erlang.erl | 1 -
lib/hipe/cerl/erl_bif_types.erl | 2 -
5 files changed, 86 insertions(+), 104 deletions(-)
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 14f9b5a79f..c284b9f198 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -8269,7 +8269,7 @@ Metadata = #{ pid => pid(),
</func>
<func>
- <name name="system_info" arity="1" clause_i="77" since=""/>
+ <name name="system_info" arity="1" clause_i="76" since=""/>
<fsummary>System info overview.</fsummary>
<desc>
<p>Returns information about the current system.
@@ -8283,8 +8283,7 @@ Metadata = #{ pid => pid(),
<seeerl marker="#system_info_allocated_areas"><c>allocated_areas</c></seeerl>,
<seeerl marker="#system_info_allocator"><c>allocator</c></seeerl>,
<seeerl marker="#system_info_alloc_util_allocators"><c>alloc_util_allocators</c></seeerl>,
- <seeerl marker="#system_info_allocator_sizes"><c>allocator_sizes</c></seeerl>,
- <seeerl marker="#system_info_elib_malloc"><c>elib_malloc</c></seeerl>
+ <seeerl marker="#system_info_allocator_sizes"><c>allocator_sizes</c></seeerl>
</p>
</item>
<tag><seeerl marker="#system_info_cpu_topology">
@@ -8408,7 +8407,6 @@ Metadata = #{ pid => pid(),
<name name="system_info" arity="1" clause_i="3" since=""/> <!-- {allocator, _} -->
<name name="system_info" arity="1" clause_i="4" since=""/> <!-- alloc_util_allocators -->
<name name="system_info" arity="1" clause_i="5" since=""/> <!-- {allocator_sizes, _} -->
- <name name="system_info" arity="1" clause_i="27" since=""/> <!-- elib_malloc -->
<fsummary>Information about the system allocators.</fsummary>
<type variable="Allocator" name_i="2"/>
<type variable="Version" name_i="2"/>
@@ -8547,13 +8545,6 @@ Metadata = #{ pid => pid(),
<c>erlang:system_info({allocator,
<anno>Alloc</anno>})</c></seeerl>.</p>
</item>
- <tag><marker id="system_info_elib_malloc"/>
- <c>elib_malloc</c></tag>
- <item>
- <p>This option will be removed in a future release.
- The return value will always be <c>false</c>, as the
- <c>elib_malloc</c> allocator has been removed.</p>
- </item>
</taglist>
</desc>
</func>
@@ -8562,8 +8553,8 @@ Metadata = #{ pid => pid(),
<name name="system_info" arity="1" clause_i="12"
anchor="system_info_cpu_topology" since=""/> <!-- cpu_topology -->
<name name="system_info" arity="1" clause_i="13" since=""/> <!-- {cpu_topology, _} -->
- <name name="system_info" arity="1" clause_i="38" since=""/> <!-- logical_processors -->
- <name name="system_info" arity="1" clause_i="74" since="OTP R14B"/> <!-- update_cpu_info -->
+ <name name="system_info" arity="1" clause_i="37" since=""/> <!-- logical_processors -->
+ <name name="system_info" arity="1" clause_i="73" since="OTP R14B"/> <!-- update_cpu_info -->
<fsummary>Information about the CPU topology of the system.</fsummary>
<type name="cpu_topology"/>
<type name="level_entry"/>
@@ -8724,16 +8715,16 @@ Metadata = #{ pid => pid(),
</func>
<func>
- <name name="system_info" arity="1" clause_i="31"
+ <name name="system_info" arity="1" clause_i="30"
anchor="system_info_process" since=""/> <!-- fullsweep_after -->
- <name name="system_info" arity="1" clause_i="32" since=""/> <!-- garbage_collection -->
- <name name="system_info" arity="1" clause_i="33" since=""/> <!-- heap_sizes -->
- <name name="system_info" arity="1" clause_i="34" since=""/> <!-- heap_type -->
- <name name="system_info" arity="1" clause_i="40" since="OTP 19.0"/> <!-- max_heap_size -->
- <name name="system_info" arity="1" clause_i="41" since="OTP 19.0"/> <!-- message_queue_data -->
- <name name="system_info" arity="1" clause_i="42" since="OTP R13B04"/> <!-- min_heap_size -->
- <name name="system_info" arity="1" clause_i="43" since="OTP R13B04"/> <!-- min_bin_vheap_size -->
- <name name="system_info" arity="1" clause_i="57" since=""/> <!-- procs -->
+ <name name="system_info" arity="1" clause_i="31" since=""/> <!-- garbage_collection -->
+ <name name="system_info" arity="1" clause_i="32" since=""/> <!-- heap_sizes -->
+ <name name="system_info" arity="1" clause_i="33" since=""/> <!-- heap_type -->
+ <name name="system_info" arity="1" clause_i="39" since="OTP 19.0"/> <!-- max_heap_size -->
+ <name name="system_info" arity="1" clause_i="40" since="OTP 19.0"/> <!-- message_queue_data -->
+ <name name="system_info" arity="1" clause_i="41" since="OTP R13B04"/> <!-- min_heap_size -->
+ <name name="system_info" arity="1" clause_i="42" since="OTP R13B04"/> <!-- min_bin_vheap_size -->
+ <name name="system_info" arity="1" clause_i="56" since=""/> <!-- procs -->
<fsummary>Information about the default process heap settings.</fsummary>
<type name="message_queue_data"/>
<type name="max_heap_size"/>
@@ -8845,12 +8836,12 @@ Metadata = #{ pid => pid(),
<func>
<name name="system_info" arity="1" clause_i="6" anchor="system_info_limits" since="OTP 20.0"/> <!-- atom_count -->
<name name="system_info" arity="1" clause_i="7" since="OTP 20.0"/> <!-- atom_limit -->
- <name name="system_info" arity="1" clause_i="29" since="OTP 21.1"/> <!-- ets_count -->
- <name name="system_info" arity="1" clause_i="30" since="OTP R16B03"/> <!-- ets_limit -->
- <name name="system_info" arity="1" clause_i="53" since="OTP R16B"/> <!-- port_count -->
- <name name="system_info" arity="1" clause_i="54" since="OTP R16B"/> <!-- port_limit -->
- <name name="system_info" arity="1" clause_i="55" since=""/> <!-- process_count -->
- <name name="system_info" arity="1" clause_i="56" since=""/> <!-- process_limit -->
+ <name name="system_info" arity="1" clause_i="28" since="OTP 21.1"/> <!-- ets_count -->
+ <name name="system_info" arity="1" clause_i="29" since="OTP R16B03"/> <!-- ets_limit -->
+ <name name="system_info" arity="1" clause_i="52" since="OTP R16B"/> <!-- port_count -->
+ <name name="system_info" arity="1" clause_i="53" since="OTP R16B"/> <!-- port_limit -->
+ <name name="system_info" arity="1" clause_i="54" since=""/> <!-- process_count -->
+ <name name="system_info" arity="1" clause_i="55" since=""/> <!-- process_limit -->
<fsummary>Information about various system limits.</fsummary>
<desc>
<marker id="system_info_limits"/>
@@ -8925,13 +8916,13 @@ Metadata = #{ pid => pid(),
<func>
<name name="system_info" arity="1" clause_i="26"
anchor="system_info_time" since="OTP 18.0"/> <!-- end_time -->
- <name name="system_info" arity="1" clause_i="50" since="OTP 18.0"/> <!-- os_monotonic_time_source -->
- <name name="system_info" arity="1" clause_i="51" since="OTP 18.0"/> <!-- os_system_time_source -->
- <name name="system_info" arity="1" clause_i="63" since="OTP 18.0"/> <!-- start_time -->
- <name name="system_info" arity="1" clause_i="69" since="OTP 18.0"/> <!-- time_correction -->
- <name name="system_info" arity="1" clause_i="70" since="OTP 18.0"/> <!-- time_offset -->
- <name name="system_info" arity="1" clause_i="71" since="OTP 18.0"/> <!-- time_warp_mode -->
- <name name="system_info" arity="1" clause_i="72" since="OTP 17.1"/> <!-- tolerant_timeofday -->
+ <name name="system_info" arity="1" clause_i="49" since="OTP 18.0"/> <!-- os_monotonic_time_source -->
+ <name name="system_info" arity="1" clause_i="50" since="OTP 18.0"/> <!-- os_system_time_source -->
+ <name name="system_info" arity="1" clause_i="62" since="OTP 18.0"/> <!-- start_time -->
+ <name name="system_info" arity="1" clause_i="68" since="OTP 18.0"/> <!-- time_correction -->
+ <name name="system_info" arity="1" clause_i="69" since="OTP 18.0"/> <!-- time_offset -->
+ <name name="system_info" arity="1" clause_i="70" since="OTP 18.0"/> <!-- time_warp_mode -->
+ <name name="system_info" arity="1" clause_i="71" since="OTP 17.1"/> <!-- tolerant_timeofday -->
<fsummary>Information about system time.</fsummary>
<desc>
<marker id="system_info_time_tags"/>
@@ -9155,16 +9146,16 @@ Metadata = #{ pid => pid(),
anchor="system_info_scheduler" since="OTP 17.0"/> <!-- dirty_cpu_schedulers -->
<name name="system_info" arity="1" clause_i="18" since="OTP 17.0"/> <!-- dirty_cpu_schedulers_online -->
<name name="system_info" arity="1" clause_i="19" since="OTP 17.0"/> <!-- dirty_io_schedulers -->
- <name name="system_info" arity="1" clause_i="45" since=""/> <!-- multi_scheduling -->
- <name name="system_info" arity="1" clause_i="46" since=""/> <!-- multi_scheduling_blockers -->
- <name name="system_info" arity="1" clause_i="49" since="OTP 19.0"/> <!-- normal_multi_scheduling_blockers -->
- <name name="system_info" arity="1" clause_i="58" since=""/> <!-- scheduler_bind_type -->
- <name name="system_info" arity="1" clause_i="59" since=""/> <!-- scheduler_bindings -->
- <name name="system_info" arity="1" clause_i="60" since=""/> <!-- scheduler_id -->
- <name name="system_info" arity="1" clause_i="61" since=""/> <!-- schedulers -->
- <name name="system_info" arity="1" clause_i="62" since=""/> <!-- smp_support -->
- <name name="system_info" arity="1" clause_i="67" since=""/> <!-- threads -->
- <name name="system_info" arity="1" clause_i="68" since=""/> <!-- thread_pool_size -->
+ <name name="system_info" arity="1" clause_i="44" since=""/> <!-- multi_scheduling -->
+ <name name="system_info" arity="1" clause_i="45" since=""/> <!-- multi_scheduling_blockers -->
+ <name name="system_info" arity="1" clause_i="47" since="OTP 19.0"/> <!-- normal_multi_scheduling_blockers -->
+ <name name="system_info" arity="1" clause_i="57" since=""/> <!-- scheduler_bind_type -->
+ <name name="system_info" arity="1" clause_i="58" since=""/> <!-- scheduler_bindings -->
+ <name name="system_info" arity="1" clause_i="59" since=""/> <!-- scheduler_id -->
+ <name name="system_info" arity="1" clause_i="60" since=""/> <!-- schedulers -->
+ <name name="system_info" arity="1" clause_i="61" since=""/> <!-- smp_support -->
+ <name name="system_info" arity="1" clause_i="66" since=""/> <!-- threads -->
+ <name name="system_info" arity="1" clause_i="67" since=""/> <!-- thread_pool_size -->
<fsummary>Information about system schedulers.</fsummary>
<desc>
<marker id="system_info_scheduler_tags"/>
@@ -9549,58+9540,57@@ Metadata = #{ pid => pid(),
<name name="system_info" arity="1" clause_i="24" since="OTP R15B01"/> <!-- dynamic_trace -->
<name name="system_info" arity="1" clause_i="25" since="OTP R15B01"/> <!-- dynamic_trace_probes -->
<!-- <name name="system_info" arity="1" clause_i="26"/> end_time -->
- <!-- <name name="system_info" arity="1" clause_i="27"/> elib_malloc -->
- <!-- <name name="system_info" arity="1" clause_i="28"/> eager_check_io, removed -->
- <!-- <name name="system_info" arity="1" clause_i="29"/> ets_count -->
- <!-- <name name="system_info" arity="1" clause_i="30"/> ets_limit -->
- <!-- <name name="system_info" arity="1" clause_i="31"/> fullsweep_after -->
- <!-- <name name="system_info" arity="1" clause_i="32"/> garbage_collection -->
- <!-- <name name="system_info" arity="1" clause_i="33"/> heap_sizes -->
- <!-- <name name="system_info" arity="1" clause_i="34"/> heap_type -->
- <name name="system_info" arity="1" clause_i="35" since=""/> <!-- info -->
- <name name="system_info" arity="1" clause_i="36" since=""/> <!-- kernel_poll -->
- <name name="system_info" arity="1" clause_i="37" since=""/> <!-- loaded -->
- <!-- <name name="system_info" arity="1" clause_i="38"/> logical_processors -->
- <name name="system_info" arity="1" clause_i="39" since=""/> <!-- machine -->
- <!-- <name name="system_info" arity="1" clause_i="40"/> max_heap_size -->
- <!-- <name name="system_info" arity="1" clause_i="41"/> message_queue_data -->
- <!-- <name name="system_info" arity="1" clause_i="42"/> min_heap_size -->
- <!-- <name name="system_info" arity="1" clause_i="43"/> min_bin_vheap_size -->
- <name name="system_info" arity="1" clause_i="44" since=""/> <!-- modified_timing_level -->
- <!-- <name name="system_info" arity="1" clause_i="45"/> multi_scheduling -->
- <!-- <name name="system_info" arity="1" clause_i="46"/> multi_scheduling_blockers -->
- <name name="system_info" arity="1" clause_i="47" since="OTP 17.4"/> <!-- nif_version -->
- <!-- n<name name="system_info" arity="1" clause_i="48"/> ormal_multi_scheduling_blockers -->
- <name name="system_info" arity="1" clause_i="49" since=""/> <!-- otp_release -->
- <!-- <name name="system_info" arity="1" clause_i="50"/> os_monotonic_time_source -->
- <!-- <name name="system_info" arity="1" clause_i="51"/> os_system_time_source -->
- <name name="system_info" arity="1" clause_i="52" since="OTP 23.3.4.10"/> <!-- outstanding_system_requests_limit -->
- <name name="system_info" arity="1" clause_i="53" since="OTP R16B"/> <!-- port_parallelism -->
- <!-- <name name="system_info" arity="1" clause_i="54"/> port_count -->
- <!-- <name name="system_info" arity="1" clause_i="55"/> port_limit -->
- <!-- <name name="system_info" arity="1" clause_i="56"/> process_count -->
- <!-- <name name="system_info" arity="1" clause_i="57"/> process_limit -->
- <!-- <name name="system_info" arity="1" clause_i="58"/> procs -->
- <!-- <name name="system_info" arity="1" clause_i="59"/> scheduler_bind_type -->
- <!-- <name name="system_info" arity="1" clause_i="60"/> scheduler_bindings -->
- <!-- <name name="system_info" arity="1" clause_i="61"/> scheduler_id -->
- <!-- <name name="system_info" arity="1" clause_i="62"/> schedulers -->
- <!-- <name name="system_info" arity="1" clause_i="63"/> smp_support -->
- <!-- <name name="system_info" arity="1" clause_i="64"/> start_time -->
- <name name="system_info" arity="1" clause_i="65" since=""/> <!-- system_architecture -->
- <name name="system_info" arity="1" clause_i="66" since="OTP 21.3"/> <!-- system_logger -->
- <name name="system_info" arity="1" clause_i="67" since=""/> <!-- system_version -->
- <!-- <name name="system_info" arity="1" clause_i="68"/> threads -->
- <!-- <name name="system_info" arity="1" clause_i="69"/> thread_pool_size -->
- <!-- <name name="system_info" arity="1" clause_i="70"/> time_correction -->
- <!-- <name name="system_info" arity="1" clause_i="71"/> time_offset -->
- <!-- <name name="system_info" arity="1" clause_i="72"/> time_warp_mode -->
- <!-- <name name="system_info" arity="1" clause_i="73"/> tolerant_timeofday -->
- <name name="system_info" arity="1" clause_i="74" since=""/> <!-- trace_control_word -->
- <!-- <name name="system_info" arity="1" clause_i="75"/> update_cpu_info -->
- <name name="system_info" arity="1" clause_i="76" since=""/> <!-- version -->
- <name name="system_info" arity="1" clause_i="77" since=""/> <!-- wordsize -->
- <!-- <name name="system_info" arity="1" clause_i="78"/> overview -->
+ <!-- <name name="system_info" arity="1" clause_i="27"/> eager_check_io, removed -->
+ <!-- <name name="system_info" arity="1" clause_i="28"/> ets_count -->
+ <!-- <name name="system_info" arity="1" clause_i="29"/> ets_limit -->
+ <!-- <name name="system_info" arity="1" clause_i="30"/> fullsweep_after -->
+ <!-- <name name="system_info" arity="1" clause_i="31"/> garbage_collection -->
+ <!-- <name name="system_info" arity="1" clause_i="32"/> heap_sizes -->
+ <!-- <name name="system_info" arity="1" clause_i="33"/> heap_type -->
+ <name name="system_info" arity="1" clause_i="34" since=""/> <!-- info -->
+ <name name="system_info" arity="1" clause_i="35" since=""/> <!-- kernel_poll -->
+ <name name="system_info" arity="1" clause_i="36" since=""/> <!-- loaded -->
+ <!-- <name name="system_info" arity="1" clause_i="37"/> logical_processors -->
+ <name name="system_info" arity="1" clause_i="38" since=""/> <!-- machine -->
+ <!-- <name name="system_info" arity="1" clause_i="39"/> max_heap_size -->
+ <!-- <name name="system_info" arity="1" clause_i="40"/> message_queue_data -->
+ <!-- <name name="system_info" arity="1" clause_i="41"/> min_heap_size -->
+ <!-- <name name="system_info" arity="1" clause_i="42"/> min_bin_vheap_size -->
+ <name name="system_info" arity="1" clause_i="43" since=""/> <!-- modified_timing_level -->
+ <!-- <name name="system_info" arity="1" clause_i="44"/> multi_scheduling -->
+ <!-- <name name="system_info" arity="1" clause_i="45"/> multi_scheduling_blockers -->
+ <name name="system_info" arity="1" clause_i="46" since="OTP 17.4"/> <!-- nif_version -->
+ <!-- n<name name="system_info" arity="1" clause_i="47"/> normal_multi_scheduling_blockers -->
+ <name name="system_info" arity="1" clause_i="48" since=""/> <!-- otp_release -->
+ <!-- <name name="system_info" arity="1" clause_i="49"/> os_monotonic_time_source -->
+ <!-- <name name="system_info" arity="1" clause_i="50"/> os_system_time_source -->
+ <name name="system_info" arity="1" clause_i="51" since="OTP 23.3.4.10"/> <!-- outstanding_system_requests_limit -->
+ <name name="system_info" arity="1" clause_i="52" since="OTP R16B"/> <!-- port_parallelism -->
+ <!-- <name name="system_info" arity="1" clause_i="53"/> port_count -->
+ <!-- <name name="system_info" arity="1" clause_i="54"/> port_limit -->
+ <!-- <name name="system_info" arity="1" clause_i="55"/> process_count -->
+ <!-- <name name="system_info" arity="1" clause_i="56"/> process_limit -->
+ <!-- <name name="system_info" arity="1" clause_i="57"/> procs -->
+ <!-- <name name="system_info" arity="1" clause_i="58"/> scheduler_bind_type -->
+ <!-- <name name="system_info" arity="1" clause_i="59"/> scheduler_bindings -->
+ <!-- <name name="system_info" arity="1" clause_i="60"/> scheduler_id -->
+ <!-- <name name="system_info" arity="1" clause_i="61"/> schedulers -->
+ <!-- <name name="system_info" arity="1" clause_i="62"/> smp_support -->
+ <!-- <name name="system_info" arity="1" clause_i="63"/> start_time -->
+ <name name="system_info" arity="1" clause_i="64" since=""/> <!-- system_architecture -->
+ <name name="system_info" arity="1" clause_i="65" since="OTP 21.3"/> <!-- system_logger -->
+ <name name="system_info" arity="1" clause_i="66" since=""/> <!-- system_version -->
+ <!-- <name name="system_info" arity="1" clause_i="67"/> threads -->
+ <!-- <name name="system_info" arity="1" clause_i="68"/> thread_pool_size -->
+ <!-- <name name="system_info" arity="1" clause_i="69"/> time_correction -->
+ <!-- <name name="system_info" arity="1" clause_i="70"/> time_offset -->
+ <!-- <name name="system_info" arity="1" clause_i="71"/> time_warp_mode -->
+ <!-- <name name="system_info" arity="1" clause_i="72"/> tolerant_timeofday -->
+ <name name="system_info" arity="1" clause_i="73" since=""/> <!-- trace_control_word -->
+ <!-- <name name="system_info" arity="1" clause_i="74"/> update_cpu_info -->
+ <name name="system_info" arity="1" clause_i="75" since=""/> <!-- version -->
+ <name name="system_info" arity="1" clause_i="76" since=""/> <!-- wordsize -->
+ <!-- <name name="system_info" arity="1" clause_i="77"/> overview -->
<!-- When adding any entry, make sure to update the overview clause_i -->
<fsummary>Information about the system.</fsummary>
<desc>
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index 31acd46260..fb1dee5767 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -234,7 +234,6 @@ atom duplicate_bag
atom duplicated
atom dupnames
atom einval
-atom elib_malloc
atom emulator
atom enable_trace
atom enabled
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 0e51dc311c..3d58eb31f0 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -2677,10 +2677,6 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
else if (BIF_ARG_1 == am_alloc_util_allocators) {
BIF_RET(erts_alloc_util_allocators((void *) BIF_P));
}
- else if (BIF_ARG_1 == am_elib_malloc) {
- /* To be removed in R15 */
- BIF_RET(am_false);
- }
else if (BIF_ARG_1 == am_os_version) {
BIF_RET(erts_get_global_literal(ERTS_LIT_OS_VERSION));
}
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index a9d8803575..966eef357b 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2747,7 +2747,6 @@ tuple_to_list(_Tuple) ->
(dynamic_trace) -> none | dtrace | systemtap;
(dynamic_trace_probes) -> boolean();
(end_time) -> non_neg_integer();
- (elib_malloc) -> false;
(eager_check_io) -> boolean();
(ets_count) -> pos_integer();
(ets_limit) -> pos_integer();
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index bac489c07c..80776ca552 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -887,8 +887,6 @@ type(erlang, system_info, 1, Xs, Opaques) ->
t_binary();
['dist_ctrl'] ->
t_list(t_tuple([t_atom(), t_sup([t_pid(), t_port()])]));
- %% elib_malloc is intentionally not included,
- %% because it scheduled for removal in R15.
['endian'] ->
t_endian();
['fullsweep_after'] ->
--
2.26.2
