Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VPP modified some state checking logic
[vpp.git]
/
src
/
vpp
/
vnet
/
main.c
diff --git
a/src/vpp/vnet/main.c
b/src/vpp/vnet/main.c
index
4a96ca9
..
b330f60
100644
(file)
--- a/
src/vpp/vnet/main.c
+++ b/
src/vpp/vnet/main.c
@@
-25,6
+25,8
@@
static void
vpe_main_init (vlib_main_t * vm)
{
static void
vpe_main_init (vlib_main_t * vm)
{
+ void vat_plugin_hash_create (void);
+
if (CLIB_DEBUG > 0)
vlib_unix_cli_set_prompt ("DBGvpp# ");
else
if (CLIB_DEBUG > 0)
vlib_unix_cli_set_prompt ("DBGvpp# ");
else
@@
-33,8
+35,17
@@
vpe_main_init (vlib_main_t * vm)
/* Turn off network stack components which we don't want */
vlib_mark_init_function_complete (vm, srp_init);
/* Turn off network stack components which we don't want */
vlib_mark_init_function_complete (vm, srp_init);
+ /*
+ * Create the binary api plugin hashes before loading plugins
+ */
+ vat_plugin_hash_create ();
}
}
+/*
+ * Default path for runtime data
+ */
+char *vlib_default_runtime_dir = "vpp";
+
/*
* Load plugins from /usr/lib/vpp_plugins by default
*/
/*
* Load plugins from /usr/lib/vpp_plugins by default
*/
@@
-193,9
+204,6
@@
defaulted:
{
vm->init_functions_called = hash_create (0, /* value bytes */ 0);
vpe_main_init (vm);
{
vm->init_functions_called = hash_create (0, /* value bytes */ 0);
vpe_main_init (vm);
-#if DPDK == 0
- unix_physmem_init (vm, 0 /* fail_if_physical_memory_not_present */ );
-#endif
return vlib_unix_main (argc, argv);
}
else
return vlib_unix_main (argc, argv);
}
else
@@
-250,11
+258,13
@@
plugin_path_config (vlib_main_t * vm, unformat_input_t * input)
VLIB_CONFIG_FUNCTION (plugin_path_config, "plugin_path");
void vl_msg_api_post_mortem_dump (void);
VLIB_CONFIG_FUNCTION (plugin_path_config, "plugin_path");
void vl_msg_api_post_mortem_dump (void);
+void elog_post_mortem_dump (void);
void
os_panic (void)
{
vl_msg_api_post_mortem_dump ();
void
os_panic (void)
{
vl_msg_api_post_mortem_dump ();
+ elog_post_mortem_dump ();
abort ();
}
abort ();
}
@@
-277,12
+287,21
@@
os_exit (int code)
recursion_block = 1;
vl_msg_api_post_mortem_dump ();
recursion_block = 1;
vl_msg_api_post_mortem_dump ();
+ elog_post_mortem_dump ();
vhost_user_unmap_all ();
abort ();
}
exit (code);
}
vhost_user_unmap_all ();
abort ();
}
exit (code);
}
+#ifdef BARRIER_TRACING
+void
+vl_msg_api_barrier_trace_context (const char *context)
+{
+ vlib_worker_threads[0].barrier_context = context;
+}
+#endif
+
void
vl_msg_api_barrier_sync (void)
{
void
vl_msg_api_barrier_sync (void)
{
@@
-317,6
+336,12
@@
test_crash_command_fn (vlib_main_t * vm,
{
u64 *p = (u64 *) 0xdefec8ed;
{
u64 *p = (u64 *) 0xdefec8ed;
+ ELOG_TYPE_DECLARE (e) =
+ {
+ .format = "deliberate crash: touching %x",.format_args = "i4",};
+
+ elog (&vm->elog_main, &e, 0xdefec8ed);
+
*p = 0xdeadbeef;
/* Not so much... */
*p = 0xdeadbeef;
/* Not so much... */