X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp-api%2Fclient%2Fstat_client.c;h=018cce34228408cd2975cd4c92c180ac717b0c8a;hb=41f15ae1dfd4ac1777b684fdc763d12496209418;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..018cce34228 100644 --- a/src/vpp-api/client/stat_client.c +++ b/src/vpp-api/client/stat_client.c @@ -28,17 +28,9 @@ #include #include #include -#include "stat_client.h" #include #include - -struct stat_client_main_t -{ - uint64_t current_epoch; - stat_segment_shared_header_t *shared_header; - stat_segment_directory_entry_t *directory_vector; - ssize_t memory_size; -}; +#include stat_client_main_t stat_client_main; @@ -93,15 +85,8 @@ static stat_segment_directory_entry_t * get_stat_vector_r (stat_client_main_t * sm) { ASSERT (sm->shared_header); - return stat_segment_pointer (sm->shared_header, - 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); + return stat_segment_adjust (sm, + (void *) sm->shared_header->directory_vector); } int @@ -124,14 +109,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,20 +126,23 @@ 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 = - stat_segment_pointer (memaddr, sm->shared_header->directory_offset); + stat_segment_adjust (sm, (void *) sm->shared_header->directory_vector); return 0; } @@ -183,9 +171,18 @@ 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; + if (stat_segment_access_start (&sa, sm)) + return 0; + 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,15 +192,24 @@ stat_segment_heartbeat (void) return stat_segment_heartbeat_r (sm); } -stat_segment_data_t +#define stat_vec_dup(S,V) \ + ({ \ + __typeof__ ((V)[0]) * _v(v) = 0; \ + if (V && ((void *)V > (void *)S->shared_header) && \ + (((void*)V + vec_bytes(V)) < \ + ((void *)S->shared_header + S->memory_size))) \ + _v(v) = vec_dup(V); \ + _v(v); \ +}) + +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; + uint64_t *error_vector; assert (sm->shared_header); @@ -216,44 +222,54 @@ copy_data (stat_segment_directory_entry_t * ep, stat_client_main_t * sm) break; case STAT_DIR_TYPE_COUNTER_VECTOR_SIMPLE: - if (ep->offset == 0) - return result; - simple_c = stat_segment_pointer (sm->shared_header, ep->offset); - result.simple_counter_vec = vec_dup (simple_c); - offset_vector = - stat_segment_pointer (sm->shared_header, ep->offset_vector); + simple_c = stat_segment_adjust (sm, ep->data); + result.simple_counter_vec = stat_vec_dup (sm, simple_c); for (i = 0; i < vec_len (simple_c); i++) { - counter_t *cb = - stat_segment_pointer (sm->shared_header, offset_vector[i]); - result.simple_counter_vec[i] = vec_dup (cb); + counter_t *cb = stat_segment_adjust (sm, simple_c[i]); + result.simple_counter_vec[i] = stat_vec_dup (sm, cb); } break; case STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED: - if (ep->offset == 0) - return result; - combined_c = stat_segment_pointer (sm->shared_header, ep->offset); - result.combined_counter_vec = vec_dup (combined_c); - offset_vector = - stat_segment_pointer (sm->shared_header, ep->offset_vector); + combined_c = stat_segment_adjust (sm, ep->data); + result.combined_counter_vec = stat_vec_dup (sm, combined_c); for (i = 0; i < vec_len (combined_c); i++) { - vlib_counter_t *cb = - stat_segment_pointer (sm->shared_header, offset_vector[i]); - result.combined_counter_vec[i] = vec_dup (cb); + vlib_counter_t *cb = stat_segment_adjust (sm, combined_c[i]); + result.combined_counter_vec[i] = stat_vec_dup (sm, cb); } 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 */ + error_vector = + stat_segment_adjust (sm, (void *) sm->shared_header->error_vector); + vec_validate (result.error_vector, vec_len (error_vector) - 1); + for (i = 0; i < vec_len (error_vector); i++) + { + counter_t *cb = stat_segment_adjust (sm, (void *) error_vector[i]); + result.error_vector[i] = cb[ep->index]; + } + break; + + case STAT_DIR_TYPE_NAME_VECTOR: + { + uint8_t **name_vector = stat_segment_adjust (sm, ep->data); + result.name_vector = stat_vec_dup (sm, name_vector); + for (i = 0; i < vec_len (name_vector); i++) + { + u8 *name = stat_segment_adjust (sm, name_vector[i]); + result.name_vector[i] = stat_vec_dup (sm, name); + } + } + break; + + case STAT_DIR_TYPE_EMPTY: break; default: - fprintf (stderr, "Unknown type: %d", ep->type); + fprintf (stderr, "Unknown type: %d\n", ep->type); } return result; } @@ -276,40 +292,24 @@ stat_segment_data_free (stat_segment_data_t * res) vec_free (res[i].combined_counter_vec[j]); vec_free (res[i].combined_counter_vec); break; + case STAT_DIR_TYPE_NAME_VECTOR: + for (j = 0; j < vec_len (res[i].name_vector); j++) + vec_free (res[i].name_vector[j]); + vec_free (res[i].name_vector); + break; + case STAT_DIR_TYPE_ERROR_INDEX: + vec_free (res[i].error_vector); + break; + case STAT_DIR_TYPE_SCALAR_INDEX: + break; default: - ; + assert (0); } free (res[i].name); } 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) { @@ -329,7 +329,8 @@ stat_segment_ls_r (uint8_t ** patterns, stat_client_main_t * sm) } } - stat_segment_access_start (&sa, sm); + if (stat_segment_access_start (&sa, sm)) + return 0; stat_segment_directory_entry_t *counter_vec = get_stat_vector_r (sm); for (j = 0; j < vec_len (counter_vec); j++) @@ -382,7 +383,9 @@ stat_segment_dump_r (uint32_t * stats, stat_client_main_t * sm) if (sm->shared_header->epoch != sm->current_epoch) return 0; - stat_segment_access_start (&sa, sm); + if (stat_segment_access_start (&sa, sm)) + return 0; + for (i = 0; i < vec_len (stats); i++) { /* Collect counter */ @@ -437,7 +440,8 @@ stat_segment_dump_entry_r (uint32_t index, stat_client_main_t * sm) stat_segment_data_t *res = 0; stat_segment_access_t sa; - stat_segment_access_start (&sa, sm); + if (stat_segment_access_start (&sa, sm)) + return 0; /* Collect counter */ ep = vec_elt_at_index (sm->directory_vector, index); @@ -456,14 +460,43 @@ 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; + if (stat_segment_access_start (&sa, sm)) + return 0; + 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); } /*