From 6c36ca545bbd6f65937a4ec0de55614cf7223690 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Fri, 10 May 2019 08:38:25 -0400 Subject: Fix stat seg average vector rate computation Add the number of worker threads and per worker thread vector rates to the stats segment. Change-Id: I3040108ec9fcdf5fdb6b9a950060dea9b3c88fd1 Signed-off-by: Dave Barach Signed-off-by: Dave Barach (cherry picked from commit f89a6de8f032536080c4a11b267bf921093d3740) --- src/vpp/stats/stat_segment.h | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'src/vpp/stats/stat_segment.h') diff --git a/src/vpp/stats/stat_segment.h b/src/vpp/stats/stat_segment.h index 4167695a94c..fd7ce79cabe 100644 --- a/src/vpp/stats/stat_segment.h +++ b/src/vpp/stats/stat_segment.h @@ -24,6 +24,8 @@ typedef enum { STAT_COUNTER_VECTOR_RATE = 0, + STAT_COUNTER_NUM_WORKER_THREADS, + STAT_COUNTER_VECTOR_RATE_PER_WORKER, STAT_COUNTER_INPUT_RATE, STAT_COUNTER_LAST_UPDATE, STAT_COUNTER_LAST_STATS_CLEAR, @@ -37,16 +39,19 @@ typedef enum STAT_COUNTERS } stat_segment_counter_t; -#define foreach_stat_segment_counter_name \ - _(VECTOR_RATE, SCALAR_INDEX, vector_rate, /sys) \ - _(INPUT_RATE, SCALAR_INDEX, input_rate, /sys) \ - _(LAST_UPDATE, SCALAR_INDEX, last_update, /sys) \ - _(LAST_STATS_CLEAR, SCALAR_INDEX, last_stats_clear, /sys) \ - _(HEARTBEAT, SCALAR_INDEX, heartbeat, /sys) \ - _(NODE_CLOCKS, COUNTER_VECTOR_SIMPLE, clocks, /sys/node) \ - _(NODE_VECTORS, COUNTER_VECTOR_SIMPLE, vectors, /sys/node) \ - _(NODE_CALLS, COUNTER_VECTOR_SIMPLE, calls, /sys/node) \ - _(NODE_SUSPENDS, COUNTER_VECTOR_SIMPLE, suspends, /sys/node) \ +#define foreach_stat_segment_counter_name \ + _(VECTOR_RATE, SCALAR_INDEX, vector_rate, /sys) \ + _(VECTOR_RATE_PER_WORKER, COUNTER_VECTOR_SIMPLE, \ + vector_rate_per_worker, /sys) \ + _(NUM_WORKER_THREADS, SCALAR_INDEX, num_worker_threads, /sys) \ + _(INPUT_RATE, SCALAR_INDEX, input_rate, /sys) \ + _(LAST_UPDATE, SCALAR_INDEX, last_update, /sys) \ + _(LAST_STATS_CLEAR, SCALAR_INDEX, last_stats_clear, /sys) \ + _(HEARTBEAT, SCALAR_INDEX, heartbeat, /sys) \ + _(NODE_CLOCKS, COUNTER_VECTOR_SIMPLE, clocks, /sys/node) \ + _(NODE_VECTORS, COUNTER_VECTOR_SIMPLE, vectors, /sys/node) \ + _(NODE_CALLS, COUNTER_VECTOR_SIMPLE, calls, /sys/node) \ + _(NODE_SUSPENDS, COUNTER_VECTOR_SIMPLE, suspends, /sys/node) \ _(INTERFACE_NAMES, NAME_VECTOR, names, /if) \ _(NODE_NAMES, NAME_VECTOR, names, /sys/node) -- cgit 1.2.3-korg