diff options
Diffstat (limited to 'src/vlibmemory')
-rw-r--r-- | src/vlibmemory/memory_api.c | 6 | ||||
-rw-r--r-- | src/vlibmemory/memory_client.c | 2 | ||||
-rw-r--r-- | src/vlibmemory/socket_api.c | 6 | ||||
-rw-r--r-- | src/vlibmemory/vlib_api_cli.c | 20 |
4 files changed, 0 insertions, 34 deletions
diff --git a/src/vlibmemory/memory_api.c b/src/vlibmemory/memory_api.c index 01fe49bfe31..39c6b0fd15b 100644 --- a/src/vlibmemory/memory_api.c +++ b/src/vlibmemory/memory_api.c @@ -661,14 +661,12 @@ vl_mem_api_dead_client_scan (api_main_t * am, vl_shmem_hdr_t * shm, f64 now) vec_reset_length (dead_indices); vec_reset_length (confused_indices); - /* *INDENT-OFF* */ pool_foreach (regpp, am->vl_clients) { if (!(*regpp)->keepalive) continue; vl_mem_send_client_keepalive_w_reg (am, now, regpp, &dead_indices, &confused_indices); } - /* *INDENT-ON* */ /* This should "never happen," but if it does, fix it... */ if (PREDICT_FALSE (vec_len (confused_indices) > 0)) @@ -1106,7 +1104,6 @@ vl_api_ring_command (vlib_main_t * vm, vl_api_registration_t *regp = 0; /* For horizontal scaling, add a hash table... */ - /* *INDENT-OFF* */ pool_foreach (regpp, am->vl_clients) { regp = *regpp; @@ -1118,7 +1115,6 @@ vl_api_ring_command (vlib_main_t * vm, } vlib_cli_output (vm, "regp %llx not found?", regp); continue; - /* *INDENT-ON* */ found: vlib_cli_output (vm, "%U", format_api_message_rings, am, 0 /* print header */ , 0 /* notused */ ); @@ -1132,14 +1128,12 @@ vl_api_ring_command (vlib_main_t * vm, /*? * Display binary api message allocation ring statistics ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cli_show_api_ring_command, static) = { .path = "show api ring-stats", .short_help = "Message ring statistics", .function = vl_api_ring_command, }; -/* *INDENT-ON* */ clib_error_t * vlibmemory_init (vlib_main_t * vm) diff --git a/src/vlibmemory/memory_client.c b/src/vlibmemory/memory_client.c index c66c71c43b1..8bce069f97b 100644 --- a/src/vlibmemory/memory_client.c +++ b/src/vlibmemory/memory_client.c @@ -101,12 +101,10 @@ vl_api_name_and_crc_free (void) if (!am->msg_index_by_name_and_crc) return; - /* *INDENT-OFF* */ hash_foreach_pair (hp, am->msg_index_by_name_and_crc, ({ vec_add1 (keys, (u8 *) hp->key); })); - /* *INDENT-ON* */ for (i = 0; i < vec_len (keys); i++) vec_free (keys[i]); vec_free (keys); diff --git a/src/vlibmemory/socket_api.c b/src/vlibmemory/socket_api.c index c139b652609..26be8d09522 100644 --- a/src/vlibmemory/socket_api.c +++ b/src/vlibmemory/socket_api.c @@ -87,7 +87,6 @@ vl_sock_api_dump_clients (vlib_main_t * vm, api_main_t * am) vlib_cli_output (vm, "Socket clients"); vlib_cli_output (vm, "%20s %8s", "Name", "Fildesc"); - /* *INDENT-OFF* */ pool_foreach (reg, sm->registration_pool) { if (reg->registration_type == REGISTRATION_TYPE_SOCKET_SERVER) { @@ -95,7 +94,6 @@ vl_sock_api_dump_clients (vlib_main_t * vm, api_main_t * am) vlib_cli_output (vm, "%20s %8d", reg->name, f->file_descriptor); } } -/* *INDENT-ON* */ } vl_api_registration_t * @@ -527,7 +525,6 @@ vl_api_sockclnt_create_t_handler (vl_api_sockclnt_create_t * mp) rp->response = htonl (rv); rp->count = htons (nmsg); - /* *INDENT-OFF* */ hash_foreach_pair (hp, am->msg_index_by_name_and_crc, ({ rp->message_table[i].index = htons(hp->value[0]); @@ -537,7 +534,6 @@ vl_api_sockclnt_create_t_handler (vl_api_sockclnt_create_t * mp) 64-1 /* chars to copy, without zero byte. */); i++; })); - /* *INDENT-ON* */ vl_api_send_msg (regp, (u8 *) rp); } @@ -855,13 +851,11 @@ socket_exit (vlib_main_t * vm) if (sm->registration_pool) { u32 index; - /* *INDENT-OFF* */ pool_foreach (rp, sm->registration_pool) { vl_api_registration_del_file (rp); index = rp->vl_api_registration_pool_index; vl_socket_free_registration_index (index); } -/* *INDENT-ON* */ } return 0; diff --git a/src/vlibmemory/vlib_api_cli.c b/src/vlibmemory/vlib_api_cli.c index f9cda9b34e9..4492f5af980 100644 --- a/src/vlibmemory/vlib_api_cli.c +++ b/src/vlibmemory/vlib_api_cli.c @@ -61,14 +61,12 @@ vl_api_show_histogram_command (vlib_main_t * vm, /*? * Display the binary api sleep-time histogram ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cli_show_api_histogram_command, static) = { .path = "show api histogram", .short_help = "show api histogram", .function = vl_api_show_histogram_command, }; -/* *INDENT-ON* */ static clib_error_t * vl_api_clear_histogram_command (vlib_main_t * vm, @@ -85,14 +83,12 @@ vl_api_clear_histogram_command (vlib_main_t * vm, /*? * Clear the binary api sleep-time histogram ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cli_clear_api_histogram_command, static) = { .path = "clear api histogram", .short_help = "clear api histogram", .function = vl_api_clear_histogram_command, }; -/* *INDENT-ON* */ static clib_error_t * vl_api_client_command (vlib_main_t * vm, @@ -110,7 +106,6 @@ vl_api_client_command (vlib_main_t * vm, vlib_cli_output (vm, "%20s %8s %14s %18s %s", "Name", "PID", "Queue Length", "Queue VA", "Health"); - /* *INDENT-OFF* */ pool_foreach (regpp, am->vl_clients) { regp = *regpp; @@ -135,7 +130,6 @@ vl_api_client_command (vlib_main_t * vm, vec_add1 (confused_indices, regpp - am->vl_clients); } } - /* *INDENT-ON* */ /* This should "never happen," but if it does, fix it... */ if (PREDICT_FALSE (vec_len (confused_indices) > 0)) @@ -191,37 +185,31 @@ vl_api_status_command (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cli_show_api_command, static) = { .path = "show api", .short_help = "Show API information", }; -/* *INDENT-ON* */ /*? * Display current api client connections ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cli_show_api_clients_command, static) = { .path = "show api clients", .short_help = "Client information", .function = vl_api_client_command, }; -/* *INDENT-ON* */ /*? * Display the current api message tracing status ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cli_show_api_status_command, static) = { .path = "show api trace-status", .short_help = "Display API trace status", .function = vl_api_status_command, }; -/* *INDENT-ON* */ static clib_error_t * vl_api_message_table_command (vlib_main_t * vm, @@ -264,14 +252,12 @@ vl_api_message_table_command (vlib_main_t * vm, /*? * Display the current api message decode tables ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cli_show_api_message_table_command, static) = { .path = "show api message-table", .short_help = "Message Table", .function = vl_api_message_table_command, }; -/* *INDENT-ON* */ static int range_compare (vl_api_msg_range_t * a0, vl_api_msg_range_t * a1) @@ -331,14 +317,12 @@ vl_api_show_plugin_command (vlib_main_t * vm, /*? * Display the plugin binary API message range table ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (cli_show_api_plugin_command, static) = { .path = "show api plugin", .short_help = "show api plugin", .function = vl_api_show_plugin_command, }; -/* *INDENT-ON* */ typedef enum { @@ -1149,7 +1133,6 @@ out: * Display, replay, or save a binary API trace ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (api_trace_command, static) = { .path = "api trace", .short_help = "api trace [tx][on|off][first <n>][last <n>][status][free]" @@ -1159,7 +1142,6 @@ VLIB_CLI_COMMAND (api_trace_command, static) = { .function = api_trace_command_fn, .is_mp_safe = 1, }; -/* *INDENT-ON* */ static clib_error_t * api_trace_config_fn (vlib_main_t * vm, unformat_input_t * input) @@ -1489,7 +1471,6 @@ cleanup: * decode table with the current image, to establish API differences. * ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (dump_api_table_file, static) = { .path = "show api dump", @@ -1497,7 +1478,6 @@ VLIB_CLI_COMMAND (dump_api_table_file, static) = .function = dump_api_table_file_command_fn, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON * |