Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
stats: refactor
[vpp.git]
/
src
/
vpp-api
/
client
/
stat_client.c
diff --git
a/src/vpp-api/client/stat_client.c
b/src/vpp-api/client/stat_client.c
index
b0c8391
..
a5eafaf
100644
(file)
--- a/
src/vpp-api/client/stat_client.c
+++ b/
src/vpp-api/client/stat_client.c
@@
-29,7
+29,8
@@
#include <vppinfra/vec.h>
#include <vppinfra/lock.h>
#include <stdatomic.h>
#include <vppinfra/vec.h>
#include <vppinfra/lock.h>
#include <stdatomic.h>
-#include <vpp/stats/stat_segment.h>
+#include <vlib/vlib.h>
+#include <vlib/stats/stats.h>
#include <vpp-api/client/stat_client.h>
stat_client_main_t stat_client_main;
#include <vpp-api/client/stat_client.h>
stat_client_main_t stat_client_main;
@@
-81,8
+82,8
@@
recv_fd (int sock)
return fd;
}
return fd;
}
-static
stat_segment_directory
_entry_t *
-get_stat_vector_r (stat_client_main_t *
sm)
+static
vlib_stats
_entry_t *
+get_stat_vector_r (stat_client_main_t *sm)
{
ASSERT (sm->shared_header);
return stat_segment_adjust (sm,
{
ASSERT (sm->shared_header);
return stat_segment_adjust (sm,
@@
-172,7
+173,7
@@
double
stat_segment_heartbeat_r (stat_client_main_t * sm)
{
stat_segment_access_t sa;
stat_segment_heartbeat_r (stat_client_main_t * sm)
{
stat_segment_access_t sa;
-
stat_segment_directory
_entry_t *ep;
+
vlib_stats
_entry_t *ep;
/* Has directory been updated? */
if (sm->shared_header->epoch != sm->current_epoch)
/* Has directory been updated? */
if (sm->shared_header->epoch != sm->current_epoch)
@@
-223,7
+224,7
@@
stat_vec_combined_init (vlib_counter_t c)
* threads), otherwise copy out all values.
*/
static stat_segment_data_t
* threads), otherwise copy out all values.
*/
static stat_segment_data_t
-copy_data (
stat_segment_directory
_entry_t *ep, u32 index2, char *name,
+copy_data (
vlib_stats
_entry_t *ep, u32 index2, char *name,
stat_client_main_t *sm)
{
stat_segment_data_t result = { 0 };
stat_client_main_t *sm)
{
stat_segment_data_t result = { 0 };
@@
-297,7
+298,7
@@
copy_data (stat_segment_directory_entry_t *ep, u32 index2, char *name,
case STAT_DIR_TYPE_SYMLINK:
/* Gather info from all threads into a vector */
{
case STAT_DIR_TYPE_SYMLINK:
/* Gather info from all threads into a vector */
{
-
stat_segment_directory
_entry_t *ep2;
+
vlib_stats
_entry_t *ep2;
ep2 = vec_elt_at_index (sm->directory_vector, ep->index1);
return copy_data (ep2, ep->index2, ep->name, sm);
}
ep2 = vec_elt_at_index (sm->directory_vector, ep->index1);
return copy_data (ep2, ep->index2, ep->name, sm);
}
@@
-370,7
+371,7
@@
stat_segment_ls_r (uint8_t ** patterns, stat_client_main_t * sm)
if (stat_segment_access_start (&sa, sm))
return 0;
if (stat_segment_access_start (&sa, sm))
return 0;
-
stat_segment_directory
_entry_t *counter_vec = get_stat_vector_r (sm);
+
vlib_stats
_entry_t *counter_vec = get_stat_vector_r (sm);
for (j = 0; j < vec_len (counter_vec); j++)
{
for (i = 0; i < vec_len (patterns); i++)
for (j = 0; j < vec_len (counter_vec); j++)
{
for (i = 0; i < vec_len (patterns); i++)
@@
-413,7
+414,7
@@
stat_segment_data_t *
stat_segment_dump_r (uint32_t * stats, stat_client_main_t * sm)
{
int i;
stat_segment_dump_r (uint32_t * stats, stat_client_main_t * sm)
{
int i;
-
stat_segment_directory
_entry_t *ep;
+
vlib_stats
_entry_t *ep;
stat_segment_data_t *res = 0;
stat_segment_access_t sa;
stat_segment_data_t *res = 0;
stat_segment_access_t sa;
@@
-474,7
+475,7
@@
stat_segment_string_vector (uint8_t ** string_vector, const char *string)
stat_segment_data_t *
stat_segment_dump_entry_r (uint32_t index, stat_client_main_t * sm)
{
stat_segment_data_t *
stat_segment_dump_entry_r (uint32_t index, stat_client_main_t * sm)
{
-
stat_segment_directory
_entry_t *ep;
+
vlib_stats
_entry_t *ep;
stat_segment_data_t *res = 0;
stat_segment_access_t sa;
stat_segment_data_t *res = 0;
stat_segment_access_t sa;
@@
-504,9
+505,9
@@
stat_segment_dump_entry (uint32_t index)
char *
stat_segment_index_to_name_r (uint32_t index, stat_client_main_t * sm)
{
char *
stat_segment_index_to_name_r (uint32_t index, stat_client_main_t * sm)
{
-
stat_segment_directory
_entry_t *ep;
+
vlib_stats
_entry_t *ep;
stat_segment_access_t sa;
stat_segment_access_t sa;
-
stat_segment_directory
_entry_t *vec;
+
vlib_stats
_entry_t *vec;
/* Has directory been update? */
if (sm->shared_header->epoch != sm->current_epoch)
/* Has directory been update? */
if (sm->shared_header->epoch != sm->current_epoch)