Merge branch 'lukas/erts/scheduler-pollset-fixes/OTP-15538' into maint

* lukas/erts/scheduler-pollset-fixes/OTP-15538:
  erts: Fix getting of poll events on linux >= 4.15.0
  erts: Use reduction based polling for starved poll-set
  erts: Fix pollset test cases

2 files changed, 8 insertions, 6 deletions

diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c
index c681fa481f..ac9a070bce 100644
--- a/erts/emulator/sys/common/erl_check_io.c
+++ b/erts/emulator/sys/common/erl_check_io.c
@@ -2262,14 +2262,14 @@ erts_check_io_info(void *proc)
 
 #if ERTS_POLL_USE_FALLBACK
     erts_poll_info_flbk(get_fallback_pollset(), &piv[0]);
-    piv[0].poll_threads = 1;
+    piv[0].poll_threads = 0;
     piv[0].active_fds = 0;
     piv++;
 #endif
 
 #if ERTS_POLL_USE_SCHEDULER_POLLING
     erts_poll_info(get_scheduler_pollset(0), &piv[0]);
-    piv[0].poll_threads = 1;
+    piv[0].poll_threads = 0;
     piv[0].active_fds = 0;
     piv++;
 #endif
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c
index 51d50933ff..27ffba58bd 100644
--- a/erts/emulator/sys/common/erl_poll.c
+++ b/erts/emulator/sys/common/erl_poll.c
@@ -2326,6 +2326,7 @@ uint32_t epoll_events(int kp_fd, int fd)
 {
     /* For epoll we read the information about what is selected upon from the proc fs.*/
     char fname[30];
+    char s[256];
     FILE *f;
     unsigned int pos, flags, mnt_id;
     int line = 0;
@@ -2343,12 +2344,12 @@ uint32_t epoll_events(int kp_fd, int fd)
     }
     if (fscanf(f,"\nmnt_id:\t%x\n", &mnt_id));
     line += 3;
-    while (!feof(f)) {
+    while (fgets(s, sizeof(s) / sizeof(*s), f)) {
         /* tfd:       10 events: 40000019 data:       180000000a */
         int ev_fd;
         uint32_t events;
         uint64_t data;
-        if (fscanf(f,"tfd:%d events:%x data:%llx\n", &ev_fd, &events,
+        if (sscanf(s,"tfd:%d events:%x data:%llx", &ev_fd, &events,
                    (unsigned long long*)&data) != 3) {
             fprintf(stderr,"failed to parse file %s on line %d, errno = %d\n", fname,
                     line,
@@ -2392,6 +2393,7 @@ ERTS_POLL_EXPORT(erts_poll_get_selected_events)(ErtsPollSet *ps,
 
     /* For epoll we read the information about what is selected upon from the proc fs.*/
     char fname[30];
+    char s[256];
     FILE *f;
     unsigned int pos, flags, mnt_id;
     int line = 0;
@@ -2410,12 +2412,12 @@ ERTS_POLL_EXPORT(erts_poll_get_selected_events)(ErtsPollSet *ps,
     }
     if (fscanf(f,"\nmnt_id:\t%x\n", &mnt_id));
     line += 3;
-    while (!feof(f)) {
+    while (fgets(s, sizeof(s) / sizeof(*s), f)) {
         /* tfd:       10 events: 40000019 data:       180000000a */
         int fd;
         uint32_t events;
         uint64_t data;
-        if (fscanf(f,"tfd:%d events:%x data:%llx\n", &fd, &events,
+        if (sscanf(s,"tfd:%d events:%x data:%llx", &fd, &events,
                    (unsigned long long*)&data) != 3) {
             fprintf(stderr,"failed to parse file %s on line %d, errno = %d\n",
                     fname, line, errno);