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, 8 insertions, 3 deletions

diff --git a/erts/emulator/beam/erl_afit_alloc.c b/erts/emulator/beam/erl_afit_alloc.c
index 570cc59be2..306b32691c 100644
--- a/erts/emulator/beam/erl_afit_alloc.c
+++ b/erts/emulator/beam/erl_afit_alloc.c
@@ -37,6 +37,12 @@
 #define GET_ERL_AF_ALLOC_IMPL
 #include "erl_afit_alloc.h"
 
+struct AFFreeBlock_t_ {
+    Block_t block_head;
+    AFFreeBlock_t *prev;
+    AFFreeBlock_t *next;
+};
+#define AF_BLK_SZ(B) MBC_FBLK_SZ(&(B)->block_head)
 
 #define MIN_MBC_SZ		(16*1024)
 #define MIN_MBC_FIRST_FREE_SZ	(4*1024)
@@ -80,7 +86,6 @@ erts_afalc_start(AFAllctr_t *afallctr,
 
     init->sbmbct = 0; /* Small mbc not supported by afit */
 
-    allctr->mbc_header_size		= sizeof(Carrier_t);
     allctr->min_mbc_size		= MIN_MBC_SZ;
     allctr->min_mbc_first_free_size	= MIN_MBC_FIRST_FREE_SZ;
     allctr->min_block_size		= sizeof(AFFreeBlock_t);
@@ -118,7 +123,7 @@ get_free_block(Allctr_t *allctr, Uint size, Block_t *cand_blk, Uint cand_size,
 
     ASSERT(!cand_blk || cand_size >= size);
 
-    if (afallctr->free_list && BLK_SZ(afallctr->free_list) >= size) {
+    if (afallctr->free_list && AF_BLK_SZ(afallctr->free_list) >= size) {
 	AFFreeBlock_t *res = afallctr->free_list;	
 	afallctr->free_list = res->next;
 	if (res->next)
@@ -135,7 +140,7 @@ link_free_block(Allctr_t *allctr, Block_t *block, Uint32 flags)
     AFFreeBlock_t *blk = (AFFreeBlock_t *) block;
     AFAllctr_t *afallctr = (AFAllctr_t *) allctr;
 
-    if (afallctr->free_list && BLK_SZ(afallctr->free_list) > BLK_SZ(blk)) {
+    if (afallctr->free_list && AF_BLK_SZ(afallctr->free_list) > AF_BLK_SZ(blk)) {
 	blk->next = afallctr->free_list->next;
 	blk->prev = afallctr->free_list;
 	afallctr->free_list->next = blk;