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, 1 deletions

diff --git a/erts/emulator/sys/common/erl_poll_api.h b/erts/emulator/sys/common/erl_poll_api.h
index 1170a549b9..f3a91e54f7 100644
--- a/erts/emulator/sys/common/erl_poll_api.h
+++ b/erts/emulator/sys/common/erl_poll_api.h
@@ -72,11 +72,15 @@ ErtsPollEvents ERTS_POLL_EXPORT(erts_poll_control)(ErtsPollSet *ps,
  * @param res an array of fd results that the ready fds are put in.
  * @param[in] length the length of the res array
  * @param[out] length the number of ready events returned in res
+ * @param tpd the thread progress data to note sleep state in
+ * @param timeout_time the time in native to wake up at
  * @return 0 on success, else the ERRNO of the error that happened.
  */
 int ERTS_POLL_EXPORT(erts_poll_wait)(ErtsPollSet *ps,
                                      ErtsPollResFd res[],
-                                     int *length);
+                                     int *length,
+                                     ErtsThrPrgrData *tpd,
+                                     ErtsMonotonicTime timeout_time);
 /**
  * Interrupt the thread waiting in the pollset. This function should be called
  * with set = 0 before any thread calls erts_poll_wait in order to clear any