X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2Fapi%2Fapi.c;h=70dfd1f8271d8a1b408b55b7cc274b55ed33a4ed;hb=a1400cecb;hp=70b104234b77423d5f4c0bd9c36ad550835c18a7;hpb=e86a8edd3c14fb41ace2a12efd17bc7772bf623f;p=vpp.git diff --git a/src/vpp/api/api.c b/src/vpp/api/api.c index 70b104234b7..70dfd1f8271 100644 --- a/src/vpp/api/api.c +++ b/src/vpp/api/api.c @@ -2,7 +2,7 @@ *------------------------------------------------------------------ * api.c - message handler registration * - * Copyright (c) 2010-2016 Cisco and/or its affiliates. + * Copyright (c) 2010-2018 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. * You may obtain a copy of the License at: @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include @@ -48,6 +47,7 @@ #include #include +#include #include #include #include @@ -56,9 +56,12 @@ #undef BIHASH_TYPE #undef __included_bihash_template_h__ -#include +#include #include +#include +#include +#include #define vl_typedefs /* define message structures */ #include @@ -73,15 +76,10 @@ #undef vl_printfun #include -#define foreach_vpe_api_msg \ -_(CONTROL_PING, control_ping) \ -_(CLI, cli) \ -_(CLI_INBAND, cli_inband) \ -_(GET_NODE_INDEX, get_node_index) \ -_(ADD_NODE_NEXT, add_node_next) \ -_(SHOW_VERSION, show_version) \ -_(GET_NODE_GRAPH, get_node_graph) \ -_(GET_NEXT_INDEX, get_next_index) \ +#define foreach_vpe_api_msg \ + _ (SHOW_VERSION, show_version) \ + _ (SHOW_VPE_SYSTEM_TIME, show_vpe_system_time) \ + _ (LOG_DUMP, log_dump) #define QUOTE_(x) #x #define QUOTE(x) QUOTE_(x) @@ -101,9 +99,6 @@ memclnt_delete_callback (u32 client_index) vpe_api_main_t *vam = &vpe_api_main; vpe_client_registration_t *rp; uword *p; - int stats_memclnt_delete_callback (u32 client_index); - - stats_memclnt_delete_callback (client_index); #define _(a) \ p = hash_get (vam->a##_registration_hash, client_index); \ @@ -119,118 +114,6 @@ memclnt_delete_callback (u32 client_index) VL_MSG_API_REAPER_FUNCTION (memclnt_delete_callback); -static void -vl_api_control_ping_t_handler (vl_api_control_ping_t * mp) -{ - vl_api_control_ping_reply_t *rmp; - int rv = 0; - - /* *INDENT-OFF* */ - REPLY_MACRO2(VL_API_CONTROL_PING_REPLY, - ({ - rmp->vpe_pid = ntohl (getpid()); - })); - /* *INDENT-ON* */ -} - -static void -shmem_cli_output (uword arg, u8 * buffer, uword buffer_bytes) -{ - u8 **shmem_vecp = (u8 **) arg; - u8 *shmem_vec; - void *oldheap; - api_main_t *am = &api_main; - u32 offset; - - shmem_vec = *shmem_vecp; - - offset = vec_len (shmem_vec); - - pthread_mutex_lock (&am->vlib_rp->mutex); - oldheap = svm_push_data_heap (am->vlib_rp); - - vec_validate (shmem_vec, offset + buffer_bytes - 1); - - clib_memcpy (shmem_vec + offset, buffer, buffer_bytes); - - svm_pop_heap (oldheap); - pthread_mutex_unlock (&am->vlib_rp->mutex); - - *shmem_vecp = shmem_vec; -} - - -static void -vl_api_cli_t_handler (vl_api_cli_t * mp) -{ - vl_api_cli_reply_t *rp; - svm_queue_t *q; - vlib_main_t *vm = vlib_get_main (); - api_main_t *am = &api_main; - unformat_input_t input; - u8 *shmem_vec = 0; - void *oldheap; - - q = vl_api_client_index_to_input_queue (mp->client_index); - if (!q) - return; - - rp = vl_msg_api_alloc (sizeof (*rp)); - rp->_vl_msg_id = ntohs (VL_API_CLI_REPLY); - rp->context = mp->context; - - unformat_init_vector (&input, (u8 *) (uword) mp->cmd_in_shmem); - - vlib_cli_input (vm, &input, shmem_cli_output, (uword) & shmem_vec); - - pthread_mutex_lock (&am->vlib_rp->mutex); - oldheap = svm_push_data_heap (am->vlib_rp); - - vec_add1 (shmem_vec, 0); - - svm_pop_heap (oldheap); - pthread_mutex_unlock (&am->vlib_rp->mutex); - - rp->reply_in_shmem = (uword) shmem_vec; - - vl_msg_api_send_shmem (q, (u8 *) & rp); -} - -static void -inband_cli_output (uword arg, u8 * buffer, uword buffer_bytes) -{ - u8 **mem_vecp = (u8 **) arg; - u8 *mem_vec = *mem_vecp; - u32 offset = vec_len (mem_vec); - - vec_validate (mem_vec, offset + buffer_bytes - 1); - clib_memcpy (mem_vec + offset, buffer, buffer_bytes); - *mem_vecp = mem_vec; -} - -static void -vl_api_cli_inband_t_handler (vl_api_cli_inband_t * mp) -{ - vl_api_cli_inband_reply_t *rmp; - int rv = 0; - vlib_main_t *vm = vlib_get_main (); - unformat_input_t input; - u8 *out_vec = 0; - - unformat_init_string (&input, (char *) mp->cmd, ntohl (mp->length)); - vlib_cli_input (vm, &input, inband_cli_output, (uword) & out_vec); - - u32 len = vec_len (out_vec); - /* *INDENT-OFF* */ - REPLY_MACRO3(VL_API_CLI_INBAND_REPLY, len, - ({ - rmp->length = htonl (len); - clib_memcpy (rmp->reply, out_vec, len); - })); - /* *INDENT-ON* */ - vec_free (out_vec); -} - static void vl_api_show_version_t_handler (vl_api_show_version_t * mp) { @@ -255,144 +138,80 @@ vl_api_show_version_t_handler (vl_api_show_version_t * mp) } static void -vl_api_get_node_index_t_handler (vl_api_get_node_index_t * mp) +vl_api_show_vpe_system_time_t_handler (vl_api_show_vpe_system_time_t *mp) { - vlib_main_t *vm = vlib_get_main (); - vl_api_get_node_index_reply_t *rmp; - vlib_node_t *n; int rv = 0; - u32 node_index = ~0; - - n = vlib_get_node_by_name (vm, mp->node_name); - - if (n == 0) - rv = VNET_API_ERROR_NO_SUCH_NODE; - else - node_index = n->index; - + vl_api_show_vpe_system_time_reply_t *rmp; /* *INDENT-OFF* */ - REPLY_MACRO2(VL_API_GET_NODE_INDEX_REPLY, - ({ - rmp->node_index = ntohl(node_index); - })); + REPLY_MACRO2 ( + VL_API_SHOW_VPE_SYSTEM_TIME_REPLY, + ({ rmp->vpe_system_time = clib_host_to_net_f64 (unix_time_now ()); })); /* *INDENT-ON* */ } static void -vl_api_get_next_index_t_handler (vl_api_get_next_index_t * mp) +show_log_details (vl_api_registration_t * reg, u32 context, + f64 timestamp, + vl_api_log_level_t * level, u8 * msg_class, u8 * message) { - vlib_main_t *vm = vlib_get_main (); - vl_api_get_next_index_reply_t *rmp; - vlib_node_t *node, *next_node; - int rv = 0; - u32 next_node_index = ~0, next_index = ~0; - uword *p; - - node = vlib_get_node_by_name (vm, mp->node_name); - - if (node == 0) - { - rv = VNET_API_ERROR_NO_SUCH_NODE; - goto out; - } - - next_node = vlib_get_node_by_name (vm, mp->next_name); - - if (next_node == 0) - { - rv = VNET_API_ERROR_NO_SUCH_NODE2; - goto out; - } - else - next_node_index = next_node->index; - - p = hash_get (node->next_slot_by_node, next_node_index); - - if (p == 0) - { - rv = VNET_API_ERROR_NO_SUCH_ENTRY; - goto out; - } - else - next_index = p[0]; - -out: - /* *INDENT-OFF* */ - REPLY_MACRO2(VL_API_GET_NEXT_INDEX_REPLY, - ({ - rmp->next_index = ntohl(next_index); - })); - /* *INDENT-ON* */ + u32 msg_size; + + vl_api_log_details_t *rmp; + int class_len = + clib_min (vec_len (msg_class) + 1, ARRAY_LEN (rmp->msg_class)); + int message_len = + clib_min (vec_len (message) + 1, ARRAY_LEN (rmp->message)); + msg_size = sizeof (*rmp) + class_len + message_len; + + rmp = vl_msg_api_alloc (msg_size); + clib_memset (rmp, 0, msg_size); + rmp->_vl_msg_id = ntohs (VL_API_LOG_DETAILS); + + rmp->context = context; + rmp->timestamp = clib_host_to_net_f64 (timestamp); + rmp->level = htonl (*level); + + memcpy (rmp->msg_class, msg_class, class_len - 1); + memcpy (rmp->message, message, message_len - 1); + /* enforced by memset() above */ + ASSERT (0 == rmp->msg_class[class_len - 1]); + ASSERT (0 == rmp->message[message_len - 1]); + + vl_api_send_msg (reg, (u8 *) rmp); } static void -vl_api_add_node_next_t_handler (vl_api_add_node_next_t * mp) +vl_api_log_dump_t_handler (vl_api_log_dump_t * mp) { - vlib_main_t *vm = vlib_get_main (); - vl_api_add_node_next_reply_t *rmp; - vlib_node_t *n, *next; - int rv = 0; - u32 next_index = ~0; - - n = vlib_get_node_by_name (vm, mp->node_name); - - if (n == 0) - { - rv = VNET_API_ERROR_NO_SUCH_NODE; - goto out; - } - - next = vlib_get_node_by_name (vm, mp->next_name); - - if (next == 0) - rv = VNET_API_ERROR_NO_SUCH_NODE2; - else - next_index = vlib_node_add_next (vm, n->index, next->index); - -out: - /* *INDENT-OFF* */ - REPLY_MACRO2(VL_API_GET_NODE_INDEX_REPLY, - ({ - rmp->next_index = ntohl(next_index); - })); - /* *INDENT-ON* */ -} -static void -vl_api_get_node_graph_t_handler (vl_api_get_node_graph_t * mp) -{ - int rv = 0; - u8 *vector = 0; - api_main_t *am = &api_main; - vlib_main_t *vm = vlib_get_main (); - void *oldheap; - vl_api_get_node_graph_reply_t *rmp; - vlib_node_t ***node_dups; + /* from log.c */ + vlib_log_main_t *lm = &log_main; + vlib_log_entry_t *e; + int i = last_log_entry (); + int count = lm->count; + f64 time_offset, start_time; + vl_api_registration_t *reg; - pthread_mutex_lock (&am->vlib_rp->mutex); - oldheap = svm_push_data_heap (am->vlib_rp); + reg = vl_api_client_index_to_registration (mp->client_index); + if (reg == 0) + return; - /* - * Keep the number of memcpy ops to a minimum (e.g. 1). - */ - vec_validate (vector, 16384); - vec_reset_length (vector); + start_time = clib_net_to_host_f64 (mp->start_timestamp); - /* $$$$ FIXME */ - node_dups = vlib_node_get_nodes (vm, (u32) ~ 0 /* all threads */ , - 1 /* include stats */ ); - vector = vlib_node_serialize (vm, node_dups, vector, 1 /* include nexts */ , - 1 /* include stats */ ); + time_offset = (f64) lm->time_zero_timeval.tv_sec + + (((f64) lm->time_zero_timeval.tv_usec) * 1e-6) - lm->time_zero; - svm_pop_heap (oldheap); - pthread_mutex_unlock (&am->vlib_rp->mutex); + while (count--) + { + e = vec_elt_at_index (lm->entries, i); + if (start_time <= e->timestamp + time_offset) + show_log_details (reg, mp->context, e->timestamp + time_offset, + (vl_api_log_level_t *) & e->level, + format (0, "%U", format_vlib_log_class, e->class), + e->string); + i = (i + 1) % lm->size; + } - /* *INDENT-OFF* */ - REPLY_MACRO2(VL_API_GET_NODE_GRAPH_REPLY, - ({ - rmp->reply_in_shmem = (uword) vector; - })); - /* *INDENT-ON* */ } #define BOUNCE_HANDLER(nn) \ @@ -404,7 +223,7 @@ static void vl_api_##nn##_t_handler ( \ svm_queue_t * q; \ \ /* One registration only... */ \ - pool_foreach(reg, vam->nn##_registrations, \ + pool_foreach (reg, vam->nn##_registrations) \ ({ \ q = vl_api_client_index_to_input_queue (reg->client_index); \ if (q) { \ @@ -430,14 +249,14 @@ static void setup_message_id_table (api_main_t * am); /* * vpe_api_hookup * Add vpe's API message handlers to the table. - * vlib has alread mapped shared memory and + * vlib has already mapped shared memory and * added the client registration handlers. * See .../open-repo/vlib/memclnt_vlib.c:memclnt_process() */ static clib_error_t * vpe_api_hookup (vlib_main_t * vm) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); #define _(N,n) \ vl_msg_api_set_handlers(VL_API_##N, #n, \ @@ -453,14 +272,13 @@ vpe_api_hookup (vlib_main_t * vm) * Trace space for classifier mask+match */ am->api_trace_cfg[VL_API_CLASSIFY_ADD_DEL_TABLE].size += 5 * sizeof (u32x4); - am->api_trace_cfg[VL_API_CLASSIFY_ADD_DEL_SESSION].size - += 5 * sizeof (u32x4); + am->api_trace_cfg[VL_API_CLASSIFY_ADD_DEL_SESSION].size += + 5 * sizeof (u32x4); /* * Thread-safe API messages */ - am->is_mp_safe[VL_API_IP_ADD_DEL_ROUTE] = 1; - am->is_mp_safe[VL_API_GET_NODE_GRAPH] = 1; + am->is_mp_safe[VL_API_IP_ROUTE_ADD_DEL] = 1; /* * Set up the (msg_name, crc, message-id) table @@ -472,7 +290,7 @@ vpe_api_hookup (vlib_main_t * vm) VLIB_API_INIT_FUNCTION (vpe_api_hookup); -static clib_error_t * +clib_error_t * vpe_api_init (vlib_main_t * vm) { vpe_api_main_t *am = &vpe_api_main; @@ -490,9 +308,6 @@ vpe_api_init (vlib_main_t * vm) return 0; } -VLIB_INIT_FUNCTION (vpe_api_init); - - static clib_error_t * api_segment_config (vlib_main_t * vm, unformat_input_t * input) { @@ -576,7 +391,8 @@ api_segment_config (vlib_main_t * vm, unformat_input_t * input) /* lookup the group name */ grp = NULL; while (((rv = - getgrnam_r (s, &_grp, buf, vec_len (buf), &grp)) == ERANGE) + getgrnam_r (s, &_grp, buf, vec_len (buf), + &grp)) == ERANGE) && (vec_len (buf) <= max_buf_size)) { vec_resize (buf, vec_len (buf) * 2); @@ -617,78 +433,6 @@ get_unformat_vnet_sw_interface (void) return (void *) &unformat_vnet_sw_interface; } -static u8 * -format_arp_event (u8 * s, va_list * args) -{ - vl_api_ip4_arp_event_t *event = va_arg (*args, vl_api_ip4_arp_event_t *); - - s = format (s, "pid %d: ", ntohl (event->pid)); - s = format (s, "resolution for %U", format_ip4_address, &event->address); - return s; -} - -static u8 * -format_nd_event (u8 * s, va_list * args) -{ - vl_api_ip6_nd_event_t *event = va_arg (*args, vl_api_ip6_nd_event_t *); - - s = format (s, "pid %d: ", ntohl (event->pid)); - s = format (s, "resolution for %U", format_ip6_address, event->address); - return s; -} - -static clib_error_t * -show_ip_arp_nd_events_fn (vlib_main_t * vm, - unformat_input_t * input, vlib_cli_command_t * cmd) -{ - vpe_api_main_t *am = &vpe_api_main; - vl_api_ip4_arp_event_t *arp_event; - vl_api_ip6_nd_event_t *nd_event; - - if (pool_elts (am->arp_events) == 0 && pool_elts (am->nd_events) == 0 && - pool_elts (am->wc_ip4_arp_events_registrations) == 0 && - pool_elts (am->wc_ip6_nd_events_registrations) == 0) - { - vlib_cli_output (vm, "No active arp or nd event registrations"); - return 0; - } - - /* *INDENT-OFF* */ - pool_foreach (arp_event, am->arp_events, - ({ - vlib_cli_output (vm, "%U", format_arp_event, arp_event); - })); - - vpe_client_registration_t *reg; - pool_foreach(reg, am->wc_ip4_arp_events_registrations, - ({ - vlib_cli_output (vm, "pid %d: bd mac/ip4 binding events", - ntohl (reg->client_pid)); - })); - - pool_foreach (nd_event, am->nd_events, - ({ - vlib_cli_output (vm, "%U", format_nd_event, nd_event); - })); - - pool_foreach(reg, am->wc_ip6_nd_events_registrations, - ({ - vlib_cli_output (vm, "pid %d: bd mac/ip6 binding events", - ntohl (reg->client_pid)); - })); - /* *INDENT-ON* */ - - return 0; -} - -/* *INDENT-OFF* */ -VLIB_CLI_COMMAND (show_ip_arp_nd_events, static) = { - .path = "show arp-nd-event registrations", - .function = show_ip_arp_nd_events_fn, - .short_help = "Show ip4 arp and ip6 nd event registrations", -}; -/* *INDENT-ON* */ - #define vl_msg_name_crc_list #include #undef vl_msg_name_crc_list