ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stats: check if stats vector entry is empty

Browse Source 
When a stats entry is removed it is marked empty.
The stats client did not check for that and returned an empty string.
This resulted in blank lines in vpp_get_stats. Fix by returning null instead
and checking value.

Type: fix
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: I08a39ba3ef4421bf275747a6300f97fe36791b50
This commit is contained in:
Ole Troan
2023-03-23 22:09:51 +01:00
committed by Andrew Yourtchenko
parent 003330c55a
commit 22ca0d03db
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vpp-api/client/stat_client.c
View File

@ -512,6 +512,11 @@ stat_segment_index_to_name_r (uint32_t index, stat_client_main_t * sm)
return 0; return 0;
vec = get_stat_vector_r (sm); vec = get_stat_vector_r (sm);
ep = vec_elt_at_index (vec, index); ep = vec_elt_at_index (vec, index);
if (ep->type == STAT_DIR_TYPE_EMPTY)
{
stat_segment_access_end (&sa, sm);
return 0;
}
if (!stat_segment_access_end (&sa, sm)) if (!stat_segment_access_end (&sa, sm))
return 0; return 0;
return strdup (ep->name); return strdup (ep->name);

2
src/vpp/app/vpp_get_stats.c
View File

@ -179,6 +179,8 @@ reconnect:
for (i = 0; i < vec_len (dir); i++) for (i = 0; i < vec_len (dir); i++)
{ {
char *n = stat_segment_index_to_name (dir[i]); char *n = stat_segment_index_to_name (dir[i]);
if (!n)
continue;
printf ("%s\n", n); printf ("%s\n", n);
free (n); free (n);
} }