From defd43985282606e841e2bcb29ad7414080d5a80 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Fri, 26 Jan 2018 18:42:32 +0100
Subject: erts: Add age order first fit allocator strategies

ageffcaoff: Age First Fit Carrier, Address Order First Fit (within carrier)
ageffcbf  : Age First Fit Carrier, Best Fit (within carrier)
ageffcaobf: Age First Fit Carrier, Address Order Best Fit (within carrier)

Prefer old carriers, the older the better.
---
 lib/runtime_tools/src/erts_alloc_config.erl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib/runtime_tools')

diff --git a/lib/runtime_tools/src/erts_alloc_config.erl b/lib/runtime_tools/src/erts_alloc_config.erl
index 514530332c..4b028681a0 100644
--- a/lib/runtime_tools/src/erts_alloc_config.erl
+++ b/lib/runtime_tools/src/erts_alloc_config.erl
@@ -265,7 +265,13 @@ strategy_str(aoff) ->
 strategy_str(aoffcbf) ->
     "Address order first fit carrier best fit";
 strategy_str(aoffcaobf) ->
-    "Address order first fit carrier adress order best fit".
+    "Address order first fit carrier adress order best fit";
+strategy_str(ageffcaoff) ->
+    "Age order first fit carrier address order first fit";
+strategy_str(ageffcbf) ->
+    "Age order first fit carrier best fit";
+strategy_str(ageffcaobf) ->
+    "Age order first fit carrier adress order best fit".
 
 default_acul(A, S) ->
     case carrier_migration_support(S) of
-- 
cgit v1.2.3


From 3162499ddc48d4ce877945775f084725ceab57c5 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Mon, 12 Feb 2018 13:38:24 +0100
Subject: Update version numbers

---
 lib/runtime_tools/vsn.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/runtime_tools')

diff --git a/lib/runtime_tools/vsn.mk b/lib/runtime_tools/vsn.mk
index 872bd5db1d..0dc6a48570 100644
--- a/lib/runtime_tools/vsn.mk
+++ b/lib/runtime_tools/vsn.mk
@@ -1 +1 @@
-RUNTIME_TOOLS_VSN = 1.12.3
+RUNTIME_TOOLS_VSN = 1.12.4
-- 
cgit v1.2.3


From e11c649522be8849cc21e364734be62c7783f090 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Mon, 12 Feb 2018 13:38:43 +0100
Subject: Update release notes

---
 lib/runtime_tools/doc/src/notes.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'lib/runtime_tools')

diff --git a/lib/runtime_tools/doc/src/notes.xml b/lib/runtime_tools/doc/src/notes.xml
index 93e3e26fda..74300ba3fc 100644
--- a/lib/runtime_tools/doc/src/notes.xml
+++ b/lib/runtime_tools/doc/src/notes.xml
@@ -32,6 +32,23 @@
   <p>This document describes the changes made to the Runtime_Tools
     application.</p>
 
+<section><title>Runtime_Tools 1.12.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    New family of <c>erts_alloc</c> strategies: Age Order
+	    First Fit. Similar to "address order", but instead the
+	    oldest possible carrier is always chosen for allocation.</p>
+          <p>
+	    Own Id: OTP-14917 Aux Id: ERIERL-88 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Runtime_Tools 1.12.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3