Merge branch 'sverk/egil/r16/new-alloc-header-scheme/OTP-10273'

OTP-10415

* sverk/egil/r16/new-alloc-header-scheme/OTP-10273: (42 commits)
  erts: Make ll main mbc fit into 2pow size
  erts: Clear entire mseg cache upon request
  erts: Reduce max heap sizes
  tests: Refactor away ?line macro in beam_SUITE
  tests: Fix heap_sizes check
  tests: Refactor away ?line macro in process_SUITE
  tests: Use new correct min_bin_vheap_size in test
  erts: Set super alignment (256kb) and limits for sbct (8Mb) and lmbcs (128Mb)
  erts: Do not cache segments that are misaligned
  erts: Add mseg cache for large sbc segments
  erts: Reintroduce mseg options amcbf and rmcbf
  erts: Optimize erl_alloc_util.c by substitute MBC_BLK_SZ
  erts: Fix bug when allocating size near sbc_threshold
  erts: Make gc sizes fit into MB Carrier blocks
  erts: Force sbmbc to be disabled in a crude way
  erts: Fix new header scheme for win64
  erts: Fix mseg cache. Malplaced NULL pointer
  erts: Remove unused mseg options amcbf and rmcbf
  erts: Use aligned bits as constant in mseg_alloc
  erts: Don't let zero be considered a power of two
  ...

Conflicts:
	erts/emulator/test/process_SUITE.erl

1 files changed, 18 insertions, 4 deletions

diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index 04d807b780..5da8c69c03 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -310,9 +310,9 @@ set_default_ll_alloc_opts(struct au_init *ip)
     ip->init.util.name_prefix	= "ll_";
     ip->init.util.alloc_no	= ERTS_ALC_A_LONG_LIVED;
 #ifndef SMALL_MEMORY
-    ip->init.util.mmbcs 	= 2*1024*1024; /* Main carrier size */
+    ip->init.util.mmbcs 	= 2*1024*1024 - 40; /* Main carrier size */
 #else
-    ip->init.util.mmbcs 	= 1*1024*1024; /* Main carrier size */
+    ip->init.util.mmbcs 	= 1*1024*1024 - 40; /* Main carrier size */
 #endif
     ip->init.util.ts 		= ERTS_ALC_MTA_LONG_LIVED;
     ip->init.util.asbcst	= 0;
@@ -1173,6 +1173,11 @@ handle_au_arg(struct au_init *auip,
 	break;
     case 'e':
 	auip->enable = get_bool_value(sub_param+1, argv, ip);
+#if !HAVE_ERTS_SBMBC
+	if (auip->init.util.alloc_no == ERTS_ALC_A_SBMBC) {
+	    auip->enable = 0;
+	}
+#endif
 	break;
     case 'l':
 	if (has_prefix("lmbcs", sub_param)) {
@@ -1233,10 +1238,16 @@ handle_au_arg(struct au_init *auip,
 	    auip->init.util.sbct = get_kb_value(sub_param + 4, argv, ip);
 	}
 	else if (has_prefix("sbmbcs", sub_param)) {
-	    auip->init.util.sbmbcs = get_byte_value(sub_param + 6, argv, ip);
+#if HAVE_ERTS_SBMBC
+	    auip->init.util.sbmbcs =
+#endif
+		get_byte_value(sub_param + 6, argv, ip);
 	}
 	else if (has_prefix("sbmbct", sub_param)) {
-	    auip->init.util.sbmbct = get_byte_value(sub_param + 6, argv, ip);
+#if HAVE_ERTS_SBMBC
+	    auip->init.util.sbmbct =
+#endif
+		get_byte_value(sub_param + 6, argv, ip);
 	}
 	else if (has_prefix("smbcs", sub_param)) {
 	    auip->default_.smbcs = 0;
@@ -1403,6 +1414,9 @@ handle_args(int *argc, char **argv, erts_alc_hndl_args_init_t *init)
 			else if (strcmp("max", arg) == 0) {
 			    for (a = 0; a < aui_sz; a++)
 				aui[a]->enable = 1;
+#if !HAVE_ERTS_SBMBC
+			    init->sbmbc_alloc.enable = 0;
+#endif
 			}
 			else if (strcmp("config", arg) == 0) {
 			    init->erts_alloc_config = 1;