X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp-api%2Fclient%2Fstat_client.c;h=0eaec15ffb6c6416300000fcc0d2ec116ad7a447;hb=3ffe6cadf;hp=bb7f240a753769dae830dc3f5e3343142ae0d048;hpb=90a9fdfd3e7a3150aa30ef3ccf7aa3cc54301383;p=vpp.git

diff --git a/src/vpp-api/client/stat_client.c b/src/vpp-api/client/stat_client.c
index bb7f240a753..0eaec15ffb6 100644
--- a/src/vpp-api/client/stat_client.c
+++ b/src/vpp-api/client/stat_client.c
@@ -97,13 +97,6 @@ get_stat_vector_r (stat_client_main_t * sm)
 			       sm->shared_header->directory_offset);
 }
 
-static stat_segment_directory_entry_t *
-get_stat_vector (void)
-{
-  stat_client_main_t *sm = &stat_client_main;
-  return get_stat_vector_r (sm);
-}
-
 int
 stat_segment_connect_r (const char *socket_name, stat_client_main_t * sm)
 {
@@ -124,14 +117,14 @@ stat_segment_connect_r (const char *socket_name, stat_client_main_t * sm)
       0)
     {
       close (sock);
-      return -1;
+      return -2;
     }
 
   if ((mfd = recv_fd (sock)) < 0)
     {
       close (sock);
       fprintf (stderr, "Receiving file descriptor failed\n");
-      return -1;
+      return -3;
     }
   close (sock);
 
@@ -141,16 +134,19 @@ stat_segment_connect_r (const char *socket_name, stat_client_main_t * sm)
 
   if (fstat (mfd, &st) == -1)
     {
+      close (mfd);
       perror ("mmap fstat failed");
-      return -1;
+      return -4;
     }
   if ((memaddr =
        mmap (NULL, st.st_size, PROT_READ, MAP_SHARED, mfd, 0)) == MAP_FAILED)
     {
+      close (mfd);
       perror ("mmap map failed");
-      return -1;
+      return -5;
     }
 
+  close (mfd);
   sm->memory_size = st.st_size;
   sm->shared_header = memaddr;
   sm->directory_vector =
@@ -173,6 +169,34 @@ stat_segment_disconnect_r (stat_client_main_t * sm)
   return;
 }
 
+typedef struct
+{
+  uint64_t epoch;
+} stat_segment_access_t;
+
+static void
+stat_segment_access_start (stat_segment_access_t * sa,
+			   stat_client_main_t * sm)
+{
+  stat_segment_shared_header_t *shared_header = sm->shared_header;
+  sa->epoch = shared_header->epoch;
+  while (shared_header->in_progress != 0)
+    ;
+  sm->directory_vector = stat_segment_pointer (sm->shared_header,
+					       sm->
+					       shared_header->directory_offset);
+}
+
+static 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;
+
+  if (shared_header->epoch != sa->epoch || shared_header->in_progress)
+    return false;
+  return true;
+}
+
 void
 stat_segment_disconnect (void)
 {
@@ -183,9 +207,17 @@ stat_segment_disconnect (void)
 double
 stat_segment_heartbeat_r (stat_client_main_t * sm)
 {
-  stat_segment_directory_entry_t *vec = get_stat_vector_r (sm);
-  double *hb = stat_segment_pointer (sm->shared_header, vec[4].offset);
-  return *hb;
+  stat_segment_access_t sa;
+  stat_segment_directory_entry_t *ep;
+
+  /* Has directory been update? */
+  if (sm->shared_header->epoch != sm->current_epoch)
+    return 0;
+  stat_segment_access_start (&sa, sm);
+  ep = vec_elt_at_index (sm->directory_vector, STAT_COUNTER_HEARTBEAT);
+  if (!stat_segment_access_end (&sa, sm))
+    return 0.0;
+  return ep->value;
 }
 
 double
@@ -195,14 +227,13 @@ stat_segment_heartbeat (void)
   return stat_segment_heartbeat_r (sm);
 }
 
-stat_segment_data_t
+static stat_segment_data_t
 copy_data (stat_segment_directory_entry_t * ep, stat_client_main_t * sm)
 {
   stat_segment_data_t result = { 0 };
   int i;
   vlib_counter_t **combined_c;	/* Combined counter */
   counter_t **simple_c;		/* Simple counter */
-  counter_t *error_base;
   uint64_t *offset_vector;
 
   assert (sm->shared_header);
@@ -246,14 +277,41 @@ copy_data (stat_segment_directory_entry_t * ep, stat_client_main_t * sm)
       break;
 
     case STAT_DIR_TYPE_ERROR_INDEX:
-      error_base =
-	stat_segment_pointer (sm->shared_header,
-			      sm->shared_header->error_offset);
-      result.error_value = error_base[ep->index];
+      /* Gather errors from all threads into a vector */
+      offset_vector = stat_segment_pointer (sm->shared_header,
+					    sm->shared_header->error_offset);
+      vec_validate (result.error_vector, vec_len (offset_vector) - 1);
+      for (i = 0; i < vec_len (offset_vector); i++)
+	{
+	  counter_t *cb =
+	    stat_segment_pointer (sm->shared_header, offset_vector[i]);
+	  result.error_vector[i] = cb[ep->index];
+	}
+      break;
+
+    case STAT_DIR_TYPE_NAME_VECTOR:
+      if (ep->offset == 0)
+	return result;
+      uint8_t **name_vector =
+	stat_segment_pointer (sm->shared_header, ep->offset);
+      result.name_vector = vec_dup (name_vector);
+      offset_vector =
+	stat_segment_pointer (sm->shared_header, ep->offset_vector);
+      for (i = 0; i < vec_len (name_vector); i++)
+	{
+	  if (offset_vector[i])
+	    {
+	      u8 *name =
+		stat_segment_pointer (sm->shared_header, offset_vector[i]);
+	      result.name_vector[i] = vec_dup (name);
+	    }
+	  else
+	    result.name_vector[i] = 0;
+	}
       break;
 
     default:
-      fprintf (stderr, "Unknown type: %d", ep->type);
+      fprintf (stderr, "Unknown type: %d\n", ep->type);
     }
   return result;
 }
@@ -284,32 +342,6 @@ stat_segment_data_free (stat_segment_data_t * res)
   vec_free (res);
 }
 
-
-typedef struct
-{
-  uint64_t epoch;
-} stat_segment_access_t;
-
-static void
-stat_segment_access_start (stat_segment_access_t * sa,
-			   stat_client_main_t * sm)
-{
-  stat_segment_shared_header_t *shared_header = sm->shared_header;
-  sa->epoch = shared_header->epoch;
-  while (shared_header->in_progress != 0)
-    ;
-}
-
-static 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;
-
-  if (shared_header->epoch != sa->epoch || shared_header->in_progress)
-    return false;
-  return true;
-}
-
 uint32_t *
 stat_segment_ls_r (uint8_t ** patterns, stat_client_main_t * sm)
 {
@@ -456,14 +488,42 @@ stat_segment_dump_entry (uint32_t index)
 }
 
 char *
-stat_segment_index_to_name (uint32_t index)
+stat_segment_index_to_name_r (uint32_t index, stat_client_main_t * sm)
 {
-  char *name;
-  stat_segment_directory_entry_t *counter_vec = get_stat_vector ();
   stat_segment_directory_entry_t *ep;
-  ep = vec_elt_at_index (counter_vec, index);
-  name = strdup (ep->name);
-  return name;
+  stat_segment_access_t sa;
+  stat_segment_directory_entry_t *vec;
+
+  /* Has directory been update? */
+  if (sm->shared_header->epoch != sm->current_epoch)
+    return 0;
+  stat_segment_access_start (&sa, sm);
+  vec = get_stat_vector_r (sm);
+  ep = vec_elt_at_index (vec, index);
+  if (!stat_segment_access_end (&sa, sm))
+    return 0;
+  return strdup (ep->name);
+}
+
+char *
+stat_segment_index_to_name (uint32_t index)
+{
+  stat_client_main_t *sm = &stat_client_main;
+  return stat_segment_index_to_name_r (index, sm);
+}
+
+uint64_t
+stat_segment_version_r (stat_client_main_t * sm)
+{
+  ASSERT (sm->shared_header);
+  return sm->shared_header->version;
+}
+
+uint64_t
+stat_segment_version (void)
+{
+  stat_client_main_t *sm = &stat_client_main;
+  return stat_segment_version_r (sm);
 }
 
 /*