X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp-api%2Fclient%2Fstat_client.h;h=f8473efd47f0f8dc17ae78463eaf86cf9d0bd7ff;hb=65c56c83ce4e58178b5ad90a8f325692c9904381;hp=5f076686fdd90225c61f10f074caf2d6256b37e3;hpb=2fee16787ed0d622631223567635a77e14c8c076;p=vpp.git

diff --git a/src/vpp-api/client/stat_client.h b/src/vpp-api/client/stat_client.h
index 5f076686fdd..f8473efd47f 100644
--- a/src/vpp-api/client/stat_client.h
+++ b/src/vpp-api/client/stat_client.h
@@ -17,8 +17,20 @@
 #ifndef included_stat_client_h
 #define included_stat_client_h
 
-#include <vlib/vlib.h>
-#include <vpp/stats/stats.h>
+#define STAT_VERSION_MAJOR     1
+#define STAT_VERSION_MINOR     2
+
+#include <stdint.h>
+#include <unistd.h>
+#include <vlib/counter_types.h>
+#include <time.h>
+#include <stdbool.h>
+#include <vpp/stats/stat_segment_shared.h>
+
+/* Default socket to exchange segment fd */
+/* TODO: Get from runtime directory */
+#define STAT_SEGMENT_SOCKET_FILE "/run/vpp/stats.sock"
+#define STAT_SEGMENT_SOCKET_FILENAME "stats.sock"
 
 typedef struct
 {
@@ -26,32 +38,139 @@ typedef struct
   stat_directory_type_t type;
   union
   {
-    f64 scalar_value;
-    u64 error_value;
-    u64 *vector_pointer;
+    double scalar_value;
+    counter_t *error_vector;
     counter_t **simple_counter_vec;
     vlib_counter_t **combined_counter_vec;
+    uint8_t **name_vector;
   };
 } stat_segment_data_t;
 
 typedef struct
 {
-  char *name;
-  stat_segment_directory_entry_t *ep;
-} stat_segment_cached_pointer_t;
+  uint64_t current_epoch;
+  stat_segment_shared_header_t *shared_header;
+  stat_segment_directory_entry_t *directory_vector;
+  ssize_t memory_size;
+  uint64_t timeout;
+} stat_client_main_t;
+
+extern stat_client_main_t stat_client_main;
 
-int stat_segment_connect (char *socket_name);
+stat_client_main_t *stat_client_get (void);
+void stat_client_free (stat_client_main_t * sm);
+int stat_segment_connect_r (const char *socket_name, stat_client_main_t * sm);
+int stat_segment_connect (const char *socket_name);
+void stat_segment_disconnect_r (stat_client_main_t * sm);
 void stat_segment_disconnect (void);
+uint8_t **stat_segment_string_vector (uint8_t ** string_vector,
+				      const char *string);
+int stat_segment_vec_len (void *vec);
+void stat_segment_vec_free (void *vec);
+uint32_t *stat_segment_ls_r (uint8_t ** patterns, stat_client_main_t * sm);
+uint32_t *stat_segment_ls (uint8_t ** pattern);
+stat_segment_data_t *stat_segment_dump_r (uint32_t * stats,
+					  stat_client_main_t * sm);
+stat_segment_data_t *stat_segment_dump (uint32_t * counter_vec);
+stat_segment_data_t *stat_segment_dump_entry_r (uint32_t index,
+						stat_client_main_t * sm);
+stat_segment_data_t *stat_segment_dump_entry (uint32_t index);
 
-u8 **stat_segment_ls (u8 ** pattern);
-stat_segment_data_t *stat_segment_dump (u8 ** counter_vec);
+void stat_segment_data_free (stat_segment_data_t * res);
+double stat_segment_heartbeat_r (stat_client_main_t * sm);
+double stat_segment_heartbeat (void);
 
-stat_segment_cached_pointer_t *stat_segment_register (u8 ** counter_vec);
-stat_segment_data_t *stat_segment_collect (stat_segment_cached_pointer_t *);	/* Collects registered counters */
+char *stat_segment_index_to_name_r (uint32_t index, stat_client_main_t * sm);
+char *stat_segment_index_to_name (uint32_t index);
+uint64_t stat_segment_version (void);
+uint64_t stat_segment_version_r (stat_client_main_t * sm);
 
-void stat_segment_data_free (stat_segment_data_t * res);
+typedef struct
+{
+  uint64_t epoch;
+} stat_segment_access_t;
+
+static inline uint64_t
+_time_now_nsec (void)
+{
+  struct timespec ts;
+  clock_gettime (CLOCK_REALTIME, &ts);
+  return 1e9 * ts.tv_sec + ts.tv_nsec;
+}
+
+static inline void *
+stat_segment_adjust (stat_client_main_t * sm, void *data)
+{
+  void *p = (void *) ((char *) sm->shared_header +
+		      ((char *) data - (char *) sm->shared_header->base));
+  if (p > (void *) sm->shared_header &&
+      ((p + sizeof (p)) < ((void *) sm->shared_header + sm->memory_size)))
+    return p;
+  return 0;
+}
+
+/*
+ * Returns 0 on success, -1 on failure (timeout)
+ */
+static inline int
+stat_segment_access_start (stat_segment_access_t * sa,
+			   stat_client_main_t * sm)
+{
+  stat_segment_shared_header_t *shared_header = sm->shared_header;
+  uint64_t max_time;
+
+  sa->epoch = shared_header->epoch;
+  if (sm->timeout)
+    {
+      max_time = _time_now_nsec () + sm->timeout;
+      while (shared_header->in_progress != 0 && _time_now_nsec () < max_time)
+	;
+    }
+  else
+    {
+      while (shared_header->in_progress != 0)
+	;
+    }
+  sm->directory_vector =
+    (stat_segment_directory_entry_t *) stat_segment_adjust (sm,
+							    (void *)
+							    sm->shared_header->directory_vector);
+  if (sm->timeout)
+    return _time_now_nsec () < max_time ? 0 : -1;
+  return 0;
+}
+
+/*
+ * set maximum number of nano seconds to wait for in_progress state
+ */
+static inline void
+stat_segment_set_timeout_nsec (stat_client_main_t * sm, uint64_t timeout)
+{
+  sm->timeout = timeout;
+}
+
+/*
+ * set maximum number of nano seconds to wait for in_progress state
+ * this function can be called directly by module using shared stat
+ * segment
+ */
+static inline void
+stat_segment_set_timeout (uint64_t timeout)
+{
+  stat_client_main_t *sm = &stat_client_main;
+  stat_segment_set_timeout_nsec (sm, timeout);
+}
+
+
+static inline bool
+stat_segment_access_end (stat_segment_access_t * sa, stat_client_main_t * sm)
+{
+  stat_segment_shared_header_t *shared_header = sm->shared_header;
 
-f64 stat_segment_heartbeat (void);
+  if (shared_header->epoch != sa->epoch || shared_header->in_progress)
+    return false;
+  return true;
+}
 
 #endif /* included_stat_client_h */