X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Funix%2Finput.c;h=9c7c54f6b1b0c898152c1276dc948f53d25347fc;hb=6ffb7c61899eb782416cbd2f117042a583f189f7;hp=43bb206eb293277cb23ccec5b13218e74bc9349b;hpb=f8d50682cd1245f6f5ce4c846ca6f1bdc11255a6;p=vpp.git

diff --git a/src/vlib/unix/input.c b/src/vlib/unix/input.c
index 43bb206eb29..9c7c54f6b1b 100644
--- a/src/vlib/unix/input.c
+++ b/src/vlib/unix/input.c
@@ -198,9 +198,9 @@ linux_epoll_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	  }
 	node->input_main_loops_per_call = 0;
       }
-    else if (is_main == 0 && vector_rate < 2
-	     && (vlib_global_main.time_last_barrier_release + 0.5 < now)
-	     && nm->input_node_counts_by_state[VLIB_NODE_STATE_POLLING] == 0)
+    else if (is_main == 0 && vector_rate < 2 &&
+	     (vlib_get_first_main ()->time_last_barrier_release + 0.5 < now) &&
+	     nm->input_node_counts_by_state[VLIB_NODE_STATE_POLLING] == 0)
       {
 	timeout = 10e-3;
 	timeout_ms = max_timeout_ms;
@@ -249,7 +249,8 @@ linux_epoll_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 
 		while (nanosleep (&ts, &tsrem) < 0)
 		  ts = tsrem;
-		if (*vlib_worker_threads->wait_at_barrier)
+		if (*vlib_worker_threads->wait_at_barrier ||
+		    *nm->pending_interrupts)
 		  goto done;
 	      }
 	  }
@@ -272,17 +273,18 @@ linux_epoll_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
   for (e = em->epoll_events; e < em->epoll_events + n_fds_ready; e++)
     {
       u32 i = e->data.u32;
-      clib_file_t *f = pool_elt_at_index (fm->file_pool, i);
+      clib_file_t *f;
       clib_error_t *errors[4];
       int n_errors = 0;
 
+      /*
+       * Under rare scenarios, epoll may still post us events for the
+       * deleted file descriptor. We just deal with it and throw away the
+       * events for the corresponding file descriptor.
+       */
+      f = fm->file_pool + i;
       if (PREDICT_FALSE (pool_is_free (fm->file_pool, f)))
 	{
-	  /*
-	   * Under rare scenerop, epoll may still post us events for the
-	   * deleted file descriptor. We just deal with it and throw away the
-	   * events for the corresponding file descriptor.
-	   */
 	  if (e->events & EPOLLIN)
 	    {
 	      errors[n_errors] =