* 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);
}
}
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;
/* 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);
shared_header->epoch = 1;
/* Scalar stats and node counters */
- vec_validate (sm->directory_vector, STAT_COUNTERS - 1);
+ vec_validate (sm->directory_vector, STAT_COUNTERS);
#define _(E,t,n,p) \
strcpy(sm->directory_vector[STAT_COUNTER_##E].name, #p "/" #n); \
sm->directory_vector[STAT_COUNTER_##E].type = STAT_DIR_TYPE_##t;
stat_validate_counter_vector (&sm->directory_vector
[STAT_COUNTER_NODE_SUSPENDS], l);
+ 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);
no_max_nodes = l;
ASSERT (shared_header);
- oldheap = vlib_stats_push_heap ();
+ oldheap = vlib_stats_push_heap (NULL);
vlib_stat_segment_lock ();
memset (&e, 0, sizeof (e));
stat_segment_main_t *sm = &stat_segment_main;
stat_segment_shared_header_t *shared_header = sm->shared_header;
- void *oldheap = vlib_stats_push_heap ();
+ void *oldheap = vlib_stats_push_heap (sm->interfaces);
vlib_stat_segment_lock ();
vec_validate (sm->interfaces, sw_if_index);
ep->offset_vector) : 0;
vec_validate (offset_vector, vec_len (sm->interfaces) - 1);
- for (i = 0; i < vec_len (sm->interfaces); i++)
+
+ 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[i] =
- sm->interfaces[i] ? stat_segment_offset (shared_header,
- sm->interfaces[i]) : 0;
+ 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);