X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2Fstats%2Fstat_segment.h;h=f5862a684e42a0d7d68d5cae43f69594bd88337f;hb=3b51f28a6fd480cc397dac90b8f0c1152c186d4d;hp=6e75e6338d438d7b5bb555080d815fa95195740f;hpb=1be5206814e9bae825b320b21bbe22618f8cd214;p=vpp.git

diff --git a/src/vpp/stats/stat_segment.h b/src/vpp/stats/stat_segment.h
index 6e75e6338d4..f5862a684e4 100644
--- a/src/vpp/stats/stat_segment.h
+++ b/src/vpp/stats/stat_segment.h
@@ -16,78 +16,51 @@
 #ifndef included_stat_segment_h
 #define included_stat_segment_h
 
-#include <stdatomic.h>
 #include <vlib/vlib.h>
 #include <vppinfra/socket.h>
-#include <vpp-api/client/stat_client.h>
+#include <vpp/stats/stat_segment_shared.h>
 
 typedef enum
 {
- STAT_COUNTER_VECTOR_RATE = 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_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;
 
-#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)	\
-  _(INTERFACE_NAMES, NAME_VECTOR, names, /if)                   \
-  _(NODE_NAMES, NAME_VECTOR, names, /sys/node)
-
-typedef struct
-{
-  stat_directory_type_t type;
-  union {
-    uint64_t offset;
-    uint64_t index;
-    uint64_t value;
-  };
-  uint64_t offset_vector;
-  char name[128]; // TODO change this to pointer to "somewhere"
-} stat_segment_directory_entry_t;
+/* clang-format off */
+#define foreach_stat_segment_node_counter_name                                \
+  _ (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                                     \
+  _ (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)                                \
+  _ (INTERFACE_NAMES, NAME_VECTOR, names, /if)                                \
+  _ (NODE_NAMES, NAME_VECTOR, names, /sys/node)                               \
+  foreach_stat_segment_node_counter_name
+/* clang-format on */
 
 /* Default stat segment 32m */
 #define STAT_SEGMENT_DEFAULT_SIZE	(32<<20)
 
-/*
- * Shared header first in the shared memory segment.
- */
-typedef struct
-{
-  atomic_int_fast64_t epoch;
-  atomic_int_fast64_t in_progress;
-  atomic_int_fast64_t directory_offset;
-  atomic_int_fast64_t error_offset;
-  atomic_int_fast64_t stats_offset;
-} stat_segment_shared_header_t;
-
-static inline uint64_t
-stat_segment_offset (void *start, void *data)
-{
-  return (char *) data - (char *) start;
-}
+/* Shared segment memory layout version */
+#define STAT_SEGMENT_VERSION		2
 
-static inline void *
-stat_segment_pointer (void *start, uint64_t offset)
-{
-  return ((char *) start + offset);
-}
+#define STAT_SEGMENT_INDEX_INVALID	UINT32_MAX
 
 typedef void (*stat_segment_update_fn)(stat_segment_directory_entry_t * e, u32 i);
 
@@ -105,14 +78,20 @@ typedef struct
   /* statistics segment */
   uword *directory_vector_by_name;
   stat_segment_directory_entry_t *directory_vector;
+  volatile u64 **error_vector;
   u8 **interfaces;
   u8 **nodes;
 
+  /* Update interval */
+  f64 update_interval;
+
   clib_spinlock_t *stat_segment_lockp;
   clib_socket_t *socket;
   u8 *socket_name;
   ssize_t memory_size;
+  clib_mem_page_sz_t log2_page_sz;
   u8 node_counters_enabled;
+  void *last;
   void *heap;
   stat_segment_shared_header_t *shared_header;	/* pointer to shared memory segment */
   int memfd;
@@ -124,5 +103,21 @@ extern stat_segment_main_t stat_segment_main;
 
 clib_error_t *
 stat_segment_register_gauge (u8 *names, stat_segment_update_fn update_fn, u32 index);
+clib_error_t *
+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