Merge branch 'sverker/revert-ets-load-factor'

3 files changed, 30 insertions, 30 deletions

diff --git a/erts/emulator/beam/erl_db_hash.c b/erts/emulator/beam/erl_db_hash.c
index 074ac6d64e..74979f984a 100644
--- a/erts/emulator/beam/erl_db_hash.c
+++ b/erts/emulator/beam/erl_db_hash.c
@@ -95,8 +95,7 @@
 /* 
  * The following symbols can be manipulated to "tune" the linear hash array 
  */
-#define GROW_LIMIT(NACTIVE) ((NACTIVE)*2)
-#define SHRINK_LIMIT(NACTIVE) ((NACTIVE) / 2)
+#define CHAIN_LEN 6                 /* Medium bucket chain len      */
 
 /* Number of slots per segment */
 #define SEGSZ_EXP  8
@@ -464,7 +463,7 @@ db_finalize_dbterm_hash(int cret, DbUpdateHandle* handle);
 static ERTS_INLINE void try_shrink(DbTableHash* tb)
 {
     int nactive = NACTIVE(tb);
-    if (nactive > SEGSZ && NITEMS(tb) < SHRINK_LIMIT(nactive)
+    if (nactive > SEGSZ && NITEMS(tb) < (nactive * CHAIN_LEN)
 	&& !IS_FIXED(tb)) {
 	shrink(tb, nactive);
     }
@@ -671,8 +670,8 @@ int db_create_hash(Process *p, DbTable *tbl)
     tb->nsegs = NSEG_1;
     tb->nslots = SEGSZ;
 
-#ifdef ERTS_SMP
     erts_smp_atomic_init_nob(&tb->is_resizing, 0);
+#ifdef ERTS_SMP
     if (tb->common.type & DB_FINE_LOCKED) {
 	erts_smp_rwmtx_opt_t rwmtx_opt = ERTS_SMP_RWMTX_OPT_DEFAULT_INITER;
 	int i;
@@ -863,7 +862,7 @@ Lnew:
     WUNLOCK_HASH(lck);
     {
 	int nactive = NACTIVE(tb);       
-	if (nitems > GROW_LIMIT(nactive) && !IS_FIXED(tb)) {
+	if (nitems > nactive * (CHAIN_LEN+1) && !IS_FIXED(tb)) {
 	    grow(tb, nactive);
 	}
     }
@@ -2251,12 +2250,12 @@ static int db_free_table_continue_hash(DbTable *tbl)
 
     done /= 2;
     while(tb->nslots != 0) {
-	done += 1 + SEGSZ/64 + free_seg(tb, 1);
+	free_seg(tb, 1);
 
 	/*
 	 * If we have done enough work, get out here.
 	 */
-	if (done >= DELETE_RECORD_LIMIT) {
+	if (++done >= (DELETE_RECORD_LIMIT / CHAIN_LEN / SEGSZ)) {
 	    return 0;	/* Not done */
 	}
     }
@@ -2605,22 +2604,23 @@ static Eterm build_term_list(Process* p, HashDbTerm* ptr1, HashDbTerm* ptr2,
 static ERTS_INLINE int
 begin_resizing(DbTableHash* tb)
 {
-#ifdef ERTS_SMP
     if (DB_USING_FINE_LOCKING(tb))
-	return !erts_atomic_xchg_acqb(&tb->is_resizing, 1);
-    else
-        ERTS_LC_ASSERT(erts_lc_rwmtx_is_rwlocked(&tb->common.rwlock));
-#endif
-    return 1;
+	return !erts_smp_atomic_xchg_acqb(&tb->is_resizing, 1);
+    else {
+	if (erts_smp_atomic_read_nob(&tb->is_resizing))
+	    return 0;
+	erts_smp_atomic_set_nob(&tb->is_resizing, 1);
+	return 1;
+    }
 }
 
 static ERTS_INLINE void
 done_resizing(DbTableHash* tb)
 {
-#ifdef ERTS_SMP
     if (DB_USING_FINE_LOCKING(tb))
-	erts_atomic_set_relb(&tb->is_resizing, 0);
-#endif
+	erts_smp_atomic_set_relb(&tb->is_resizing, 0);
+    else
+	erts_smp_atomic_set_nob(&tb->is_resizing, 0);
 }
 
 /* Grow table with one new bucket.
@@ -2871,7 +2871,7 @@ db_lookup_dbterm_hash(Process *p, DbTable *tbl, Eterm key, Eterm obj,
                 int nitems = erts_smp_atomic_inc_read_nob(&tb->common.nitems);
                 int nactive = NACTIVE(tb);
 
-                if (nitems > GROW_LIMIT(nactive) && !IS_FIXED(tb)) {
+                if (nitems > nactive * (CHAIN_LEN + 1) && !IS_FIXED(tb)) {
                     grow(tb, nactive);
                 }
             }
diff --git a/erts/emulator/beam/erl_db_hash.h b/erts/emulator/beam/erl_db_hash.h
index 081ff8fafc..e654363cd5 100644
--- a/erts/emulator/beam/erl_db_hash.h
+++ b/erts/emulator/beam/erl_db_hash.h
@@ -60,8 +60,8 @@ typedef struct db_table_hash {
     /* List of slots where elements have been deleted while table was fixed */
     erts_smp_atomic_t fixdel;  /* (FixedDeletion*) */	
     erts_smp_atomic_t nactive; /* Number of "active" slots */
-#ifdef ERTS_SMP
     erts_smp_atomic_t is_resizing; /* grow/shrink in progress */
+#ifdef ERTS_SMP
     DbTableHashFineLocks* locks;
 #endif
 #ifdef VALGRIND
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 40764a943d..8c1c625676 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -215,7 +215,7 @@ memory_check_summary(_Config) ->
 	    receive {get_failed_memchecks, FailedMemchecks} -> ok end,
 	    io:format("Failed memchecks: ~p\n",[FailedMemchecks]),
 	    NoFailedMemchecks = length(FailedMemchecks),
-	    if NoFailedMemchecks > 300 ->
+	    if NoFailedMemchecks > 3 ->
 		    ct:fail("Too many failed (~p) memchecks", [NoFailedMemchecks]);
 	       true ->
 		    ok
@@ -604,9 +604,9 @@ memory(Config) when is_list(Config) ->
 memory_do(Opts) ->
     L = [T1,T2,T3,T4] = fill_sets_int(1000,Opts),
     XR1 = case mem_mode(T1) of
-	      {normal,_} ->     {13836,13560,13560,13566}; %{13836,13046,13046,13052}
-	      {compressed,4} -> {11041,10865,10865,10866}; %{11041,10251,10251,10252}
-	      {compressed,8} -> {10050,9774,9774,9774} % {10050,9260,9260,9260}
+	      {normal,_} ->     {13836,13046,13046,13052}; %{13862,13072,13072,13078};
+	      {compressed,4} -> {11041,10251,10251,10252}; %{11067,10277,10277,10278};
+	      {compressed,8} -> {10050,9260,9260,9260} %{10076,9286,9286,9286}
 	  end,
     XRes1 = adjust_xmem(L, XR1),
     Res1 = {?S(T1),?S(T2),?S(T3),?S(T4)},
@@ -620,9 +620,9 @@ memory_do(Opts) ->
 		  end,
 		  L),
     XR2 = case mem_mode(T1) of
-	      {normal,_} ->     {13826,13551,13542,13548}; %{13826,13037,13028,13034};
-	      {compressed,4} -> {11031,10856,10747,10748}; %{11031,10242,10233,10234};
-	      {compressed,8} -> {10040,9765,9756,9756} %{10040,9251,9242,9242}
+	      {normal,_} ->     {13826,13037,13028,13034}; %{13852,13063,13054,13060};
+	      {compressed,4} -> {11031,10242,10233,10234}; %{11057,10268,10259,10260};
+	      {compressed,8} -> {10040,9251,9242,9242}     %10066,9277,9268,9268}
 	  end,
     XRes2 = adjust_xmem(L, XR2),
     Res2 = {?S(T1),?S(T2),?S(T3),?S(T4)},
@@ -636,9 +636,9 @@ memory_do(Opts) ->
 		  end,
 		  L),
     XR3 = case mem_mode(T1) of
-	      {normal,_} ->     {13816,13542,13524,13530}; %{13816,13028,13010,13016}
-	      {compressed,4} -> {11021,10747,10729,10730}; %{11021,10233,10215,10216}
-	      {compressed,8} -> {10030,9756,9738,9738}  %{10030,9242,9224,9224}
+	      {normal,_} ->     {13816,13028,13010,13016}; %{13842,13054,13036,13042};
+	      {compressed,4} -> {11021,10233,10215,10216}; %{11047,10259,10241,10242};
+	      {compressed,8} -> {10030,9242,9224,9224} %{10056,9268,9250,9250}
 	  end,
     XRes3 = adjust_xmem(L, XR3),
     Res3 = {?S(T1),?S(T2),?S(T3),?S(T4)},
@@ -5350,12 +5350,12 @@ verify_table_load(T) ->
     Stats = ets:info(T,stats),
     {Buckets,AvgLen,StdDev,ExpSD,_MinLen,_MaxLen,_} = Stats,
     ok = if
-	     AvgLen > 2 ->
+	     AvgLen > 7 ->
 		 io:format("Table overloaded: Stats=~p\n~p\n",
 			   [Stats, ets:info(T)]),
 		 false;
 
-	     Buckets>256, AvgLen < 0.5 ->
+	     Buckets>256, AvgLen < 6 ->
 		 io:format("Table underloaded: Stats=~p\n~p\n",
 			   [Stats, ets:info(T)]),
 		 false;