Revert raw column from the perfmon plugin.
Type: refactor
Signed-off-by: Ray Kinsella <mdr@ashroe.eu>
Change-Id: If127f57ee2022cc1c0ea5177f1655a792f195f1d
perfmon_instance_t *in;
u8 *s = 0;
int n_row = 0;
perfmon_instance_t *in;
u8 *s = 0;
int n_row = 0;
if (b == 0)
return clib_error_return (0, "no bundle selected");
if (b == 0)
return clib_error_return (0, "no bundle selected");
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (input, "raw"))
- raw = 1;
- else
- break;
- }
-
n_instances = vec_len (it->instances);
vec_validate (readings, n_instances - 1);
n_instances = vec_len (it->instances);
vec_validate (readings, n_instances - 1);
char **hdr = b->column_headers;
while (hdr[0])
table_format_cell (t, -1, n_row++, "%s", hdr++[0]);
char **hdr = b->column_headers;
while (hdr[0])
table_format_cell (t, -1, n_row++, "%s", hdr++[0]);
-
- if (b->raw_column_headers && raw)
- {
- hdr = b->raw_column_headers;
- while (hdr[0])
- table_format_cell (t, -1, n_row++, "%s", hdr++[0]);
- }
vlib_cli_output (vm, "%U\n", format_table, t);
table_free (t);
vlib_cli_output (vm, "%U\n", format_table, t);
table_free (t);
- if (raw)
- vlib_cli_output (vm, "Sample time is %.4f seconds \n", pm->sample_time);
-
if (b->footer)
vlib_cli_output (vm, "\n%s\n", b->footer);
if (b->footer)
vlib_cli_output (vm, "\n%s\n", b->footer);
case 4:
s = format (s, "%05.2f", (ns->value[2] / (f64) ns->value[0]) * 100);
break;
case 4:
s = format (s, "%05.2f", (ns->value[2] / (f64) ns->value[0]) * 100);
break;
- case 5:
- s = format (s, "%9f", (f64) ns->value[0]);
- break;
- case 6:
- s = format (s, "%9f", (f64) ns->value[1]);
- break;
- case 7:
- s = format (s, "%9f", (f64) ns->value[2]);
- break;
.format_fn = format_branch_mispredictions,
.column_headers = PERFMON_STRINGS ("Branches/call", "Branches/pkt",
"Taken/call", "Taken/pkt", "% MisPred"),
.format_fn = format_branch_mispredictions,
.column_headers = PERFMON_STRINGS ("Branches/call", "Branches/pkt",
"Taken/call", "Taken/pkt", "% MisPred"),
- .raw_column_headers = PERFMON_STRINGS ("branches", "taken", "misses"),
perfmon_bundle_init_fn_t *init_fn;
char **column_headers;
perfmon_bundle_init_fn_t *init_fn;
char **column_headers;
- char **raw_column_headers;
format_function_t *format_fn;
clib_cpu_supports_func_t cpu_supports;
format_function_t *format_fn;
clib_cpu_supports_func_t cpu_supports;