#include <vnet/devices/devices.h> /* vnet_get_aggregate_rx_packets */
#undef HAVE_MEMFD_CREATE
#include <vppinfra/linux/syscall.h>
+#include <vpp-api/client/stat_client.h>
+#include <vppinfra/mheap.h>
stat_segment_main_t stat_segment_main;
* Change heap to the stats shared memory segment
*/
void *
-vlib_stats_push_heap (void)
+vlib_stats_push_heap (void *old)
{
stat_segment_main_t *sm = &stat_segment_main;
+ sm->last = old;
ASSERT (sm && sm->shared_header);
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];
}
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;
+}
+
void
-vlib_stats_pop_heap (void *cm_arg, void *oldheap, stat_directory_type_t type)
+vlib_stats_pop_heap (void *cm_arg, void *oldheap, u32 cindex,
+ stat_directory_type_t type)
{
vlib_simple_counter_main_t *cm = (vlib_simple_counter_main_t *) cm_arg;
stat_segment_main_t *sm = &stat_segment_main;
/* 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++;
+ vector_index = vlib_stats_create_counter (&e, oldheap);
}
stat_segment_directory_entry_t *ep = &sm->directory_vector[vector_index];
/* Update the 2nd dimension offset vector */
int i;
vec_validate (offset_vector, vec_len (cm->counters) - 1);
- for (i = 0; i < vec_len (cm->counters); i++)
- offset_vector[i] = stat_segment_offset (shared_header, cm->counters[i]);
+
+ if (sm->last != offset_vector)
+ {
+ for (i = 0; i < vec_len (cm->counters); i++)
+ offset_vector[i] =
+ stat_segment_offset (shared_header, cm->counters[i]);
+ }
+ 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);
}
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;
stat_segment_directory_entry_t e;
- hash_pair_t *hp;
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.offset = index;
+ e.offset_vector = 0;
+ vector_index = vlib_stats_create_counter (&e, oldheap);
+
+ /* Warn clients to refresh any pointers they might be holding */
+ shared_header->directory_offset =
+ stat_segment_offset (shared_header, sm->directory_vector);
+ }
vlib_stat_segment_unlock ();
}
ep->offset_vector = stat_segment_offset (shared_header, offset_vector);
}
+always_inline void
+stat_set_simple_counter (stat_segment_directory_entry_t * ep,
+ u32 thread_index, u32 index, u64 value)
+{
+ stat_segment_main_t *sm = &stat_segment_main;
+ stat_segment_shared_header_t *shared_header = sm->shared_header;
+
+ ASSERT (shared_header);
+ counter_t *offset_vector =
+ stat_segment_pointer (sm->shared_header, ep->offset_vector);
+ counter_t *cb =
+ stat_segment_pointer (sm->shared_header, offset_vector[thread_index]);
+ cb[index] = value;
+}
+
void
-vlib_stats_pop_heap2 (u64 * error_vector, u32 thread_index, void *oldheap)
+vlib_stats_pop_heap2 (u64 * error_vector, u32 thread_index, void *oldheap,
+ int lock)
{
stat_segment_main_t *sm = &stat_segment_main;
stat_segment_shared_header_t *shared_header = sm->shared_header;
ASSERT (shared_header);
- vlib_stat_segment_lock ();
+ if (lock)
+ vlib_stat_segment_lock ();
/* Reset the client hash table pointer, since it WILL change! */
- shared_header->error_offset =
+ vec_validate (sm->error_vector, thread_index);
+ sm->error_vector[thread_index] =
stat_segment_offset (shared_header, 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);
- vlib_stat_segment_unlock ();
+ if (lock)
+ vlib_stat_segment_unlock ();
clib_mem_set_heap (oldheap);
}
{
stat_segment_main_t *sm = &stat_segment_main;
stat_segment_shared_header_t *shared_header;
- stat_segment_directory_entry_t *ep;
-
- f64 *scalar_data;
- u8 *name;
void *oldheap;
- u32 *lock;
- int rv;
ssize_t memory_size;
-
-
int mfd;
char *mem_name = "stat_segment_test";
void *memaddr;
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
-
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;
+
sm->stat_segment_lockp = clib_mem_alloc (sizeof (clib_spinlock_t));
clib_spinlock_init (sm->stat_segment_lockp);
/* Scalar stats and node counters */
vec_validate (sm->directory_vector, STAT_COUNTERS - 1);
#define _(E,t,n,p) \
- strcpy(sm->directory_vector[STAT_COUNTER_##E].name, "/sys" #p "/" #n); \
+ strcpy(sm->directory_vector[STAT_COUNTER_##E].name, #p "/" #n); \
sm->directory_vector[STAT_COUNTER_##E].type = STAT_DIR_TYPE_##t;
foreach_stat_segment_counter_name
#undef _
clib_mem_set_heap (oldheap);
+ /* Total shared memory size */
+ clib_mem_usage_t usage;
+ mheap_usage (sm->heap, &usage);
+ sm->directory_vector[STAT_COUNTER_MEM_STATSEG_TOTAL].value =
+ usage.bytes_total;
+
return 0;
}
type_name = "ErrIndex";
break;
+ case STAT_DIR_TYPE_NAME_VECTOR:
+ type_name = "NameVector";
+ break;
+
+ case STAT_DIR_TYPE_EMPTY:
+ type_name = "empty";
+ break;
+
default:
type_name = "illegal!";
break;
vlib_cli_command_t * cmd)
{
stat_segment_main_t *sm = &stat_segment_main;
- counter_t *counter;
- hash_pair_t *p;
- stat_segment_directory_entry_t *show_data, *this;
- int i, j;
+ stat_segment_directory_entry_t *show_data;
+ int i;
int verbose = 0;
- u8 *s;
if (unformat (input, "verbose"))
verbose = 1;
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));
}
static inline void
update_node_counters (stat_segment_main_t * sm)
{
- vlib_main_t *vm = vlib_mains[0];
vlib_main_t **stat_vms = 0;
vlib_node_t ***node_dups = 0;
int i, j;
vlib_stat_segment_lock ();
stat_validate_counter_vector (&sm->directory_vector
- [STAT_COUNTER_NODE_CLOCKS], l);
+ [STAT_COUNTER_NODE_CLOCKS], l - 1);
stat_validate_counter_vector (&sm->directory_vector
- [STAT_COUNTER_NODE_VECTORS], l);
+ [STAT_COUNTER_NODE_VECTORS], l - 1);
stat_validate_counter_vector (&sm->directory_vector
- [STAT_COUNTER_NODE_CALLS], l);
+ [STAT_COUNTER_NODE_CALLS], l - 1);
stat_validate_counter_vector (&sm->directory_vector
- [STAT_COUNTER_NODE_SUSPENDS], l);
+ [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);
+
+ 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];
+
+ for (i = 0; i < vec_len (nodes); i++)
+ {
+ vlib_node_t *n = nodes[i];
+ u8 *s = 0;
+ s = format (s, "%v%c", n->name, 0);
+ 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;
+
+ }
+ ep->offset_vector = stat_segment_offset (shared_header, offset_vector);
vlib_stat_segment_unlock ();
clib_mem_set_heap (oldheap);
for (j = 0; j < vec_len (node_dups); j++)
{
vlib_node_t **nodes = node_dups[j];
- u32 l = vec_len (nodes);
for (i = 0; i < vec_len (nodes); i++)
{
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
{
vlib_main_t *vm = vlib_mains[0];
f64 vector_rate;
- u64 input_packets, last_input_packets;
+ u64 input_packets;
f64 dt, now;
vlib_main_t *this_vlib_main;
- int i, start;
+ int i;
+ static int num_worker_threads_set;
/*
- * Compute the average vector rate across all workers
+ * Set once at the beginning of time.
+ * Can't do this from the init routine, which happens before
+ * start_workers sets up vlib_mains...
*/
- vector_rate = 0.0;
+ if (PREDICT_FALSE (num_worker_threads_set == 0))
+ {
+ 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], 0);
+ num_worker_threads_set = 1;
+ vlib_stat_segment_unlock ();
+ clib_mem_set_heap (oldheap);
+ }
- start = vec_len (vlib_mains) > 1 ? 1 : 0;
+ /*
+ * Compute per-worker vector rates, and the average vector rate
+ * across all workers
+ */
+ vector_rate = 0.0;
- for (i = start; i < vec_len (vlib_mains); i++)
+ for (i = 0; i < vec_len (vlib_mains); i++)
{
+
+ f64 this_vector_rate;
+
this_vlib_main = vlib_mains[i];
- vector_rate += vlib_last_vector_length_per_node (this_vlib_main);
+
+ this_vector_rate = vlib_internal_node_vector_rate (this_vlib_main);
+ vlib_clear_internal_node_vector_rate (this_vlib_main);
+
+ vector_rate += this_vector_rate;
+
+ /* Set the per-worker rate */
+ stat_set_simple_counter (&sm->directory_vector
+ [STAT_COUNTER_VECTOR_RATE_PER_WORKER], i, 0,
+ this_vector_rate);
}
- vector_rate /= (f64) (i - start);
- sm->directory_vector[STAT_COUNTER_VECTOR_RATE].value =
- vector_rate / ((f64) (vec_len (vlib_mains) - start));
+ /* And set the system average rate */
+ vector_rate /= (f64) (i > 1 ? i - 1 : 1);
+
+ sm->directory_vector[STAT_COUNTER_VECTOR_RATE].value = vector_rate;
/*
* Compute the aggregate input rate
sm->directory_vector[STAT_COUNTER_LAST_STATS_CLEAR].value =
vm->node_main.time_last_runtime_stats_clear;
+ /* Stats segment memory heap counter */
+ clib_mem_usage_t usage;
+ mheap_usage (sm->heap, &usage);
+ sm->directory_vector[STAT_COUNTER_MEM_STATSEG_USED].value =
+ usage.bytes_used;
+
if (sm->node_counters_enabled)
update_node_counters (sm);
+ /* *INDENT-OFF* */
+ stat_segment_gauges_pool_t *g;
+ 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 */
sm->directory_vector[STAT_COUNTER_HEARTBEAT].value++;
}
return 0;
}
-static void
+static clib_error_t *
stats_segment_socket_init (void)
{
stat_segment_main_t *sm = &stat_segment_main;
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;
clib_file_add (&file_main, &template);
sm->socket = s;
+
+ return 0;
+}
+
+static clib_error_t *
+stats_segment_socket_exit (vlib_main_t * vm)
+{
+ /*
+ * cleanup the listener socket on exit.
+ */
+ stat_segment_main_t *sm = &stat_segment_main;
+ unlink ((char *) sm->socket_name);
+ return 0;
+}
+
+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_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);
+ vlib_process_suspend (vm, sm->update_interval);
}
return 0; /* or not */
}
statseg_init (vlib_main_t * vm)
{
stat_segment_main_t *sm = &stat_segment_main;
- clib_error_t *error;
- /* dependent on unix_input_init */
- if ((error = vlib_call_init_function (vm, unix_input_init)))
- return error;
+ /* 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 ();
+}
- if (sm->socket_name)
- stats_segment_socket_init ();
+/* *INDENT-OFF* */
+VLIB_INIT_FUNCTION (statseg_init) =
+{
+ .runs_after = VLIB_INITS("unix_input_init"),
+};
+/* *INDENT-ON* */
+clib_error_t *
+stat_segment_register_gauge (u8 * name, stat_segment_update_fn update_fn,
+ u32 caller_index)
+{
+ 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;
+ stat_segment_gauges_pool_t *gauge;
+
+ ASSERT (shared_header);
+
+ u32 vector_index = lookup_hash_index (name);
+
+ if (vector_index != STAT_SEGMENT_INDEX_INVALID) /* Already registered */
+ return clib_error_return (0, "%v is already registered", name);
+
+ memset (&e, 0, sizeof (e));
+ e.type = STAT_DIR_TYPE_SCALAR_INDEX;
+ 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_offset =
+ stat_segment_offset (shared_header, sm->directory_vector);
+
+ 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 = vector_index;
+
+ return NULL;
+}
+
+clib_error_t *
+stat_segment_register_state_counter (u8 * name, u32 * index)
+{
+ 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);
+ ASSERT (vlib_get_thread_index () == 0);
+
+ u32 vector_index = lookup_hash_index (name);
+
+ if (vector_index != STAT_SEGMENT_INDEX_INVALID) /* Already registered */
+ return clib_error_return (0, "%v is already registered", name);
+
+ memset (&e, 0, sizeof (e));
+ e.type = STAT_DIR_TYPE_SCALAR_INDEX;
+ 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_offset =
+ stat_segment_offset (shared_header, sm->directory_vector);
+
+ vlib_stat_segment_unlock ();
+ clib_mem_set_heap (oldheap);
+
+ *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;
+
+ ASSERT (shared_header);
+
+ if (index > vec_len (sm->directory_vector))
+ return clib_error_return (0, "%u index does not exist", 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);
+
+ oldheap = vlib_stats_push_heap (NULL);
+ vlib_stat_segment_lock ();
+
+ vlib_stats_delete_counter (index, oldheap);
+
+ vlib_stat_segment_unlock ();
+ clib_mem_set_heap (oldheap);
+
+ return 0;
+}
+
+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"))
- sm->socket_name = format (0, "%s", STAT_SEGMENT_SOCKET_FILE);
- else
- if (unformat
- (input, "size %U", unformat_memory_size, &sm->memory_size))
+ ;
+ else if (unformat (input, "size %U",
+ unformat_memory_size, &sm->memory_size))
;
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);
}
+
+ /*
+ * NULL-terminate socket name string
+ * clib_socket_init()->socket_config() use C str*
+ */
+ if (vec_len (sm->socket_name))
+ vec_terminate_c_string (sm->socket_name);
+
return 0;
}
-VLIB_INIT_FUNCTION (statseg_init);
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;
+
+ void *oldheap = vlib_stats_push_heap (sm->interfaces);
+ vlib_stat_segment_lock ();
+
+ vec_validate (sm->interfaces, sw_if_index);
+ 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;
+ }
+ else
+ {
+ vec_free (sm->interfaces[sw_if_index]);
+ sm->interfaces[sw_if_index] = 0;
+ }
+
+ 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);
+
+ vlib_stat_segment_unlock ();
+ clib_mem_set_heap (oldheap);
+
+ return 0;
+}
+
+VNET_SW_INTERFACE_ADD_DEL_FUNCTION (statseg_sw_interface_add_del);
+
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (stat_segment_collector, static) =
{
Code Review / vpp.git / blobdiff