Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vcl/session: apps with process workers
[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
b5aab74
..
5e10e18
100644
(file)
--- a/
src/vpp-api/client/stat_client.c
+++ b/
src/vpp-api/client/stat_client.c
@@
-89,7
+89,7
@@
stat_segment_connect (char *socket_name)
int mfd = -1;
int sock;
int mfd = -1;
int sock;
- memset (sm, 0, sizeof (*sm));
+
clib_
memset (sm, 0, sizeof (*sm));
if ((sock = socket (AF_UNIX, SOCK_SEQPACKET, 0)) < 0)
{
perror ("Couldn't open socket");
if ((sock = socket (AF_UNIX, SOCK_SEQPACKET, 0)) < 0)
{
perror ("Couldn't open socket");
@@
-102,12
+102,14
@@
stat_segment_connect (char *socket_name)
if (connect (sock, (struct sockaddr *) &un, sizeof (struct sockaddr_un)) <
0)
{
if (connect (sock, (struct sockaddr *) &un, sizeof (struct sockaddr_un)) <
0)
{
+ close (sock);
perror ("connect");
return -1;
}
if ((mfd = recv_fd (sock)) < 0)
{
perror ("connect");
return -1;
}
if ((mfd = recv_fd (sock)) < 0)
{
+ close (sock);
fprintf (stderr, "Receiving file descriptor failed\n");
return -1;
}
fprintf (stderr, "Receiving file descriptor failed\n");
return -1;
}
@@
-177,6
+179,8
@@
copy_data (stat_segment_directory_entry_t * ep)
break;
case STAT_DIR_TYPE_COUNTER_VECTOR_SIMPLE:
break;
case STAT_DIR_TYPE_COUNTER_VECTOR_SIMPLE:
+ if (ep->offset == 0)
+ return result;
simple_c = stat_segment_pointer (sm->shared_header, ep->offset);
result.simple_counter_vec = vec_dup (simple_c);
offset_vector =
simple_c = stat_segment_pointer (sm->shared_header, ep->offset);
result.simple_counter_vec = vec_dup (simple_c);
offset_vector =
@@
-190,6
+194,8
@@
copy_data (stat_segment_directory_entry_t * ep)
break;
case STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED:
break;
case STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED:
+ if (ep->offset == 0)
+ return result;
combined_c = stat_segment_pointer (sm->shared_header, ep->offset);
result.combined_counter_vec = vec_dup (combined_c);
offset_vector =
combined_c = stat_segment_pointer (sm->shared_header, ep->offset);
result.combined_counter_vec = vec_dup (combined_c);
offset_vector =
@@
-358,6
+364,12
@@
stat_segment_vec_len (void *vec)
return vec_len (vec);
}
return vec_len (vec);
}
+void
+stat_segment_vec_free (void *vec)
+{
+ vec_free (vec);
+}
+
/* Create a vector from a string (or add to existing) */
u8 **
stat_segment_string_vector (u8 ** string_vector, char *string)
/* Create a vector from a string (or add to existing) */
u8 **
stat_segment_string_vector (u8 ** string_vector, char *string)