X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Fmain.c;h=fd9937fe3e64636e1e2c608671ac5385d9a3915e;hb=47bcca2ec8b3fb21b099a4f19a260a4783068e63;hp=5d99e899273c6eca40a8128423149211c96a58cc;hpb=d84ba85c0071a28fe888c912c3dc37f471b0caeb;p=vpp.git

diff --git a/src/vlib/main.c b/src/vlib/main.c
index 5d99e899273..fd9937fe3e6 100644
--- a/src/vlib/main.c
+++ b/src/vlib/main.c
@@ -884,52 +884,32 @@ vlib_elog_main_loop_event (vlib_main_t * vm,
 		/* data to log */ n_vectors);
 }
 
+#if VLIB_BUFFER_TRACE_TRAJECTORY > 0
+void (*vlib_buffer_trace_trajectory_cb) (vlib_buffer_t * b, u32 node_index);
+void (*vlib_buffer_trace_trajectory_init_cb) (vlib_buffer_t * b);
+
 void
-vlib_dump_context_trace (vlib_main_t * vm, u32 bi)
+vlib_buffer_trace_trajectory_init (vlib_buffer_t * b)
 {
-  vlib_node_main_t *vnm = &vm->node_main;
-  vlib_buffer_t *b;
-  u8 i, n;
-
-  if (VLIB_BUFFER_TRACE_TRAJECTORY)
+  if (PREDICT_TRUE (vlib_buffer_trace_trajectory_init_cb != 0))
     {
-      b = vlib_get_buffer (vm, bi);
-      n = b->pre_data[0];
-
-      fformat (stderr, "Context trace for bi %d b 0x%llx, visited %d\n",
-	       bi, b, n);
-
-      if (n == 0 || n > 20)
-	{
-	  fformat (stderr, "n is unreasonable\n");
-	  return;
-	}
-
-
-      for (i = 0; i < n; i++)
-	{
-	  u32 node_index;
-
-	  node_index = b->pre_data[i + 1];
+      (*vlib_buffer_trace_trajectory_init_cb) (b);
+    }
+}
 
-	  if (node_index > vec_len (vnm->nodes))
-	    {
-	      fformat (stderr, "Skip bogus node index %d\n", node_index);
-	      continue;
-	    }
+#endif
 
-	  fformat (stderr, "%v (%d)\n", vnm->nodes[node_index]->name,
-		   node_index);
-	}
-    }
-  else
+static inline void
+add_trajectory_trace (vlib_buffer_t * b, u32 node_index)
+{
+#if VLIB_BUFFER_TRACE_TRAJECTORY > 0
+  if (PREDICT_TRUE (vlib_buffer_trace_trajectory_cb != 0))
     {
-      fformat (stderr,
-	       "in vlib/buffers.h, #define VLIB_BUFFER_TRACE_TRAJECTORY 1\n");
+      (*vlib_buffer_trace_trajectory_cb) (b, node_index);
     }
+#endif
 }
 
-
 static_always_inline u64
 dispatch_node (vlib_main_t * vm,
 	       vlib_node_runtime_t * node,
@@ -995,15 +975,12 @@ dispatch_node (vlib_main_t * vm,
       if (VLIB_BUFFER_TRACE_TRAJECTORY && frame)
 	{
 	  int i;
-	  int log_index;
 	  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]);
-	      ASSERT (b->pre_data[0] < 32);
-	      log_index = b->pre_data[0]++ + 1;
-	      b->pre_data[log_index] = node->node_index;
+	      add_trajectory_trace (b, node->node_index);
 	    }
 	  n = node->function (vm, node, frame);
 	}
@@ -1705,22 +1682,16 @@ vlib_main (vlib_main_t * volatile vm, unformat_input_t * input)
   if (!vm->name)
     vm->name = "VLIB";
 
-  vec_validate (vm->buffer_main, 0);
-  if (vlib_buffer_callbacks)
+  if ((error = unix_physmem_init (vm)))
     {
-      /* external plugin has registered own buffer callbacks
-         so we just copy them */
-      vlib_buffer_main_t *bm = vm->buffer_main;
-      clib_memcpy (&bm->cb, vlib_buffer_callbacks,
-		   sizeof (vlib_buffer_callbacks_t));
-      bm->callbacks_registered = 1;
+      clib_error_report (error);
+      goto done;
     }
-  else
+
+  if ((error = vlib_buffer_main_init (vm)))
     {
-      vlib_physmem_main_t *vpm = &vm->physmem_main;
-      vlib_buffer_cb_init (vm);
-      unix_physmem_init (vm, 0 /* fail_if_physical_memory_not_present */ );
-      vlib_buffer_add_mem_range (vm, vpm->virtual.start, vpm->virtual.size);
+      clib_error_report (error);
+      goto done;
     }
 
   if ((error = vlib_thread_init (vm)))