From a8d77eda738855480c3028664028c7a448d52424 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Fri, 5 Aug 2016 18:09:54 -0400 Subject: VPP-237 Coding standards cleanup Change-Id: I239143f920285050ad85244ece6893236195534f Signed-off-by: Dave Barach --- vpp/vpp-api/summary_stats_client.c | 300 ++++++++++++++++++++----------------- 1 file changed, 160 insertions(+), 140 deletions(-) (limited to 'vpp/vpp-api/summary_stats_client.c') diff --git a/vpp/vpp-api/summary_stats_client.c b/vpp/vpp-api/summary_stats_client.c index 97e9f9d1..cbfef48d 100644 --- a/vpp/vpp-api/summary_stats_client.c +++ b/vpp/vpp-api/summary_stats_client.c @@ -1,7 +1,7 @@ /* *------------------------------------------------------------------ - * summary_stats_client - - * + * summary_stats_client - + * * Copyright (c) 2010 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. *------------------------------------------------------------------ */ @@ -56,86 +56,89 @@ #define f64_endian(a) #define f64_print(a,b) -#define vl_typedefs /* define message structures */ -#include +#define vl_typedefs /* define message structures */ +#include #undef vl_typedefs -#define vl_endianfun /* define message structures */ -#include +#define vl_endianfun /* define message structures */ +#include #undef vl_endianfun /* instantiate all the print functions we know about */ -#define vl_print(handle, ...) +#define vl_print(handle, ...) #define vl_printfun #include #undef vl_printfun vl_shmem_hdr_t *shmem_hdr; -typedef struct { - volatile int sigterm_received; +typedef struct +{ + volatile int sigterm_received; - struct sockaddr_in send_data_addr; - int send_data_socket; - u8 * display_name; + struct sockaddr_in send_data_addr; + int send_data_socket; + u8 *display_name; - /* convenience */ - unix_shared_memory_queue_t * vl_input_queue; - u32 my_client_index; + /* convenience */ + unix_shared_memory_queue_t *vl_input_queue; + u32 my_client_index; } test_main_t; test_main_t test_main; -/* +/* * Satisfy external references when -lvlib is not available. */ -void vlib_cli_output (struct vlib_main_t * vm, char * fmt, ...) +void +vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...) { - clib_warning ("vlib_cli_output callled..."); + clib_warning ("vlib_cli_output callled..."); } static void -vl_api_vnet_summary_stats_reply_t_handler ( - vl_api_vnet_summary_stats_reply_t * mp) +vl_api_vnet_summary_stats_reply_t_handler (vl_api_vnet_summary_stats_reply_t * + mp) { - test_main_t * tm = &test_main; - static u8 *sb; - int n; - - printf ("total rx pkts %llu, total rx bytes %llu\n", - (unsigned long long) mp->total_pkts[0], - (unsigned long long) mp->total_bytes[0]); - printf ("total tx pkts %llu, total tx bytes %llu\n", - (unsigned long long) mp->total_pkts[1], - (unsigned long long) mp->total_bytes[1]); - printf ("vector rate %.2f\n", mp->vector_rate); - - vec_reset_length (sb); - sb = format (sb, "%v,%.0f,%llu,%llu,%llu,%llu\n%c", - tm->display_name, mp->vector_rate, - (unsigned long long) mp->total_pkts[0], - (unsigned long long) mp->total_bytes[0], - (unsigned long long) mp->total_pkts[1], - (unsigned long long) mp->total_bytes[1], 0); - - n = sendto (tm->send_data_socket, sb, vec_len(sb), - 0, (struct sockaddr *)&tm->send_data_addr, - sizeof (tm->send_data_addr)); - - if (n != vec_len (sb)) - clib_unix_warning ("sendto"); - -} + test_main_t *tm = &test_main; + static u8 *sb; + int n; + + printf ("total rx pkts %llu, total rx bytes %llu\n", + (unsigned long long) mp->total_pkts[0], + (unsigned long long) mp->total_bytes[0]); + printf ("total tx pkts %llu, total tx bytes %llu\n", + (unsigned long long) mp->total_pkts[1], + (unsigned long long) mp->total_bytes[1]); + printf ("vector rate %.2f\n", mp->vector_rate); + + vec_reset_length (sb); + sb = format (sb, "%v,%.0f,%llu,%llu,%llu,%llu\n%c", + tm->display_name, mp->vector_rate, + (unsigned long long) mp->total_pkts[0], + (unsigned long long) mp->total_bytes[0], + (unsigned long long) mp->total_pkts[1], + (unsigned long long) mp->total_bytes[1], 0); + + n = sendto (tm->send_data_socket, sb, vec_len (sb), + 0, (struct sockaddr *) &tm->send_data_addr, + sizeof (tm->send_data_addr)); + + if (n != vec_len (sb)) + clib_unix_warning ("sendto"); + +} #define foreach_api_msg \ _(VNET_SUMMARY_STATS_REPLY, vnet_summary_stats_reply) -int connect_to_vpe(char *name) +int +connect_to_vpe (char *name) { - int rv=0; + int rv = 0; - rv = vl_client_connect_to_vlib("/vpe-api", name, 32); + rv = vl_client_connect_to_vlib ("/vpe-api", name, 32); #define _(N,n) \ vl_msg_api_set_handlers(VL_API_##N, #n, \ @@ -143,34 +146,37 @@ int connect_to_vpe(char *name) vl_noop_handler, \ vl_api_##n##_t_endian, \ vl_api_##n##_t_print, \ - sizeof(vl_api_##n##_t), 1); - foreach_api_msg; + sizeof(vl_api_##n##_t), 1); + foreach_api_msg; #undef _ - shmem_hdr = api_main.shmem_hdr; + shmem_hdr = api_main.shmem_hdr; - return rv; + return rv; } -int disconnect_from_vpe(void) +int +disconnect_from_vpe (void) { - vl_client_disconnect_from_vlib(); - return 0; + vl_client_disconnect_from_vlib (); + return 0; } -static void sigterm_handler (int sig) +static void +sigterm_handler (int sig) { - test_main_t *tm = &test_main; - tm->sigterm_received = 1; + test_main_t *tm = &test_main; + tm->sigterm_received = 1; } /* Parse an IP4 address %d.%d.%d.%d. */ -uword unformat_ip4_address (unformat_input_t * input, va_list * args) +uword +unformat_ip4_address (unformat_input_t * input, va_list * args) { - u8 * result = va_arg (*args, u8 *); + u8 *result = va_arg (*args, u8 *); unsigned a[4]; - if (! unformat (input, "%d.%d.%d.%d", &a[0], &a[1], &a[2], &a[3])) + if (!unformat (input, "%d.%d.%d.%d", &a[0], &a[1], &a[2], &a[3])) return 0; if (a[0] >= 256 || a[1] >= 256 || a[2] >= 256 || a[3] >= 256) @@ -184,96 +190,110 @@ uword unformat_ip4_address (unformat_input_t * input, va_list * args) return 1; } -int main (int argc, char ** argv) +int +main (int argc, char **argv) { - api_main_t * am = &api_main; - test_main_t * tm = &test_main; - vl_api_vnet_get_summary_stats_t * mp; - unformat_input_t _input, *input = &_input; - clib_error_t * error = 0; - ip4_address_t collector_ip; - u8 * display_name = 0; - u16 collector_port = 7654; - - collector_ip.as_u32 = (u32)~0; - - unformat_init_command_line (input, argv); - - while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "collector-ip %U", - unformat_ip4_address, &collector_ip)) - ; - else if (unformat (input, "display-name %v", &display_name)) - ; - else if (unformat (input, "collector-port %d", &collector_port)) - ; - else { - error = - clib_error_return - (0, "Usage: %s collector-ip \n" - " [display-name ] [collector-port ]\n" - " port defaults to 7654", argv[0]); - break; - } + api_main_t *am = &api_main; + test_main_t *tm = &test_main; + vl_api_vnet_get_summary_stats_t *mp; + unformat_input_t _input, *input = &_input; + clib_error_t *error = 0; + ip4_address_t collector_ip; + u8 *display_name = 0; + u16 collector_port = 7654; + + collector_ip.as_u32 = (u32) ~ 0; + + unformat_init_command_line (input, argv); + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "collector-ip %U", + unformat_ip4_address, &collector_ip)) + ; + else if (unformat (input, "display-name %v", &display_name)) + ; + else if (unformat (input, "collector-port %d", &collector_port)) + ; + else + { + error = + clib_error_return + (0, "Usage: %s collector-ip \n" + " [display-name ] [collector-port ]\n" + " port defaults to 7654", argv[0]); + break; + } } - if (error == 0 && collector_ip.as_u32 == (u32)~0) - error = clib_error_return (0, "collector-ip not set...\n"); + if (error == 0 && collector_ip.as_u32 == (u32) ~ 0) + error = clib_error_return (0, "collector-ip not set...\n"); - if (error) { - clib_error_report (error); - exit (1); + if (error) + { + clib_error_report (error); + exit (1); } - if (display_name == 0) { - display_name = format (0, "vpe-to-%d.%d.%d.%d", - collector_ip.as_u8[0], - collector_ip.as_u8[1], - collector_ip.as_u8[2], - collector_ip.as_u8[3]); + if (display_name == 0) + { + display_name = format (0, "vpe-to-%d.%d.%d.%d", + collector_ip.as_u8[0], + collector_ip.as_u8[1], + collector_ip.as_u8[2], collector_ip.as_u8[3]); } - connect_to_vpe("test_client"); - - tm->vl_input_queue = shmem_hdr->vl_input_queue; - tm->my_client_index = am->my_client_index; - tm->display_name = display_name; - - signal(SIGTERM, sigterm_handler); - signal(SIGINT, sigterm_handler); - signal(SIGQUIT, sigterm_handler); - - /* data (multicast) RX socket */ - tm->send_data_socket = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); - if (tm->send_data_socket < 0) { - clib_unix_warning(0, "data_rx_socket"); - exit (1); - } + connect_to_vpe ("test_client"); - memset(&tm->send_data_addr, 0, sizeof(tm->send_data_addr)); - tm->send_data_addr.sin_family = AF_INET; - tm->send_data_addr.sin_addr.s_addr = collector_ip.as_u32; - tm->send_data_addr.sin_port = htons(collector_port); + tm->vl_input_queue = shmem_hdr->vl_input_queue; + tm->my_client_index = am->my_client_index; + tm->display_name = display_name; - fformat(stdout, "Send SIGINT or SIGTERM to quit...\n"); + signal (SIGTERM, sigterm_handler); + signal (SIGINT, sigterm_handler); + signal (SIGQUIT, sigterm_handler); - while (1) { - sleep (5); + /* data (multicast) RX socket */ + tm->send_data_socket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); + if (tm->send_data_socket < 0) + { + clib_unix_warning (0, "data_rx_socket"); + exit (1); + } - if (tm->sigterm_received) - break; - /* Poll for stats */ - mp = vl_msg_api_alloc (sizeof (*mp)); - memset(mp, 0, sizeof (*mp)); - mp->_vl_msg_id = ntohs (VL_API_VNET_GET_SUMMARY_STATS); - mp->client_index = tm->my_client_index; - vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *)&mp); + memset (&tm->send_data_addr, 0, sizeof (tm->send_data_addr)); + tm->send_data_addr.sin_family = AF_INET; + tm->send_data_addr.sin_addr.s_addr = collector_ip.as_u32; + tm->send_data_addr.sin_port = htons (collector_port); + + fformat (stdout, "Send SIGINT or SIGTERM to quit...\n"); + + while (1) + { + sleep (5); + + if (tm->sigterm_received) + break; + /* Poll for stats */ + mp = vl_msg_api_alloc (sizeof (*mp)); + memset (mp, 0, sizeof (*mp)); + mp->_vl_msg_id = ntohs (VL_API_VNET_GET_SUMMARY_STATS); + mp->client_index = tm->my_client_index; + vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp); } - fformat(stdout, "Exiting...\n"); + fformat (stdout, "Exiting...\n"); - disconnect_from_vpe(); - exit (0); + disconnect_from_vpe (); + exit (0); } + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ -- cgit 1.2.3-korg