diff options
| author |   Ondrej Fabry <ofabry@cisco.com> | 2019-05-31 08:56:20 +0200 |
|---|---|---|
| committer | Ondrej Fabry <ofabry@cisco.com> | 2019-05-31 08:56:20 +0200 |
| commit | 3f0489044a1fbc6539aa8c57ffce6d7b00de7d82 (patch) | |
| tree | 430770c075de85bcbef72ebe2548bce4208da326 /adapter/vppapiclient/stat_client_wrapper.h | |
| parent | df781c9bcf64ba93d0ab7ce62573d93c2bf93d4e (diff) | |
Support for error vectors
- this fixes compilation error for VPP 19.08 and keeps
backwards compatibility with previous versions
Change-Id: Ib58557a090caa5e8342c0cb21de8af684cb18137
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
Diffstat (limited to 'adapter/vppapiclient/stat_client_wrapper.h')
| -rw-r--r-- | adapter/vppapiclient/stat_client_wrapper.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/adapter/vppapiclient/stat_client_wrapper.h b/adapter/vppapiclient/stat_client_wrapper.h index 9178fb5..3fe0460 100644 --- a/adapter/vppapiclient/stat_client_wrapper.h +++ b/adapter/vppapiclient/stat_client_wrapper.h @@ -32,6 +32,10 @@ #if STAT_VERSION_MAJOR >= 1 && STAT_VERSION_MINOR >= 1 #define SUPPORTS_NAME_VECTOR // VPP 19.04 is required! #endif +// Error value was changed into vector in VPP 19.08 +#if STAT_VERSION_MAJOR >= 1 && STAT_VERSION_MINOR >= 2 + #define SUPPORTS_ERROR_VECTOR // VPP 19.08 is required! +#endif static int govpp_stat_connect(char *socket_name) @@ -93,10 +97,18 @@ govpp_stat_segment_data_get_scalar_value(stat_segment_data_t *data) return data->scalar_value; } -static double +static counter_t govpp_stat_segment_data_get_error_value(stat_segment_data_t *data) { - return data->error_value; +#ifdef SUPPORTS_ERROR_VECTOR + counter_t value = 0; + int j; + for (j = 0; j < stat_segment_vec_len(data->error_vector); j++) // VPP 19.08+ is required! + value += data->error_vector[j]; + return value; +#else + return data->error_value; // VPP <19.08 +#endif } static uint64_t** @@ -168,9 +180,9 @@ govpp_stat_segment_data_free(stat_segment_data_t *data) } static uint8_t** -govpp_stat_segment_string_vector(uint8_t ** string_vector, char *string) +govpp_stat_segment_string_vector(uint8_t **string_vec, char *s) { - return stat_segment_string_vector(string_vector, string); + return stat_segment_string_vector(string_vec, s); } #endif /* included_stat_client_wrapper_h */ |