stats: move vector_rate counters into provider

[vpp.git] / src / vpp / stats / stat_segment.h

diff --git a/src/vpp/stats/stat_segment.h b/src/vpp/stats/stat_segment.h
index 1d1ff31..f5862a6 100644 (file)
--- a/src/vpp/stats/stat_segment.h
+++ b/src/vpp/stats/stat_segment.h
@@ -22,22 +22,18 @@
 
 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,
- STAT_COUNTER_HEARTBEAT,
- STAT_COUNTER_NODE_CLOCKS,
- STAT_COUNTER_NODE_VECTORS,
- STAT_COUNTER_NODE_CALLS,
- STAT_COUNTER_NODE_SUSPENDS,
- STAT_COUNTER_INTERFACE_NAMES,
- STAT_COUNTER_NODE_NAMES,
- STAT_COUNTER_MEM_STATSEG_TOTAL,
- STAT_COUNTER_MEM_STATSEG_USED,
- STAT_COUNTERS
+  STAT_COUNTER_NUM_WORKER_THREADS = 0,
+  STAT_COUNTER_INPUT_RATE,
+  STAT_COUNTER_LAST_UPDATE,
+  STAT_COUNTER_LAST_STATS_CLEAR,
+  STAT_COUNTER_HEARTBEAT,
+  STAT_COUNTER_NODE_CLOCKS,
+  STAT_COUNTER_NODE_VECTORS,
+  STAT_COUNTER_NODE_CALLS,
+  STAT_COUNTER_NODE_SUSPENDS,
+  STAT_COUNTER_INTERFACE_NAMES,
+  STAT_COUNTER_NODE_NAMES,
+  STAT_COUNTERS
 } stat_segment_counter_t;
 
 /* clang-format off */
@@ -48,9 +44,6 @@ typedef enum
   _ (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)                            \
@@ -58,8 +51,6 @@ typedef enum
   _ (HEARTBEAT, SCALAR_INDEX, heartbeat, /sys)                                \
   _ (INTERFACE_NAMES, NAME_VECTOR, names, /if)                                \
   _ (NODE_NAMES, NAME_VECTOR, names, /sys/node)                               \
-  _ (MEM_STATSEG_TOTAL, SCALAR_INDEX, total, /mem/statseg)                    \
-  _ (MEM_STATSEG_USED, SCALAR_INDEX, used, /mem/statseg)                      \
   foreach_stat_segment_node_counter_name
 /* clang-format on */
 
@@ -117,5 +108,16 @@ stat_segment_register_state_counter(u8 *name, u32 *index);
 clib_error_t *
 stat_segment_deregister_state_counter(u32 index);
 void stat_segment_set_state_counter (u32 index, u64 value);
+void stat_segment_poll_add (u32 vector_index, stat_segment_update_fn update_fn,
+                           u32 caller_index, u32 interval);
+
+u32 stat_segment_new_entry (u8 *name, stat_directory_type_t t);
+void vlib_stats_register_mem_heap (clib_mem_heap_t *heap);
+void vlib_stat_segment_lock (void);
+void vlib_stat_segment_unlock (void);
+void vlib_stats_register_symlink (void *oldheap, u8 *name, u32 index1,
+                                 u32 index2, u8 lock);
+
+void stat_provider_register_vector_rate (u32 num_workers);
 
 #endif