X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2Fstats%2Fstat_segment.c;h=efbc2e42ffcf26fee2d6c88e77e88480131d30a9;hb=a606d9210;hp=61b21babbe3cc3f07d500006268fc032bd7ef77b;hpb=49ee68443d41ffe1ab72c964104da980a2eb4367;p=vpp.git diff --git a/src/vpp/stats/stat_segment.c b/src/vpp/stats/stat_segment.c index 61b21babbe3..efbc2e42ffc 100644 --- a/src/vpp/stats/stat_segment.c +++ b/src/vpp/stats/stat_segment.c @@ -19,8 +19,6 @@ #include "stat_segment.h" #include #include /* vnet_get_aggregate_rx_packets */ -#undef HAVE_MEMFD_CREATE -#include #include stat_segment_main_t stat_segment_main; @@ -58,21 +56,18 @@ vlib_stats_push_heap (void *old) return clib_mem_set_heap (sm->heap); } -/* Name to vector index hash */ static u32 -lookup_or_create_hash_index (void *oldheap, char *name, u32 next_vector_index) +lookup_hash_index (u8 * name) { stat_segment_main_t *sm = &stat_segment_main; - u32 index; + u32 index = STAT_SEGMENT_INDEX_INVALID; hash_pair_t *hp; + /* Must be called in the context of the main heap */ + ASSERT (clib_mem_get_heap () != sm->heap); + hp = hash_get_pair (sm->directory_vector_by_name, name); - if (!hp) - { - hash_set (sm->directory_vector_by_name, name, next_vector_index); - index = next_vector_index; - } - else + if (hp) { index = hp->value[0]; } @@ -80,6 +75,110 @@ lookup_or_create_hash_index (void *oldheap, char *name, u32 next_vector_index) return index; } +static void +create_hash_index (u8 * name, u32 index) +{ + stat_segment_main_t *sm = &stat_segment_main; + + /* Must be called in the context of the main heap */ + ASSERT (clib_mem_get_heap () != sm->heap); + + hash_set (sm->directory_vector_by_name, format (0, "%s%c", name, 0), index); +} + +static u32 +vlib_stats_get_next_vector_index () +{ + stat_segment_main_t *sm = &stat_segment_main; + u32 next_vector_index = vec_len (sm->directory_vector); + + ssize_t i; + vec_foreach_index_backwards (i, sm->directory_vector) + { + if (sm->directory_vector[i].type == STAT_DIR_TYPE_EMPTY) + { + next_vector_index = i; + break; + } + } + + return next_vector_index; +} + +static u32 +vlib_stats_create_counter (stat_segment_directory_entry_t * e, void *oldheap) +{ + stat_segment_main_t *sm = &stat_segment_main; + + ASSERT (clib_mem_get_heap () == sm->heap); + + u32 index = vlib_stats_get_next_vector_index (); + + clib_mem_set_heap (oldheap); + create_hash_index ((u8 *) e->name, index); + clib_mem_set_heap (sm->heap); + + vec_validate (sm->directory_vector, index); + sm->directory_vector[index] = *e; + + return index; +} + +static void +vlib_stats_delete_counter (u32 index, void *oldheap) +{ + stat_segment_main_t *sm = &stat_segment_main; + stat_segment_directory_entry_t *e; + + ASSERT (clib_mem_get_heap () == sm->heap); + + if (index > vec_len (sm->directory_vector)) + return; + + e = &sm->directory_vector[index]; + + clib_mem_set_heap (oldheap); + hash_unset (sm->directory_vector_by_name, &e->name); + clib_mem_set_heap (sm->heap); + + memset (e, 0, sizeof (*e)); + e->type = STAT_DIR_TYPE_EMPTY; +} + +/* + * Called from main heap + */ +void +vlib_stats_delete_cm (void *cm_arg) +{ + vlib_simple_counter_main_t *cm = (vlib_simple_counter_main_t *) cm_arg; + stat_segment_main_t *sm = &stat_segment_main; + stat_segment_directory_entry_t *e; + + /* Not all counters have names / hash-table entries */ + if (!cm->name && !cm->stat_segment_name) + { + return; + } + vlib_stat_segment_lock (); + + /* Lookup hash-table is on the main heap */ + char *stat_segment_name = + cm->stat_segment_name ? cm->stat_segment_name : cm->name; + u32 index = lookup_hash_index ((u8 *) stat_segment_name); + + e = &sm->directory_vector[index]; + hash_unset (sm->directory_vector_by_name, &e->name); + + void *oldheap = clib_mem_set_heap (sm->heap); /* Enter stats segment */ + clib_mem_set_heap (oldheap); /* Exit stats segment */ + + memset (e, 0, sizeof (*e)); + e->type = STAT_DIR_TYPE_EMPTY; + + vlib_stat_segment_unlock (); +} + void vlib_stats_pop_heap (void *cm_arg, void *oldheap, u32 cindex, stat_directory_type_t type) @@ -104,56 +203,108 @@ vlib_stats_pop_heap (void *cm_arg, void *oldheap, u32 cindex, /* Lookup hash-table is on the main heap */ stat_segment_name = cm->stat_segment_name ? cm->stat_segment_name : cm->name; - u32 next_vector_index = vec_len (sm->directory_vector); + clib_mem_set_heap (oldheap); /* Exit stats segment */ - u32 vector_index = lookup_or_create_hash_index (oldheap, stat_segment_name, - next_vector_index); + u32 vector_index = lookup_hash_index ((u8 *) stat_segment_name); /* Back to stats segment */ clib_mem_set_heap (sm->heap); /* Re-enter stat segment */ /* Update the vector */ - if (vector_index == next_vector_index) + if (vector_index == STAT_SEGMENT_INDEX_INVALID) { /* New */ strncpy (e.name, stat_segment_name, 128 - 1); e.type = type; - vec_add1 (sm->directory_vector, e); + vector_index = vlib_stats_create_counter (&e, oldheap); } stat_segment_directory_entry_t *ep = &sm->directory_vector[vector_index]; - ep->offset = stat_segment_offset (shared_header, cm->counters); /* Vector of threads of vectors of counters */ - u64 *offset_vector = - ep->offset_vector ? stat_segment_pointer (shared_header, - ep->offset_vector) : 0; + ep->data = cm->counters; + + /* Reset the client hash table pointer, since it WILL change! */ + shared_header->directory_vector = sm->directory_vector; + + vlib_stat_segment_unlock (); + clib_mem_set_heap (oldheap); +} - /* Update the 2nd dimension offset vector */ +u8 * +format_vlib_stats_symlink (u8 *s, va_list *args) +{ + char *input = va_arg (*args, char *); + char *modified_input = vec_dup (input); int i; - vec_validate (offset_vector, vec_len (cm->counters) - 1); + u8 *result; + + for (i = 0; i < strlen (modified_input); i++) + if (modified_input[i] == '/') + modified_input[i] = '_'; + + result = format (s, "%s", modified_input); + vec_free (modified_input); + return result; +} + +void +vlib_stats_register_symlink (void *oldheap, u8 *name, u32 index1, u32 index2, + u8 lock) +{ + stat_segment_main_t *sm = &stat_segment_main; + stat_segment_shared_header_t *shared_header = sm->shared_header; + stat_segment_directory_entry_t e; - if (sm->last != offset_vector) + ASSERT (shared_header); + + if (lock) + vlib_stat_segment_lock (); + clib_mem_set_heap (oldheap); /* Exit stats segment */ + u32 vector_index = lookup_hash_index (name); + /* Back to stats segment */ + clib_mem_set_heap (sm->heap); /* Re-enter stat segment */ + + if (vector_index == STAT_SEGMENT_INDEX_INVALID) { - for (i = 0; i < vec_len (cm->counters); i++) - offset_vector[i] = - stat_segment_offset (shared_header, cm->counters[i]); + memcpy (e.name, name, vec_len (name)); + e.name[vec_len (name)] = '\0'; + e.type = STAT_DIR_TYPE_SYMLINK; + e.index1 = index1; + e.index2 = index2; + vector_index = vlib_stats_create_counter (&e, oldheap); + + /* Warn clients to refresh any pointers they might be holding */ + shared_header->directory_vector = sm->directory_vector; } - else - offset_vector[cindex] = - stat_segment_offset (shared_header, cm->counters[cindex]); - ep->offset_vector = stat_segment_offset (shared_header, offset_vector); - sm->directory_vector[vector_index].offset = - stat_segment_offset (shared_header, cm->counters); + if (lock) + vlib_stat_segment_unlock (); +} - /* Reset the client hash table pointer, since it WILL change! */ - shared_header->directory_offset = - stat_segment_offset (shared_header, sm->directory_vector); +void +vlib_stats_rename_symlink (void *oldheap, u64 index, u8 *new_name) +{ + stat_segment_main_t *sm = &stat_segment_main; + stat_segment_directory_entry_t *e; + + ASSERT (clib_mem_get_heap () == sm->heap); + + if (index > vec_len (sm->directory_vector)) + return; + + e = &sm->directory_vector[index]; - vlib_stat_segment_unlock (); clib_mem_set_heap (oldheap); + hash_unset (sm->directory_vector_by_name, &e->name); + clib_mem_set_heap (sm->heap); + + strncpy (e->name, (char *) new_name, 128 - 1); + clib_mem_set_heap (oldheap); + hash_set (sm->directory_vector_by_name, &e->name, index); + clib_mem_set_heap (sm->heap); } void -vlib_stats_register_error_index (u8 * name, u64 * em_vec, u64 index) +vlib_stats_register_error_index (void *oldheap, u8 * name, u64 * em_vec, + u64 index) { stat_segment_main_t *sm = &stat_segment_main; stat_segment_shared_header_t *shared_header = sm->shared_header; @@ -162,41 +313,60 @@ vlib_stats_register_error_index (u8 * name, u64 * em_vec, u64 index) ASSERT (shared_header); vlib_stat_segment_lock (); + clib_mem_set_heap (oldheap); /* Exit stats segment */ + u32 vector_index = lookup_hash_index (name); + /* Back to stats segment */ + clib_mem_set_heap (sm->heap); /* Re-enter stat segment */ - memcpy (e.name, name, vec_len (name)); - e.name[vec_len (name)] = '\0'; - e.type = STAT_DIR_TYPE_ERROR_INDEX; - e.offset = index; - e.offset_vector = 0; - vec_add1 (sm->directory_vector, e); - - /* Warn clients to refresh any pointers they might be holding */ - shared_header->directory_offset = - stat_segment_offset (shared_header, sm->directory_vector); + if (vector_index == STAT_SEGMENT_INDEX_INVALID) + { + memcpy (e.name, name, vec_len (name)); + e.name[vec_len (name)] = '\0'; + e.type = STAT_DIR_TYPE_ERROR_INDEX; + e.index = index; + vector_index = vlib_stats_create_counter (&e, oldheap); + + /* Warn clients to refresh any pointers they might be holding */ + shared_header->directory_vector = sm->directory_vector; + } vlib_stat_segment_unlock (); } +/* + * Creates a two dimensional vector with the maximum valid index specified in + * both dimensions as arguments. + * Must be called on the stat segment heap. + */ static void -stat_validate_counter_vector (stat_segment_directory_entry_t * ep, u32 max) +stat_validate_counter_vector2 (stat_segment_directory_entry_t *ep, u32 max1, + u32 max2) { - stat_segment_main_t *sm = &stat_segment_main; - stat_segment_shared_header_t *shared_header = sm->shared_header; - counter_t **counters = 0; - vlib_thread_main_t *tm = vlib_get_thread_main (); + counter_t **counters = ep->data; int i; - u64 *offset_vector = 0; + vec_validate_aligned (counters, max1, CLIB_CACHE_LINE_BYTES); + for (i = 0; i <= max1; i++) + vec_validate_aligned (counters[i], max2, CLIB_CACHE_LINE_BYTES); - vec_validate_aligned (counters, tm->n_vlib_mains - 1, - CLIB_CACHE_LINE_BYTES); - for (i = 0; i < tm->n_vlib_mains; i++) - { - vec_validate_aligned (counters[i], max, CLIB_CACHE_LINE_BYTES); - vec_add1 (offset_vector, - stat_segment_offset (shared_header, counters[i])); - } - ep->offset = stat_segment_offset (shared_header, counters); - ep->offset_vector = stat_segment_offset (shared_header, offset_vector); + ep->data = counters; +} + +static void +stat_validate_counter_vector (stat_segment_directory_entry_t *ep, u32 max) +{ + vlib_thread_main_t *tm = vlib_get_thread_main (); + ASSERT (tm->n_vlib_mains > 0); + stat_validate_counter_vector2 (ep, tm->n_vlib_mains, max); +} + +always_inline void +stat_set_simple_counter (stat_segment_directory_entry_t * ep, + u32 thread_index, u32 index, u64 value) +{ + ASSERT (ep->data); + counter_t **counters = ep->data; + counter_t *cb = counters[thread_index]; + cb[index] = value; } void @@ -213,65 +383,100 @@ vlib_stats_pop_heap2 (u64 * error_vector, u32 thread_index, void *oldheap, /* Reset the client hash table pointer, since it WILL change! */ vec_validate (sm->error_vector, thread_index); - sm->error_vector[thread_index] = - stat_segment_offset (shared_header, error_vector); + sm->error_vector[thread_index] = error_vector; - shared_header->error_offset = - stat_segment_offset (shared_header, sm->error_vector); - shared_header->directory_offset = - stat_segment_offset (shared_header, sm->directory_vector); + shared_header->error_vector = sm->error_vector; + shared_header->directory_vector = sm->directory_vector; if (lock) vlib_stat_segment_unlock (); clib_mem_set_heap (oldheap); } +/* + * Create a new entry and add name to directory hash. + * Returns ~0 if name exists. + * Called from main heap. + */ +u32 +stat_segment_new_entry (u8 *name, stat_directory_type_t t) +{ + stat_segment_main_t *sm = &stat_segment_main; + stat_segment_shared_header_t *shared_header = sm->shared_header; + void *oldheap; + stat_segment_directory_entry_t e; + + ASSERT (shared_header); + + u32 vector_index = lookup_hash_index (name); + if (vector_index != STAT_SEGMENT_INDEX_INVALID) /* Already registered */ + return ~0; + + memset (&e, 0, sizeof (e)); + e.type = t; + memcpy (e.name, name, vec_len (name)); + + oldheap = vlib_stats_push_heap (NULL); + vlib_stat_segment_lock (); + vector_index = vlib_stats_create_counter (&e, oldheap); + + shared_header->directory_vector = sm->directory_vector; + + vlib_stat_segment_unlock (); + clib_mem_set_heap (oldheap); + + return vector_index; +} + clib_error_t * vlib_map_stat_segment_init (void) { stat_segment_main_t *sm = &stat_segment_main; stat_segment_shared_header_t *shared_header; void *oldheap; - ssize_t memory_size; + uword memory_size, sys_page_sz; int mfd; - char *mem_name = "stat_segment_test"; - void *memaddr; + char *mem_name = "stat segment"; + void *heap, *memaddr; memory_size = sm->memory_size; if (memory_size == 0) memory_size = STAT_SEGMENT_DEFAULT_SIZE; - /* Create shared memory segment */ - if ((mfd = memfd_create (mem_name, 0)) < 0) - return clib_error_return (0, "stat segment memfd_create failure"); + if (sm->log2_page_sz == CLIB_MEM_PAGE_SZ_UNKNOWN) + sm->log2_page_sz = CLIB_MEM_PAGE_SZ_DEFAULT; + + mfd = clib_mem_vm_create_fd (sm->log2_page_sz, mem_name); + if (mfd == -1) + return clib_error_return (0, "stat segment memory fd failure: %U", + format_clib_error, clib_mem_get_last_error ()); /* Set size */ if ((ftruncate (mfd, memory_size)) == -1) - return clib_error_return (0, "stat segment ftruncate failure"); + { + close (mfd); + return clib_error_return (0, "stat segment ftruncate failure"); + } - if ((memaddr = - mmap (NULL, memory_size, PROT_READ | PROT_WRITE, MAP_SHARED, mfd, - 0)) == MAP_FAILED) + memaddr = clib_mem_vm_map_shared (0, memory_size, mfd, 0, mem_name); + + if (memaddr == CLIB_MEM_VM_MAP_FAILED) return clib_error_return (0, "stat segment mmap failure"); - void *heap; -#if USE_DLMALLOC == 0 - heap = mheap_alloc_with_flags (((u8 *) memaddr) + getpagesize (), - memory_size - getpagesize (), - MHEAP_FLAG_DISABLE_VM | - MHEAP_FLAG_THREAD_SAFE); -#else - heap = - create_mspace_with_base (((u8 *) memaddr) + getpagesize (), - memory_size - getpagesize (), 1 /* locked */ ); - mspace_disable_expand (heap); -#endif + sys_page_sz = clib_mem_get_page_size (); + heap = + clib_mem_create_heap (((u8 *) memaddr) + sys_page_sz, + memory_size - sys_page_sz, 1 /* locked */, mem_name); sm->heap = heap; sm->memfd = mfd; sm->directory_vector_by_name = hash_create_string (0, sizeof (uword)); sm->shared_header = shared_header = memaddr; + + shared_header->version = STAT_SEGMENT_VERSION; + shared_header->base = memaddr; + sm->stat_segment_lockp = clib_mem_alloc (sizeof (clib_spinlock_t)); clib_spinlock_init (sm->stat_segment_lockp); @@ -289,12 +494,13 @@ vlib_map_stat_segment_init (void) sm->directory_vector[STAT_COUNTER_##E].type = STAT_DIR_TYPE_##t; foreach_stat_segment_counter_name #undef _ - /* Save the vector offset in the shared segment, for clients */ - shared_header->directory_offset = - stat_segment_offset (shared_header, sm->directory_vector); + /* Save the vector in the shared segment, for clients */ + shared_header->directory_vector = sm->directory_vector; clib_mem_set_heap (oldheap); + vlib_stats_register_mem_heap (heap); + return 0; } @@ -332,12 +538,24 @@ format_stat_dir_entry (u8 * s, va_list * args) type_name = "ErrIndex"; break; + case STAT_DIR_TYPE_NAME_VECTOR: + type_name = "NameVector"; + break; + + case STAT_DIR_TYPE_EMPTY: + type_name = "empty"; + break; + + case STAT_DIR_TYPE_SYMLINK: + type_name = "Symlink"; + break; + default: type_name = "illegal!"; break; } - return format (s, format_string, ep->name, type_name, ep->offset); + return format (s, format_string, ep->name, type_name, 0); } static clib_error_t * @@ -365,6 +583,11 @@ show_stat_segment_command_fn (vlib_main_t * vm, for (i = 0; i < vec_len (show_data); i++) { + stat_segment_directory_entry_t *ep = vec_elt_at_index (show_data, i); + + if (ep->type == STAT_DIR_TYPE_EMPTY) + continue; + vlib_cli_output (vm, "%-100U", format_stat_dir_entry, vec_elt_at_index (show_data, i)); } @@ -372,7 +595,8 @@ show_stat_segment_command_fn (vlib_main_t * vm, if (verbose) { ASSERT (sm->heap); - vlib_cli_output (vm, "%U", format_mheap, sm->heap, 0 /* verbose */ ); + vlib_cli_output (vm, "%U", format_clib_mem_heap, sm->heap, + 0 /* verbose */ ); } return 0; @@ -401,16 +625,14 @@ update_node_counters (stat_segment_main_t * sm) vlib_main_t **stat_vms = 0; vlib_node_t ***node_dups = 0; int i, j; - stat_segment_shared_header_t *shared_header = sm->shared_header; static u32 no_max_nodes = 0; - vlib_node_get_nodes (0 /* vm, for barrier sync */ , - (u32) ~ 0 /* all threads */ , - 1 /* include stats */ , - 0 /* barrier sync */ , - &node_dups, &stat_vms); + vlib_node_get_nodes (0 /* vm, for barrier sync */, + (u32) ~0 /* all threads */, 1 /* include stats */, + 0 /* barrier sync */, &node_dups, &stat_vms); u32 l = vec_len (node_dups[0]); + u8 *symlink_name = 0; /* * Extend performance nodes if necessary @@ -420,28 +642,23 @@ update_node_counters (stat_segment_main_t * sm) void *oldheap = clib_mem_set_heap (sm->heap); vlib_stat_segment_lock (); - stat_validate_counter_vector (&sm->directory_vector - [STAT_COUNTER_NODE_CLOCKS], l); - stat_validate_counter_vector (&sm->directory_vector - [STAT_COUNTER_NODE_VECTORS], l); - stat_validate_counter_vector (&sm->directory_vector - [STAT_COUNTER_NODE_CALLS], l); - stat_validate_counter_vector (&sm->directory_vector - [STAT_COUNTER_NODE_SUSPENDS], l); + stat_validate_counter_vector ( + &sm->directory_vector[STAT_COUNTER_NODE_CLOCKS], l - 1); + stat_validate_counter_vector ( + &sm->directory_vector[STAT_COUNTER_NODE_VECTORS], l - 1); + stat_validate_counter_vector ( + &sm->directory_vector[STAT_COUNTER_NODE_CALLS], l - 1); + stat_validate_counter_vector ( + &sm->directory_vector[STAT_COUNTER_NODE_SUSPENDS], l - 1); vec_validate (sm->nodes, l - 1); stat_segment_directory_entry_t *ep; ep = &sm->directory_vector[STAT_COUNTER_NODE_NAMES]; - ep->offset = stat_segment_offset (shared_header, sm->nodes); + ep->data = sm->nodes; - int i; - u64 *offset_vector = - ep->offset_vector ? stat_segment_pointer (shared_header, - ep->offset_vector) : 0; /* Update names dictionary */ - vec_validate (offset_vector, l - 1); vlib_node_t **nodes = node_dups[0]; - + int i; for (i = 0; i < vec_len (nodes); i++) { vlib_node_t *n = nodes[i]; @@ -450,13 +667,17 @@ update_node_counters (stat_segment_main_t * sm) if (sm->nodes[n->index]) vec_free (sm->nodes[n->index]); sm->nodes[n->index] = s; - offset_vector[i] = - sm->nodes[i] ? stat_segment_offset (shared_header, - sm->nodes[i]) : 0; +#define _(E, t, name, p) \ + vec_reset_length (symlink_name); \ + symlink_name = format (symlink_name, "/nodes/%U/" #name "%c", \ + format_vlib_stats_symlink, s, 0); \ + vlib_stats_register_symlink (oldheap, symlink_name, STAT_COUNTER_##E, \ + n->index, 0 /* don't lock */); + foreach_stat_segment_node_counter_name +#undef _ } - ep->offset_vector = stat_segment_offset (shared_header, offset_vector); - + vec_free (symlink_name); vlib_stat_segment_unlock (); clib_mem_set_heap (oldheap); no_max_nodes = l; @@ -472,49 +693,69 @@ update_node_counters (stat_segment_main_t * sm) counter_t *c; vlib_node_t *n = nodes[i]; - counters = - stat_segment_pointer (shared_header, - sm->directory_vector - [STAT_COUNTER_NODE_CLOCKS].offset); + if (j == 0) + { + if (strncmp ((char *) sm->nodes[n->index], (char *) n->name, + strlen ((char *) sm->nodes[n->index]))) + { + u8 *s = 0; + u32 vector_index; + u8 *symlink_new_name = 0; + void *oldheap = clib_mem_set_heap (sm->heap); + vlib_stat_segment_lock (); + s = format (s, "%v%c", n->name, 0); +#define _(E, t, name, p) \ + vec_reset_length (symlink_name); \ + symlink_name = format (symlink_name, "/nodes/%U/" #name "%c", \ + format_vlib_stats_symlink, sm->nodes[n->index], 0); \ + clib_mem_set_heap (oldheap); /* Exit stats segment */ \ + vector_index = lookup_hash_index ((u8 *) symlink_name); \ + clib_mem_set_heap (sm->heap); /* Re-enter stat segment */ \ + vec_reset_length (symlink_new_name); \ + symlink_new_name = format (symlink_new_name, "/nodes/%U/" #name "%c", \ + format_vlib_stats_symlink, s, 0); \ + vlib_stats_rename_symlink (oldheap, vector_index, symlink_new_name); + foreach_stat_segment_node_counter_name +#undef _ + vec_free (symlink_name); + vec_free (symlink_new_name); + vec_free (sm->nodes[n->index]); + sm->nodes[n->index] = s; + vlib_stat_segment_unlock (); + clib_mem_set_heap (oldheap); + } + } + + counters = sm->directory_vector[STAT_COUNTER_NODE_CLOCKS].data; c = counters[j]; c[n->index] = n->stats_total.clocks - n->stats_last_clear.clocks; - counters = - stat_segment_pointer (shared_header, - sm->directory_vector - [STAT_COUNTER_NODE_VECTORS].offset); + counters = sm->directory_vector[STAT_COUNTER_NODE_VECTORS].data; c = counters[j]; c[n->index] = n->stats_total.vectors - n->stats_last_clear.vectors; - counters = - stat_segment_pointer (shared_header, - sm->directory_vector - [STAT_COUNTER_NODE_CALLS].offset); + counters = sm->directory_vector[STAT_COUNTER_NODE_CALLS].data; c = counters[j]; c[n->index] = n->stats_total.calls - n->stats_last_clear.calls; - counters = - stat_segment_pointer (shared_header, - sm->directory_vector - [STAT_COUNTER_NODE_SUSPENDS].offset); + counters = sm->directory_vector[STAT_COUNTER_NODE_SUSPENDS].data; c = counters[j]; - c[n->index] = - n->stats_total.suspends - n->stats_last_clear.suspends; + c[n->index] = n->stats_total.suspends - n->stats_last_clear.suspends; } + vec_free (node_dups[j]); } + vec_free (node_dups); + vec_free (stat_vms); } static void -do_stat_segment_updates (stat_segment_main_t * sm) +do_stat_segment_updates (vlib_main_t *vm, stat_segment_main_t *sm) { - stat_segment_shared_header_t *shared_header = sm->shared_header; - vlib_main_t *vm = vlib_mains[0]; f64 vector_rate; u64 input_packets; f64 dt, now; vlib_main_t *this_vlib_main; - int i, start; - counter_t **counters; + int i; static int num_worker_threads_set; /* @@ -524,13 +765,14 @@ do_stat_segment_updates (stat_segment_main_t * sm) */ if (PREDICT_FALSE (num_worker_threads_set == 0)) { - sm->directory_vector[STAT_COUNTER_NUM_WORKER_THREADS].value = - vec_len (vlib_mains) > 1 ? vec_len (vlib_mains) - 1 : 1; + void *oldheap = clib_mem_set_heap (sm->heap); + vlib_stat_segment_lock (); stat_validate_counter_vector (&sm->directory_vector - [STAT_COUNTER_VECTOR_RATE_PER_WORKER], - vec_len (vlib_mains)); + [STAT_COUNTER_VECTOR_RATE_PER_WORKER], 0); num_worker_threads_set = 1; + vlib_stat_segment_unlock (); + clib_mem_set_heap (oldheap); } /* @@ -539,29 +781,26 @@ do_stat_segment_updates (stat_segment_main_t * sm) */ vector_rate = 0.0; - counters = - stat_segment_pointer (shared_header, - sm->directory_vector - [STAT_COUNTER_VECTOR_RATE_PER_WORKER].offset); - - start = vec_len (vlib_mains) > 1 ? 1 : 0; - - for (i = start; i < vec_len (vlib_mains); i++) + for (i = 0; i < vlib_get_n_threads (); i++) { f64 this_vector_rate; - this_vlib_main = vlib_mains[i]; + this_vlib_main = vlib_get_main_by_index (i); + + this_vector_rate = vlib_internal_node_vector_rate (this_vlib_main); + vlib_clear_internal_node_vector_rate (this_vlib_main); - this_vector_rate = vlib_last_vector_length_per_node (this_vlib_main); vector_rate += this_vector_rate; /* Set the per-worker rate */ - counters[i - start][0] = this_vector_rate; + stat_set_simple_counter (&sm->directory_vector + [STAT_COUNTER_VECTOR_RATE_PER_WORKER], i, 0, + this_vector_rate); } /* And set the system average rate */ - vector_rate /= (f64) (i - start); + vector_rate /= (f64) (i > 1 ? i - 1 : 1); sm->directory_vector[STAT_COUNTER_VECTOR_RATE].value = vector_rate; @@ -583,10 +822,10 @@ do_stat_segment_updates (stat_segment_main_t * sm) /* *INDENT-OFF* */ stat_segment_gauges_pool_t *g; - pool_foreach(g, sm->gauges, - ({ + pool_foreach (g, sm->gauges) + { g->fn(&sm->directory_vector[g->directory_index], g->caller_index); - })); + } /* *INDENT-ON* */ /* Heartbeat, so clients detect we're still here */ @@ -620,7 +859,7 @@ stats_socket_accept_ready (clib_file_t * uf) return 0; } -static void +static clib_error_t * stats_segment_socket_init (void) { stat_segment_main_t *sm = &stat_segment_main; @@ -633,10 +872,7 @@ stats_segment_socket_init (void) CLIB_SOCKET_F_ALLOW_GROUP_WRITE | CLIB_SOCKET_F_PASSCRED; if ((error = clib_socket_init (s))) - { - clib_error_report (error); - return; - } + return error; clib_file_t template = { 0 }; template.read_function = stats_socket_accept_ready; @@ -645,6 +881,8 @@ stats_segment_socket_init (void) clib_file_add (&file_main, &template); sm->socket = s; + + return 0; } static clib_error_t * @@ -660,181 +898,225 @@ stats_segment_socket_exit (vlib_main_t * vm) VLIB_MAIN_LOOP_EXIT_FUNCTION (stats_segment_socket_exit); +/* Overrides weak reference in vlib:node_cli.c */ +f64 +vlib_get_stat_segment_update_rate (void) +{ + return stat_segment_main.update_interval; +} + static uword stat_segment_collector_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) { stat_segment_main_t *sm = &stat_segment_main; - /* Wait for Godot... */ - f64 sleep_duration = 10; - while (1) { - do_stat_segment_updates (sm); - vlib_process_suspend (vm, sleep_duration); + do_stat_segment_updates (vm, sm); + vlib_process_suspend (vm, sm->update_interval); } return 0; /* or not */ } -static clib_error_t * -statseg_init (vlib_main_t * vm) +/* + * Add a data provider (via callback) for a given stats entry. + * TODO: Add support for per-provider interval. + */ +void +stat_segment_poll_add (u32 vector_index, stat_segment_update_fn update_fn, + u32 caller_index, u32 interval) { stat_segment_main_t *sm = &stat_segment_main; + stat_segment_gauges_pool_t *gauge; - if (sm->socket_name) - stats_segment_socket_init (); + pool_get (sm->gauges, gauge); + gauge->fn = update_fn; + gauge->caller_index = caller_index; + gauge->directory_index = vector_index; - return 0; + return; } -/* *INDENT-OFF* */ -VLIB_INIT_FUNCTION (statseg_init) = +/* + * Create an scalar entry with a data provider. + * Deprecated, replace with stat_segment_new_entry + stat_segment_pool_add + */ +clib_error_t * +stat_segment_register_gauge (u8 * name, stat_segment_update_fn update_fn, + u32 caller_index) { - .runs_after = VLIB_INITS("unix_input_init"), -}; -/* *INDENT-ON* */ + stat_segment_main_t *sm = &stat_segment_main; + stat_segment_gauges_pool_t *gauge; + + u32 vector_index = stat_segment_new_entry (name, STAT_DIR_TYPE_SCALAR_INDEX); + if (vector_index == ~0) /* Already registered */ + return clib_error_return (0, "%v is already registered", name); + pool_get (sm->gauges, gauge); + gauge->fn = update_fn; + gauge->caller_index = caller_index; + gauge->directory_index = vector_index; + + return NULL; +} clib_error_t * -stat_segment_register_gauge (u8 * name, stat_segment_update_fn update_fn, - u32 caller_index) +stat_segment_register_state_counter (u8 * name, u32 * index) +{ + ASSERT (vlib_get_thread_index () == 0); + + u32 vector_index = stat_segment_new_entry (name, STAT_DIR_TYPE_SCALAR_INDEX); + if (vector_index == ~0) /* Already registered */ + return clib_error_return (0, "%v is already registered", name); + *index = vector_index; + return 0; +} + +clib_error_t * +stat_segment_deregister_state_counter (u32 index) { stat_segment_main_t *sm = &stat_segment_main; stat_segment_shared_header_t *shared_header = sm->shared_header; + stat_segment_directory_entry_t *e; void *oldheap; - stat_segment_directory_entry_t e; - u32 index; - stat_segment_gauges_pool_t *gauge; ASSERT (shared_header); - oldheap = vlib_stats_push_heap (NULL); - vlib_stat_segment_lock (); + if (index > vec_len (sm->directory_vector)) + return clib_error_return (0, "%u index does not exist", index); - memset (&e, 0, sizeof (e)); - e.type = STAT_DIR_TYPE_SCALAR_INDEX; + e = &sm->directory_vector[index]; + if (e->type != STAT_DIR_TYPE_SCALAR_INDEX) + return clib_error_return (0, "%u index cannot be deleted", index); - memcpy (e.name, name, vec_len (name)); - index = vec_len (sm->directory_vector); - vec_add1 (sm->directory_vector, e); + oldheap = vlib_stats_push_heap (NULL); + vlib_stat_segment_lock (); - shared_header->directory_offset = - stat_segment_offset (shared_header, sm->directory_vector); + vlib_stats_delete_counter (index, oldheap); vlib_stat_segment_unlock (); clib_mem_set_heap (oldheap); - /* Back on our own heap */ - pool_get (sm->gauges, gauge); - gauge->fn = update_fn; - gauge->caller_index = caller_index; - gauge->directory_index = index; + return 0; +} - return NULL; +void +stat_segment_set_state_counter (u32 index, u64 value) +{ + stat_segment_main_t *sm = &stat_segment_main; + + ASSERT (index < vec_len (sm->directory_vector)); + sm->directory_vector[index].index = value; } static clib_error_t * statseg_config (vlib_main_t * vm, unformat_input_t * input) { stat_segment_main_t *sm = &stat_segment_main; + sm->update_interval = 10.0; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { if (unformat (input, "socket-name %s", &sm->socket_name)) ; + /* DEPRECATE: default (does nothing) */ else if (unformat (input, "default")) - { - vec_reset_length (sm->socket_name); - sm->socket_name = format (sm->socket_name, "%s", - STAT_SEGMENT_SOCKET_FILE); - } + ; else if (unformat (input, "size %U", unformat_memory_size, &sm->memory_size)) ; + else if (unformat (input, "page-size %U", + unformat_log2_page_size, &sm->log2_page_sz)) + ; else if (unformat (input, "per-node-counters on")) sm->node_counters_enabled = 1; else if (unformat (input, "per-node-counters off")) sm->node_counters_enabled = 0; + else if (unformat (input, "update-interval %f", &sm->update_interval)) + ; else return clib_error_return (0, "unknown input `%U'", format_unformat_error, input); } - /* set default socket file name when statseg config stanza is empty. */ - if (!vec_len (sm->socket_name)) - sm->socket_name = format (sm->socket_name, "%s", - STAT_SEGMENT_SOCKET_FILE); /* * NULL-terminate socket name string * clib_socket_init()->socket_config() use C str* */ - vec_terminate_c_string (sm->socket_name); + if (vec_len (sm->socket_name)) + vec_terminate_c_string (sm->socket_name); return 0; } +VLIB_EARLY_CONFIG_FUNCTION (statseg_config, "statseg"); + static clib_error_t * statseg_sw_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add) { stat_segment_main_t *sm = &stat_segment_main; - stat_segment_shared_header_t *shared_header = sm->shared_header; + vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, sw_if_index); + vnet_sw_interface_t *si_sup = + vnet_get_sup_sw_interface (vnm, si->sw_if_index); + vnet_hw_interface_t *hi_sup; + u8 *s = 0; + u8 *symlink_name = 0; + u32 vector_index; void *oldheap = vlib_stats_push_heap (sm->interfaces); vlib_stat_segment_lock (); vec_validate (sm->interfaces, sw_if_index); + + ASSERT (si_sup->type == VNET_SW_INTERFACE_TYPE_HARDWARE); + hi_sup = vnet_get_hw_interface (vnm, si_sup->hw_if_index); + + s = format (s, "%v", hi_sup->name); + if (si->type != VNET_SW_INTERFACE_TYPE_HARDWARE) + s = format (s, ".%d", si->sub.id); + s = format (s, "%c", 0); + if (is_add) { - vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, sw_if_index); - vnet_sw_interface_t *si_sup = - vnet_get_sup_sw_interface (vnm, si->sw_if_index); - vnet_hw_interface_t *hi_sup; - - ASSERT (si_sup->type == VNET_SW_INTERFACE_TYPE_HARDWARE); - hi_sup = vnet_get_hw_interface (vnm, si_sup->hw_if_index); - - u8 *s = 0; - s = format (s, "%v", hi_sup->name); - if (si->type != VNET_SW_INTERFACE_TYPE_HARDWARE) - s = format (s, ".%d", si->sub.id); - s = format (s, "%c", 0); sm->interfaces[sw_if_index] = s; +#define _(E, n, p) \ + clib_mem_set_heap (oldheap); /* Exit stats segment */ \ + vector_index = lookup_hash_index ((u8 *) "/" #p "/" #n); \ + clib_mem_set_heap (sm->heap); /* Re-enter stat segment */ \ + vec_reset_length (symlink_name); \ + symlink_name = format (symlink_name, "/interfaces/%U/" #n "%c", \ + format_vlib_stats_symlink, s, 0); \ + vlib_stats_register_symlink (oldheap, symlink_name, vector_index, \ + sw_if_index, 0 /* don't lock */); + foreach_simple_interface_counter_name + foreach_combined_interface_counter_name +#undef _ + + vec_free (symlink_name); } else { vec_free (sm->interfaces[sw_if_index]); sm->interfaces[sw_if_index] = 0; +#define _(E, n, p) \ + vec_reset_length (symlink_name); \ + symlink_name = format (symlink_name, "/interfaces/%U/" #n "%c", \ + format_vlib_stats_symlink, s, 0); \ + clib_mem_set_heap (oldheap); /* Exit stats segment */ \ + vector_index = lookup_hash_index ((u8 *) symlink_name); \ + clib_mem_set_heap (sm->heap); /* Re-enter stat segment */ \ + vlib_stats_delete_counter (vector_index, oldheap); + foreach_simple_interface_counter_name + foreach_combined_interface_counter_name +#undef _ + + vec_free (symlink_name); } stat_segment_directory_entry_t *ep; ep = &sm->directory_vector[STAT_COUNTER_INTERFACE_NAMES]; - ep->offset = stat_segment_offset (shared_header, sm->interfaces); - - int i; - u64 *offset_vector = - ep->offset_vector ? stat_segment_pointer (shared_header, - ep->offset_vector) : 0; - - vec_validate (offset_vector, vec_len (sm->interfaces) - 1); - - if (sm->last != sm->interfaces) - { - /* the interface vector moved, so need to recalulate the offset array */ - for (i = 0; i < vec_len (sm->interfaces); i++) - { - offset_vector[i] = - sm->interfaces[i] ? stat_segment_offset (shared_header, - sm->interfaces[i]) : 0; - } - } - else - { - offset_vector[sw_if_index] = - sm->interfaces[sw_if_index] ? - stat_segment_offset (shared_header, sm->interfaces[sw_if_index]) : 0; - } - ep->offset_vector = stat_segment_offset (shared_header, offset_vector); + ep->data = sm->interfaces; vlib_stat_segment_unlock (); clib_mem_set_heap (oldheap); @@ -842,10 +1124,8 @@ statseg_sw_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add) return 0; } -VLIB_EARLY_CONFIG_FUNCTION (statseg_config, "statseg"); VNET_SW_INTERFACE_ADD_DEL_FUNCTION (statseg_sw_interface_add_del); -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (stat_segment_collector, static) = { .function = stat_segment_collector_process, @@ -853,7 +1133,21 @@ VLIB_REGISTER_NODE (stat_segment_collector, static) = .type = VLIB_NODE_TYPE_PROCESS, }; -/* *INDENT-ON* */ +static clib_error_t * +statseg_init (vlib_main_t *vm) +{ + stat_segment_main_t *sm = &stat_segment_main; + + /* set default socket file name when statseg config stanza is empty. */ + if (!vec_len (sm->socket_name)) + sm->socket_name = format (0, "%s/%s%c", vlib_unix_get_runtime_dir (), + STAT_SEGMENT_SOCKET_FILENAME, 0); + return stats_segment_socket_init (); +} + +VLIB_INIT_FUNCTION (statseg_init) = { + .runs_after = VLIB_INITS ("unix_input_init"), +}; /* * fd.io coding-style-patch-verification: ON