Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add config option to use dlmalloc instead of mheap
[vpp.git]
/
src
/
vat
/
main.c
diff --git
a/src/vat/main.c
b/src/vat/main.c
index
723c5e8
..
c34ec94
100644
(file)
--- a/
src/vat/main.c
+++ b/
src/vat/main.c
@@
-117,7
+117,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)
@@
-305,18
+305,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",