ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api: replace print functions wth format

Browse Source 
Type: improvement
Change-Id: I7f7050c19453a69a7fb6c5e62f8f57db847d9144
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2022-05-20 16:01:22 +02:00
committed by Ole Tr�an
parent b704971248
commit fe45f8f5af
39 changed files with 201 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/vlibmemory/vlib_api_cli.c
View File

@ -584,40 +584,24 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename,
switch (which)
{
case DUMP_JSON:
if (m && m->print_json_handler)
{
m->print_json_handler (tmpbuf + sizeof (uword), vm);
}
else
{
vlib_cli_output (vm, "Skipping msg id %d: no JSON print fcn\n",
msg_id);
break;
}
vlib_cli_output (vm, "%U", format_vl_api_msg_json, am, msg_id,
tmpbuf + sizeof (uword));
break;
case DUMP:
if (m && m->print_handler)
{
m->print_handler (tmpbuf + sizeof (uword), vm);
}
else
{
vlib_cli_output (vm, "Skipping msg id %d: no print fcn\n",
msg_id);
break;
}
vlib_cli_output (vm, "%U", format_vl_api_msg_text, am, msg_id,
tmpbuf + sizeof (uword));
break;
case INITIALIZERS:
if (m && m->print_handler)
if (m)
{
u8 *s;
int j;
vlib_cli_output (vm, "/*");
vlib_cli_output (vm, "/*%U*/", format_vl_api_msg_text, am,
msg_id, tmpbuf + sizeof (uword));
m->print_handler (tmpbuf + sizeof (uword), vm);
vlib_cli_output (vm, "*/\n");
s = format (0, "static u8 * vl_api_%s_%d[%d] = {", m->name, i,
@ -636,7 +620,7 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename,
break;
case REPLAY:
if (m && m->print_handler && m->replay_allowed)
if (m && m->handler && m->replay_allowed)
{
if (!m->is_mp_safe)
vl_msg_api_barrier_sync ();
@ -690,7 +674,6 @@ vl_msg_print_trace (u8 *msg, void *ctx)
api_main_t *am = vlibapi_get_main ();
u16 msg_id = ntohs (*((u16 *) msg));
vl_api_msg_data_t *m = vl_api_get_msg_data (am, msg_id);
void (*handler) (void *, void *) = 0;
u8 is_json = a->is_json;
u8 *tmpbuf = 0;
@ -710,12 +693,9 @@ vl_msg_print_trace (u8 *msg, void *ctx)
m->endian_handler (tmpbuf);
}
handler = is_json ? m->print_json_handler : m->print_handler;
if (handler)
handler (msg, a->vm);
else
vlib_cli_output (a->vm, "Skipping msg id %d: no print fcn\n", msg_id);
vlib_cli_output (a->vm, "%U\n",
is_json ? format_vl_api_msg_json : format_vl_api_msg_text,
am, msg_id, msg);
vec_free (tmpbuf);
return 0;
@ -868,11 +848,14 @@ vl_msg_exec_json_command (vlib_main_t *vm, cJSON *o)
goto end;
}
if (!m->is_mp_safe)
vl_msg_api_barrier_sync ();
m->handler (msg);
if (!m->is_mp_safe)
vl_msg_api_barrier_release ();
if (m->handler)
{
if (!m->is_mp_safe)
vl_msg_api_barrier_sync ();
m->handler (msg);
if (!m->is_mp_safe)
vl_msg_api_barrier_release ();
}
}
rv = 0;