X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvat%2Fapi_format.c;h=161e309d1fee14b45a632be9bd13adcbb3bed23d;hb=048a4e5a000017d0d632ebf02dcc23d9bf9ccf72;hp=df62e81d848ad949508820ba7dd647286b5f25f9;hpb=04e0bb2ff0f39dab45da01ecdbc7914035a36897;p=vpp.git diff --git a/src/vat/api_format.c b/src/vat/api_format.c index df62e81d848..161e309d1fe 100644 --- a/src/vat/api_format.c +++ b/src/vat/api_format.c @@ -2669,10 +2669,11 @@ vl_api_dhcp_compl_event_t_handler (vl_api_dhcp_compl_event_t * mp) { errmsg ("DHCP compl event: pid %d %s hostname %s host_addr %U " "router_addr %U host_mac %U", - ntohl (mp->pid), mp->is_ipv6 ? "ipv6" : "ipv4", mp->hostname, - format_ip4_address, &mp->host_address, - format_ip4_address, &mp->router_address, - format_ethernet_address, mp->host_mac); + ntohl (mp->pid), mp->lease.is_ipv6 ? "ipv6" : "ipv4", + mp->lease.hostname, + format_ip4_address, &mp->lease.host_address, + format_ip4_address, &mp->lease.router_address, + format_ethernet_address, mp->lease.host_mac); } static void vl_api_dhcp_compl_event_t_handler_json @@ -5883,7 +5884,8 @@ _(SESSION_RULE_ADD_DEL_REPLY, session_rule_add_del_reply) \ _(SESSION_RULES_DETAILS, session_rules_details) \ _(IP_CONTAINER_PROXY_ADD_DEL_REPLY, ip_container_proxy_add_del_reply) \ _(OUTPUT_ACL_SET_INTERFACE_REPLY, output_acl_set_interface_reply) \ -_(QOS_RECORD_ENABLE_DISABLE_REPLY, qos_record_enable_disable_reply) +_(QOS_RECORD_ENABLE_DISABLE_REPLY, qos_record_enable_disable_reply) \ +_(MAP_STATS_SEGMENT_REPLY, map_stats_segment_reply) #define foreach_standalone_reply_msg \ _(SW_INTERFACE_EVENT, sw_interface_event) \ @@ -7354,7 +7356,7 @@ api_l2fib_add_del (vat_main_t * vam) u8 mac_set = 0; u32 bd_id; u8 bd_id_set = 0; - u32 sw_if_index = ~0; + u32 sw_if_index = 0; u8 sw_if_index_set = 0; u8 is_add = 1; u8 static_mac = 0; @@ -7437,10 +7439,10 @@ api_l2fib_add_del (vat_main_t * vam) clib_memcpy (mp->mac, mac, 6); mp->bd_id = ntohl (bd_id); mp->is_add = is_add; + mp->sw_if_index = ntohl (sw_if_index); if (is_add) { - mp->sw_if_index = ntohl (sw_if_index); mp->static_mac = static_mac; mp->filter_mac = filter_mac; mp->bvi_mac = bvi_mac; @@ -10125,12 +10127,12 @@ api_dhcp_client_config (vat_main_t * vam) /* Construct the API message */ M (DHCP_CLIENT_CONFIG, mp); - mp->sw_if_index = htonl (sw_if_index); - clib_memcpy (mp->hostname, hostname, vec_len (hostname)); - vec_free (hostname); mp->is_add = is_add; - mp->want_dhcp_event = disable_event ? 0 : 1; - mp->pid = htonl (getpid ()); + mp->client.sw_if_index = htonl (sw_if_index); + clib_memcpy (mp->client.hostname, hostname, vec_len (hostname)); + vec_free (hostname); + mp->client.want_dhcp_event = disable_event ? 0 : 1; + mp->client.pid = htonl (getpid ()); /* send it... */ S (mp); @@ -22430,6 +22432,92 @@ api_app_namespace_add_del (vat_main_t * vam) return ret; } +static void vl_api_map_stats_segment_reply_t_handler + (vl_api_map_stats_segment_reply_t * mp) +{ +#if VPP_API_TEST_BUILTIN == 0 + vat_main_t *vam = &vat_main; + ssvm_private_t *ssvmp = &vam->stat_segment; + ssvm_shared_header_t *shared_header; + socket_client_main_t *scm = vam->socket_client_main; + int rv = ntohl (mp->retval); + int my_fd, retval; + clib_error_t *error; + + vam->retval = rv; + + if (rv != 0) + { + vam->result_ready = 1; + return; + } + + /* + * Check the socket for the magic fd + */ + error = vl_sock_api_recv_fd_msg (scm->socket_fd, &my_fd, 5); + if (error) + { + clib_error_report (error); + vam->retval = -99; + vam->result_ready = 1; + return; + } + + memset (ssvmp, 0, sizeof (*ssvmp)); + ssvmp->fd = my_fd; + + /* Note: this closes memfd.fd */ + retval = ssvm_slave_init_memfd (ssvmp); + if (retval) + { + clib_warning ("WARNING: segment map returned %d", retval); + vam->retval = -99; + vam->result_ready = 1; + return; + } + else + errmsg ("stat segment mapped OK..."); + + ASSERT (ssvmp && ssvmp->sh); + + /* Pick up the segment lock from the shared memory header */ + shared_header = ssvmp->sh; + vam->stat_segment_lockp = (clib_spinlock_t *) (shared_header->opaque[0]); + vam->retval = 0; + vam->result_ready = 1; +#endif +} + +static void vl_api_map_stats_segment_reply_t_handler_json + (vl_api_map_stats_segment_reply_t * mp) +{ +#if VPP_API_TEST_BUILTIN == 0 + vat_main_t *vam = &vat_main; + clib_warning ("not implemented"); + vam->retval = -99; + vam->result_ready = 1; +#endif +} + +static int +api_map_stats_segment (vat_main_t * vam) +{ +#if VPP_API_TEST_BUILTIN == 0 + vl_api_map_stats_segment_t *mp; + int ret; + + M (MAP_STATS_SEGMENT, mp); + S (mp); + W (ret); + + return ret; +#else + errmsg ("api unavailable"); + return -99; +#endif +} + static int api_sock_init_shm (vat_main_t * vam) { @@ -22955,6 +23043,7 @@ api_qos_record_enable_disable (vat_main_t * vam) return ret; } + static int q_or_quit (vat_main_t * vam) { @@ -22982,6 +23071,80 @@ comment (vat_main_t * vam) return 0; } +static int +statseg (vat_main_t * vam) +{ + ssvm_private_t *ssvmp = &vam->stat_segment; + ssvm_shared_header_t *shared_header = ssvmp->sh; + vlib_counter_t **counters; + u64 thread0_index1_packets; + u64 thread0_index1_bytes; + f64 vector_rate, input_rate; + uword *p; + + uword *counter_vector_by_name; + if (vam->stat_segment_lockp == 0) + { + errmsg ("Stat segment not mapped..."); + return -99; + } + + /* look up "/if/rx for sw_if_index 1 as a test */ + + clib_spinlock_lock (vam->stat_segment_lockp); + + counter_vector_by_name = (uword *) shared_header->opaque[1]; + + p = hash_get_mem (counter_vector_by_name, "/if/rx"); + if (p == 0) + { + clib_spinlock_unlock (vam->stat_segment_lockp); + errmsg ("/if/tx not found?"); + return -99; + } + + /* Fish per-thread vector of combined counters from shared memory */ + counters = (vlib_counter_t **) p[0]; + + if (vec_len (counters[0]) < 2) + { + clib_spinlock_unlock (vam->stat_segment_lockp); + errmsg ("/if/tx vector length %d", vec_len (counters[0])); + return -99; + } + + /* Read thread 0 sw_if_index 1 counter */ + thread0_index1_packets = counters[0][1].packets; + thread0_index1_bytes = counters[0][1].bytes; + + p = hash_get_mem (counter_vector_by_name, "vector_rate"); + if (p == 0) + { + clib_spinlock_unlock (vam->stat_segment_lockp); + errmsg ("vector_rate not found?"); + return -99; + } + + vector_rate = *(f64 *) (p[0]); + p = hash_get_mem (counter_vector_by_name, "input_rate"); + if (p == 0) + { + clib_spinlock_unlock (vam->stat_segment_lockp); + errmsg ("input_rate not found?"); + return -99; + } + input_rate = *(f64 *) (p[0]); + + clib_spinlock_unlock (vam->stat_segment_lockp); + + print (vam->ofp, "vector_rate %.2f input_rate %.2f", + vector_rate, input_rate); + print (vam->ofp, "thread 0 sw_if_index 1 rx pkts %lld, bytes %lld", + thread0_index1_packets, thread0_index1_bytes); + + return 0; +} + static int cmd_cmp (void *a1, void *a2) { @@ -23298,7 +23461,7 @@ script (vat_main_t * vam) vam->current_file = s; do_one_file (vam); - clib_memcpy (&vam->input, &save_input, sizeof (vam->input)); + clib_memcpy (&vam->input, &save_input, sizeof (save_input)); clib_memcpy (&vam->jump_buf, &save_jump_buf, sizeof (save_jump_buf)); vam->ifp = save_ifp; vam->input_line_number = save_line_number; @@ -23798,7 +23961,8 @@ _(ip_container_proxy_add_del, "[add|del]
") \ _(output_acl_set_interface, \ " | sw_if_index [ip4-table ] [ip6-table ]\n" \ " [l2-table ] [del]") \ -_(qos_record_enable_disable, " | sw_if_index [disable]") +_(qos_record_enable_disable, " | sw_if_index [disable]") \ +_(map_stats_segment, "") /* List of command functions, CLI names map directly to functions */ #define foreach_cli_function \ @@ -23821,7 +23985,9 @@ _(quit, "usage: quit") \ _(search_node_table, "usage: search_node_table ...") \ _(set, "usage: set ") \ _(script, "usage: script ") \ +_(statseg, "usage: statseg"); \ _(unset, "usage: unset ") + #define _(N,n) \ static void vl_api_##n##_t_handler_uni \ (vl_api_##n##_t * mp) \