File 2411-Drop-remnants-of-elib_malloc-removed-in-R1... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2411-Drop-remnants-of-elib_malloc-removed-in-R15.patch of Package erlang (Revision 97a92d92303e246a7315238523f6198f)

Currently displaying revision 97a92d92303e246a7315238523f6198f , Show latest

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>
 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>
 
 </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=""/> 
 <name name="system_info" arity="1" clause_i="4" since=""/> 
 <name name="system_info" arity="1" clause_i="5" since=""/> 
- <name name="system_info" arity="1" clause_i="27" since=""/> 
 <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>.
 </item>
- <tag><marker id="system_info_elib_malloc"/>
- <c>elib_malloc</c></tag>
- <item>
- 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.
- </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=""/> 
 <name name="system_info" arity="1" clause_i="13" since=""/> 
- <name name="system_info" arity="1" clause_i="38" since=""/> 
- <name name="system_info" arity="1" clause_i="74" since="OTP R14B"/> 
+ <name name="system_info" arity="1" clause_i="37" since=""/> 
+ <name name="system_info" arity="1" clause_i="73" since="OTP R14B"/> 
 <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=""/> 
- <name name="system_info" arity="1" clause_i="32" since=""/> 
- <name name="system_info" arity="1" clause_i="33" since=""/> 
- <name name="system_info" arity="1" clause_i="34" since=""/> 
- <name name="system_info" arity="1" clause_i="40" since="OTP 19.0"/> 
- <name name="system_info" arity="1" clause_i="41" since="OTP 19.0"/> 
- <name name="system_info" arity="1" clause_i="42" since="OTP R13B04"/> 
- <name name="system_info" arity="1" clause_i="43" since="OTP R13B04"/> 
- <name name="system_info" arity="1" clause_i="57" since=""/> 
+ <name name="system_info" arity="1" clause_i="31" since=""/> 
+ <name name="system_info" arity="1" clause_i="32" since=""/> 
+ <name name="system_info" arity="1" clause_i="33" since=""/> 
+ <name name="system_info" arity="1" clause_i="39" since="OTP 19.0"/> 
+ <name name="system_info" arity="1" clause_i="40" since="OTP 19.0"/> 
+ <name name="system_info" arity="1" clause_i="41" since="OTP R13B04"/> 
+ <name name="system_info" arity="1" clause_i="42" since="OTP R13B04"/> 
+ <name name="system_info" arity="1" clause_i="56" since=""/> 
 <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"/> 
 <name name="system_info" arity="1" clause_i="7" since="OTP 20.0"/> 
- <name name="system_info" arity="1" clause_i="29" since="OTP 21.1"/> 
- <name name="system_info" arity="1" clause_i="30" since="OTP R16B03"/> 
- <name name="system_info" arity="1" clause_i="53" since="OTP R16B"/> 
- <name name="system_info" arity="1" clause_i="54" since="OTP R16B"/> 
- <name name="system_info" arity="1" clause_i="55" since=""/> 
- <name name="system_info" arity="1" clause_i="56" since=""/> 
+ <name name="system_info" arity="1" clause_i="28" since="OTP 21.1"/> 
+ <name name="system_info" arity="1" clause_i="29" since="OTP R16B03"/> 
+ <name name="system_info" arity="1" clause_i="52" since="OTP R16B"/> 
+ <name name="system_info" arity="1" clause_i="53" since="OTP R16B"/> 
+ <name name="system_info" arity="1" clause_i="54" since=""/> 
+ <name name="system_info" arity="1" clause_i="55" since=""/> 
 <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"/> 
- <name name="system_info" arity="1" clause_i="50" since="OTP 18.0"/> 
- <name name="system_info" arity="1" clause_i="51" since="OTP 18.0"/> 
- <name name="system_info" arity="1" clause_i="63" since="OTP 18.0"/> 
- <name name="system_info" arity="1" clause_i="69" since="OTP 18.0"/> 
- <name name="system_info" arity="1" clause_i="70" since="OTP 18.0"/> 
- <name name="system_info" arity="1" clause_i="71" since="OTP 18.0"/> 
- <name name="system_info" arity="1" clause_i="72" since="OTP 17.1"/> 
+ <name name="system_info" arity="1" clause_i="49" since="OTP 18.0"/> 
+ <name name="system_info" arity="1" clause_i="50" since="OTP 18.0"/> 
+ <name name="system_info" arity="1" clause_i="62" since="OTP 18.0"/> 
+ <name name="system_info" arity="1" clause_i="68" since="OTP 18.0"/> 
+ <name name="system_info" arity="1" clause_i="69" since="OTP 18.0"/> 
+ <name name="system_info" arity="1" clause_i="70" since="OTP 18.0"/> 
+ <name name="system_info" arity="1" clause_i="71" since="OTP 17.1"/> 
 <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"/> 
 <name name="system_info" arity="1" clause_i="18" since="OTP 17.0"/> 
 <name name="system_info" arity="1" clause_i="19" since="OTP 17.0"/> 
- <name name="system_info" arity="1" clause_i="45" since=""/> 
- <name name="system_info" arity="1" clause_i="46" since=""/> 
- <name name="system_info" arity="1" clause_i="49" since="OTP 19.0"/> 
- <name name="system_info" arity="1" clause_i="58" since=""/> 
- <name name="system_info" arity="1" clause_i="59" since=""/> 
- <name name="system_info" arity="1" clause_i="60" since=""/> 
- <name name="system_info" arity="1" clause_i="61" since=""/> 
- <name name="system_info" arity="1" clause_i="62" since=""/> 
- <name name="system_info" arity="1" clause_i="67" since=""/> 
- <name name="system_info" arity="1" clause_i="68" since=""/> 
+ <name name="system_info" arity="1" clause_i="44" since=""/> 
+ <name name="system_info" arity="1" clause_i="45" since=""/> 
+ <name name="system_info" arity="1" clause_i="47" since="OTP 19.0"/> 
+ <name name="system_info" arity="1" clause_i="57" since=""/> 
+ <name name="system_info" arity="1" clause_i="58" since=""/> 
+ <name name="system_info" arity="1" clause_i="59" since=""/> 
+ <name name="system_info" arity="1" clause_i="60" since=""/> 
+ <name name="system_info" arity="1" clause_i="61" since=""/> 
+ <name name="system_info" arity="1" clause_i="66" since=""/> 
+ <name name="system_info" arity="1" clause_i="67" since=""/> 
 <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"/> 
 <name name="system_info" arity="1" clause_i="25" since="OTP R15B01"/> 
 
- 
- 
- 
- 
- 
- 
- 
- 
- <name name="system_info" arity="1" clause_i="35" since=""/> 
- <name name="system_info" arity="1" clause_i="36" since=""/> 
- <name name="system_info" arity="1" clause_i="37" since=""/> 
- 
- <name name="system_info" arity="1" clause_i="39" since=""/> 
- 
- 
- 
- 
- <name name="system_info" arity="1" clause_i="44" since=""/> 
- 
- 
- <name name="system_info" arity="1" clause_i="47" since="OTP 17.4"/> 
- 
- <name name="system_info" arity="1" clause_i="49" since=""/> 
- 
- 
- <name name="system_info" arity="1" clause_i="52" since="OTP 23.3.4.10"/> 
- <name name="system_info" arity="1" clause_i="53" since="OTP R16B"/> 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <name name="system_info" arity="1" clause_i="65" since=""/> 
- <name name="system_info" arity="1" clause_i="66" since="OTP 21.3"/> 
- <name name="system_info" arity="1" clause_i="67" since=""/> 
- 
- 
- 
- 
- 
- 
- <name name="system_info" arity="1" clause_i="74" since=""/> 
- 
- <name name="system_info" arity="1" clause_i="76" since=""/> 
- <name name="system_info" arity="1" clause_i="77" since=""/> 
- 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ <name name="system_info" arity="1" clause_i="34" since=""/> 
+ <name name="system_info" arity="1" clause_i="35" since=""/> 
+ <name name="system_info" arity="1" clause_i="36" since=""/> 
+ 
+ <name name="system_info" arity="1" clause_i="38" since=""/> 
+ 
+ 
+ 
+ 
+ <name name="system_info" arity="1" clause_i="43" since=""/> 
+ 
+ 
+ <name name="system_info" arity="1" clause_i="46" since="OTP 17.4"/> 
+ 
+ <name name="system_info" arity="1" clause_i="48" since=""/> 
+ 
+ 
+ <name name="system_info" arity="1" clause_i="51" since="OTP 23.3.4.10"/> 
+ <name name="system_info" arity="1" clause_i="52" since="OTP R16B"/> 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ <name name="system_info" arity="1" clause_i="64" since=""/> 
+ <name name="system_info" arity="1" clause_i="65" since="OTP 21.3"/> 
+ <name name="system_info" arity="1" clause_i="66" since=""/> 
+ 
+ 
+ 
+ 
+ 
+ 
+ <name name="system_info" arity="1" clause_i="73" since=""/> 
+ 
+ <name name="system_info" arity="1" clause_i="75" since=""/> 
+ <name name="system_info" arity="1" clause_i="76" since=""/> 
+ 
 
 <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

Places

File 2411-Drop-remnants-of-elib_malloc-removed-in-R15.patch of Package erlang (Revision 97a92d92303e246a7315238523f6198f)

Places