From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Wed, 6 Apr 2016 09:57:28 +0000 (+0200)
Subject: IO: Avoid multiple event cycles in one loop cycle.
X-Git-Tag: v1.6.0~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd22d7f41d37dec8f7b8b845f6a18c775e66ddfc;p=thirdparty%2Fbird.git

IO: Avoid multiple event cycles in one loop cycle.

Event cycle may took too much time and trigger next timer events, so
avoid cycling between timer and event cycles inside the loop cycle.
---

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 7328cb79a..94c8e5c24 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -668,6 +668,10 @@ bgp_keepalive_timeout(timer *t)
 
   DBG("BGP: Keepalive timer\n");
   bgp_schedule_packet(conn, PKT_KEEPALIVE);
+
+  /* Kick TX a bit faster */
+  if (ev_active(conn->tx_ev))
+    ev_run(conn->tx_ev);
 }
 
 static void
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 078fe73c2..5955dbfef 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -2055,12 +2055,13 @@ io_loop(void)
   for(;;)
     {
       events = ev_run_list(&global_event_list);
+    timers:
       update_times();
       tout = tm_first_shot();
       if (tout <= now)
 	{
 	  tm_shot();
-	  continue;
+	  goto timers;
 	}
       poll_tout = (events ? 0 : MIN(tout - now, 3)) * 1000; /* Time in milliseconds */