From 233e4681830bc2a9cd40deb4b5909b4e310d1a2a Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Thu, 16 May 2019 15:01:34 +0200 Subject: stats: support multiple works for error counters The current code only allowed access to the main thread error counters. That is not so useful for a multi worker instance. No return a vector indexed by thread of counter_t values. Type: fix Change-Id: Ie322c8889c0c8175e1116e71de04a2cf453b9ed7 Signed-off-by: Ole Troan --- src/vpp-api/python/vpp_papi/vpp_stats.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'src/vpp-api/python/vpp_papi/vpp_stats.py') diff --git a/src/vpp-api/python/vpp_papi/vpp_stats.py b/src/vpp-api/python/vpp_papi/vpp_stats.py index c90aa349434..86a80ddc328 100644 --- a/src/vpp-api/python/vpp_papi/vpp_stats.py +++ b/src/vpp-api/python/vpp_papi/vpp_stats.py @@ -40,7 +40,7 @@ typedef struct union { double scalar_value; - uint64_t error_value; + counter_t *error_vector; counter_t **simple_counter_vec; vlib_counter_t **combined_counter_vec; uint8_t **name_vector; @@ -126,6 +126,12 @@ def combined_counter_vec_list(api, e): vec.append(if_per_thread) return vec +def error_vec_list(api, e): + vec = [] + for thread in range(api.stat_segment_vec_len(e)): + vec.append(e[thread]) + return vec + def name_vec_list(api, e): return [ffi.string(e[i]).decode('utf-8') for i in range(api.stat_segment_vec_len(e)) if e[i] != ffi.NULL] @@ -138,7 +144,7 @@ def stat_entry_to_python(api, e): if e.type == 3: return combined_counter_vec_list(api, e.combined_counter_vec) if e.type == 4: - return e.error_value + return error_vec_list(api, e.error_vector) if e.type == 5: return name_vec_list(api, e.name_vector) raise NotImplementedError() @@ -248,6 +254,11 @@ class VPPStats(object): return None retries += 1 + def get_err_counter(self, name): + """Get an error counter. The errors from each worker thread + are summed""" + return sum(self.get_counter(name)) + def disconnect(self): self.api.stat_segment_disconnect_r(self.client) self.api.stat_client_free(self.client) @@ -265,8 +276,8 @@ class VPPStats(object): return None retries += 1 - return {k: error_counters[k] - for k in error_counters.keys() if error_counters[k]} + return {k: sum(error_counters[k]) + for k in error_counters.keys() if sum(error_counters[k])} def set_errors_str(self): '''Return all errors counters > 0 pretty printed''' -- cgit 1.2.3-korg