Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vnet: remove unused field
[vpp.git]
/
src
/
vat
/
main.c
diff --git
a/src/vat/main.c
b/src/vat/main.c
index
aa990a3
..
295ccec
100644
(file)
--- a/
src/vat/main.c
+++ b/
src/vat/main.c
@@
-26,17
+26,6
@@
vat_suspend (vlib_main_t * vm, f64 interval)
/* do nothing in the standalone version, just return */
}
/* do nothing in the standalone version, just return */
}
-void
-fformat_append_cr (FILE * ofp, const char *fmt, ...)
-{
- va_list va;
-
- va_start (va, fmt);
- (void) va_fformat (ofp, (char *) fmt, &va);
- va_end (va);
- fformat (ofp, "\n");
-}
-
int
connect_to_vpe (char *name)
{
int
connect_to_vpe (char *name)
{
@@
-117,7
+106,7
@@
do_one_file (vat_main_t * vam)
vec_free (this_cmd);
this_cmd =
vec_free (this_cmd);
this_cmd =
- (u8 *) clib_macro_eval (&vam->macro_main, (
char
*) vam->inbuf,
+ (u8 *) clib_macro_eval (&vam->macro_main, (
i8
*) vam->inbuf,
1 /* complain */ );
if (vam->exec_mode == 0)
1 /* complain */ );
if (vam->exec_mode == 0)
@@
-264,7
+253,7
@@
setup_signal_handlers (void)
for (i = 1; i < 32; i++)
{
for (i = 1; i < 32; i++)
{
- memset (&sa, 0, sizeof (sa));
+
clib_
memset (&sa, 0, sizeof (sa));
sa.sa_sigaction = (void *) signal_handler;
sa.sa_flags = SA_SIGINFO;
sa.sa_sigaction = (void *) signal_handler;
sa.sa_flags = SA_SIGINFO;
@@
-305,18
+294,10
@@
main (int argc, char **argv)
u8 *this_input_file;
u8 interactive = 1;
u8 json_output = 0;
u8 *this_input_file;
u8 interactive = 1;
u8 json_output = 0;
- u8 *heap;
- mheap_t *h;
int i;
f64 timeout;
int i;
f64 timeout;
- clib_mem_init (0, 128 << 20);
-
- heap = clib_mem_get_per_cpu_heap ();
- h = mheap_header (heap);
-
- /* make the main heap thread-safe */
- h->flags |= MHEAP_FLAG_THREAD_SAFE;
+ clib_mem_init_thread_safe (0, 128 << 20);
clib_macro_init (&vam->macro_main);
clib_macro_add_builtin (&vam->macro_main, "current_file",
clib_macro_init (&vam->macro_main);
clib_macro_add_builtin (&vam->macro_main, "current_file",
@@
-389,7
+370,7
@@
main (int argc, char **argv)
if (vam->socket_name && vat_socket_connect (vam))
fformat (stderr, "WARNING: socket connection failed");
if (vam->socket_name && vat_socket_connect (vam))
fformat (stderr, "WARNING: socket connection failed");
- if (
vam->socket_client_main.socket_fd == 0
+ if (
(!vam->socket_client_main || vam->socket_client_main->socket_fd == 0)
&& connect_to_vpe ("vpp_api_test") < 0)
{
svm_region_exit ();
&& connect_to_vpe ("vpp_api_test") < 0)
{
svm_region_exit ();