From f58571ee6f7b0460392ee6a7f86be2e07e747390 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Tue, 18 Feb 2020 21:09:12 +0000 Subject: [PATCH] hsa: cleanup vpp_echo JSON output - Fix invalid json syntax - Add bits_per_second rx/tx fields Type: fix Change-Id: I4100245b01093e99a6c7def16cd83572ab033e24 Signed-off-by: Dave Wallace --- src/plugins/hs_apps/sapi/vpp_echo.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/plugins/hs_apps/sapi/vpp_echo.c b/src/plugins/hs_apps/sapi/vpp_echo.c index 12be1f99537..4dd8e0f2d80 100644 --- a/src/plugins/hs_apps/sapi/vpp_echo.c +++ b/src/plugins/hs_apps/sapi/vpp_echo.c @@ -151,6 +151,10 @@ print_global_json_stats (echo_main_t * em) end_evt_missing ? "True" : "False"); fformat (stdout, " \"rx_data\": %lld,\n", em->stats.rx_total); fformat (stdout, " \"tx_data\": %lld,\n", em->stats.tx_total); + fformat (stdout, " \"rx_bits_per_second\": %.1f,\n", + em->stats.rx_total * 8 / deltat); + fformat (stdout, " \"tx_bits_per_second\": %.1f,\n", + em->stats.tx_total * 8 / deltat); fformat (stdout, " \"closing\": {\n"); fformat (stdout, " \"reset\": { \"q\": %d, \"s\": %d },\n", em->stats.reset_count.q, em->stats.reset_count.s); @@ -158,15 +162,15 @@ print_global_json_stats (echo_main_t * em) em->stats.close_count.q, em->stats.close_count.s); fformat (stdout, " \"send evt\": { \"q\": %d, \"s\": %d },\n", em->stats.active_count.q, em->stats.active_count.s); - fformat (stdout, " \"clean\": { \"q\": %d, \"s\": %d }\n", + fformat (stdout, " \"clean\": { \"q\": %d, \"s\": %d },\n", em->stats.clean_count.q, em->stats.clean_count.s); - fformat (stdout, " \"accepted\": { \"q\": %d, \"s\": %d }\n", + fformat (stdout, " \"accepted\": { \"q\": %d, \"s\": %d },\n", em->stats.accepted_count.q, em->stats.accepted_count.s); fformat (stdout, " \"connected\": { \"q\": %d, \"s\": %d }\n", em->stats.connected_count.q, em->stats.connected_count.s); - fformat (stdout, " }\n"); + fformat (stdout, " },\n"); fformat (stdout, " \"results\": {\n"); - fformat (stdout, " \"has_failed\": \"%d\"\n", em->has_failed); + fformat (stdout, " \"has_failed\": \"%d\",\n", em->has_failed); fformat (stdout, " \"fail_descr\": \"%v\"\n", em->fail_descr); fformat (stdout, " }\n"); fformat (stdout, "}\n"); -- 2.16.6