Merge branch 'sverk/opt-check-io'

* sverk/opt-check-io:
  Revert conceptually wrong little fix as part of check_io opt
  Make allocation of check_io tables more scalable.

3 files changed, 32 insertions, 7 deletions

diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c
index c1336c60d9..ce014c19c2 100644
--- a/erts/emulator/sys/common/erl_check_io.c
+++ b/erts/emulator/sys/common/erl_check_io.c
@@ -39,7 +39,6 @@
 #include "dtrace-wrapper.h"
 
 #ifdef ERTS_SYS_CONTINOUS_FD_NUMBERS
-#  define ERTS_DRV_EV_STATE_EXTRA_SIZE 128
 #else
 #  include "safe_hash.h"
 #  define DRV_EV_STATE_HTAB_SIZE 1024
@@ -334,7 +333,9 @@ static void
 grow_drv_ev_state(int min_ix)
 {
     int i;
-    int new_len = min_ix + 1 + ERTS_DRV_EV_STATE_EXTRA_SIZE;
+    int new_len;
+
+    new_len = ERTS_POLL_EXPORT(erts_poll_get_table_len)(min_ix + 1);
     if (new_len > max_fds)
 	new_len = max_fds;
 
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c
index 26858052c4..5a8588351d 100644
--- a/erts/emulator/sys/common/erl_poll.c
+++ b/erts/emulator/sys/common/erl_poll.c
@@ -105,8 +105,8 @@
 
 #define ERTS_POLL_COALESCE_KP_RES (ERTS_POLL_USE_KQUEUE || ERTS_POLL_USE_EPOLL)
 
-#define FDS_STATUS_EXTRA_FREE_SIZE 128
-#define POLL_FDS_EXTRA_FREE_SIZE 128
+#define ERTS_EV_TABLE_MIN_LENGTH		1024
+#define ERTS_EV_TABLE_EXP_THRESHOLD		(2048*1024)
 
 #ifdef ERTS_POLL_NEED_ASYNC_INTERRUPT_SUPPORT
 #  define ERTS_POLL_ASYNC_INTERRUPT_SUPPORT 1
@@ -563,6 +563,28 @@ free_update_requests_block(ErtsPollSet ps,
  * --- Growing poll set structures -------------------------------------------
  */
 
+int
+ERTS_POLL_EXPORT(erts_poll_get_table_len) (int new_len)
+{
+    if (new_len < ERTS_EV_TABLE_MIN_LENGTH) {
+	new_len = ERTS_EV_TABLE_MIN_LENGTH;
+    } else if (new_len < ERTS_EV_TABLE_EXP_THRESHOLD) {
+	/* find next power of 2 */
+	--new_len;
+	new_len |= new_len >> 1;
+	new_len |= new_len >> 2;
+	new_len |= new_len >> 4;
+	new_len |= new_len >> 8;
+	new_len |= new_len >> 16;
+	++new_len;
+    } else {
+	/* grow incrementally */
+	new_len += ERTS_EV_TABLE_EXP_THRESHOLD;
+    }
+    return new_len;
+}
+
+
 #if ERTS_POLL_USE_KERNEL_POLL
 static void
 grow_res_events(ErtsPollSet ps, int new_len)
@@ -575,7 +597,7 @@ grow_res_events(ErtsPollSet ps, int new_len)
 #elif ERTS_POLL_USE_KQUEUE
 	struct kevent
 #endif
-	)*new_len;
+	) * ERTS_POLL_EXPORT(erts_poll_get_table_len)(new_len);
     /* We do not need to save previously stored data */
     if (ps->res_events)
 	erts_free(ERTS_ALC_T_POLL_RES_EVS, ps->res_events);
@@ -589,7 +611,7 @@ static void
 grow_poll_fds(ErtsPollSet ps, int min_ix)
 {
     int i;
-    int new_len = min_ix + 1 + POLL_FDS_EXTRA_FREE_SIZE;
+    int new_len = ERTS_POLL_EXPORT(erts_poll_get_table_len)(min_ix + 1);
     if (new_len > max_fds)
 	new_len = max_fds;
     ps->poll_fds = (ps->poll_fds_len
@@ -611,7 +633,7 @@ static void
 grow_fds_status(ErtsPollSet ps, int min_fd)
 {
     int i;
-    int new_len = min_fd + 1 + FDS_STATUS_EXTRA_FREE_SIZE;
+    int new_len = ERTS_POLL_EXPORT(erts_poll_get_table_len)(min_fd + 1);
     ASSERT(min_fd < max_fds);
     if (new_len > max_fds)
 	new_len = max_fds;
diff --git a/erts/emulator/sys/common/erl_poll.h b/erts/emulator/sys/common/erl_poll.h
index 8dde619105..502290e4bb 100644
--- a/erts/emulator/sys/common/erl_poll.h
+++ b/erts/emulator/sys/common/erl_poll.h
@@ -246,4 +246,6 @@ void		ERTS_POLL_EXPORT(erts_poll_get_selected_events)(ErtsPollSet,
 								ErtsPollEvents [],
 								int);
 
+int		ERTS_POLL_EXPORT(erts_poll_get_table_len)(int);
+
 #endif /* #ifndef ERL_POLL_H__ */