aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Vinciguerra <pvinci@vinciconsulting.com>2018-11-21 16:34:09 -0800
committerOle Trøan <otroan@employees.org>2018-11-22 06:35:16 +0000
commit5642109506e304c9817434b6f82616dcad83698f (patch)
tree3d77a8677a5d7e5bad4df8062a634cbe40d98e32
parentb4515b4be4ead1ea5d0af205989cf313272e8770 (diff)
stat_client issues while running parallel tests.
This patch addresses intermittent problems we saw in our CI while running parallel tests. Change-Id: Icb5fdb34cc134e3eb341225d56ab67fbbef80b0d Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
-rw-r--r--src/vpp-api/client/libvppapiclient.map9
-rw-r--r--src/vpp-api/client/stat_client.c128
-rw-r--r--src/vpp-api/client/stat_client.h20
-rw-r--r--src/vpp-api/python/vpp_papi/vpp_stats.py57
4 files changed, 162 insertions, 52 deletions
diff --git a/src/vpp-api/client/libvppapiclient.map b/src/vpp-api/client/libvppapiclient.map
index cb3d18b4de0..79f150149b3 100644
--- a/src/vpp-api/client/libvppapiclient.map
+++ b/src/vpp-api/client/libvppapiclient.map
@@ -1,5 +1,5 @@
-VPPAPICLIENT_18.10 {
+VPPAPICLIENT_19.01 {
global:
vac_read;
vac_write;
@@ -13,11 +13,18 @@ VPPAPICLIENT_18.10 {
vac_free;
vac_msg_table_size;
api_main;
+ stat_client_get;
+ stat_client_free;
+ stat_segment_connect_r;
stat_segment_connect;
+ stat_segment_disconnect_r;
stat_segment_disconnect;
+ stat_segment_ls_r;
stat_segment_ls;
+ stat_segment_dump_r;
stat_segment_dump;
stat_segment_data_free;
+ stat_segment_heartbeat_r;
stat_segment_heartbeat;
stat_segment_string_vector;
stat_segment_vec_len;
diff --git a/src/vpp-api/client/stat_client.c b/src/vpp-api/client/stat_client.c
index 5e10e18c43e..98c275727f0 100644
--- a/src/vpp-api/client/stat_client.c
+++ b/src/vpp-api/client/stat_client.c
@@ -31,16 +31,24 @@
#include "stat_client.h"
#include <stdatomic.h>
-typedef struct
-{
- uint64_t current_epoch;
- stat_segment_shared_header_t *shared_header;
- stat_segment_directory_entry_t *directory_vector;
- ssize_t memory_size;
-} stat_client_main_t;
stat_client_main_t stat_client_main;
+stat_client_main_t *
+stat_client_get (void)
+{
+ stat_client_main_t *sm;
+ sm = (stat_client_main_t *) malloc (sizeof (stat_client_main_t));
+ clib_memset (sm, 0, sizeof (stat_client_main_t));
+ return sm;
+}
+
+void
+stat_client_free (stat_client_main_t * sm)
+{
+ free (sm);
+}
+
static int
recv_fd (int sock)
{
@@ -74,25 +82,30 @@ recv_fd (int sock)
}
static stat_segment_directory_entry_t *
-get_stat_vector (void)
+get_stat_vector_r (stat_client_main_t * sm)
{
- stat_client_main_t *sm = &stat_client_main;
ASSERT (sm->shared_header);
return stat_segment_pointer (sm->shared_header,
sm->shared_header->directory_offset);
}
-int
-stat_segment_connect (char *socket_name)
+static stat_segment_directory_entry_t *
+get_stat_vector (void)
{
stat_client_main_t *sm = &stat_client_main;
+ return get_stat_vector_r (sm);
+}
+
+int
+stat_segment_connect_r (char *socket_name, stat_client_main_t * sm)
+{
int mfd = -1;
int sock;
clib_memset (sm, 0, sizeof (*sm));
if ((sock = socket (AF_UNIX, SOCK_SEQPACKET, 0)) < 0)
{
- perror ("Couldn't open socket");
+ perror ("Stat client couldn't open socket");
return -1;
}
@@ -103,7 +116,6 @@ stat_segment_connect (char *socket_name)
0)
{
close (sock);
- perror ("connect");
return -1;
}
@@ -121,13 +133,13 @@ stat_segment_connect (char *socket_name)
if (fstat (mfd, &st) == -1)
{
- perror ("mmap");
+ perror ("mmap fstat failed");
return -1;
}
if ((memaddr =
mmap (NULL, st.st_size, PROT_READ, MAP_SHARED, mfd, 0)) == MAP_FAILED)
{
- perror ("mmap");
+ perror ("mmap map failed");
return -1;
}
@@ -139,28 +151,45 @@ stat_segment_connect (char *socket_name)
return 0;
}
+int
+stat_segment_connect (char *socket_name)
+{
+ stat_client_main_t *sm = &stat_client_main;
+ return stat_segment_connect_r (socket_name, sm);
+}
+
+void
+stat_segment_disconnect_r (stat_client_main_t * sm)
+{
+ munmap (sm->shared_header, sm->memory_size);
+ return;
+}
+
void
stat_segment_disconnect (void)
{
stat_client_main_t *sm = &stat_client_main;
- munmap (sm->shared_header, sm->memory_size);
+ return stat_segment_disconnect_r (sm);
+}
- return;
+double
+stat_segment_heartbeat_r (stat_client_main_t * sm)
+{
+ stat_segment_directory_entry_t *vec = get_stat_vector_r (sm);
+ double *hb = stat_segment_pointer (sm->shared_header, vec[4].offset);
+ return *hb;
}
double
stat_segment_heartbeat (void)
{
stat_client_main_t *sm = &stat_client_main;
- stat_segment_directory_entry_t *vec = get_stat_vector ();
- double *hb = stat_segment_pointer (sm->shared_header, vec[4].offset);
- return *hb;
+ return stat_segment_heartbeat_r (sm);
}
stat_segment_data_t
-copy_data (stat_segment_directory_entry_t * ep)
+copy_data (stat_segment_directory_entry_t * ep, stat_client_main_t * sm)
{
- stat_client_main_t *sm = &stat_client_main;
stat_segment_data_t result = { 0 };
int i;
vlib_counter_t **combined_c; /* Combined counter */
@@ -254,9 +283,9 @@ typedef struct
} stat_segment_access_t;
static void
-stat_segment_access_start (stat_segment_access_t * sa)
+stat_segment_access_start (stat_segment_access_t * sa,
+ stat_client_main_t * sm)
{
- stat_client_main_t *sm = &stat_client_main;
stat_segment_shared_header_t *shared_header = sm->shared_header;
sa->epoch = shared_header->epoch;
while (shared_header->in_progress != 0)
@@ -264,9 +293,8 @@ stat_segment_access_start (stat_segment_access_t * sa)
}
static bool
-stat_segment_access_end (stat_segment_access_t * sa)
+stat_segment_access_end (stat_segment_access_t * sa, stat_client_main_t * sm)
{
- stat_client_main_t *sm = &stat_client_main;
stat_segment_shared_header_t *shared_header = sm->shared_header;
if (shared_header->epoch != sa->epoch || shared_header->in_progress)
@@ -275,9 +303,8 @@ stat_segment_access_end (stat_segment_access_t * sa)
}
uint32_t *
-stat_segment_ls (uint8_t ** patterns)
+stat_segment_ls_r (uint8_t ** patterns, stat_client_main_t * sm)
{
- stat_client_main_t *sm = &stat_client_main;
stat_segment_access_t sa;
uint32_t *dir = 0;
@@ -294,9 +321,9 @@ stat_segment_ls (uint8_t ** patterns)
}
}
- stat_segment_access_start (&sa);
+ stat_segment_access_start (&sa, sm);
- stat_segment_directory_entry_t *counter_vec = get_stat_vector ();
+ stat_segment_directory_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++)
@@ -315,7 +342,7 @@ stat_segment_ls (uint8_t ** patterns)
for (i = 0; i < vec_len (patterns); i++)
regfree (&regex[i]);
- if (!stat_segment_access_end (&sa))
+ if (!stat_segment_access_end (&sa, sm))
{
/* Failed, clean up */
vec_free (dir);
@@ -328,11 +355,17 @@ stat_segment_ls (uint8_t ** patterns)
return dir;
}
+uint32_t *
+stat_segment_ls (uint8_t ** patterns)
+{
+ stat_client_main_t *sm = &stat_client_main;
+ return stat_segment_ls_r ((uint8_t **) patterns, sm);
+}
+
stat_segment_data_t *
-stat_segment_dump (uint32_t * stats)
+stat_segment_dump_r (uint32_t * stats, stat_client_main_t * sm)
{
int i;
- stat_client_main_t *sm = &stat_client_main;
stat_segment_directory_entry_t *ep;
stat_segment_data_t *res = 0;
stat_segment_access_t sa;
@@ -341,15 +374,15 @@ stat_segment_dump (uint32_t * stats)
if (sm->shared_header->epoch != sm->current_epoch)
return 0;
- stat_segment_access_start (&sa);
+ stat_segment_access_start (&sa, sm);
for (i = 0; i < vec_len (stats); i++)
{
/* Collect counter */
ep = vec_elt_at_index (sm->directory_vector, stats[i]);
- vec_add1 (res, copy_data (ep));
+ vec_add1 (res, copy_data (ep, sm));
}
- if (stat_segment_access_end (&sa))
+ if (stat_segment_access_end (&sa, sm))
return res;
fprintf (stderr, "Epoch changed while reading, invalid results\n");
@@ -357,6 +390,13 @@ stat_segment_dump (uint32_t * stats)
return 0;
}
+stat_segment_data_t *
+stat_segment_dump (uint32_t * stats)
+{
+ stat_client_main_t *sm = &stat_client_main;
+ return stat_segment_dump_r (stats, sm);
+}
+
/* Wrapper for accessing vectors from other languages */
int
stat_segment_vec_len (void *vec)
@@ -381,24 +421,30 @@ stat_segment_string_vector (u8 ** string_vector, char *string)
}
stat_segment_data_t *
-stat_segment_dump_entry (uint32_t index)
+stat_segment_dump_entry_r (uint32_t index, stat_client_main_t * sm)
{
- stat_client_main_t *sm = &stat_client_main;
stat_segment_directory_entry_t *ep;
stat_segment_data_t *res = 0;
stat_segment_access_t sa;
- stat_segment_access_start (&sa);
+ stat_segment_access_start (&sa, sm);
/* Collect counter */
ep = vec_elt_at_index (sm->directory_vector, index);
- vec_add1 (res, copy_data (ep));
+ vec_add1 (res, copy_data (ep, sm));
- if (stat_segment_access_end (&sa))
+ if (stat_segment_access_end (&sa, sm))
return res;
return 0;
}
+stat_segment_data_t *
+stat_segment_dump_entry (uint32_t index)
+{
+ stat_client_main_t *sm = &stat_client_main;
+ return stat_segment_dump_entry_r (index, sm);
+}
+
char *
stat_segment_index_to_name (uint32_t index)
{
diff --git a/src/vpp-api/client/stat_client.h b/src/vpp-api/client/stat_client.h
index ef16e4246dc..aeca63419ee 100644
--- a/src/vpp-api/client/stat_client.h
+++ b/src/vpp-api/client/stat_client.h
@@ -23,6 +23,14 @@
typedef struct
{
+ uint64_t current_epoch;
+ stat_segment_shared_header_t *shared_header;
+ stat_segment_directory_entry_t *directory_vector;
+ ssize_t memory_size;
+} stat_client_main_t;
+
+typedef struct
+{
char *name;
stat_directory_type_t type;
union
@@ -34,16 +42,26 @@ typedef struct
};
} stat_segment_data_t;
+stat_client_main_t *stat_client_get (void);
+void stat_client_free (stat_client_main_t * sm);
+int stat_segment_connect_r (char *socket_name, stat_client_main_t * sm);
int stat_segment_connect (char *socket_name);
+void stat_segment_disconnect_r (stat_client_main_t * sm);
void stat_segment_disconnect (void);
uint8_t **stat_segment_string_vector (uint8_t ** string_vector, char *string);
int stat_segment_vec_len (void *vec);
void stat_segment_vec_free (void *vec);
+uint32_t *stat_segment_ls_r (uint8_t ** patterns, stat_client_main_t * sm);
uint32_t *stat_segment_ls (uint8_t ** pattern);
+stat_segment_data_t *stat_segment_dump_r (uint32_t * stats,
+ stat_client_main_t * sm);
stat_segment_data_t *stat_segment_dump (uint32_t * counter_vec);
+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 (uint32_t index);
-void stat_segment_data_free (stat_segment_data_t * res);
+void stat_segment_data_free (stat_segment_data_t * res);
+double stat_segment_heartbeat_r (stat_client_main_t * sm);
double stat_segment_heartbeat (void);
char *stat_segment_index_to_name (uint32_t index);
diff --git a/src/vpp-api/python/vpp_papi/vpp_stats.py b/src/vpp-api/python/vpp_papi/vpp_stats.py
index 76e1e5435f0..654cb82d841 100644
--- a/src/vpp-api/python/vpp_papi/vpp_stats.py
+++ b/src/vpp-api/python/vpp_papi/vpp_stats.py
@@ -2,6 +2,7 @@
from __future__ import print_function
from cffi import FFI
+import time
ffi = FFI()
ffi.cdef("""
@@ -44,12 +45,37 @@ typedef struct
};
} stat_segment_data_t;
+typedef struct
+{
+ uint64_t epoch;
+ uint64_t in_progress;
+ uint64_t directory_offset;
+ uint64_t error_offset;
+ uint64_t stats_offset;
+} stat_segment_shared_header_t;
+
+typedef struct
+{
+ uint64_t current_epoch;
+ stat_segment_shared_header_t *shared_header;
+ stat_segment_directory_entry_t *directory_vector;
+ ssize_t memory_size;
+} stat_client_main_t;
+
+stat_client_main_t * stat_client_get(void);
+void stat_client_free(stat_client_main_t * sm);
+int stat_segment_connect_r (char *socket_name, stat_client_main_t * sm);
int stat_segment_connect (char *socket_name);
+void stat_segment_disconnect_r (stat_client_main_t * sm);
void stat_segment_disconnect (void);
+uint32_t *stat_segment_ls_r (uint8_t ** patterns, stat_client_main_t * sm);
uint32_t *stat_segment_ls (uint8_t ** pattern);
+stat_segment_data_t *stat_segment_dump_r (uint32_t * stats, stat_client_main_t * sm);
stat_segment_data_t *stat_segment_dump (uint32_t * counter_vec);
void stat_segment_data_free (stat_segment_data_t * res);
+
+double stat_segment_heartbeat_r (stat_client_main_t * sm);
double stat_segment_heartbeat (void);
int stat_segment_vec_len(void *vec);
uint8_t **stat_segment_string_vector(uint8_t **string_vector, char *string);
@@ -113,21 +139,34 @@ def stat_entry_to_python(api, e):
class VPPStats:
- def __init__(self, socketname='/var/run/stats.sock'):
- self.api = ffi.dlopen('libvppapiclient.so')
- rv = self.api.stat_segment_connect(socketname.encode())
+ def __init__(self, socketname='/var/run/stats.sock', timeout=10):
+ try:
+ self.api = ffi.dlopen('libvppapiclient.so')
+ except Exception:
+ raise RuntimeError("Could not open: libvppapiclient.so")
+ self.client = self.api.stat_client_get()
+
+ poll_end_time = time.time() + timeout
+ while time.time() < poll_end_time:
+ rv = self.api.stat_segment_connect_r(socketname.encode(),
+ self.client)
+ if rv == 0:
+ break
+
if rv != 0:
raise IOError()
def heartbeat(self):
- return self.api.stat_segment_heartbeat()
+ return self.api.stat_segment_heartbeat_r(self.client)
def ls(self, patterns):
- return self.api.stat_segment_ls(make_string_vector(self.api, patterns))
+ return self.api.stat_segment_ls_r(make_string_vector(self.api,
+ patterns),
+ self.client)
def dump(self, counters):
stats = {}
- rv = self.api.stat_segment_dump(counters)
+ rv = self.api.stat_segment_dump_r(counters, self.client)
# Raise exception and retry
if rv == ffi.NULL:
raise IOError()
@@ -149,10 +188,10 @@ class VPPStats:
if retries > 10:
return None
retries += 1
- pass
def disconnect(self):
- self.api.stat_segment_disconnect()
+ self.api.stat_segment_disconnect_r(self.client)
+ self.api.stat_client_free(self.client)
def set_errors(self):
'''Return all errors counters > 0'''
@@ -166,7 +205,7 @@ class VPPStats:
if retries > 10:
return None
retries += 1
- pass
+
return {k: error_counters[k]
for k in error_counters.keys() if error_counters[k]}