cli: Add return value in cli_inband
[vpp.git] / src / vlib / main.c
index 0e480fa..759c1d0 100644 (file)
@@ -91,10 +91,11 @@ vlib_frame_find_magic (vlib_frame_t * f, vlib_node_t * node)
   return p;
 }
 
-static vlib_frame_size_t *
+static inline vlib_frame_size_t *
 get_frame_size_info (vlib_node_main_t * nm,
                     u32 n_scalar_bytes, u32 n_vector_bytes)
 {
+#ifdef VLIB_SUPPORTS_ARBITRARY_SCALAR_SIZES
   uword key = (n_scalar_bytes << 16) | n_vector_bytes;
   uword *p, i;
 
@@ -109,6 +110,11 @@ get_frame_size_info (vlib_node_main_t * nm,
     }
 
   return vec_elt_at_index (nm->frame_sizes, i);
+#else
+  ASSERT (vlib_frame_bytes (n_scalar_bytes, n_vector_bytes)
+         == (vlib_frame_bytes (0, 4)));
+  return vec_elt_at_index (nm->frame_sizes, 0);
+#endif
 }
 
 static u32
@@ -233,7 +239,7 @@ vlib_frame_free (vlib_main_t * vm, vlib_node_runtime_t * r, vlib_frame_t * f)
        ASSERT (nf->frame_index != frame_index);
     }
 
-  f->frame_flags &= ~VLIB_FRAME_IS_ALLOCATED;
+  f->frame_flags &= ~(VLIB_FRAME_IS_ALLOCATED | VLIB_FRAME_NO_APPEND);
 
   vec_add1 (fs->free_frame_indices, frame_index);
   ASSERT (fs->n_alloc_frames > 0);
@@ -387,9 +393,11 @@ vlib_get_next_frame_internal (vlib_main_t * vm,
       f->flags = 0;
     }
 
-  /* Allocate new frame if current one is already full. */
+  /* Allocate new frame if current one is marked as no-append or
+     it is already full. */
   n_used = f->n_vectors;
-  if (n_used >= VLIB_FRAME_SIZE || (allocate_new_next_frame && n_used > 0))
+  if (n_used >= VLIB_FRAME_SIZE || (allocate_new_next_frame && n_used > 0) ||
+      (f->frame_flags & VLIB_FRAME_NO_APPEND))
     {
       /* Old frame may need to be freed after dispatch, since we'll have
          two redundant frames from node -> next node. */
@@ -463,7 +471,7 @@ vlib_put_next_frame (vlib_main_t * vm,
   vlib_frame_t *f;
   u32 n_vectors_in_frame;
 
-  if (vm->buffer_main->callbacks_registered == 0 && CLIB_DEBUG > 0)
+  if (CLIB_DEBUG > 0)
     vlib_put_next_frame_validate (vm, r, next_index, n_vectors_left);
 
   nf = vlib_node_runtime_get_next_frame (vm, r, next_index);
@@ -672,13 +680,16 @@ vlib_node_runtime_update_stats (vlib_main_t * vm,
   return r;
 }
 
-static inline void
-vlib_node_runtime_perf_counter (vlib_main_t * vm, u64 * pmc0, u64 * pmc1)
+always_inline void
+vlib_node_runtime_perf_counter (vlib_main_t * vm, u64 * pmc0, u64 * pmc1,
+                               vlib_node_runtime_t * node,
+                               vlib_frame_t * frame, int before_or_after)
 {
   *pmc0 = 0;
   *pmc1 = 0;
   if (PREDICT_FALSE (vm->vlib_node_runtime_perf_counter_cb != 0))
-    (*vm->vlib_node_runtime_perf_counter_cb) (vm, pmc0, pmc1);
+    (*vm->vlib_node_runtime_perf_counter_cb) (vm, pmc0, pmc1, node,
+                                             frame, before_or_after);
 }
 
 always_inline void
@@ -912,18 +923,35 @@ vlib_elog_main_loop_event (vlib_main_t * vm,
 {
   vlib_main_t *evm = &vlib_global_main;
   elog_main_t *em = &evm->elog_main;
+  int enabled = evm->elog_trace_graph_dispatch |
+    evm->elog_trace_graph_circuit;
 
-  if (VLIB_ELOG_MAIN_LOOP && n_vectors)
-    elog_track (em,
-               /* event type */
-               vec_elt_at_index (is_return
-                                 ? evm->node_return_elog_event_types
-                                 : evm->node_call_elog_event_types,
-                                 node_index),
-               /* track */
-               (vm->thread_index ? &vlib_worker_threads[vm->thread_index].
-                elog_track : &em->default_track),
-               /* data to log */ n_vectors);
+  if (PREDICT_FALSE (enabled && n_vectors))
+    {
+      if (PREDICT_FALSE (!elog_is_enabled (em)))
+       {
+         evm->elog_trace_graph_dispatch = 0;
+         evm->elog_trace_graph_circuit = 0;
+         return;
+       }
+      if (PREDICT_TRUE
+         (evm->elog_trace_graph_dispatch ||
+          (evm->elog_trace_graph_circuit &&
+           node_index == evm->elog_trace_graph_circuit_node_index)))
+       {
+         elog_track (em,
+                     /* event type */
+                     vec_elt_at_index (is_return
+                                       ? evm->node_return_elog_event_types
+                                       : evm->node_call_elog_event_types,
+                                       node_index),
+                     /* track */
+                     (vm->thread_index ?
+                      &vlib_worker_threads[vm->thread_index].elog_track
+                      : &em->default_track),
+                     /* data to log */ n_vectors);
+       }
+    }
 }
 
 #if VLIB_BUFFER_TRACE_TRAJECTORY > 0
@@ -987,8 +1015,8 @@ format_buffer_metadata (u8 * s, va_list * args)
              (i32) (b->current_data), (i32) (b->current_length));
   s = format (s, "current_config_index: %d, flow_id: %x, next_buffer: %x\n",
              b->current_config_index, b->flow_id, b->next_buffer);
-  s = format (s, "error: %d, n_add_refs: %d, buffer_pool_index: %d\n",
-             (u32) (b->error), (u32) (b->n_add_refs),
+  s = format (s, "error: %d, ref_count: %d, buffer_pool_index: %d\n",
+             (u32) (b->error), (u32) (b->ref_count),
              (u32) (b->buffer_pool_index));
   s = format (s,
              "trace_index: %d, len_not_first_buf: %d\n",
@@ -1105,8 +1133,6 @@ dispatch_pcap_trace (vlib_main_t * vm,
     }
 }
 
-u64 oingo0, oingo1;
-
 static_always_inline u64
 dispatch_node (vlib_main_t * vm,
               vlib_node_runtime_t * node,
@@ -1118,6 +1144,7 @@ dispatch_node (vlib_main_t * vm,
   u64 t;
   vlib_node_main_t *nm = &vm->node_main;
   vlib_next_frame_t *nf;
+  u64 pmc_before[2], pmc_after[2], pmc_delta[2];
 
   if (CLIB_DEBUG > 0)
     {
@@ -1153,148 +1180,144 @@ dispatch_node (vlib_main_t * vm,
 
   vm->cpu_time_last_node_dispatch = last_time_stamp;
 
-  if (1 /* || vm->thread_index == node->thread_index */ )
-    {
-      u64 pmc_before[2], pmc_after[2], pmc_delta[2];
-
-      vlib_elog_main_loop_event (vm, node->node_index,
-                                last_time_stamp,
-                                frame ? frame->n_vectors : 0,
-                                /* is_after */ 0);
+  vlib_elog_main_loop_event (vm, node->node_index,
+                            last_time_stamp, frame ? frame->n_vectors : 0,
+                            /* is_after */ 0);
 
-      vlib_node_runtime_perf_counter (vm, &pmc_before[0], &pmc_before[1]);
+  vlib_node_runtime_perf_counter (vm, &pmc_before[0], &pmc_before[1],
+                                 node, frame, 0 /* before */ );
 
-      /*
-       * Turn this on if you run into
-       * "bad monkey" contexts, and you want to know exactly
-       * which nodes they've visited... See ixge.c...
-       */
-      if (VLIB_BUFFER_TRACE_TRAJECTORY && frame)
-       {
-         int i;
-         u32 *from;
-         from = vlib_frame_vector_args (frame);
-         for (i = 0; i < frame->n_vectors; i++)
-           {
-             vlib_buffer_t *b = vlib_get_buffer (vm, from[i]);
-             add_trajectory_trace (b, node->node_index);
-           }
-         if (PREDICT_FALSE (vm->dispatch_pcap_enable))
-           dispatch_pcap_trace (vm, node, frame);
-         n = node->function (vm, node, frame);
-       }
-      else
+  /*
+   * Turn this on if you run into
+   * "bad monkey" contexts, and you want to know exactly
+   * which nodes they've visited... See ixge.c...
+   */
+  if (VLIB_BUFFER_TRACE_TRAJECTORY && frame)
+    {
+      int i;
+      u32 *from;
+      from = vlib_frame_vector_args (frame);
+      for (i = 0; i < frame->n_vectors; i++)
        {
-         if (PREDICT_FALSE (vm->dispatch_pcap_enable))
-           dispatch_pcap_trace (vm, node, frame);
-         n = node->function (vm, node, frame);
+         vlib_buffer_t *b = vlib_get_buffer (vm, from[i]);
+         add_trajectory_trace (b, node->node_index);
        }
+      if (PREDICT_FALSE (vm->dispatch_pcap_enable))
+       dispatch_pcap_trace (vm, node, frame);
+      n = node->function (vm, node, frame);
+    }
+  else
+    {
+      if (PREDICT_FALSE (vm->dispatch_pcap_enable))
+       dispatch_pcap_trace (vm, node, frame);
+      n = node->function (vm, node, frame);
+    }
 
-      t = clib_cpu_time_now ();
-
-      /*
-       * To validate accounting: pmc_delta = t - pmc_before;
-       * perf ticks should equal clocks/pkt...
-       */
-      vlib_node_runtime_perf_counter (vm, &pmc_after[0], &pmc_after[1]);
-
-      pmc_delta[0] = pmc_after[0] - pmc_before[0];
-      pmc_delta[1] = pmc_after[1] - pmc_before[1];
-
-      vlib_elog_main_loop_event (vm, node->node_index, t, n,   /* is_after */
-                                1);
-
-      vm->main_loop_vectors_processed += n;
-      vm->main_loop_nodes_processed += n > 0;
+  t = clib_cpu_time_now ();
 
-      if (pmc_delta[0] || pmc_delta[1])
-       {
-         oingo0 += pmc_delta[0];
-         oingo1 += pmc_delta[1];
-       }
+  /*
+   * To validate accounting: pmc_delta = t - pmc_before;
+   * perf ticks should equal clocks/pkt...
+   */
+  vlib_node_runtime_perf_counter (vm, &pmc_after[0], &pmc_after[1], node,
+                                 frame, 1 /* after */ );
+
+  pmc_delta[0] = pmc_after[0] - pmc_before[0];
+  pmc_delta[1] = pmc_after[1] - pmc_before[1];
+
+  vlib_elog_main_loop_event (vm, node->node_index, t, n, 1 /* is_after */ );
+
+  vm->main_loop_vectors_processed += n;
+  vm->main_loop_nodes_processed += n > 0;
+
+  v = vlib_node_runtime_update_stats (vm, node,
+                                     /* n_calls */ 1,
+                                     /* n_vectors */ n,
+                                     /* n_clocks */ t - last_time_stamp,
+                                     pmc_delta[0] /* PMC0 */ ,
+                                     pmc_delta[1] /* PMC1 */ );
+
+  /* When in interrupt mode and vector rate crosses threshold switch to
+     polling mode. */
+  if (PREDICT_FALSE ((dispatch_state == VLIB_NODE_STATE_INTERRUPT)
+                    || (dispatch_state == VLIB_NODE_STATE_POLLING
+                        && (node->flags
+                            &
+                            VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE))))
+    {
+      /* *INDENT-OFF* */
+      ELOG_TYPE_DECLARE (e) =
+        {
+          .function = (char *) __FUNCTION__,
+          .format = "%s vector length %d, switching to %s",
+          .format_args = "T4i4t4",
+          .n_enum_strings = 2,
+          .enum_strings = {
+            "interrupt", "polling",
+          },
+        };
+      /* *INDENT-ON* */
+      struct
+      {
+       u32 node_name, vector_length, is_polling;
+      } *ed;
 
-      v = vlib_node_runtime_update_stats (vm, node,
-                                         /* n_calls */ 1,
-                                         /* n_vectors */ n,
-                                         /* n_clocks */ t - last_time_stamp,
-                                         pmc_delta[0] /* PMC0 */ ,
-                                         pmc_delta[1] /* PMC1 */ );
-
-      /* When in interrupt mode and vector rate crosses threshold switch to
-         polling mode. */
-      if ((dispatch_state == VLIB_NODE_STATE_INTERRUPT)
-         || (dispatch_state == VLIB_NODE_STATE_POLLING
-             && (node->flags
-                 & VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE)))
+      if ((dispatch_state == VLIB_NODE_STATE_INTERRUPT
+          && v >= nm->polling_threshold_vector_length) &&
+         !(node->flags &
+           VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE))
        {
-#ifdef DISPATCH_NODE_ELOG_REQUIRED
-         ELOG_TYPE_DECLARE (e) =
-         {
-           .function = (char *) __FUNCTION__,.format =
-             "%s vector length %d, switching to %s",.format_args =
-             "T4i4t4",.n_enum_strings = 2,.enum_strings =
+         vlib_node_t *n = vlib_get_node (vm, node->node_index);
+         n->state = VLIB_NODE_STATE_POLLING;
+         node->state = VLIB_NODE_STATE_POLLING;
+         node->flags &=
+           ~VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE;
+         node->flags |= VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE;
+         nm->input_node_counts_by_state[VLIB_NODE_STATE_INTERRUPT] -= 1;
+         nm->input_node_counts_by_state[VLIB_NODE_STATE_POLLING] += 1;
+
+         if (PREDICT_FALSE (vlib_global_main.elog_trace_graph_dispatch))
            {
-         "interrupt", "polling",},};
-         struct
-         {
-           u32 node_name, vector_length, is_polling;
-         } *ed;
-         vlib_worker_thread_t *w = vlib_worker_threads + vm->thread_index;
-#endif
-
-         if ((dispatch_state == VLIB_NODE_STATE_INTERRUPT
-              && v >= nm->polling_threshold_vector_length) &&
-             !(node->flags &
-               VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE))
-           {
-             vlib_node_t *n = vlib_get_node (vm, node->node_index);
-             n->state = VLIB_NODE_STATE_POLLING;
-             node->state = VLIB_NODE_STATE_POLLING;
-             node->flags &=
-               ~VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE;
-             node->flags |=
-               VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE;
-             nm->input_node_counts_by_state[VLIB_NODE_STATE_INTERRUPT] -= 1;
-             nm->input_node_counts_by_state[VLIB_NODE_STATE_POLLING] += 1;
+             vlib_worker_thread_t *w = vlib_worker_threads
+               + vm->thread_index;
 
-#ifdef DISPATCH_NODE_ELOG_REQUIRED
              ed = ELOG_TRACK_DATA (&vlib_global_main.elog_main, e,
                                    w->elog_track);
              ed->node_name = n->name_elog_string;
              ed->vector_length = v;
              ed->is_polling = 1;
-#endif
            }
-         else if (dispatch_state == VLIB_NODE_STATE_POLLING
-                  && v <= nm->interrupt_threshold_vector_length)
+       }
+      else if (dispatch_state == VLIB_NODE_STATE_POLLING
+              && v <= nm->interrupt_threshold_vector_length)
+       {
+         vlib_node_t *n = vlib_get_node (vm, node->node_index);
+         if (node->flags &
+             VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE)
            {
-             vlib_node_t *n = vlib_get_node (vm, node->node_index);
-             if (node->flags &
-                 VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE)
-               {
-                 /* Switch to interrupt mode after dispatch in polling one more time.
-                    This allows driver to re-enable interrupts. */
-                 n->state = VLIB_NODE_STATE_INTERRUPT;
-                 node->state = VLIB_NODE_STATE_INTERRUPT;
-                 node->flags &=
-                   ~VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE;
-                 nm->input_node_counts_by_state[VLIB_NODE_STATE_POLLING] -=
-                   1;
-                 nm->input_node_counts_by_state[VLIB_NODE_STATE_INTERRUPT] +=
-                   1;
+             /* Switch to interrupt mode after dispatch in polling one more time.
+                This allows driver to re-enable interrupts. */
+             n->state = VLIB_NODE_STATE_INTERRUPT;
+             node->state = VLIB_NODE_STATE_INTERRUPT;
+             node->flags &=
+               ~VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE;
+             nm->input_node_counts_by_state[VLIB_NODE_STATE_POLLING] -= 1;
+             nm->input_node_counts_by_state[VLIB_NODE_STATE_INTERRUPT] += 1;
 
-               }
-             else
+           }
+         else
+           {
+             vlib_worker_thread_t *w = vlib_worker_threads
+               + vm->thread_index;
+             node->flags |=
+               VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE;
+             if (PREDICT_FALSE (vlib_global_main.elog_trace_graph_dispatch))
                {
-                 node->flags |=
-                   VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE;
-#ifdef DISPATCH_NODE_ELOG_REQUIRED
                  ed = ELOG_TRACK_DATA (&vlib_global_main.elog_main, e,
                                        w->elog_track);
                  ed->node_name = n->name_elog_string;
                  ed->vector_length = v;
                  ed->is_polling = 0;
-#endif
                }
            }
        }
@@ -1360,7 +1383,7 @@ dispatch_pending_node (vlib_main_t * vm, uword pending_frame_index,
                                   VLIB_NODE_STATE_POLLING,
                                   f, last_time_stamp);
 
-  f->frame_flags &= ~VLIB_FRAME_PENDING;
+  f->frame_flags &= ~(VLIB_FRAME_PENDING | VLIB_FRAME_NO_APPEND);
 
   /* Frame is ready to be used again, so restore it. */
   if (restore_frame_index != ~0)
@@ -1661,6 +1684,7 @@ vlib_main_or_worker_loop (vlib_main_t * vm, int is_main)
   u64 cpu_time_now;
   vlib_frame_queue_main_t *fqm;
   u32 *last_node_runtime_indices = 0;
+  u32 frame_queue_check_counter = 0;
 
   /* Initialize pending node vector. */
   if (is_main)
@@ -1690,6 +1714,9 @@ vlib_main_or_worker_loop (vlib_main_t * vm, int is_main)
   if (!nm->interrupt_threshold_vector_length)
     nm->interrupt_threshold_vector_length = 5;
 
+  vm->cpu_id = clib_get_current_cpu_id ();
+  vm->numa_node = clib_get_current_numa_node ();
+
   /* Start all processes. */
   if (is_main)
     {
@@ -1713,8 +1740,26 @@ vlib_main_or_worker_loop (vlib_main_t * vm, int is_main)
       if (!is_main)
        {
          vlib_worker_thread_barrier_check ();
-         vec_foreach (fqm, tm->frame_queue_mains)
-           vlib_frame_queue_dequeue (vm, fqm);
+         if (PREDICT_FALSE (vm->check_frame_queues +
+                            frame_queue_check_counter))
+           {
+             u32 processed = 0;
+
+             if (vm->check_frame_queues)
+               {
+                 frame_queue_check_counter = 100;
+                 vm->check_frame_queues = 0;
+               }
+
+             vec_foreach (fqm, tm->frame_queue_mains)
+               processed += vlib_frame_queue_dequeue (vm, fqm);
+
+             /* No handoff queue work found? */
+             if (processed)
+               frame_queue_check_counter = 100;
+             else
+               frame_queue_check_counter--;
+           }
          if (PREDICT_FALSE (vm->worker_thread_main_loop_callback != 0))
            ((void (*)(vlib_main_t *)) vm->worker_thread_main_loop_callback)
              (vm);
@@ -1783,9 +1828,30 @@ vlib_main_or_worker_loop (vlib_main_t * vm, int is_main)
 
       if (is_main)
        {
+          /* *INDENT-OFF* */
+          ELOG_TYPE_DECLARE (es) =
+            {
+              .format = "process tw start",
+              .format_args = "",
+            };
+          ELOG_TYPE_DECLARE (ee) =
+            {
+              .format = "process tw end: %d",
+              .format_args = "i4",
+            };
+          /* *INDENT-ON* */
+
+         struct
+         {
+           int nready_procs;
+         } *ed;
+
          /* Check if process nodes have expired from timing wheel. */
          ASSERT (nm->data_from_advancing_timing_wheel != 0);
 
+         if (PREDICT_FALSE (vm->elog_trace_graph_dispatch))
+           ed = ELOG_DATA (&vlib_global_main.elog_main, es);
+
          nm->data_from_advancing_timing_wheel =
            TW (tw_timer_expire_timers_vec)
            ((TWT (tw_timer_wheel) *) nm->timing_wheel, vlib_time_now (vm),
@@ -1793,6 +1859,13 @@ vlib_main_or_worker_loop (vlib_main_t * vm, int is_main)
 
          ASSERT (nm->data_from_advancing_timing_wheel != 0);
 
+         if (PREDICT_FALSE (vm->elog_trace_graph_dispatch))
+           {
+             ed = ELOG_DATA (&vlib_global_main.elog_main, ee);
+             ed->nready_procs =
+               _vec_len (nm->data_from_advancing_timing_wheel);
+           }
+
          if (PREDICT_FALSE
              (_vec_len (nm->data_from_advancing_timing_wheel) > 0))
            {
@@ -1936,19 +2009,19 @@ vlib_main (vlib_main_t * volatile vm, unformat_input_t * input)
       goto done;
     }
 
-  if ((error = vlib_buffer_main_init (vm)))
+  if ((error = vlib_map_stat_segment_init (vm)))
     {
       clib_error_report (error);
       goto done;
     }
 
-  if ((error = vlib_thread_init (vm)))
+  if ((error = vlib_buffer_main_init (vm)))
     {
       clib_error_report (error);
       goto done;
     }
 
-  if ((error = vlib_map_stat_segment_init (vm)))
+  if ((error = vlib_thread_init (vm)))
     {
       clib_error_report (error);
       goto done;
@@ -1998,9 +2071,6 @@ vlib_main (vlib_main_t * volatile vm, unformat_input_t * input)
   if ((error = vlib_call_all_init_functions (vm)))
     goto done;
 
-  /* Create default buffer free list. */
-  vlib_buffer_create_free_list (vm, VLIB_BUFFER_DATA_SIZE, "default");
-
   nm->timing_wheel = clib_mem_alloc_aligned (sizeof (TWT (tw_timer_wheel)),
                                             CLIB_CACHE_LINE_BYTES);
 
@@ -2018,6 +2088,17 @@ vlib_main (vlib_main_t * volatile vm, unformat_input_t * input)
   vec_validate (vm->processing_rpc_requests, 0);
   _vec_len (vm->processing_rpc_requests) = 0;
 
+  if ((error = vlib_call_all_config_functions (vm, input, 0 /* is_early */ )))
+    goto done;
+
+  /* Call all main loop enter functions. */
+  {
+    clib_error_t *sub_error;
+    sub_error = vlib_call_all_main_loop_enter_functions (vm);
+    if (sub_error)
+      clib_error_report (sub_error);
+  }
+
   switch (clib_setjmp (&vm->main_loop_exit, VLIB_MAIN_LOOP_EXIT_NONE))
     {
     case VLIB_MAIN_LOOP_EXIT_NONE:
@@ -2032,17 +2113,6 @@ vlib_main (vlib_main_t * volatile vm, unformat_input_t * input)
       goto done;
     }
 
-  if ((error = vlib_call_all_config_functions (vm, input, 0 /* is_early */ )))
-    goto done;
-
-  /* Call all main loop enter functions. */
-  {
-    clib_error_t *sub_error;
-    sub_error = vlib_call_all_main_loop_enter_functions (vm);
-    if (sub_error)
-      clib_error_report (sub_error);
-  }
-
   vlib_main_loop (vm);
 
 done:
@@ -2065,15 +2135,12 @@ pcap_dispatch_trace_command_internal (vlib_main_t * vm,
                                      unformat_input_t * input,
                                      vlib_cli_command_t * cmd, int rx_tx)
 {
-#define PCAP_DEF_PKT_TO_CAPTURE (100)
-
   unformat_input_t _line_input, *line_input = &_line_input;
   pcap_main_t *pm = &vm->dispatch_pcap_main;
-  u8 *filename;
-  u8 *chroot_filename = 0;
-  u32 max = 0;
+  u8 *filename = 0;
+  u32 max = 1000;
   int enabled = 0;
-  int errorFlag = 0;
+  int is_error = 0;
   clib_error_t *error = 0;
   u32 node_index, add;
   vlib_trace_main_t *tm;
@@ -2094,7 +2161,7 @@ pcap_dispatch_trace_command_internal (vlib_main_t * vm,
          else
            {
              vlib_cli_output (vm, "pcap dispatch capture already on...");
-             errorFlag = 1;
+             is_error = 1;
              break;
            }
        }
@@ -2118,7 +2185,7 @@ pcap_dispatch_trace_command_internal (vlib_main_t * vm,
          else
            {
              vlib_cli_output (vm, "pcap tx capture already off...");
-             errorFlag = 1;
+             is_error = 1;
              break;
            }
        }
@@ -2129,35 +2196,22 @@ pcap_dispatch_trace_command_internal (vlib_main_t * vm,
              vlib_cli_output
                (vm,
                 "can't change max value while pcap tx capture active...");
-             errorFlag = 1;
+             is_error = 1;
              break;
            }
          pm->n_packets_to_capture = max;
        }
-      else if (unformat (line_input, "file %s", &filename))
+      else
+       if (unformat
+           (line_input, "file %U", unformat_vlib_tmpfile, &filename))
        {
          if (vm->dispatch_pcap_enable)
            {
              vlib_cli_output
                (vm, "can't change file while pcap tx capture active...");
-             errorFlag = 1;
+             is_error = 1;
              break;
            }
-
-         /* Brain-police user path input */
-         if (strstr ((char *) filename, "..")
-             || index ((char *) filename, '/'))
-           {
-             vlib_cli_output (vm, "illegal characters in filename '%s'",
-                              filename);
-             vlib_cli_output (vm, "Hint: .. and / are not allowed.");
-             vec_free (filename);
-             errorFlag = 1;
-             break;
-           }
-
-         chroot_filename = format (0, "/tmp/%s%c", filename, 0);
-         vec_free (filename);
        }
       else if (unformat (line_input, "status"))
        {
@@ -2200,32 +2254,27 @@ pcap_dispatch_trace_command_internal (vlib_main_t * vm,
        {
          error = clib_error_return (0, "unknown input `%U'",
                                     format_unformat_error, line_input);
-         errorFlag = 1;
+         is_error = 1;
          break;
        }
     }
   unformat_free (line_input);
 
-
-  if (errorFlag == 0)
+  if (is_error == 0)
     {
-      /* Since no error, save configured values. */
-      if (chroot_filename)
-       {
-         if (pm->file_name)
-           vec_free (pm->file_name);
-         vec_add1 (chroot_filename, 0);
-         pm->file_name = (char *) chroot_filename;
-       }
+      /* Clean up from previous run */
+      vec_free (pm->file_name);
+      vec_free (pm->pcap_data);
 
-      if (max)
-       pm->n_packets_to_capture = max;
+      memset (pm, 0, sizeof (*pm));
+      pm->n_packets_to_capture = max;
 
       if (enabled)
        {
-         if (pm->file_name == 0)
-           pm->file_name = (char *) format (0, "/tmp/dispatch.pcap%c", 0);
+         if (filename == 0)
+           filename = format (0, "/tmp/dispatch.pcap%c", 0);
 
+         pm->file_name = (char *) filename;
          pm->n_packets_captured = 0;
          pm->packet_type = PCAP_PACKET_TYPE_vpp;
          if (pm->lock == 0)
@@ -2234,8 +2283,6 @@ pcap_dispatch_trace_command_internal (vlib_main_t * vm,
          vlib_cli_output (vm, "pcap dispatch capture on...");
        }
     }
-  else if (chroot_filename)
-    vec_free (chroot_filename);
 
   return error;
 }