diff options
| author |   Ole Troan <ot@cisco.com> | 2019-05-16 15:01:34 +0200 |
|---|---|---|
| committer |   Andrew Yourtchenko <ayourtch@gmail.com> | 2019-05-22 09:43:49 +0000 |
| commit | 233e4681830bc2a9cd40deb4b5909b4e310d1a2a (patch) | |
| tree | 495c36ffbafdfaf8c85672024e2162ea8ee923ac /src/vpp/app | |
| parent | a29d18ae6bb7cda3923693a052c3b9208588be8e (diff) | |
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 <ot@cisco.com>
Diffstat (limited to 'src/vpp/app')
| -rw-r--r-- | src/vpp/app/vpp_get_stats.c | 8 | ||||
| -rw-r--r-- | src/vpp/app/vpp_prometheus_export.c | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/vpp/app/vpp_get_stats.c b/src/vpp/app/vpp_get_stats.c index 1d878029dda..c00fb835d1c 100644 --- a/src/vpp/app/vpp_get_stats.c +++ b/src/vpp/app/vpp_get_stats.c @@ -80,7 +80,9 @@ stat_poll_loop (u8 ** patterns) break; case STAT_DIR_TYPE_ERROR_INDEX: - fformat (stdout, "%llu %s\n", res[i].error_value, res[i].name); + for (j = 0; j < vec_len (res[i].error_vector); j++) + fformat (stdout, "%llu %s\n", res[i].error_vector[j], + res[i].name); break; case STAT_DIR_TYPE_SCALAR_INDEX: @@ -213,7 +215,9 @@ reconnect: break; case STAT_DIR_TYPE_ERROR_INDEX: - fformat (stdout, "%llu %s\n", res[i].error_value, res[i].name); + for (j = 0; j < vec_len (res[i].error_vector); j++) + fformat (stdout, "[@%d] %llu %s\n", j, res[i].error_vector[j], + res[i].name); break; case STAT_DIR_TYPE_SCALAR_INDEX: diff --git a/src/vpp/app/vpp_prometheus_export.c b/src/vpp/app/vpp_prometheus_export.c index e2fdd7150e5..06f1a9169cd 100644 --- a/src/vpp/app/vpp_prometheus_export.c +++ b/src/vpp/app/vpp_prometheus_export.c @@ -97,9 +97,13 @@ retry: } break; case STAT_DIR_TYPE_ERROR_INDEX: - fformat (stream, "# TYPE %s counter\n", prom_string (res[i].name)); - fformat (stream, "%s{thread=\"0\"} %lld\n", - prom_string (res[i].name), res[i].error_value); + for (j = 0; j < vec_len (res[i].error_vector); j++) + { + fformat (stream, "# TYPE %s counter\n", + prom_string (res[i].name)); + fformat (stream, "%s{thread=\"%d\"} %lld\n", + prom_string (res[i].name), j, res[i].error_vector[j]); + } break; case STAT_DIR_TYPE_SCALAR_INDEX: |