1 files changed, 81 insertions, 70 deletions

diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c
index ac7f420708..53062979a6 100644
--- a/erts/emulator/beam/erl_alloc_util.c
+++ b/erts/emulator/beam/erl_alloc_util.c
@@ -588,17 +588,21 @@ do {									\
 
 #ifdef DEBUG
 #ifdef USE_THREADS
+# ifdef ERTS_SMP
+#  define IS_ACTUALLY_BLOCKING (erts_thr_progress_is_blocking())
+# else
+#  define IS_ACTUALLY_BLOCKING 0
+# endif
 #define ERTS_ALCU_DBG_CHK_THR_ACCESS(A)					\
 do {									\
-    if (!(A)->thread_safe) {						\
-	if (!(A)->debug.saved_tid) {					\
+    if (!(A)->thread_safe && !IS_ACTUALLY_BLOCKING) {                   \
+	if (!(A)->debug.saved_tid) {                                    \
 	    (A)->debug.tid = erts_thr_self();				\
 	    (A)->debug.saved_tid = 1;					\
 	}								\
 	else {								\
 	    ERTS_SMP_LC_ASSERT(						\
-		ethr_equal_tids((A)->debug.tid, erts_thr_self())	\
-		|| erts_thr_progress_is_blocking());			\
+		ethr_equal_tids((A)->debug.tid, erts_thr_self()));	\
 	}								\
     }									\
 } while (0)
@@ -878,8 +882,10 @@ erts_alcu_fix_alloc_shrink(Allctr_t *allctr, erts_aint32_t flgs)
 
 #ifdef ERTS_SMP
 
-#define ERTS_ALCU_DD_FIX_TYPE_OFFS \
-  ((sizeof(ErtsAllctrDDBlock_t)-1)/sizeof(UWord) + 1)
+typedef struct {
+    ErtsAllctrDDBlock_t ddblock__; /* must be first */
+    ErtsAlcType_t fix_type;
+}ErtsAllctrFixDDBlock_t;
 
 
 static ERTS_INLINE Allctr_t*
@@ -1180,7 +1186,7 @@ handle_delayed_dealloc(Allctr_t *allctr,
 	if (fix) {
 	    ErtsAlcType_t type;
 
-	    type = (ErtsAlcType_t) ((UWord *) ptr)[ERTS_ALCU_DD_FIX_TYPE_OFFS];
+	    type = ((ErtsAllctrFixDDBlock_t*) ptr)->fix_type;
 	    ix = type - ERTS_ALC_N_MIN_A_FIXED_SIZE;
 	    ERTS_DBG_CHK_FIX_LIST(allctr, fix, ix, 1);
 	    fix[ix].used--;
@@ -1242,7 +1248,7 @@ enqueue_dealloc_other_instance(ErtsAlcType_t type,
 			       int cinit)
 {
     if (allctr->fix)
-	((UWord *) ptr)[ERTS_ALCU_DD_FIX_TYPE_OFFS] = (UWord) type;
+	((ErtsAllctrFixDDBlock_t*) ptr)->fix_type = type;
 
     if (ddq_enqueue(type, &allctr->dd.q, ptr, cinit))
 	erts_alloc_notify_delayed_dealloc(allctr->ix);
@@ -2508,12 +2514,6 @@ static erts_mtx_t init_atoms_mtx;
 static void
 init_atoms(Allctr_t *allctr)
 {
-
-#ifdef USE_THREADS
-    if (allctr && allctr->thread_safe)
-	erts_mtx_unlock(&allctr->mutex);
-#endif
-
     erts_mtx_lock(&init_atoms_mtx);
 
     if (!atoms_initialized) {
@@ -2604,18 +2604,13 @@ init_atoms(Allctr_t *allctr)
 	    fix_type_atoms[ix] = am_atom_put(name, len);
 	}
     }
-
     
-    if (allctr) {
+    if (allctr && !allctr->atoms_initialized) {
 
 	make_name_atoms(allctr);
 
 	(*allctr->init_atoms)();
 
-#ifdef USE_THREADS
-	if (allctr->thread_safe)
-	    erts_mtx_lock(&allctr->mutex);
-#endif
     	allctr->atoms_initialized = 1;
     }
 
@@ -3243,17 +3238,21 @@ erts_alcu_info_options(Allctr_t *allctr,
 {
     Eterm res;
 
+    if (hpp || szp)
+	ensure_atoms_initialized(allctr);
 
 #ifdef USE_THREADS
-    if (allctr->thread_safe)
+    if (allctr->thread_safe) {
+	erts_allctr_wrapper_pre_lock();
 	erts_mtx_lock(&allctr->mutex);
+    }
 #endif
-    if (hpp || szp)
-	ensure_atoms_initialized(allctr);
     res = info_options(allctr, print_to_p, print_to_arg, hpp, szp);
 #ifdef USE_THREADS
-    if (allctr->thread_safe)
+    if (allctr->thread_safe) { 
 	erts_mtx_unlock(&allctr->mutex);
+	erts_allctr_wrapper_pre_unlock();
+    }
 #endif
     return res;
 }
@@ -3280,16 +3279,18 @@ erts_alcu_sz_info(Allctr_t *allctr,
 	return am_false;
     }
 
+    if (hpp || szp)
+	ensure_atoms_initialized(allctr);
+
 #ifdef USE_THREADS
-    if (allctr->thread_safe)
+    if (allctr->thread_safe) {
+	erts_allctr_wrapper_pre_lock();
 	erts_mtx_lock(&allctr->mutex);
+    }
 #endif
 
     ERTS_ALCU_DBG_CHK_THR_ACCESS(allctr);
 
-    if (hpp || szp)
-	ensure_atoms_initialized(allctr);
-
     /* Update sbc values not continously updated */
     allctr->sbcs.blocks.curr.no
 	= allctr->sbcs.curr.norm.mseg.no + allctr->sbcs.curr.norm.sys_alloc.no;
@@ -3325,13 +3326,16 @@ erts_alcu_sz_info(Allctr_t *allctr,
 
 
 #ifdef USE_THREADS
-    if (allctr->thread_safe)
+    if (allctr->thread_safe) {
 	erts_mtx_unlock(&allctr->mutex);
+	erts_allctr_wrapper_pre_unlock();
+    }
 #endif
 
     return res;
 }
 
+
 Eterm
 erts_alcu_info(Allctr_t *allctr,
 	       int begin_max_period,
@@ -3352,16 +3356,18 @@ erts_alcu_info(Allctr_t *allctr,
 	return am_false;
     }
 
+    if (hpp || szp)
+	ensure_atoms_initialized(allctr);
+
 #ifdef USE_THREADS
-    if (allctr->thread_safe)
+    if (allctr->thread_safe) {
+	erts_allctr_wrapper_pre_lock();
 	erts_mtx_lock(&allctr->mutex);
+    }
 #endif
 
     ERTS_ALCU_DBG_CHK_THR_ACCESS(allctr);
 
-    if (hpp || szp)
-	ensure_atoms_initialized(allctr);
-
     /* Update sbc values not continously updated */
     allctr->sbcs.blocks.curr.no
 	= allctr->sbcs.curr.norm.mseg.no + allctr->sbcs.curr.norm.sys_alloc.no;
@@ -3414,8 +3420,10 @@ erts_alcu_info(Allctr_t *allctr,
 
 
 #ifdef USE_THREADS
-    if (allctr->thread_safe)
+    if (allctr->thread_safe) {
 	erts_mtx_unlock(&allctr->mutex);
+	erts_allctr_wrapper_pre_unlock();
+    }
 #endif
 
     return res;
@@ -3487,7 +3495,9 @@ do_erts_alcu_alloc(ErtsAlcType_t type, void *extra, Uint size)
     fix = allctr->fix;
     if (fix) {
 	int ix = type - ERTS_ALC_N_MIN_A_FIXED_SIZE;
+	ASSERT((unsigned)ix < ERTS_ALC_NO_FIXED_SIZES);
 	ERTS_DBG_CHK_FIX_LIST(allctr, fix, ix, 1);
+	ASSERT(size <= fix[ix].type_size);
 	fix[ix].used++;
 	res = fix[ix].list;
 	if (res) {
@@ -3508,8 +3518,7 @@ do_erts_alcu_alloc(ErtsAlcType_t type, void *extra, Uint size)
 	    ERTS_DBG_CHK_FIX_LIST(allctr, fix, ix, 0);
 	    return res;
 	}
-	if (size < 2*sizeof(UWord))
-	    size += sizeof(UWord);
+	size = fix[ix].type_size;
 	if (fix[ix].limit < fix[ix].used)
 	    fix[ix].limit = fix[ix].used;
 	if (fix[ix].max_used < fix[ix].used)
@@ -4198,9 +4207,8 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
 #if ERTS_SMP
     if (init->tpref) {
 	Uint sz = ABLK_HDR_SZ;
-	sz += ERTS_ALCU_DD_FIX_TYPE_OFFS*sizeof(UWord);
-	if (init->fix)
-	    sz += sizeof(UWord);
+	sz += (init->fix ? 
+	       sizeof(ErtsAllctrFixDDBlock_t) : sizeof(ErtsAllctrDDBlock_t));
 	sz = UNIT_CEILING(sz);
 	if (sz > allctr->min_block_size)
 	    allctr->min_block_size = sz;
@@ -4325,6 +4333,9 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
 	    allctr->fix[i].list = NULL;
 	    allctr->fix[i].allocated = 0;
 	    allctr->fix[i].used = 0;
+#ifdef ERTS_SMP
+	    ASSERT(allctr->fix[i].type_size >= sizeof(ErtsAllctrFixDDBlock_t));
+#endif
 	}
     }
 
@@ -4394,42 +4405,42 @@ erts_alcu_init(AlcUInit_t *init)
  * to erts_alcu_test()                                                       *
 \*                                                                           */
 
-unsigned long
-erts_alcu_test(unsigned long op, unsigned long a1, unsigned long a2)
+UWord
+erts_alcu_test(UWord op, UWord a1, UWord a2)
 {
     switch (op) {
-    case 0x000:	return (unsigned long) BLK_SZ((Block_t *) a1);
-    case 0x001:	return (unsigned long) BLK_UMEM_SZ((Block_t *) a1);
-    case 0x002:	return (unsigned long) IS_PREV_BLK_FREE((Block_t *) a1);
-    case 0x003:	return (unsigned long) IS_FREE_BLK((Block_t *) a1);
-    case 0x004:	return (unsigned long) IS_LAST_BLK((Block_t *) a1);
-    case 0x005:	return (unsigned long) UMEM2BLK((void *) a1);
-    case 0x006:	return (unsigned long) BLK2UMEM((Block_t *) a1);
-    case 0x007:	return (unsigned long) IS_SB_CARRIER((Carrier_t *) a1);
-    case 0x008:	return (unsigned long) IS_SBC_BLK((Block_t *) a1);
-    case 0x009:	return (unsigned long) IS_MB_CARRIER((Carrier_t *) a1);
-    case 0x00a:	return (unsigned long) IS_MSEG_CARRIER((Carrier_t *) a1);
-    case 0x00b:	return (unsigned long) CARRIER_SZ((Carrier_t *) a1);
-    case 0x00c:	return (unsigned long) SBC2BLK((Allctr_t *) a1,
+    case 0x000:	return (UWord) BLK_SZ((Block_t *) a1);
+    case 0x001:	return (UWord) BLK_UMEM_SZ((Block_t *) a1);
+    case 0x002:	return (UWord) IS_PREV_BLK_FREE((Block_t *) a1);
+    case 0x003:	return (UWord) IS_FREE_BLK((Block_t *) a1);
+    case 0x004:	return (UWord) IS_LAST_BLK((Block_t *) a1);
+    case 0x005:	return (UWord) UMEM2BLK((void *) a1);
+    case 0x006:	return (UWord) BLK2UMEM((Block_t *) a1);
+    case 0x007:	return (UWord) IS_SB_CARRIER((Carrier_t *) a1);
+    case 0x008:	return (UWord) IS_SBC_BLK((Block_t *) a1);
+    case 0x009:	return (UWord) IS_MB_CARRIER((Carrier_t *) a1);
+    case 0x00a:	return (UWord) IS_MSEG_CARRIER((Carrier_t *) a1);
+    case 0x00b:	return (UWord) CARRIER_SZ((Carrier_t *) a1);
+    case 0x00c:	return (UWord) SBC2BLK((Allctr_t *) a1,
 					       (Carrier_t *) a2);
-    case 0x00d:	return (unsigned long) BLK_TO_SBC((Block_t *) a2);
-    case 0x00e:	return (unsigned long) MBC_TO_FIRST_BLK((Allctr_t *) a1,
+    case 0x00d:	return (UWord) BLK_TO_SBC((Block_t *) a2);
+    case 0x00e:	return (UWord) MBC_TO_FIRST_BLK((Allctr_t *) a1,
 						(Carrier_t *) a2);
-    case 0x00f:	return (unsigned long) FIRST_BLK_TO_MBC((Allctr_t *) a1,
+    case 0x00f:	return (UWord) FIRST_BLK_TO_MBC((Allctr_t *) a1,
 						(Block_t *) a2);
-    case 0x010:	return (unsigned long) ((Allctr_t *) a1)->mbc_list.first;
-    case 0x011:	return (unsigned long) ((Allctr_t *) a1)->mbc_list.last;
-    case 0x012:	return (unsigned long) ((Allctr_t *) a1)->sbc_list.first;
-    case 0x013:	return (unsigned long) ((Allctr_t *) a1)->sbc_list.last;
-    case 0x014:	return (unsigned long) ((Carrier_t *) a1)->next;
-    case 0x015:	return (unsigned long) ((Carrier_t *) a1)->prev;
-    case 0x016:	return (unsigned long) ABLK_HDR_SZ; 
-    case 0x017:	return (unsigned long) ((Allctr_t *) a1)->min_block_size;
-    case 0x018:	return (unsigned long) NXT_BLK((Block_t *) a1);
-    case 0x019:	return (unsigned long) PREV_BLK((Block_t *) a1);
-    case 0x01a: return (unsigned long) IS_MBC_FIRST_BLK((Allctr_t*)a1, (Block_t *) a2);
-    case 0x01b: return (unsigned long) sizeof(Unit_t);
-    default:	ASSERT(0); return ~((unsigned long) 0);
+    case 0x010:	return (UWord) ((Allctr_t *) a1)->mbc_list.first;
+    case 0x011:	return (UWord) ((Allctr_t *) a1)->mbc_list.last;
+    case 0x012:	return (UWord) ((Allctr_t *) a1)->sbc_list.first;
+    case 0x013:	return (UWord) ((Allctr_t *) a1)->sbc_list.last;
+    case 0x014:	return (UWord) ((Carrier_t *) a1)->next;
+    case 0x015:	return (UWord) ((Carrier_t *) a1)->prev;
+    case 0x016:	return (UWord) ABLK_HDR_SZ; 
+    case 0x017:	return (UWord) ((Allctr_t *) a1)->min_block_size;
+    case 0x018:	return (UWord) NXT_BLK((Block_t *) a1);
+    case 0x019:	return (UWord) PREV_BLK((Block_t *) a1);
+    case 0x01a: return (UWord) IS_MBC_FIRST_BLK((Allctr_t*)a1, (Block_t *) a2);
+    case 0x01b: return (UWord) sizeof(Unit_t);
+    default:	ASSERT(0); return ~((UWord) 0);
     }
 }