Merge branch 'lukas/OTP-21.1.1/scheduler_pollset/OTP-15475' into maint

* lukas/OTP-21.1.1/scheduler_pollset/OTP-15475:
  erts: Move fds with active true behaviour to own pollset
  erts: Fix lists_member_2 reduction count
  erts: Allow code_model_small to be set in xcomp setting
  erts: Implement delay_send using timer instead of poll
  erts: Optimize driver_set_timer(0) to fire at once
  erts: Optimize the inet driver multi timers for one timer
  erts: Move all inet tcp CONNECTED timers to multi timer
  erts: Add erts_io_notify_port_task_executed to check_io msacc state
  erts: Add pre-alloc to ALLOC msacc state
  erts: Make thr prgr wakeup current or sched 1
  erts: Pass thread progress data where possible

1 files changed, 5 insertions, 16 deletions

diff --git a/erts/emulator/sys/common/erl_check_io.h b/erts/emulator/sys/common/erl_check_io.h
index 443ef1264c..31182be5ec 100644
--- a/erts/emulator/sys/common/erl_check_io.h
+++ b/erts/emulator/sys/common/erl_check_io.h
@@ -68,7 +68,7 @@ int erts_check_io_max_files(void);
  *
  * @param pt the poll thread structure to use.
  */
-void erts_check_io(struct erts_poll_thread *pt);
+void erts_check_io(struct erts_poll_thread *pt, ErtsMonotonicTime timeout_time);
 /**
  * Initialize the check io framework. This function will parse the arguments
  * and delete any entries that it is interested in.
@@ -90,8 +90,11 @@ void erts_check_io_interrupt(struct erts_poll_thread *pt, int set);
 /**
  * Create a new poll thread structure that is associated with the number no.
  * It is the callers responsibility that no is unique.
+ *
+ * @param no the id of the pollset thread, -2 = aux thread, -1 = scheduler
+ * @param tpd the thread progress data of the pollset thread
  */
-struct erts_poll_thread* erts_create_pollset_thread(int no);
+struct erts_poll_thread* erts_create_pollset_thread(int no, ErtsThrPrgrData *tpd);
 #ifdef ERTS_ENABLE_LOCK_COUNT
 /**
  * Toggle lock counting on all check io locks
@@ -126,16 +129,6 @@ extern int erts_no_poll_threads;
 #include "erl_poll.h"
 #include "erl_port_task.h"
 
-#ifdef __WIN32__
-/*
- * Current erts_poll implementation for Windows cannot handle
- * active events in the set of events polled.
- */
-#  define ERTS_CIO_DEFER_ACTIVE_EVENTS 1
-#else
-#  define ERTS_CIO_DEFER_ACTIVE_EVENTS 1
-#endif
-
 typedef struct {
     Eterm inport;
     Eterm outport;
@@ -147,10 +140,6 @@ struct erts_nif_select_event {
     Eterm pid;
     Eterm immed;
     Uint32 refn[ERTS_REF_NUMBERS];
-    Sint32 ddeselect_cnt; /* 0:  No delayed deselect in progress
-                           * 1:  Do deselect before next poll
-                           * >1: Countdown of ignored events
-                           */
 };
 
 typedef struct {