#define foreach_stats_msg \
_(WANT_STATS, want_stats) \
_(VNET_INTERFACE_SIMPLE_COUNTERS, vnet_interface_simple_counters) \
-_(WANT_INTERFACE_SIMPLE_STATS, want_interface_simple_stats) \
+_(WANT_INTERFACE_SIMPLE_STATS, want_interface_simple_stats) \
_(VNET_INTERFACE_COMBINED_COUNTERS, vnet_interface_combined_counters) \
-_(WANT_INTERFACE_COMBINED_STATS, want_interface_combined_stats) \
+_(WANT_INTERFACE_COMBINED_STATS, want_interface_combined_stats) \
_(WANT_PER_INTERFACE_COMBINED_STATS, want_per_interface_combined_stats) \
-_(WANT_PER_INTERFACE_SIMPLE_STATS, want_per_interface_simple_stats) \
+_(WANT_PER_INTERFACE_SIMPLE_STATS, want_per_interface_simple_stats) \
_(VNET_IP4_FIB_COUNTERS, vnet_ip4_fib_counters) \
-_(WANT_IP4_FIB_STATS, want_ip4_fib_stats) \
+_(WANT_IP4_FIB_STATS, want_ip4_fib_stats) \
_(VNET_IP6_FIB_COUNTERS, vnet_ip6_fib_counters) \
-_(WANT_IP6_FIB_STATS, want_ip6_fib_stats) \
+_(WANT_IP6_FIB_STATS, want_ip6_fib_stats) \
_(WANT_IP4_MFIB_STATS, want_ip4_mfib_stats) \
_(WANT_IP6_MFIB_STATS, want_ip6_mfib_stats) \
_(VNET_IP4_NBR_COUNTERS, vnet_ip4_nbr_counters) \
-_(WANT_IP4_NBR_STATS, want_ip4_nbr_stats) \
-_(VNET_IP6_NBR_COUNTERS, vnet_ip6_nbr_counters) \
-_(WANT_IP6_NBR_STATS, want_ip6_nbr_stats) \
-_(VNET_GET_SUMMARY_STATS, vnet_get_summary_stats) \
-_(STATS_GET_POLLER_DELAY, stats_get_poller_delay) \
-_(WANT_UDP_ENCAP_STATS, want_udp_encap_stats)
+_(WANT_IP4_NBR_STATS, want_ip4_nbr_stats) \
+_(VNET_IP6_NBR_COUNTERS, vnet_ip6_nbr_counters) \
+_(WANT_IP6_NBR_STATS, want_ip6_nbr_stats) \
+_(VNET_GET_SUMMARY_STATS, vnet_get_summary_stats) \
+_(STATS_GET_POLLER_DELAY, stats_get_poller_delay) \
+_(WANT_UDP_ENCAP_STATS, want_udp_encap_stats) \
+_(MAP_STATS_SEGMENT, map_stats_segment)
#define vl_msg_name_crc_list
#include <vpp/stats/stats.api.h>
return elts;
}
+/*
+ * Return a copy of the clients list.
+ */
vpe_client_registration_t *
get_clients_for_stat (u32 reg, u32 item)
{
registration = pool_elt_at_index (sm->stats_registrations[reg], p[0]);
vec_reset_length (clients);
- pool_foreach (client, registration->clients, (
- {
- vec_add1 (clients, *client);}
- ));
+
+ /* *INDENT-OFF* */
+ pool_foreach (client, registration->clients,
+ ({
+ vec_add1 (clients, *client);}
+ ));
+ /* *INDENT-ON* */
return clients;
}
reg_prev = reg;
}
}
+ vec_free (clients);
#if STATS_DEBUG > 0
fformat (stdout, "%U\n", format_vnet_combined_counters, mp);
#endif
vp->sw_if_index = htonl (reg->item);
im = &vnet_get_main ()->interface_main;
- cm = im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX;
- vlib_get_combined_counter (cm, reg->item, &v);
- clib_mem_unaligned (&vp->rx_packets, u64) =
- clib_host_to_net_u64 (v.packets);
- clib_mem_unaligned (&vp->rx_bytes, u64) =
- clib_host_to_net_u64 (v.bytes);
- cm = im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX;
- vlib_get_combined_counter (cm, reg->item, &v);
- clib_mem_unaligned (&vp->tx_packets, u64) =
- clib_host_to_net_u64 (v.packets);
- clib_mem_unaligned (&vp->tx_bytes, u64) =
- clib_host_to_net_u64 (v.bytes);
+
+#define _(X, x) \
+ cm = im->combined_sw_if_counters + X; \
+ vlib_get_combined_counter (cm, reg->item, &v); \
+ clib_mem_unaligned (&vp->x##_packets, u64) = \
+ clib_host_to_net_u64 (v.packets); \
+ clib_mem_unaligned (&vp->x##_bytes, u64) = \
+ clib_host_to_net_u64 (v.bytes);
+
+
+ _(VNET_INTERFACE_COUNTER_RX, rx);
+ _(VNET_INTERFACE_COUNTER_TX, tx);
+ _(VNET_INTERFACE_COUNTER_RX_UNICAST, rx_unicast);
+ _(VNET_INTERFACE_COUNTER_TX_UNICAST, tx_unicast);
+ _(VNET_INTERFACE_COUNTER_RX_MULTICAST, rx_multicast);
+ _(VNET_INTERFACE_COUNTER_TX_MULTICAST, tx_multicast);
+ _(VNET_INTERFACE_COUNTER_RX_BROADCAST, rx_broadcast);
+ _(VNET_INTERFACE_COUNTER_TX_BROADCAST, tx_broadcast);
+
+#undef _
vl_api_send_msg (vl_reg, (u8 *) mp);
}
continue;
}
}
+ vec_free (clients);
#if STATS_DEBUG > 0
fformat (stdout, "%U\n", format_vnet_simple_counters, mp);
continue;
}
}
+ vec_free (clients);
if (reg_prev && vl_api_can_send_msg (reg_prev))
{
continue;
}
}
+ vec_free (clients);
/* *INDENT-ON* */
if (reg_prev && vl_api_can_send_msg (reg_prev))
continue;
}
}
+ vec_free (clients);
+
/* *INDENT-ON* */
if (reg_prev && vl_api_can_send_msg (reg_prev))
{
continue;
}
}
+ vec_free (clients);
+
/* *INDENT-ON* */
if (reg_prev && vl_api_can_send_msg (reg_prev))
{
#define vl_api_vnet_ip4_nbr_counters_t_print vl_noop_handler
#define vl_api_vnet_ip6_nbr_counters_t_endian vl_noop_handler
#define vl_api_vnet_ip6_nbr_counters_t_print vl_noop_handler
+#define vl_api_map_stats_segment_t_print vl_noop_handler
+
+static void
+vl_api_map_stats_segment_t_handler (vl_api_map_stats_segment_t * mp)
+{
+ vl_api_map_stats_segment_reply_t *rmp;
+ stats_main_t *sm = &stats_main;
+ ssvm_private_t *ssvmp = &sm->stat_segment;
+ vl_api_registration_t *regp;
+ api_main_t *am = &api_main;
+ clib_file_t *cf;
+ vl_api_shm_elem_config_t *config = 0;
+ vl_shmem_hdr_t *shmem_hdr;
+ int rv = 0;
+
+ regp = vl_api_client_index_to_registration (mp->client_index);
+ if (regp == 0)
+ {
+ clib_warning ("API client disconnected");
+ return;
+ }
+ if (regp->registration_type != REGISTRATION_TYPE_SOCKET_SERVER)
+ rv = VNET_API_ERROR_INVALID_REGISTRATION;
+
+ rmp = vl_msg_api_alloc (sizeof (*rmp));
+ rmp->_vl_msg_id = htons (VL_API_MAP_STATS_SEGMENT_REPLY);
+ rmp->context = mp->context;
+ rmp->retval = htonl (rv);
+
+ vl_api_send_msg (regp, (u8 *) rmp);
+
+ if (rv != 0)
+ return;
+
+ /*
+ * We need the reply message to make it out the back door
+ * before we send the magic fd message so force a flush
+ */
+ cf = vl_api_registration_file (regp);
+ cf->write_function (cf);
+
+ /* Send the magic "here's your sign (aka fd)" socket message */
+ vl_sock_api_send_fd_msg (cf->file_descriptor, ssvmp->fd);
+}
static clib_error_t *
stats_init (vlib_main_t * vm)
Code Review / vpp.git / blobdiff