Commit bd22d7f4 authored by Ondrej Zajicek (work)'s avatar Ondrej Zajicek (work)
Browse files

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.
parent 9e7b3ebd

proto/bgp/bgp.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -668,6 +668,10 @@ bgp_keepalive_timeout(timer *t) 




  DBG("BGP: Keepalive timer\n");

  DBG("BGP: Keepalive timer\n");

  bgp_schedule_packet(conn, PKT_KEEPALIVE);

  bgp_schedule_packet(conn, PKT_KEEPALIVE);



  /* Kick TX a bit faster */

  if (ev_active(conn->tx_ev))

    ev_run(conn->tx_ev);

}

}





static void

static void

sysdep/unix/io.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -2055,12 +2055,13 @@ io_loop(void) 
  for(;;)

  for(;;)

    {

    {

      events = ev_run_list(&global_event_list);

      events = ev_run_list(&global_event_list);

    timers:

      update_times();

      update_times();

      tout = tm_first_shot();

      tout = tm_first_shot();

      if (tout <= now)

      if (tout <= now)

	{

	{

	  tm_shot();

	  tm_shot();

	  continue;

	  goto timers;

	}

	}

      poll_tout = (events ? 0 : MIN(tout - now, 3)) * 1000; /* Time in milliseconds */

      poll_tout = (events ? 0 : MIN(tout - now, 3)) * 1000; /* Time in milliseconds */

CRA Git | Maintained and supported by SUSTech CRA and CCSE