Poll errors must also drop a corefile. And we shouldn't run sockets when sockets...

diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index b588b73644bc8c3741f2e9932aded9b3c58dce46..5ce2d3507dc9155b67be94c0ceb8d7fe5a287883 100644 (file)
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -367,7 +367,7 @@ sockets_fire(struct birdloop *loop)
       continue;
 
     if (pfd->revents & POLLNVAL)
-      die("poll: invalid fd %d", pfd->fd);
+      bug("poll: invalid fd %d", pfd->fd);
 
     if (pfd->revents & POLLIN)
       while (e && *psk && (*psk)->rx_hook)
@@ -602,7 +602,7 @@ birdloop_main(void *arg)
     {
       if (errno == EINTR || errno == EAGAIN)
        goto try;
-      die("poll: %m");
+      bug("poll: %m");
     }
 
     birdloop_enter(loop);
@@ -615,7 +615,7 @@ birdloop_main(void *arg)
 
     loop_begin = current_time();
 
-    if (rv)
+    if (rv && !loop->poll_changed)
       sockets_fire(loop);
 
     atomic_exchange_explicit(&loop->ping_sent, 0, memory_order_acq_rel);

diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index d4a3d79822b82d36026bf3561602ae954cb96aba..fb25d5d82112e287afe62dd1e9aecb611768388b 100644 (file)
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -2315,7 +2315,7 @@ io_loop(void)
        {
          if (errno == EINTR || errno == EAGAIN)
            continue;
-         die("poll: %m");
+         bug("poll: %m");
        }
       if (pout)
        {