return s;
}
+f64 vlib_get_stat_segment_update_rate (void) __attribute__ ((weak));
+f64
+vlib_get_stat_segment_update_rate (void)
+{
+ return 1e70;
+}
+
static clib_error_t *
show_node_runtime (vlib_main_t * vm,
unformat_input_t * input, vlib_cli_command_t * cmd)
f64 time_now;
u32 node_index;
vlib_node_t ***node_dups = 0;
- f64 *vectors_per_main_loop = 0;
- f64 *last_vector_length_per_node = 0;
+ f64 *internal_node_vector_rates = 0;
time_now = vlib_time_now (vm);
u64 n_internal_vectors, n_internal_calls;
u64 n_clocks, l, v, c, d;
int brief = 1;
+ int summary = 0;
int max = 0;
vlib_main_t **stat_vms = 0, *stat_vm;
brief = 0;
if (unformat (input, "max") || unformat (input, "m"))
max = 1;
+ if (unformat (input, "summary") || unformat (input, "sum")
+ || unformat (input, "su"))
+ summary = 1;
for (i = 0; i < vec_len (vlib_mains); i++)
{
nodes = vec_dup (nm->nodes);
vec_add1 (node_dups, nodes);
- vec_add1 (vectors_per_main_loop,
- vlib_last_vectors_per_main_loop_as_f64 (stat_vm));
- vec_add1 (last_vector_length_per_node,
- vlib_last_vector_length_per_node (stat_vm));
+ vec_add1 (internal_node_vector_rates,
+ vlib_internal_node_vector_rate (stat_vm));
}
vlib_worker_thread_barrier_release (vm);
dt = time_now - nm->time_last_runtime_stats_clear;
vlib_cli_output
(vm,
- "Time %.1f, average vectors/node %.2f, last %d main loops %.2f per node %.2f"
- "\n vector rates in %.4e, out %.4e, drop %.4e, punt %.4e",
+ "Time %.1f, %f sec internal node vector rate %.2f loops/sec %.2f\n"
+ " vector rates in %.4e, out %.4e, drop %.4e, punt %.4e",
dt,
- (n_internal_calls > 0
- ? (f64) n_internal_vectors / (f64) n_internal_calls
- : 0),
- 1 << VLIB_LOG2_MAIN_LOOPS_PER_STATS_UPDATE,
- vectors_per_main_loop[j],
- last_vector_length_per_node[j],
+ vlib_get_stat_segment_update_rate (),
+ internal_node_vector_rates[j],
+ stat_vm->loops_per_second,
(f64) n_input / dt,
(f64) n_output / dt, (f64) n_drop / dt, (f64) n_punt / dt);
- vlib_cli_output (vm, "%U", format_vlib_node_stats, stat_vm, 0, max);
- for (i = 0; i < vec_len (nodes); i++)
+ if (summary == 0)
{
- c =
- nodes[i]->stats_total.calls -
- nodes[i]->stats_last_clear.calls;
- d =
- nodes[i]->stats_total.suspends -
- nodes[i]->stats_last_clear.suspends;
- if (c || d || !brief)
+ vlib_cli_output (vm, "%U", format_vlib_node_stats, stat_vm,
+ 0, max);
+ for (i = 0; i < vec_len (nodes); i++)
{
- vlib_cli_output (vm, "%U", format_vlib_node_stats, stat_vm,
- nodes[i], max);
+ c =
+ nodes[i]->stats_total.calls -
+ nodes[i]->stats_last_clear.calls;
+ d =
+ nodes[i]->stats_total.suspends -
+ nodes[i]->stats_last_clear.suspends;
+ if (c || d || !brief)
+ {
+ vlib_cli_output (vm, "%U", format_vlib_node_stats,
+ stat_vm, nodes[i], max);
+ }
}
}
vec_free (nodes);
}
vec_free (stat_vms);
vec_free (node_dups);
- vec_free (vectors_per_main_loop);
- vec_free (last_vector_length_per_node);
+ vec_free (internal_node_vector_rates);
}
return 0;
vlib_node_main_t *nm = &vm->node_main;
vlib_node_t *n;
u8 *s = 0, *s2 = 0;
- u32 i, node_index = ~0;
+ u32 i, node_index = ~0, verbose = 0;
char *type_str;
u8 valid_node_name = 0;
+ u64 cl, ca, v;
if (!unformat_user (input, unformat_line_input, line_input))
return 0;
{
if (unformat (line_input, "index %u", &node_index))
;
+ else if (unformat (line_input, "verbose"))
+ verbose = 1;
else
if (unformat (line_input, "%U", unformat_vlib_node, vm, &node_index))
valid_node_name = 1;
if (n->sibling_of)
s = format (s, ", sibling-of %s", n->sibling_of);
- vlib_cli_output (vm, "node %s, type %s, state %U, index %d%v\n",
+ vlib_cli_output (vm, "node %v, type %s, state %U, index %d%v\n",
n->name, type_str, format_vlib_node_state, vm, n,
n->index, s);
vec_reset_length (s);
s = format (s, "\n %10s %10s %=30s %8s",
"next-index", "node-index", "Node", "Vectors");
- s = format (s, "\n %=10u %=10u %-30v %=8llu", i, n->next_nodes[i],
+ s = format (s, "\n %=10u %=10u %=30v %=8llu", i, n->next_nodes[i],
pn->name, vec_elt (n->n_vectors_by_next_node, i));
}
s = format (s, "\n none");
vlib_cli_output (vm, "\n known previous nodes:%v\n", s);
vec_reset_length (s);
+ vec_free (s2);
+ }
+
+ if (!verbose)
+ goto done;
+
+ s = format (s, "\n%8s %=12s %=12s %=12s %=12s %=12s\n", "Thread", "Calls",
+ "Clocks", "Vectors", "Max Clock", "Max Vectors");
+ for (i = 0; i < vec_len (vlib_mains); i++)
+ {
+ n = vlib_get_node (vlib_mains[i], node_index);
+ vlib_node_sync_stats (vlib_mains[i], n);
+
+ cl = n->stats_total.clocks - n->stats_last_clear.clocks;
+ ca = n->stats_total.calls - n->stats_last_clear.calls;
+ v = n->stats_total.vectors - n->stats_last_clear.vectors;
+
+ s = format (s, "%=8u %=12lu %=12lu %=12lu %=12u %=12u\n", i, ca, cl, v,
+ n->stats_total.max_clock, n->stats_total.max_clock_n);
}
+ vlib_cli_output (vm, "%v", s);
+
+done:
+
vec_free (s);
- vec_free (s2);
return 0;
}
Code Review / vpp.git / blobdiff