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-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8de85843d57eaf70163ada070b6bedc1b2d6d13;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 5841e5bd3..b6751977d 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -670,6 +670,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 a747580db..297953346 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -2050,12 +2050,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 */