X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vlib%2Fvlib%2Fthreads.c;h=67c57a60f41e76655c35aa248ceabf6dce0407c9;hb=1e7658340ac4cba20defba056c2e13ec0e1a0a69;hp=d2ce449f6ce6e11f28ceb09ea9cfa5f7bb8c6e55;hpb=0f8ecf0eb267d580da4d963a0e0420eb15238d78;p=vpp.git

diff --git a/vlib/vlib/threads.c b/vlib/vlib/threads.c
index d2ce449f6ce..67c57a60f41 100644
--- a/vlib/vlib/threads.c
+++ b/vlib/vlib/threads.c
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 #define _GNU_SOURCE
-#include <sched.h>
 
 #include <signal.h>
 #include <math.h>
@@ -41,12 +40,13 @@ DECLARE_CJ_GLOBAL_LOG;
  *  Weak definitions of DPDK symbols used in this file.
  *  Needed for linking test programs without DPDK libs.
  */
-unsigned __thread      __attribute__((weak)) RTE_PER_LCORE(_lcore_id);
-struct lcore_config    __attribute__((weak)) lcore_config[];
-unsigned               __attribute__((weak)) rte_socket_id();
-int                    __attribute__((weak)) rte_eal_remote_launch();
+unsigned __thread __attribute__ ((weak)) RTE_PER_LCORE (_lcore_id);
+struct lcore_config __attribute__ ((weak)) lcore_config[];
+unsigned __attribute__ ((weak)) rte_socket_id ();
+int __attribute__ ((weak)) rte_eal_remote_launch ();
 #endif
-u32 vl(void *p)
+u32
+vl (void *p)
 {
   return vec_len (p);
 }
@@ -56,7 +56,7 @@ vlib_thread_main_t vlib_thread_main;
 uword
 os_get_cpu_number (void)
 {
-  void * sp;
+  void *sp;
   uword n;
   u32 len;
 
@@ -67,8 +67,8 @@ os_get_cpu_number (void)
   /* Get any old stack address. */
   sp = &sp;
 
-  n = ((uword)sp - (uword)vlib_thread_stacks[0])
-      >> VLIB_LOG2_THREAD_STACK_SIZE;
+  n = ((uword) sp - (uword) vlib_thread_stacks[0])
+    >> VLIB_LOG2_THREAD_STACK_SIZE;
 
   /* "processes" have their own stacks, and they always run in thread 0 */
   n = n >= len ? 0 : n;
@@ -76,27 +76,45 @@ os_get_cpu_number (void)
   return n;
 }
 
+uword
+os_get_ncpus (void)
+{
+  u32 len;
+
+  len = vec_len (vlib_thread_stacks);
+  if (len == 0)
+    return 1;
+  else
+    return len;
+}
+
 void
 vlib_set_thread_name (char *name)
 {
   int pthread_setname_np (pthread_t __target_thread, const char *__name);
-  pthread_t thread = pthread_self();
+  int rv;
+  pthread_t thread = pthread_self ();
 
-  if (thread) 
-    pthread_setname_np(thread, name);
+  if (thread)
+    {
+      rv = pthread_setname_np (thread, name);
+      if (rv)
+	clib_warning ("pthread_setname_np returned %d", rv);
+    }
 }
 
-static int sort_registrations_by_no_clone  (void *a0, void * a1)
-{ 
-  vlib_thread_registration_t ** tr0 = a0;
-  vlib_thread_registration_t ** tr1 = a1;
+static int
+sort_registrations_by_no_clone (void *a0, void *a1)
+{
+  vlib_thread_registration_t **tr0 = a0;
+  vlib_thread_registration_t **tr1 = a1;
 
-  return ((i32)((*tr0)->no_data_structure_clone) 
-          - ((i32)((*tr1)->no_data_structure_clone)));
+  return ((i32) ((*tr0)->no_data_structure_clone)
+	  - ((i32) ((*tr1)->no_data_structure_clone)));
 }
 
 static uword *
-vlib_sysfs_list_to_bitmap(char * filename)
+vlib_sysfs_list_to_bitmap (char *filename)
 {
   FILE *fp;
   uword *r = 0;
@@ -105,17 +123,19 @@ vlib_sysfs_list_to_bitmap(char * filename)
 
   if (fp != NULL)
     {
-      u8 * buffer = 0;
-      vec_validate (buffer, 256-1);
-      if (fgets ((char *)buffer, 256, fp))
-        {
-          unformat_input_t in;
-          unformat_init_string (&in, (char *) buffer, strlen ((char *) buffer));
-          unformat(&in, "%U", unformat_bitmap_list, &r);
-          unformat_free (&in);
-        }
-      vec_free(buffer);
-      fclose(fp);
+      u8 *buffer = 0;
+      vec_validate (buffer, 256 - 1);
+      if (fgets ((char *) buffer, 256, fp))
+	{
+	  unformat_input_t in;
+	  unformat_init_string (&in, (char *) buffer,
+				strlen ((char *) buffer));
+	  if (unformat (&in, "%U", unformat_bitmap_list, &r) != 1)
+	    clib_warning ("unformat_bitmap_list failed");
+	  unformat_free (&in);
+	}
+      vec_free (buffer);
+      fclose (fp);
     }
   return r;
 }
@@ -126,75 +146,86 @@ vlib_sysfs_list_to_bitmap(char * filename)
 clib_error_t *
 vlib_thread_init (vlib_main_t * vm)
 {
-  vlib_thread_main_t * tm = &vlib_thread_main;
-  vlib_worker_thread_t * w;
-  vlib_thread_registration_t * tr;
+  vlib_thread_main_t *tm = &vlib_thread_main;
+  vlib_worker_thread_t *w;
+  vlib_thread_registration_t *tr;
   u32 n_vlib_mains = 1;
   u32 first_index = 1;
   u32 i;
-  uword * avail_cpu;
+  uword *avail_cpu;
 
   /* get bitmaps of active cpu cores and sockets */
   tm->cpu_core_bitmap =
-    vlib_sysfs_list_to_bitmap("/sys/devices/system/cpu/online");
+    vlib_sysfs_list_to_bitmap ("/sys/devices/system/cpu/online");
   tm->cpu_socket_bitmap =
-    vlib_sysfs_list_to_bitmap("/sys/devices/system/node/online");
+    vlib_sysfs_list_to_bitmap ("/sys/devices/system/node/online");
 
-  avail_cpu = clib_bitmap_dup(tm->cpu_core_bitmap);
+  avail_cpu = clib_bitmap_dup (tm->cpu_core_bitmap);
 
   /* skip cores */
-  for (i=0; i < tm->skip_cores; i++)
+  for (i = 0; i < tm->skip_cores; i++)
     {
-      uword c = clib_bitmap_first_set(avail_cpu);
+      uword c = clib_bitmap_first_set (avail_cpu);
       if (c == ~0)
-        return clib_error_return (0, "no available cpus to skip");
+	return clib_error_return (0, "no available cpus to skip");
 
-      avail_cpu = clib_bitmap_set(avail_cpu, c, 0);
+      avail_cpu = clib_bitmap_set (avail_cpu, c, 0);
     }
 
   /* grab cpu for main thread */
   if (!tm->main_lcore)
     {
-      tm->main_lcore = clib_bitmap_first_set(avail_cpu);
-      if (tm->main_lcore == (u8) ~0)
-        return clib_error_return (0, "no available cpus to be used for the"
-                                  " main thread");
+      tm->main_lcore = clib_bitmap_first_set (avail_cpu);
+      if (tm->main_lcore == (u8) ~ 0)
+	return clib_error_return (0, "no available cpus to be used for the"
+				  " main thread");
     }
   else
     {
-      if (clib_bitmap_get(avail_cpu, tm->main_lcore) == 0)
-        return clib_error_return (0, "cpu %u is not available to be used"
-                                  " for the main thread", tm->main_lcore);
+      if (clib_bitmap_get (avail_cpu, tm->main_lcore) == 0)
+	return clib_error_return (0, "cpu %u is not available to be used"
+				  " for the main thread", tm->main_lcore);
     }
-  avail_cpu = clib_bitmap_set(avail_cpu, tm->main_lcore, 0);
+  avail_cpu = clib_bitmap_set (avail_cpu, tm->main_lcore, 0);
 
   /* assume that there is socket 0 only if there is no data from sysfs */
   if (!tm->cpu_socket_bitmap)
-    tm->cpu_socket_bitmap = clib_bitmap_set(0, 0, 1);
+    tm->cpu_socket_bitmap = clib_bitmap_set (0, 0, 1);
 
   /* pin main thread to main_lcore  */
 #if DPDK==0
   {
-     cpu_set_t cpuset;
-     CPU_ZERO(&cpuset);
-     CPU_SET(tm->main_lcore, &cpuset);
-     pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
+    cpu_set_t cpuset;
+    CPU_ZERO (&cpuset);
+    CPU_SET (tm->main_lcore, &cpuset);
+    pthread_setaffinity_np (pthread_self (), sizeof (cpu_set_t), &cpuset);
   }
 #endif
 
   /* as many threads as stacks... */
-  vec_validate_aligned (vlib_worker_threads, vec_len(vlib_thread_stacks)-1,
-                        CLIB_CACHE_LINE_BYTES);
+  vec_validate_aligned (vlib_worker_threads, vec_len (vlib_thread_stacks) - 1,
+			CLIB_CACHE_LINE_BYTES);
 
   /* Preallocate thread 0 */
-  _vec_len(vlib_worker_threads) = 1;
+  _vec_len (vlib_worker_threads) = 1;
   w = vlib_worker_threads;
-  w->thread_mheap = clib_mem_get_heap();
+  w->thread_mheap = clib_mem_get_heap ();
   w->thread_stack = vlib_thread_stacks[0];
   w->dpdk_lcore_id = -1;
-  w->lwp = syscall(SYS_gettid);
+  w->lwp = syscall (SYS_gettid);
   tm->n_vlib_mains = 1;
 
+  if (tm->sched_policy != ~0)
+    {
+      struct sched_param sched_param;
+      if (!sched_getparam (w->lwp, &sched_param))
+	{
+	  if (tm->sched_priority != ~0)
+	    sched_param.sched_priority = tm->sched_priority;
+	  sched_setscheduler (w->lwp, tm->sched_policy, &sched_param);
+	}
+    }
+
   /* assign threads to cores and set n_vlib_mains */
   tr = tm->next;
 
@@ -204,8 +235,7 @@ vlib_thread_init (vlib_main_t * vm)
       tr = tr->next;
     }
 
-  vec_sort_with_function
-    (tm->registrations, sort_registrations_by_no_clone);
+  vec_sort_with_function (tm->registrations, sort_registrations_by_no_clone);
 
   for (i = 0; i < vec_len (tm->registrations); i++)
     {
@@ -217,11 +247,12 @@ vlib_thread_init (vlib_main_t * vm)
 
       /* construct coremask */
       if (tr->use_pthreads || !tr->count)
-        continue;
+	continue;
 
       if (tr->coremask)
-        {
-          uword c;
+	{
+	  uword c;
+          /* *INDENT-OFF* */
           clib_bitmap_foreach (c, tr->coremask, ({
             if (clib_bitmap_get(avail_cpu, c) == 0)
               return clib_error_return (0, "cpu %u is not available to be used"
@@ -229,92 +260,98 @@ vlib_thread_init (vlib_main_t * vm)
 
             avail_cpu = clib_bitmap_set(avail_cpu, c, 0);
           }));
+/* *INDENT-ON* */
 
-        }
+	}
       else
-        {
-          for (j=0; j < tr->count; j++)
-            {
-              uword c = clib_bitmap_first_set(avail_cpu);
-              if (c == ~0)
-              return clib_error_return (0, "no available cpus to be used for"
-                                        " the '%s' thread", tr->name);
-
-              avail_cpu = clib_bitmap_set(avail_cpu, c, 0);
-              tr->coremask = clib_bitmap_set(tr->coremask, c, 1);
-            }
-        }
+	{
+	  for (j = 0; j < tr->count; j++)
+	    {
+	      uword c = clib_bitmap_first_set (avail_cpu);
+	      if (c == ~0)
+		return clib_error_return (0,
+					  "no available cpus to be used for"
+					  " the '%s' thread", tr->name);
+
+	      avail_cpu = clib_bitmap_set (avail_cpu, c, 0);
+	      tr->coremask = clib_bitmap_set (tr->coremask, c, 1);
+	    }
+	}
     }
 
-  clib_bitmap_free(avail_cpu);
+  clib_bitmap_free (avail_cpu);
 
   tm->n_vlib_mains = n_vlib_mains;
 
-  vec_validate_aligned (vlib_worker_threads, first_index-1,
-                        CLIB_CACHE_LINE_BYTES);
+  vec_validate_aligned (vlib_worker_threads, first_index - 1,
+			CLIB_CACHE_LINE_BYTES);
 
 
   tm->efd.enabled = VLIB_EFD_DISABLED;
   tm->efd.queue_hi_thresh = ((VLIB_EFD_DEF_WORKER_HI_THRESH_PCT *
-                              FRAME_QUEUE_NELTS)/100);
+			      FRAME_QUEUE_NELTS) / 100);
   return 0;
 }
 
 vlib_worker_thread_t *
 vlib_alloc_thread (vlib_main_t * vm)
 {
-  vlib_worker_thread_t * w;
+  vlib_worker_thread_t *w;
 
-  if (vec_len(vlib_worker_threads) >= vec_len (vlib_thread_stacks))
+  if (vec_len (vlib_worker_threads) >= vec_len (vlib_thread_stacks))
     {
       clib_warning ("out of worker threads... Quitting...");
-      exit(1);
+      exit (1);
     }
   vec_add2 (vlib_worker_threads, w, 1);
   w->thread_stack = vlib_thread_stacks[w - vlib_worker_threads];
   return w;
 }
 
-vlib_frame_queue_t * vlib_frame_queue_alloc (int nelts)
+vlib_frame_queue_t *
+vlib_frame_queue_alloc (int nelts)
 {
-  vlib_frame_queue_t * fq;
+  vlib_frame_queue_t *fq;
 
-  fq = clib_mem_alloc_aligned(sizeof (*fq), CLIB_CACHE_LINE_BYTES);
+  fq = clib_mem_alloc_aligned (sizeof (*fq), CLIB_CACHE_LINE_BYTES);
   memset (fq, 0, sizeof (*fq));
   fq->nelts = nelts;
-  fq->vector_threshold = 128; // packets
-  vec_validate_aligned (fq->elts, nelts-1, CLIB_CACHE_LINE_BYTES);
+  fq->vector_threshold = 128;	// packets
+  vec_validate_aligned (fq->elts, nelts - 1, CLIB_CACHE_LINE_BYTES);
 
   if (1)
-  {
-    if (((uword)&fq->tail) & (CLIB_CACHE_LINE_BYTES - 1))
-      fformat(stderr, "WARNING: fq->tail unaligned\n");
-    if (((uword)&fq->head) & (CLIB_CACHE_LINE_BYTES - 1))
-      fformat(stderr, "WARNING: fq->head unaligned\n");
-    if (((uword)fq->elts) & (CLIB_CACHE_LINE_BYTES - 1))
-      fformat(stderr, "WARNING: fq->elts unaligned\n");
-    
-    if (sizeof (fq->elts[0]) % CLIB_CACHE_LINE_BYTES)
-      fformat(stderr, "WARNING: fq->elts[0] size %d\n", 
-              sizeof (fq->elts[0]));
-    if (nelts & (nelts -1))
-      {
-        fformat (stderr, "FATAL: nelts MUST be a power of 2\n");
-        abort();
-      }
-  }
-  
+    {
+      if (((uword) & fq->tail) & (CLIB_CACHE_LINE_BYTES - 1))
+	fformat (stderr, "WARNING: fq->tail unaligned\n");
+      if (((uword) & fq->head) & (CLIB_CACHE_LINE_BYTES - 1))
+	fformat (stderr, "WARNING: fq->head unaligned\n");
+      if (((uword) fq->elts) & (CLIB_CACHE_LINE_BYTES - 1))
+	fformat (stderr, "WARNING: fq->elts unaligned\n");
+
+      if (sizeof (fq->elts[0]) % CLIB_CACHE_LINE_BYTES)
+	fformat (stderr, "WARNING: fq->elts[0] size %d\n",
+		 sizeof (fq->elts[0]));
+      if (nelts & (nelts - 1))
+	{
+	  fformat (stderr, "FATAL: nelts MUST be a power of 2\n");
+	  abort ();
+	}
+    }
+
   return (fq);
 }
 
 void vl_msg_api_handler_no_free (void *) __attribute__ ((weak));
-void vl_msg_api_handler_no_free (void *v) { }
+void
+vl_msg_api_handler_no_free (void *v)
+{
+}
 
 /* Turned off, save as reference material... */
 #if 0
-static inline int vlib_frame_queue_dequeue_internal (int thread_id, 
-                                                      vlib_main_t *vm, 
-                                                      vlib_node_main_t *nm)
+static inline int
+vlib_frame_queue_dequeue_internal (int thread_id,
+				   vlib_main_t * vm, vlib_node_main_t * nm)
 {
   vlib_frame_queue_t *fq = vlib_frame_queues[thread_id];
   vlib_frame_queue_elt_t *elt;
@@ -325,78 +362,79 @@ static inline int vlib_frame_queue_dequeue_internal (int thread_id,
   int msg_type;
   u64 before;
   int processed = 0;
-  
-  ASSERT(vm == vlib_mains[thread_id]);
+
+  ASSERT (vm == vlib_mains[thread_id]);
 
   while (1)
     {
       if (fq->head == fq->tail)
-        return processed;
+	return processed;
 
-      elt = fq->elts + ((fq->head+1) & (fq->nelts-1));
+      elt = fq->elts + ((fq->head + 1) & (fq->nelts - 1));
 
       if (!elt->valid)
-        return processed;
+	return processed;
 
-      before = clib_cpu_time_now();
+      before = clib_cpu_time_now ();
 
       f = elt->frame;
       node_runtime_index = elt->node_runtime_index;
       msg_type = elt->msg_type;
 
       switch (msg_type)
-        {
-        case VLIB_FRAME_QUEUE_ELT_FREE_BUFFERS:
-          vlib_buffer_free (vm, vlib_frame_vector_args (f), f->n_vectors);
-          /* note fallthrough... */
-        case VLIB_FRAME_QUEUE_ELT_FREE_FRAME:
-          r = vec_elt_at_index (nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL], 
-                                node_runtime_index);
-          vlib_frame_free (vm, r, f);
-          break;
-        case VLIB_FRAME_QUEUE_ELT_DISPATCH_FRAME:
-          vec_add2 (vm->node_main.pending_frames, p, 1);
-          f->flags |= (VLIB_FRAME_PENDING | VLIB_FRAME_FREE_AFTER_DISPATCH);
-          p->node_runtime_index = elt->node_runtime_index;
-          p->frame_index = vlib_frame_index (vm, f);
-          p->next_frame_index = VLIB_PENDING_FRAME_NO_NEXT_FRAME;
-          fq->dequeue_vectors += (u64) f->n_vectors;
-          break;
-        case VLIB_FRAME_QUEUE_ELT_API_MSG:
-          vl_msg_api_handler_no_free (f);
-          break;
-        default:
-          clib_warning ("bogus frame queue message, type %d", msg_type);
-          break;
-        }
+	{
+	case VLIB_FRAME_QUEUE_ELT_FREE_BUFFERS:
+	  vlib_buffer_free (vm, vlib_frame_vector_args (f), f->n_vectors);
+	  /* note fallthrough... */
+	case VLIB_FRAME_QUEUE_ELT_FREE_FRAME:
+	  r = vec_elt_at_index (nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL],
+				node_runtime_index);
+	  vlib_frame_free (vm, r, f);
+	  break;
+	case VLIB_FRAME_QUEUE_ELT_DISPATCH_FRAME:
+	  vec_add2 (vm->node_main.pending_frames, p, 1);
+	  f->flags |= (VLIB_FRAME_PENDING | VLIB_FRAME_FREE_AFTER_DISPATCH);
+	  p->node_runtime_index = elt->node_runtime_index;
+	  p->frame_index = vlib_frame_index (vm, f);
+	  p->next_frame_index = VLIB_PENDING_FRAME_NO_NEXT_FRAME;
+	  fq->dequeue_vectors += (u64) f->n_vectors;
+	  break;
+	case VLIB_FRAME_QUEUE_ELT_API_MSG:
+	  vl_msg_api_handler_no_free (f);
+	  break;
+	default:
+	  clib_warning ("bogus frame queue message, type %d", msg_type);
+	  break;
+	}
       elt->valid = 0;
       fq->dequeues++;
-      fq->dequeue_ticks += clib_cpu_time_now() - before;
-      CLIB_MEMORY_BARRIER();
+      fq->dequeue_ticks += clib_cpu_time_now () - before;
+      CLIB_MEMORY_BARRIER ();
       fq->head++;
       processed++;
     }
-  ASSERT(0);
+  ASSERT (0);
   return processed;
 }
 
-int vlib_frame_queue_dequeue (int thread_id, 
-                               vlib_main_t *vm, 
-                               vlib_node_main_t *nm)
+int
+vlib_frame_queue_dequeue (int thread_id,
+			  vlib_main_t * vm, vlib_node_main_t * nm)
 {
   return vlib_frame_queue_dequeue_internal (thread_id, vm, nm);
 }
 
-int vlib_frame_queue_enqueue (vlib_main_t *vm, u32 node_runtime_index,
-                              u32 frame_queue_index, vlib_frame_t *frame,
-                              vlib_frame_queue_msg_type_t type)
+int
+vlib_frame_queue_enqueue (vlib_main_t * vm, u32 node_runtime_index,
+			  u32 frame_queue_index, vlib_frame_t * frame,
+			  vlib_frame_queue_msg_type_t type)
 {
   vlib_frame_queue_t *fq = vlib_frame_queues[frame_queue_index];
   vlib_frame_queue_elt_t *elt;
   u32 save_count;
   u64 new_tail;
-  u64 before = clib_cpu_time_now();
-  
+  u64 before = clib_cpu_time_now ();
+
   ASSERT (fq);
 
   new_tail = __sync_add_and_fetch (&fq->tail, 1);
@@ -410,10 +448,10 @@ int vlib_frame_queue_enqueue (vlib_main_t *vm, u32 node_runtime_index,
       // vlib_frame_queue_dequeue (vm->cpu_index, vm, nm);
     }
 
-  elt = fq->elts + (new_tail & (fq->nelts-1));
+  elt = fq->elts + (new_tail & (fq->nelts - 1));
 
   /* this would be very bad... */
-  while (elt->valid) 
+  while (elt->valid)
     {
     }
 
@@ -423,7 +461,7 @@ int vlib_frame_queue_enqueue (vlib_main_t *vm, u32 node_runtime_index,
   elt->frame = frame;
   elt->node_runtime_index = node_runtime_index;
   elt->msg_type = type;
-  CLIB_MEMORY_BARRIER();
+  CLIB_MEMORY_BARRIER ();
   elt->valid = 1;
 
   return save_count;
@@ -431,10 +469,11 @@ int vlib_frame_queue_enqueue (vlib_main_t *vm, u32 node_runtime_index,
 #endif /* 0 */
 
 /* To be called by vlib worker threads upon startup */
-void vlib_worker_thread_init (vlib_worker_thread_t * w)
+void
+vlib_worker_thread_init (vlib_worker_thread_t * w)
 {
-  vlib_thread_main_t *tm = vlib_get_thread_main();
-  
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+
   /* worker threads wants no signals. */
   {
     sigset_t s;
@@ -444,13 +483,11 @@ void vlib_worker_thread_init (vlib_worker_thread_t * w)
 
   clib_mem_set_heap (w->thread_mheap);
 
-  if (vec_len(tm->thread_prefix) && w->registration->short_name)
+  if (vec_len (tm->thread_prefix) && w->registration->short_name)
     {
-      w->name = format(0, "%v_%s_%d%c", tm->thread_prefix,
-                                        w->registration->short_name,
-                                        w->instance_id,
-                                        '\0');
-      vlib_set_thread_name((char *)w->name);
+      w->name = format (0, "%v_%s_%d%c", tm->thread_prefix,
+			w->registration->short_name, w->instance_id, '\0');
+      vlib_set_thread_name ((char *) w->name);
     }
 
   if (!w->registration->use_pthreads)
@@ -460,79 +497,80 @@ void vlib_worker_thread_init (vlib_worker_thread_t * w)
       clib_smp_atomic_add (vlib_worker_threads->workers_at_barrier, 1);
 
       while (*vlib_worker_threads->wait_at_barrier)
-          ;
+	;
 
       clib_smp_atomic_add (vlib_worker_threads->workers_at_barrier, -1);
     }
 }
 
-void *vlib_worker_thread_bootstrap_fn (void *arg)
+void *
+vlib_worker_thread_bootstrap_fn (void *arg)
 {
   void *rv;
   vlib_worker_thread_t *w = arg;
-  
-  w->lwp = syscall(SYS_gettid);
+
+  w->lwp = syscall (SYS_gettid);
   w->dpdk_lcore_id = -1;
 #if DPDK==1
-  if (w->registration && !w->registration->use_pthreads &&
-      rte_socket_id) /* do we really have dpdk linked */
+  if (w->registration && !w->registration->use_pthreads && rte_socket_id)	/* do we really have dpdk linked */
     {
-      unsigned lcore = rte_lcore_id();
+      unsigned lcore = rte_lcore_id ();
       lcore = lcore < RTE_MAX_LCORE ? lcore : -1;
       w->dpdk_lcore_id = lcore;
     }
 #endif
 
-  rv = (void *) clib_calljmp 
-      ((uword (*)(uword)) w->thread_function, 
-       (uword) arg, w->thread_stack + VLIB_THREAD_STACK_SIZE);
+  rv = (void *) clib_calljmp
+    ((uword (*)(uword)) w->thread_function,
+     (uword) arg, w->thread_stack + VLIB_THREAD_STACK_SIZE);
   /* NOTREACHED, we hope */
   return rv;
 }
 
 static int
-vlib_launch_thread (void *fp, vlib_worker_thread_t *w, unsigned lcore_id)
+vlib_launch_thread (void *fp, vlib_worker_thread_t * w, unsigned lcore_id)
 {
-  void *(*fp_arg)(void *) = fp;
+  void *(*fp_arg) (void *) = fp;
 
 #if DPDK==1
   if (!w->registration->use_pthreads)
-    if (rte_eal_remote_launch) /* do we have dpdk linked */
-      return rte_eal_remote_launch (fp, (void *)w, lcore_id);
+    if (rte_eal_remote_launch)	/* do we have dpdk linked */
+      return rte_eal_remote_launch (fp, (void *) w, lcore_id);
     else
       return -1;
   else
 #endif
-  {
-    int ret;
-    pthread_t worker;
-    cpu_set_t cpuset;
-    CPU_ZERO(&cpuset);
-    CPU_SET(lcore_id, &cpuset);
-
-    ret = pthread_create (&worker, NULL /* attr */, fp_arg, (void *)w);
-    if(ret == 0)
-        return pthread_setaffinity_np(worker, sizeof(cpu_set_t), &cpuset);
-    else
-        return ret;
-  }
+    {
+      int ret;
+      pthread_t worker;
+      cpu_set_t cpuset;
+      CPU_ZERO (&cpuset);
+      CPU_SET (lcore_id, &cpuset);
+
+      ret = pthread_create (&worker, NULL /* attr */ , fp_arg, (void *) w);
+      if (ret == 0)
+	return pthread_setaffinity_np (worker, sizeof (cpu_set_t), &cpuset);
+      else
+	return ret;
+    }
 }
 
-static clib_error_t * start_workers (vlib_main_t * vm)
+static clib_error_t *
+start_workers (vlib_main_t * vm)
 {
   int i, j;
   vlib_worker_thread_t *w;
   vlib_main_t *vm_clone;
   void *oldheap;
   vlib_frame_queue_t *fq;
-  vlib_thread_main_t * tm = &vlib_thread_main;
-  vlib_thread_registration_t * tr; 
-  vlib_node_runtime_t * rt;
+  vlib_thread_main_t *tm = &vlib_thread_main;
+  vlib_thread_registration_t *tr;
+  vlib_node_runtime_t *rt;
   u32 n_vlib_mains = tm->n_vlib_mains;
   u32 worker_thread_index;
-  u8 * main_heap = clib_mem_get_per_cpu_heap();
-  mheap_t * main_heap_header = mheap_header (main_heap);
-      
+  u8 *main_heap = clib_mem_get_per_cpu_heap ();
+  mheap_t *main_heap_header = mheap_header (main_heap);
+
   vec_reset_length (vlib_worker_threads);
 
   /* Set up the main thread */
@@ -540,32 +578,31 @@ static clib_error_t * start_workers (vlib_main_t * vm)
   w->elog_track.name = "main thread";
   elog_track_register (&vm->elog_main, &w->elog_track);
 
-  if (vec_len(tm->thread_prefix))
+  if (vec_len (tm->thread_prefix))
     {
-      w->name = format(0, "%v_main%c", tm->thread_prefix, '\0');
-      vlib_set_thread_name((char *)w->name);
+      w->name = format (0, "%v_main%c", tm->thread_prefix, '\0');
+      vlib_set_thread_name ((char *) w->name);
     }
 
 #if DPDK==1
   w->dpdk_lcore_id = -1;
-  if (rte_socket_id) /* do we really have dpdk linked */
+  if (rte_socket_id)		/* do we really have dpdk linked */
     {
-      unsigned lcore = rte_lcore_id();
+      unsigned lcore = rte_lcore_id ();
       w->dpdk_lcore_id = lcore < RTE_MAX_LCORE ? lcore : -1;;
     }
 #endif
 
-  /* 
+  /*
    * Truth of the matter: we always use at least two
-   * threads. So, make the main heap thread-safe 
+   * threads. So, make the main heap thread-safe
    * and make the event log thread-safe.
    */
   main_heap_header->flags |= MHEAP_FLAG_THREAD_SAFE;
-  vm->elog_main.lock = 
-    clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, 
-                            CLIB_CACHE_LINE_BYTES);
+  vm->elog_main.lock =
+    clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES);
   vm->elog_main.lock[0] = 0;
-          
+
   if (n_vlib_mains > 1)
     {
       vec_validate (vlib_mains, tm->n_vlib_mains - 1);
@@ -577,10 +614,10 @@ static clib_error_t * start_workers (vlib_main_t * vm)
       fq = vlib_frame_queue_alloc (FRAME_QUEUE_NELTS);
       vec_add1 (vlib_frame_queues, fq);
 
-      vlib_worker_threads->wait_at_barrier = 
-        clib_mem_alloc_aligned (sizeof (u32), CLIB_CACHE_LINE_BYTES);
+      vlib_worker_threads->wait_at_barrier =
+	clib_mem_alloc_aligned (sizeof (u32), CLIB_CACHE_LINE_BYTES);
       vlib_worker_threads->workers_at_barrier =
-        clib_mem_alloc_aligned (sizeof (u32), CLIB_CACHE_LINE_BYTES);
+	clib_mem_alloc_aligned (sizeof (u32), CLIB_CACHE_LINE_BYTES);
 
       /* Ask for an initial barrier sync */
       *vlib_worker_threads->workers_at_barrier = 0;
@@ -588,132 +625,139 @@ static clib_error_t * start_workers (vlib_main_t * vm)
 
       worker_thread_index = 1;
 
-      for (i = 0; i < vec_len(tm->registrations); i++)
-        {
-          vlib_node_main_t *nm, *nm_clone;
-          vlib_buffer_main_t *bm_clone;
-          vlib_buffer_free_list_t *fl_clone, *fl_orig;
-          vlib_buffer_free_list_t *orig_freelist_pool;
-          int k;
-
-          tr = tm->registrations[i];
-
-          if (tr->count == 0)
-            continue;
-
-          for (k = 0; k < tr->count; k++)
-          {
-            vec_add2 (vlib_worker_threads, w, 1);
-            if (tr->mheap_size)
-              w->thread_mheap = mheap_alloc (0 /* use VM */, tr->mheap_size);
-            else
-              w->thread_mheap = main_heap;
-            w->thread_stack = vlib_thread_stacks[w - vlib_worker_threads];
-            w->thread_function = tr->function;
-            w->thread_function_arg = w;
-            w->instance_id = k;
-            w->registration = tr; 
-            
-            w->elog_track.name = 
-                (char *) format (0, "%s %d", tr->name, k+1);
-            vec_add1 (w->elog_track.name, 0);
-            elog_track_register (&vm->elog_main, &w->elog_track);
-            
-            if (tr->no_data_structure_clone)
-              continue;
-
-            /* Allocate "to-worker-N" frame queue */
-            if (tr->frame_queue_nelts) {
-                fq = vlib_frame_queue_alloc (tr->frame_queue_nelts);
-            } else {
-                fq = vlib_frame_queue_alloc (FRAME_QUEUE_NELTS);
-            }
-
-            vec_validate (vlib_frame_queues, worker_thread_index);
-            vlib_frame_queues[worker_thread_index] = fq;
-
-            /* Fork vlib_global_main et al. Look for bugs here */
-            oldheap = clib_mem_set_heap (w->thread_mheap);
-
-            vm_clone = clib_mem_alloc (sizeof (*vm_clone));
-            clib_memcpy (vm_clone, vlib_mains[0], sizeof (*vm_clone));
-
-            vm_clone->cpu_index = worker_thread_index;
-            vm_clone->heap_base = w->thread_mheap;
-            vm_clone->mbuf_alloc_list = 0;
-            memset (&vm_clone->random_buffer, 0, sizeof (vm_clone->random_buffer));
-
-            nm = &vlib_mains[0]->node_main;
-            nm_clone = &vm_clone->node_main;
-            /* fork next frames array, preserving node runtime indices */
-            nm_clone->next_frames = vec_dup (nm->next_frames);
-            for (j = 0; j < vec_len (nm_clone->next_frames); j++)
-              {
-                vlib_next_frame_t *nf = &nm_clone->next_frames[j];
-                u32 save_node_runtime_index;
-                u32 save_flags;
-
-                save_node_runtime_index = nf->node_runtime_index;
-                save_flags = nf->flags & VLIB_FRAME_NO_FREE_AFTER_DISPATCH;
-                vlib_next_frame_init (nf);
-                nf->node_runtime_index = save_node_runtime_index;
-                nf->flags = save_flags;
-              }
-
-            /* fork the frame dispatch queue */
-            nm_clone->pending_frames = 0;
-            vec_validate (nm_clone->pending_frames, 10); /* $$$$$?????? */
-            _vec_len (nm_clone->pending_frames) = 0;
-
-            /* fork nodes */
-            nm_clone->nodes = 0;
-            for (j = 0; j < vec_len (nm->nodes); j++) 
-              {
-                vlib_node_t *n;
-                n = clib_mem_alloc_no_fail (sizeof(*n));
-                clib_memcpy (n, nm->nodes[j], sizeof (*n));
-                /* none of the copied nodes have enqueue rights given out */
-                n->owner_node_index = VLIB_INVALID_NODE_INDEX;
-                memset (&n->stats_total, 0, sizeof (n->stats_total));
-                memset (&n->stats_last_clear, 0, sizeof (n->stats_last_clear));
-                vec_add1 (nm_clone->nodes, n);
-              }
-            nm_clone->nodes_by_type[VLIB_NODE_TYPE_INTERNAL] =
-              vec_dup (nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL]);
-
-            nm_clone->nodes_by_type[VLIB_NODE_TYPE_INPUT] =
-              vec_dup (nm->nodes_by_type[VLIB_NODE_TYPE_INPUT]);
-            vec_foreach(rt, nm_clone->nodes_by_type[VLIB_NODE_TYPE_INPUT])
-              rt->cpu_index = vm_clone->cpu_index;
-
-            nm_clone->processes = vec_dup (nm->processes);
-
-            /* zap the (per worker) frame freelists, etc */
-            nm_clone->frame_sizes = 0;
-            nm_clone->frame_size_hash = 0;
-
-            /* Packet trace buffers are guaranteed to be empty, nothing to do here */
-
-            clib_mem_set_heap (oldheap);
-            vec_add1 (vlib_mains, vm_clone);
-
-	    vm_clone->error_main.counters =
-	      vec_dup(vlib_mains[0]->error_main.counters);
-	    vm_clone->error_main.counters_last_clear =
-	      vec_dup(vlib_mains[0]->error_main.counters_last_clear);
-
-            /* Fork the vlib_buffer_main_t free lists, etc. */
-            bm_clone = vec_dup (vm_clone->buffer_main);
-            vm_clone->buffer_main = bm_clone;
-
-            orig_freelist_pool = bm_clone->buffer_free_list_pool;
-            bm_clone->buffer_free_list_pool = 0;
-
+      for (i = 0; i < vec_len (tm->registrations); i++)
+	{
+	  vlib_node_main_t *nm, *nm_clone;
+	  vlib_buffer_main_t *bm_clone;
+	  vlib_buffer_free_list_t *fl_clone, *fl_orig;
+	  vlib_buffer_free_list_t *orig_freelist_pool;
+	  int k;
+
+	  tr = tm->registrations[i];
+
+	  if (tr->count == 0)
+	    continue;
+
+	  for (k = 0; k < tr->count; k++)
+	    {
+	      vec_add2 (vlib_worker_threads, w, 1);
+	      if (tr->mheap_size)
+		w->thread_mheap =
+		  mheap_alloc (0 /* use VM */ , tr->mheap_size);
+	      else
+		w->thread_mheap = main_heap;
+	      w->thread_stack = vlib_thread_stacks[w - vlib_worker_threads];
+	      w->thread_function = tr->function;
+	      w->thread_function_arg = w;
+	      w->instance_id = k;
+	      w->registration = tr;
+
+	      w->elog_track.name =
+		(char *) format (0, "%s %d", tr->name, k + 1);
+	      vec_add1 (w->elog_track.name, 0);
+	      elog_track_register (&vm->elog_main, &w->elog_track);
+
+	      if (tr->no_data_structure_clone)
+		continue;
+
+	      /* Allocate "to-worker-N" frame queue */
+	      if (tr->frame_queue_nelts)
+		{
+		  fq = vlib_frame_queue_alloc (tr->frame_queue_nelts);
+		}
+	      else
+		{
+		  fq = vlib_frame_queue_alloc (FRAME_QUEUE_NELTS);
+		}
+
+	      vec_validate (vlib_frame_queues, worker_thread_index);
+	      vlib_frame_queues[worker_thread_index] = fq;
+
+	      /* Fork vlib_global_main et al. Look for bugs here */
+	      oldheap = clib_mem_set_heap (w->thread_mheap);
+
+	      vm_clone = clib_mem_alloc (sizeof (*vm_clone));
+	      clib_memcpy (vm_clone, vlib_mains[0], sizeof (*vm_clone));
+
+	      vm_clone->cpu_index = worker_thread_index;
+	      vm_clone->heap_base = w->thread_mheap;
+	      vm_clone->mbuf_alloc_list = 0;
+	      memset (&vm_clone->random_buffer, 0,
+		      sizeof (vm_clone->random_buffer));
+
+	      nm = &vlib_mains[0]->node_main;
+	      nm_clone = &vm_clone->node_main;
+	      /* fork next frames array, preserving node runtime indices */
+	      nm_clone->next_frames = vec_dup (nm->next_frames);
+	      for (j = 0; j < vec_len (nm_clone->next_frames); j++)
+		{
+		  vlib_next_frame_t *nf = &nm_clone->next_frames[j];
+		  u32 save_node_runtime_index;
+		  u32 save_flags;
+
+		  save_node_runtime_index = nf->node_runtime_index;
+		  save_flags = nf->flags & VLIB_FRAME_NO_FREE_AFTER_DISPATCH;
+		  vlib_next_frame_init (nf);
+		  nf->node_runtime_index = save_node_runtime_index;
+		  nf->flags = save_flags;
+		}
+
+	      /* fork the frame dispatch queue */
+	      nm_clone->pending_frames = 0;
+	      vec_validate (nm_clone->pending_frames, 10);	/* $$$$$?????? */
+	      _vec_len (nm_clone->pending_frames) = 0;
+
+	      /* fork nodes */
+	      nm_clone->nodes = 0;
+	      for (j = 0; j < vec_len (nm->nodes); j++)
+		{
+		  vlib_node_t *n;
+		  n = clib_mem_alloc_no_fail (sizeof (*n));
+		  clib_memcpy (n, nm->nodes[j], sizeof (*n));
+		  /* none of the copied nodes have enqueue rights given out */
+		  n->owner_node_index = VLIB_INVALID_NODE_INDEX;
+		  memset (&n->stats_total, 0, sizeof (n->stats_total));
+		  memset (&n->stats_last_clear, 0,
+			  sizeof (n->stats_last_clear));
+		  vec_add1 (nm_clone->nodes, n);
+		}
+	      nm_clone->nodes_by_type[VLIB_NODE_TYPE_INTERNAL] =
+		vec_dup (nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL]);
+
+	      nm_clone->nodes_by_type[VLIB_NODE_TYPE_INPUT] =
+		vec_dup (nm->nodes_by_type[VLIB_NODE_TYPE_INPUT]);
+	      vec_foreach (rt, nm_clone->nodes_by_type[VLIB_NODE_TYPE_INPUT])
+		rt->cpu_index = vm_clone->cpu_index;
+
+	      nm_clone->processes = vec_dup (nm->processes);
+
+	      /* zap the (per worker) frame freelists, etc */
+	      nm_clone->frame_sizes = 0;
+	      nm_clone->frame_size_hash = 0;
+
+	      /* Packet trace buffers are guaranteed to be empty, nothing to do here */
+
+	      clib_mem_set_heap (oldheap);
+	      vec_add1 (vlib_mains, vm_clone);
+
+	      vm_clone->error_main.counters =
+		vec_dup (vlib_mains[0]->error_main.counters);
+	      vm_clone->error_main.counters_last_clear =
+		vec_dup (vlib_mains[0]->error_main.counters_last_clear);
+
+	      /* Fork the vlib_buffer_main_t free lists, etc. */
+	      bm_clone = vec_dup (vm_clone->buffer_main);
+	      vm_clone->buffer_main = bm_clone;
+
+	      orig_freelist_pool = bm_clone->buffer_free_list_pool;
+	      bm_clone->buffer_free_list_pool = 0;
+
+            /* *INDENT-OFF* */
             pool_foreach (fl_orig, orig_freelist_pool,
                           ({
-                            pool_get_aligned (bm_clone->buffer_free_list_pool, 
+                            pool_get_aligned (bm_clone->buffer_free_list_pool,
                                               fl_clone, CLIB_CACHE_LINE_BYTES);
-                            ASSERT (fl_orig - orig_freelist_pool 
+                            ASSERT (fl_orig - orig_freelist_pool
                                     == fl_clone - bm_clone->buffer_free_list_pool);
 
                             fl_clone[0] = fl_orig[0];
@@ -721,36 +765,38 @@ static clib_error_t * start_workers (vlib_main_t * vm)
                             fl_clone->unaligned_buffers = 0;
                             fl_clone->n_alloc = 0;
                           }));
+/* *INDENT-ON* */
 
-            worker_thread_index++;
-          }
-        }
+	      worker_thread_index++;
+	    }
+	}
     }
   else
     {
       /* only have non-data-structure copy threads to create... */
-      for (i = 0; i < vec_len(tm->registrations); i++)
-        {
-          tr = tm->registrations[i];
-
-          for (j = 0; j < tr->count; j++)
-            {
-              vec_add2 (vlib_worker_threads, w, 1);
-              if (tr->mheap_size)
-                w->thread_mheap = mheap_alloc (0 /* use VM */, tr->mheap_size);
-              else
-                w->thread_mheap = main_heap;
-              w->thread_stack = vlib_thread_stacks[w - vlib_worker_threads];
-              w->thread_function = tr->function;
-              w->thread_function_arg = w;
-              w->instance_id = j;
-              w->elog_track.name = 
-                  (char *) format (0, "%s %d", tr->name, j+1);
-              w->registration = tr;
-              vec_add1 (w->elog_track.name, 0);
-              elog_track_register (&vm->elog_main, &w->elog_track);
-            }
-        }
+      for (i = 0; i < vec_len (tm->registrations); i++)
+	{
+	  tr = tm->registrations[i];
+
+	  for (j = 0; j < tr->count; j++)
+	    {
+	      vec_add2 (vlib_worker_threads, w, 1);
+	      if (tr->mheap_size)
+		w->thread_mheap =
+		  mheap_alloc (0 /* use VM */ , tr->mheap_size);
+	      else
+		w->thread_mheap = main_heap;
+	      w->thread_stack = vlib_thread_stacks[w - vlib_worker_threads];
+	      w->thread_function = tr->function;
+	      w->thread_function_arg = w;
+	      w->instance_id = j;
+	      w->elog_track.name =
+		(char *) format (0, "%s %d", tr->name, j + 1);
+	      w->registration = tr;
+	      vec_add1 (w->elog_track.name, 0);
+	      elog_track_register (&vm->elog_main, &w->elog_track);
+	    }
+	}
     }
 
   worker_thread_index = 1;
@@ -762,50 +808,53 @@ static clib_error_t * start_workers (vlib_main_t * vm)
       tr = tm->registrations[i];
 
       if (tr->use_pthreads || tm->use_pthreads)
-        {
-          for (j = 0; j < tr->count; j++)
-            {
-              w = vlib_worker_threads + worker_thread_index++;
-              if (vlib_launch_thread (vlib_worker_thread_bootstrap_fn, w, 0) < 0)
-                clib_warning ("Couldn't start '%s' pthread ", tr->name);
-            }
-        }
+	{
+	  for (j = 0; j < tr->count; j++)
+	    {
+	      w = vlib_worker_threads + worker_thread_index++;
+	      if (vlib_launch_thread (vlib_worker_thread_bootstrap_fn, w, 0) <
+		  0)
+		clib_warning ("Couldn't start '%s' pthread ", tr->name);
+	    }
+	}
       else
-        {
-            uword c;
+	{
+	  uword c;
+            /* *INDENT-OFF* */
             clib_bitmap_foreach (c, tr->coremask, ({
               w = vlib_worker_threads + worker_thread_index++;
               if (vlib_launch_thread (vlib_worker_thread_bootstrap_fn, w, c) < 0)
                 clib_warning ("Couldn't start DPDK lcore %d", c);
 
             }));
-        }
+/* *INDENT-ON* */
+	}
     }
-  vlib_worker_thread_barrier_sync(vm);
-  vlib_worker_thread_barrier_release(vm);
+  vlib_worker_thread_barrier_sync (vm);
+  vlib_worker_thread_barrier_release (vm);
   return 0;
 }
 
 VLIB_MAIN_LOOP_ENTER_FUNCTION (start_workers);
 
-void vlib_worker_thread_node_runtime_update(void)
+void
+vlib_worker_thread_node_runtime_update (void)
 {
   int i, j;
   vlib_worker_thread_t *w;
   vlib_main_t *vm;
   vlib_node_main_t *nm, *nm_clone;
-  vlib_node_t ** old_nodes_clone;
+  vlib_node_t **old_nodes_clone;
   vlib_main_t *vm_clone;
-  vlib_node_runtime_t * rt, * old_rt;
+  vlib_node_runtime_t *rt, *old_rt;
   void *oldheap;
   never_inline void
     vlib_node_runtime_sync_stats (vlib_main_t * vm,
-                                  vlib_node_runtime_t * r,
-                                  uword n_calls,
-                                  uword n_vectors,
-                                  uword n_clocks);
-  
-  ASSERT (os_get_cpu_number() == 0);
+				  vlib_node_runtime_t * r,
+				  uword n_calls,
+				  uword n_vectors, uword n_clocks);
+
+  ASSERT (os_get_cpu_number () == 0);
 
   if (vec_len (vlib_mains) == 0)
     return;
@@ -813,51 +862,52 @@ void vlib_worker_thread_node_runtime_update(void)
   vm = vlib_mains[0];
   nm = &vm->node_main;
 
-  ASSERT (os_get_cpu_number() == 0);
+  ASSERT (os_get_cpu_number () == 0);
   ASSERT (*vlib_worker_threads->wait_at_barrier == 1);
 
-  /* 
+  /*
    * Scrape all runtime stats, so we don't lose node runtime(s) with
    * pending counts, or throw away worker / io thread counts.
    */
-  for (j = 0; j < vec_len (nm->nodes); j++) 
+  for (j = 0; j < vec_len (nm->nodes); j++)
     {
-      vlib_node_t * n;
+      vlib_node_t *n;
       n = nm->nodes[j];
       vlib_node_sync_stats (vm, n);
     }
 
   for (i = 1; i < vec_len (vlib_mains); i++)
     {
-      vlib_node_t * n;
-      
+      vlib_node_t *n;
+
       vm_clone = vlib_mains[i];
       nm_clone = &vm_clone->node_main;
 
-      for (j = 0; j < vec_len (nm_clone->nodes); j++) 
-        {
-          n = nm_clone->nodes[j];
+      for (j = 0; j < vec_len (nm_clone->nodes); j++)
+	{
+	  n = nm_clone->nodes[j];
 
-          rt = vlib_node_get_runtime (vm_clone, n->index);
-          vlib_node_runtime_sync_stats (vm_clone, rt, 0, 0, 0);
-        }
+	  rt = vlib_node_get_runtime (vm_clone, n->index);
+	  vlib_node_runtime_sync_stats (vm_clone, rt, 0, 0, 0);
+	}
     }
 
   for (i = 1; i < vec_len (vlib_mains); i++)
     {
-      vlib_node_runtime_t * rt;
+      vlib_node_runtime_t *rt;
       w = vlib_worker_threads + i;
       oldheap = clib_mem_set_heap (w->thread_mheap);
 
       vm_clone = vlib_mains[i];
 
       /* Re-clone error heap */
-      u64 * old_counters = vm_clone->error_main.counters;
-      u64 * old_counters_all_clear = vm_clone->error_main.counters_last_clear;
-      clib_memcpy (&vm_clone->error_main, &vm->error_main, sizeof (vm->error_main));
-      j = vec_len(vm->error_main.counters) - 1;
-      vec_validate_aligned(old_counters, j, CLIB_CACHE_LINE_BYTES);
-      vec_validate_aligned(old_counters_all_clear, j, CLIB_CACHE_LINE_BYTES);
+      u64 *old_counters = vm_clone->error_main.counters;
+      u64 *old_counters_all_clear = vm_clone->error_main.counters_last_clear;
+      clib_memcpy (&vm_clone->error_main, &vm->error_main,
+		   sizeof (vm->error_main));
+      j = vec_len (vm->error_main.counters) - 1;
+      vec_validate_aligned (old_counters, j, CLIB_CACHE_LINE_BYTES);
+      vec_validate_aligned (old_counters_all_clear, j, CLIB_CACHE_LINE_BYTES);
       vm_clone->error_main.counters = old_counters;
       vm_clone->error_main.counters_last_clear = old_counters_all_clear;
 
@@ -866,85 +916,86 @@ void vlib_worker_thread_node_runtime_update(void)
       nm_clone->next_frames = vec_dup (nm->next_frames);
 
       for (j = 0; j < vec_len (nm_clone->next_frames); j++)
-        {
-          vlib_next_frame_t *nf = &nm_clone->next_frames[j];
-          u32 save_node_runtime_index;
-          u32 save_flags;
-
-          save_node_runtime_index = nf->node_runtime_index;
-          save_flags = nf->flags & VLIB_FRAME_NO_FREE_AFTER_DISPATCH;
-          vlib_next_frame_init (nf);
-          nf->node_runtime_index = save_node_runtime_index;
-          nf->flags = save_flags;
-        }
+	{
+	  vlib_next_frame_t *nf = &nm_clone->next_frames[j];
+	  u32 save_node_runtime_index;
+	  u32 save_flags;
+
+	  save_node_runtime_index = nf->node_runtime_index;
+	  save_flags = nf->flags & VLIB_FRAME_NO_FREE_AFTER_DISPATCH;
+	  vlib_next_frame_init (nf);
+	  nf->node_runtime_index = save_node_runtime_index;
+	  nf->flags = save_flags;
+	}
 
       old_nodes_clone = nm_clone->nodes;
       nm_clone->nodes = 0;
 
       /* re-fork nodes */
-      for (j = 0; j < vec_len (nm->nodes); j++) {
-        vlib_node_t *old_n_clone;
-        vlib_node_t *new_n, *new_n_clone;
-
-        new_n = nm->nodes[j];
-        old_n_clone = old_nodes_clone[j];
-
-        new_n_clone = clib_mem_alloc_no_fail (sizeof(*new_n_clone));
-        clib_memcpy (new_n_clone, new_n, sizeof (*new_n));
-        /* none of the copied nodes have enqueue rights given out */
-        new_n_clone->owner_node_index = VLIB_INVALID_NODE_INDEX;
-
-        if (j >= vec_len (old_nodes_clone))
-          {
-            /* new node, set to zero */
-            memset (&new_n_clone->stats_total, 0, 
-                    sizeof (new_n_clone->stats_total));
-            memset (&new_n_clone->stats_last_clear, 0, 
-                    sizeof (new_n_clone->stats_last_clear));
-          }
-        else
-          {
-            /* Copy stats if the old data is valid */
-            clib_memcpy (&new_n_clone->stats_total, 
-                    &old_n_clone->stats_total,
-                    sizeof (new_n_clone->stats_total));
-            clib_memcpy (&new_n_clone->stats_last_clear, 
-                    &old_n_clone->stats_last_clear,
-                    sizeof (new_n_clone->stats_last_clear));
-
-            /* keep previous node state */
-            new_n_clone->state = old_n_clone->state;
-          }
-        vec_add1 (nm_clone->nodes, new_n_clone);
-      }
+      for (j = 0; j < vec_len (nm->nodes); j++)
+	{
+	  vlib_node_t *old_n_clone;
+	  vlib_node_t *new_n, *new_n_clone;
+
+	  new_n = nm->nodes[j];
+	  old_n_clone = old_nodes_clone[j];
+
+	  new_n_clone = clib_mem_alloc_no_fail (sizeof (*new_n_clone));
+	  clib_memcpy (new_n_clone, new_n, sizeof (*new_n));
+	  /* none of the copied nodes have enqueue rights given out */
+	  new_n_clone->owner_node_index = VLIB_INVALID_NODE_INDEX;
+
+	  if (j >= vec_len (old_nodes_clone))
+	    {
+	      /* new node, set to zero */
+	      memset (&new_n_clone->stats_total, 0,
+		      sizeof (new_n_clone->stats_total));
+	      memset (&new_n_clone->stats_last_clear, 0,
+		      sizeof (new_n_clone->stats_last_clear));
+	    }
+	  else
+	    {
+	      /* Copy stats if the old data is valid */
+	      clib_memcpy (&new_n_clone->stats_total,
+			   &old_n_clone->stats_total,
+			   sizeof (new_n_clone->stats_total));
+	      clib_memcpy (&new_n_clone->stats_last_clear,
+			   &old_n_clone->stats_last_clear,
+			   sizeof (new_n_clone->stats_last_clear));
+
+	      /* keep previous node state */
+	      new_n_clone->state = old_n_clone->state;
+	    }
+	  vec_add1 (nm_clone->nodes, new_n_clone);
+	}
       /* Free the old node clone */
-      for (j = 0; j < vec_len(old_nodes_clone); j++)
-        clib_mem_free (old_nodes_clone[j]);
+      for (j = 0; j < vec_len (old_nodes_clone); j++)
+	clib_mem_free (old_nodes_clone[j]);
       vec_free (old_nodes_clone);
-      
+
       vec_free (nm_clone->nodes_by_type[VLIB_NODE_TYPE_INTERNAL]);
 
       nm_clone->nodes_by_type[VLIB_NODE_TYPE_INTERNAL] =
-          vec_dup (nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL]);
+	vec_dup (nm->nodes_by_type[VLIB_NODE_TYPE_INTERNAL]);
 
       /* clone input node runtime */
       old_rt = nm_clone->nodes_by_type[VLIB_NODE_TYPE_INPUT];
 
       nm_clone->nodes_by_type[VLIB_NODE_TYPE_INPUT] =
-        vec_dup (nm->nodes_by_type[VLIB_NODE_TYPE_INPUT]);
+	vec_dup (nm->nodes_by_type[VLIB_NODE_TYPE_INPUT]);
 
-      vec_foreach(rt, nm_clone->nodes_by_type[VLIB_NODE_TYPE_INPUT])
-        {
-          rt->cpu_index = vm_clone->cpu_index;
-        }
+      vec_foreach (rt, nm_clone->nodes_by_type[VLIB_NODE_TYPE_INPUT])
+      {
+	rt->cpu_index = vm_clone->cpu_index;
+      }
 
-      for (j=0; j < vec_len(old_rt); j++)
-        {
-          rt = vlib_node_get_runtime (vm_clone, old_rt[j].node_index);
-          rt->state = old_rt[j].state;
-        }
+      for (j = 0; j < vec_len (old_rt); j++)
+	{
+	  rt = vlib_node_get_runtime (vm_clone, old_rt[j].node_index);
+	  rt->state = old_rt[j].state;
+	}
 
-      vec_free(old_rt);
+      vec_free (old_rt);
 
       nm_clone->processes = vec_dup (nm->processes);
 
@@ -954,90 +1005,131 @@ void vlib_worker_thread_node_runtime_update(void)
     }
 }
 
+u32
+unformat_sched_policy (unformat_input_t * input, va_list * args)
+{
+  u32 *r = va_arg (*args, u32 *);
+
+  if (0);
+#define _(v,f,s) else if (unformat (input, s)) *r = SCHED_POLICY_##f;
+  foreach_sched_policy
+#undef _
+    else
+    return 0;
+  return 1;
+}
+
 static clib_error_t *
 cpu_config (vlib_main_t * vm, unformat_input_t * input)
 {
   vlib_thread_registration_t *tr;
-  uword * p;
-  vlib_thread_main_t * tm = &vlib_thread_main;
-  u8 * name;
+  uword *p;
+  vlib_thread_main_t *tm = &vlib_thread_main;
+  u8 *name;
   u64 coremask;
-  uword * bitmap;
+  uword *bitmap;
   u32 count;
 
   tm->thread_registrations_by_name = hash_create_string (0, sizeof (uword));
-  tm->n_thread_stacks = 1;      /* account for main thread */
+
+  tm->n_thread_stacks = 1;	/* account for main thread */
+  tm->sched_policy = ~0;
+  tm->sched_priority = ~0;
 
   tr = tm->next;
 
   while (tr)
     {
-      hash_set_mem (tm->thread_registrations_by_name, tr->name, (uword)tr);
+      hash_set_mem (tm->thread_registrations_by_name, tr->name, (uword) tr);
       tr = tr->next;
     }
 
-  while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {
       if (unformat (input, "use-pthreads"))
-        tm->use_pthreads = 1;
+	tm->use_pthreads = 1;
       else if (unformat (input, "thread-prefix %v", &tm->thread_prefix))
-          ;
+	;
       else if (unformat (input, "main-core %u", &tm->main_lcore))
-          ;
+	;
       else if (unformat (input, "skip-cores %u", &tm->skip_cores))
-          ;
+	;
       else if (unformat (input, "coremask-%s %llx", &name, &coremask))
-        {
-          p = hash_get_mem (tm->thread_registrations_by_name, name);
-          if (p == 0)
-            return clib_error_return (0, "no such thread type '%s'", name);
+	{
+	  p = hash_get_mem (tm->thread_registrations_by_name, name);
+	  if (p == 0)
+	    return clib_error_return (0, "no such thread type '%s'", name);
 
-          tr = (vlib_thread_registration_t *)p[0];
+	  tr = (vlib_thread_registration_t *) p[0];
 
-          if  (tr->use_pthreads)
-            return clib_error_return (0, "coremask cannot be set for '%s' threads",
-                                      name);
+	  if (tr->use_pthreads)
+	    return clib_error_return (0,
+				      "coremask cannot be set for '%s' threads",
+				      name);
 
-          tr->coremask = clib_bitmap_set_multiple 
-            (tr->coremask, 0, coremask, BITS(coremask));
-          tr->count = clib_bitmap_count_set_bits (tr->coremask);
-        }
+	  tr->coremask = clib_bitmap_set_multiple
+	    (tr->coremask, 0, coremask, BITS (coremask));
+	  tr->count = clib_bitmap_count_set_bits (tr->coremask);
+	}
       else if (unformat (input, "corelist-%s %U", &name, unformat_bitmap_list,
-               &bitmap))
-        {
-          p = hash_get_mem (tm->thread_registrations_by_name, name);
-          if (p == 0)
-            return clib_error_return (0, "no such thread type '%s'", name);
+			 &bitmap))
+	{
+	  p = hash_get_mem (tm->thread_registrations_by_name, name);
+	  if (p == 0)
+	    return clib_error_return (0, "no such thread type '%s'", name);
 
-          tr = (vlib_thread_registration_t *)p[0];
+	  tr = (vlib_thread_registration_t *) p[0];
 
-          if  (tr->use_pthreads)
-            return clib_error_return (0, "corelist cannot be set for '%s' threads",
-                                      name);
+	  if (tr->use_pthreads)
+	    return clib_error_return (0,
+				      "corelist cannot be set for '%s' threads",
+				      name);
 
-          tr->coremask = bitmap;
-          tr->count = clib_bitmap_count_set_bits (tr->coremask);
-        }
+	  tr->coremask = bitmap;
+	  tr->count = clib_bitmap_count_set_bits (tr->coremask);
+	}
+      else
+	if (unformat
+	    (input, "scheduler-policy %U", unformat_sched_policy,
+	     &tm->sched_policy))
+	;
+      else if (unformat (input, "scheduler-prio %u", &tm->sched_priority))
+	;
       else if (unformat (input, "%s %u", &name, &count))
-        {
-          p = hash_get_mem (tm->thread_registrations_by_name, name);
-          if (p == 0)
-              return clib_error_return (0, "no such thread type '%s'", name);
-                                        
-          tr = (vlib_thread_registration_t *)p[0];
-          if (tr->fixed_count)
-            return clib_error_return 
-              (0, "number of %s threads not configurable", tr->name);
-          tr->count = count;
-        }
-      else 
-        break;
+	{
+	  p = hash_get_mem (tm->thread_registrations_by_name, name);
+	  if (p == 0)
+	    return clib_error_return (0, "no such thread type 3 '%s'", name);
+
+	  tr = (vlib_thread_registration_t *) p[0];
+	  if (tr->fixed_count)
+	    return clib_error_return
+	      (0, "number of %s threads not configurable", tr->name);
+	  tr->count = count;
+	}
+      else
+	break;
     }
 
+  if (tm->sched_policy != ~0)
+    {
+      if (tm->sched_priority != ~0
+	  && (tm->sched_policy == SCHED_FIFO || tm->sched_policy == SCHED_RR))
+	{
+	  u32 prio_max = sched_get_priority_max (tm->sched_policy);
+	  u32 prio_min = sched_get_priority_min (tm->sched_policy);
+	  if (tm->sched_priority > prio_max)
+	    tm->sched_priority = prio_max;
+	  if (tm->sched_priority < prio_min)
+	    tm->sched_priority = prio_min;
+	}
+      else
+	tm->sched_priority = 0;
+    }
   tr = tm->next;
 
   if (!tm->thread_prefix)
-    tm->thread_prefix = format(0, "vpp");
+    tm->thread_prefix = format (0, "vpp");
 
   while (tr)
     {
@@ -1053,30 +1145,37 @@ cpu_config (vlib_main_t * vm, unformat_input_t * input)
 VLIB_EARLY_CONFIG_FUNCTION (cpu_config, "cpu");
 
 #if !defined (__x86_64__) && !defined (__aarch64__) && !defined (__powerpc64__) && !defined(__arm__)
-void __sync_fetch_and_add_8 (void)
+void
+__sync_fetch_and_add_8 (void)
 {
-  fformat(stderr, "%s called\n", __FUNCTION__);
-  abort();
+  fformat (stderr, "%s called\n", __FUNCTION__);
+  abort ();
 }
-void __sync_add_and_fetch_8 (void)
+
+void
+__sync_add_and_fetch_8 (void)
 {
-  fformat(stderr, "%s called\n", __FUNCTION__);
-  abort();
+  fformat (stderr, "%s called\n", __FUNCTION__);
+  abort ();
 }
 #endif
 
 void vnet_main_fixup (vlib_fork_fixup_t which) __attribute__ ((weak));
-void vnet_main_fixup (vlib_fork_fixup_t which) { }
+void
+vnet_main_fixup (vlib_fork_fixup_t which)
+{
+}
 
-void vlib_worker_thread_fork_fixup (vlib_fork_fixup_t which)
+void
+vlib_worker_thread_fork_fixup (vlib_fork_fixup_t which)
 {
-  vlib_main_t * vm = vlib_get_main();
+  vlib_main_t *vm = vlib_get_main ();
 
   if (vlib_mains == 0)
     return;
 
-  ASSERT(os_get_cpu_number() == 0);
-  vlib_worker_thread_barrier_sync(vm);
+  ASSERT (os_get_cpu_number () == 0);
+  vlib_worker_thread_barrier_sync (vm);
 
   switch (which)
     {
@@ -1085,48 +1184,50 @@ void vlib_worker_thread_fork_fixup (vlib_fork_fixup_t which)
       break;
 
     default:
-      ASSERT(0);
+      ASSERT (0);
     }
-  vlib_worker_thread_barrier_release(vm);
+  vlib_worker_thread_barrier_release (vm);
 }
 
-void vlib_worker_thread_barrier_sync(vlib_main_t *vm)
+void
+vlib_worker_thread_barrier_sync (vlib_main_t * vm)
 {
   f64 deadline;
   u32 count;
-  
+
   if (!vlib_mains)
-      return;
+    return;
 
   count = vec_len (vlib_mains) - 1;
 
   /* Tolerate recursive calls */
   if (++vlib_worker_threads[0].recursion_level > 1)
-      return;
+    return;
 
   vlib_worker_threads[0].barrier_sync_count++;
 
-  ASSERT (os_get_cpu_number() == 0);
+  ASSERT (os_get_cpu_number () == 0);
 
   deadline = vlib_time_now (vm) + BARRIER_SYNC_TIMEOUT;
 
   *vlib_worker_threads->wait_at_barrier = 1;
   while (*vlib_worker_threads->workers_at_barrier != count)
     {
-      if (vlib_time_now(vm) > deadline)
-        {
-          fformat(stderr, "%s: worker thread deadlock\n", __FUNCTION__);
-          os_panic();
-        }
+      if (vlib_time_now (vm) > deadline)
+	{
+	  fformat (stderr, "%s: worker thread deadlock\n", __FUNCTION__);
+	  os_panic ();
+	}
     }
 }
 
-void vlib_worker_thread_barrier_release(vlib_main_t * vm)
+void
+vlib_worker_thread_barrier_release (vlib_main_t * vm)
 {
   f64 deadline;
 
   if (!vlib_mains)
-      return;
+    return;
 
   if (--vlib_worker_threads[0].recursion_level > 0)
     return;
@@ -1137,41 +1238,42 @@ void vlib_worker_thread_barrier_release(vlib_main_t * vm)
 
   while (*vlib_worker_threads->workers_at_barrier > 0)
     {
-      if (vlib_time_now(vm) > deadline)
-        {
-          fformat(stderr, "%s: worker thread deadlock\n", __FUNCTION__);
-          os_panic();
-        }
+      if (vlib_time_now (vm) > deadline)
+	{
+	  fformat (stderr, "%s: worker thread deadlock\n", __FUNCTION__);
+	  os_panic ();
+	}
     }
 }
 
 /*
  * Check the frame queue to see if any frames are available.
- * If so, pull the packets off the frames and put them to 
+ * If so, pull the packets off the frames and put them to
  * the handoff node.
  */
-static inline int vlib_frame_queue_dequeue_internal (vlib_main_t *vm)
+static inline int
+vlib_frame_queue_dequeue_internal (vlib_main_t * vm)
 {
   u32 thread_id = vm->cpu_index;
   vlib_frame_queue_t *fq = vlib_frame_queues[thread_id];
   vlib_frame_queue_elt_t *elt;
-  u32 * from, * to;
-  vlib_frame_t * f;
+  u32 *from, *to;
+  vlib_frame_t *f;
   int msg_type;
   int processed = 0;
   u32 n_left_to_node;
   u32 vectors = 0;
-  vlib_thread_main_t *tm = vlib_get_thread_main();
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
 
   ASSERT (fq);
-  ASSERT(vm == vlib_mains[thread_id]);
+  ASSERT (vm == vlib_mains[thread_id]);
 
   if (PREDICT_FALSE (tm->handoff_dispatch_node_index == ~0))
-      return 0;
+    return 0;
   /*
    * Gather trace data for frame queues
    */
-  if (PREDICT_FALSE(fq->trace))
+  if (PREDICT_FALSE (fq->trace))
     {
       frame_queue_trace_t *fqt;
       frame_queue_nelt_counter_t *fqh;
@@ -1185,41 +1287,43 @@ static inline int vlib_frame_queue_dequeue_internal (vlib_main_t *vm)
       fqt->tail = fq->tail;
       fqt->threshold = fq->vector_threshold;
       fqt->n_in_use = fqt->tail - fqt->head;
-      if (fqt->n_in_use >= fqt->nelts){
-        // if beyond max then use max
-        fqt->n_in_use = fqt->nelts-1;
-      }
+      if (fqt->n_in_use >= fqt->nelts)
+	{
+	  // if beyond max then use max
+	  fqt->n_in_use = fqt->nelts - 1;
+	}
 
       /* Record the number of elements in use in the histogram */
       fqh = &tm->frame_queue_histogram[thread_id];
-      fqh->count[ fqt->n_in_use ]++;
+      fqh->count[fqt->n_in_use]++;
 
       /* Record a snapshot of the elements in use */
-      for (elix=0; elix<fqt->nelts; elix++) {
-        elt = fq->elts + ((fq->head+1 + elix) & (fq->nelts-1));
-        if (1 || elt->valid) 
-          {
-            fqt->n_vectors[elix] = elt->n_vectors;
-          }
-      }
+      for (elix = 0; elix < fqt->nelts; elix++)
+	{
+	  elt = fq->elts + ((fq->head + 1 + elix) & (fq->nelts - 1));
+	  if (1 || elt->valid)
+	    {
+	      fqt->n_vectors[elix] = elt->n_vectors;
+	    }
+	}
       fqt->written = 1;
     }
 
   while (1)
     {
       if (fq->head == fq->tail)
-        {
-          fq->head_hint = fq->head;
-          return processed;
-        }
+	{
+	  fq->head_hint = fq->head;
+	  return processed;
+	}
 
-      elt = fq->elts + ((fq->head+1) & (fq->nelts-1));
+      elt = fq->elts + ((fq->head + 1) & (fq->nelts - 1));
 
       if (!elt->valid)
-        {
-          fq->head_hint = fq->head;
-          return processed;
-        }
+	{
+	  fq->head_hint = fq->head;
+	  return processed;
+	}
 
       from = elt->buffer_index;
       msg_type = elt->msg_type;
@@ -1234,23 +1338,23 @@ static inline int vlib_frame_queue_dequeue_internal (vlib_main_t *vm)
       n_left_to_node = elt->n_vectors;
 
       while (n_left_to_node >= 4)
-        {
-          to[0] = from[0];
-          to[1] = from[1];
-          to[2] = from[2];
-          to[3] = from[3];
-          to += 4;
-          from += 4;
-          n_left_to_node -= 4;
-        }
+	{
+	  to[0] = from[0];
+	  to[1] = from[1];
+	  to[2] = from[2];
+	  to[3] = from[3];
+	  to += 4;
+	  from += 4;
+	  n_left_to_node -= 4;
+	}
 
       while (n_left_to_node > 0)
-        {
-          to[0] = from[0];
-          to++;
-          from++;
-          n_left_to_node--;
-        }
+	{
+	  to[0] = from[0];
+	  to++;
+	  from++;
+	  n_left_to_node--;
+	}
 
       vectors += elt->n_vectors;
       f->n_vectors = elt->n_vectors;
@@ -1259,7 +1363,7 @@ static inline int vlib_frame_queue_dequeue_internal (vlib_main_t *vm)
       elt->valid = 0;
       elt->n_vectors = 0;
       elt->msg_type = 0xfefefefe;
-      CLIB_MEMORY_BARRIER();
+      CLIB_MEMORY_BARRIER ();
       fq->head++;
       processed++;
 
@@ -1267,48 +1371,73 @@ static inline int vlib_frame_queue_dequeue_internal (vlib_main_t *vm)
        * Limit the number of packets pushed into the graph
        */
       if (vectors >= fq->vector_threshold)
-        {
-          fq->head_hint = fq->head;
-          return processed;
-        }
+	{
+	  fq->head_hint = fq->head;
+	  return processed;
+	}
     }
-  ASSERT(0);
+  ASSERT (0);
   return processed;
 }
 
 static_always_inline void
-vlib_worker_thread_internal (vlib_main_t *vm)
+vlib_worker_thread_internal (vlib_main_t * vm)
 {
-  vlib_node_main_t * nm = &vm->node_main;
+  vlib_node_main_t *nm = &vm->node_main;
   u64 cpu_time_now = clib_cpu_time_now ();
 
+  vec_alloc (nm->pending_interrupt_node_runtime_indices, 32);
+
   while (1)
     {
       vlib_worker_thread_barrier_check ();
 
       vlib_frame_queue_dequeue_internal (vm);
 
-      vlib_node_runtime_t * n;
+      vlib_node_runtime_t *n;
       vec_foreach (n, nm->nodes_by_type[VLIB_NODE_TYPE_INPUT])
-	{
-	  cpu_time_now = dispatch_node (vm, n, VLIB_NODE_TYPE_INPUT,
-					VLIB_NODE_STATE_POLLING, /* frame */ 0,
-					cpu_time_now);
-	}
+      {
+	cpu_time_now = dispatch_node (vm, n, VLIB_NODE_TYPE_INPUT,
+				      VLIB_NODE_STATE_POLLING, /* frame */ 0,
+				      cpu_time_now);
+      }
+
+      /* Next handle interrupts. */
+      {
+	uword l = _vec_len (nm->pending_interrupt_node_runtime_indices);
+	uword i;
+	if (l > 0)
+	  {
+	    _vec_len (nm->pending_interrupt_node_runtime_indices) = 0;
+	    for (i = 0; i < l; i++)
+	      {
+		n = vec_elt_at_index (nm->nodes_by_type[VLIB_NODE_TYPE_INPUT],
+				      nm->
+				      pending_interrupt_node_runtime_indices
+				      [i]);
+		cpu_time_now =
+		  dispatch_node (vm, n, VLIB_NODE_TYPE_INPUT,
+				 VLIB_NODE_STATE_INTERRUPT,
+				 /* frame */ 0,
+				 cpu_time_now);
+	      }
+	  }
+      }
 
       if (_vec_len (nm->pending_frames))
-        {
-          int i;
-          cpu_time_now = clib_cpu_time_now ();
-          for (i = 0; i < _vec_len (nm->pending_frames); i++) {
-            vlib_pending_frame_t *p;
-
-            p = nm->pending_frames + i;
-
-            cpu_time_now = dispatch_pending_node (vm, p, cpu_time_now);
-          }
-          _vec_len (nm->pending_frames) = 0;
-        }
+	{
+	  int i;
+	  cpu_time_now = clib_cpu_time_now ();
+	  for (i = 0; i < _vec_len (nm->pending_frames); i++)
+	    {
+	      vlib_pending_frame_t *p;
+
+	      p = nm->pending_frames + i;
+
+	      cpu_time_now = dispatch_pending_node (vm, p, cpu_time_now);
+	    }
+	  _vec_len (nm->pending_frames) = 0;
+	}
       vlib_increment_main_loop_counter (vm);
 
       /* Record time stamp in case there are no enabled nodes and above
@@ -1317,13 +1446,14 @@ vlib_worker_thread_internal (vlib_main_t *vm)
     }
 }
 
-void vlib_worker_thread_fn (void * arg)
+void
+vlib_worker_thread_fn (void *arg)
 {
-  vlib_worker_thread_t * w = (vlib_worker_thread_t *) arg;
-  vlib_thread_main_t * tm = vlib_get_thread_main();
-  vlib_main_t * vm = vlib_get_main();
+  vlib_worker_thread_t *w = (vlib_worker_thread_t *) arg;
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  vlib_main_t *vm = vlib_get_main ();
 
-  ASSERT(vm->cpu_index == os_get_cpu_number());
+  ASSERT (vm->cpu_index == os_get_cpu_number ());
 
   vlib_worker_thread_init (w);
   clib_time_init (&vm->clib_time);
@@ -1333,18 +1463,21 @@ void vlib_worker_thread_fn (void * arg)
   while (tm->worker_thread_release == 0)
     vlib_worker_thread_barrier_check ();
 
-  vlib_worker_thread_internal(vm);
+  vlib_worker_thread_internal (vm);
 }
 
+/* *INDENT-OFF* */
 VLIB_REGISTER_THREAD (worker_thread_reg, static) = {
   .name = "workers",
   .short_name = "wk",
   .function = vlib_worker_thread_fn,
 };
+/* *INDENT-ON* */
 
-clib_error_t *threads_init (vlib_main_t *vm)
+clib_error_t *
+threads_init (vlib_main_t * vm)
 {
-  vlib_thread_main_t * tm = vlib_get_thread_main();
+  vlib_thread_main_t *tm = vlib_get_thread_main ();
 
   tm->handoff_dispatch_node_index = ~0;
 
@@ -1352,3 +1485,11 @@ clib_error_t *threads_init (vlib_main_t *vm)
 }
 
 VLIB_INIT_FUNCTION (threads_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */