From 59cb7cf510dbea8742e8f38fd49282471f541819 Mon Sep 17 00:00:00 2001 From: Burt P Date: Mon, 6 Jan 2020 00:56:00 -0600 Subject: benchmark: "This Machine" in results To test the new label escape stuff, and for https://github.com/lpereira/hardinfo/issues/516 Signed-off-by: Burt P --- modules/benchmark.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'modules/benchmark.c') diff --git a/modules/benchmark.c b/modules/benchmark.c index 303fbd01..e00e5977 100644 --- a/modules/benchmark.c +++ b/modules/benchmark.c @@ -314,20 +314,28 @@ gchar *hi_get_field(gchar * field) static void br_mi_add(char **results_list, bench_result *b, gboolean select) { static unsigned int ri = 0; /* to ensure key is unique */ - gchar *ckey, *rkey; + gchar *rkey, *lbl, *elbl, *this_marker; + + this_marker = format_with_ansi_color(_("This Machine"), "0;30;43", params.fmt_opts); - ckey = hardinfo_clean_label(b->machine->cpu_name, 0); rkey = g_strdup_printf("%s__%d", b->machine->mid, ri++); - *results_list = h_strdup_cprintf("$%s%s$%s%s=%.2f|%s\n", *results_list, - select ? "*" : "", rkey, ckey, - b->legacy ? problem_marker() : "", + lbl = g_strdup_printf("%s%s%s%s", + select ? this_marker : "", select ? " " : "", + b->machine->cpu_name, + b->legacy ? problem_marker() : ""); + elbl = key_label_escape(lbl); + + *results_list = h_strdup_cprintf("$@%s%s$%s=%.2f|%s\n", *results_list, + select ? "*" : "", rkey, elbl, b->bvalue.result, b->machine->cpu_config); moreinfo_add_with_prefix("BENCH", rkey, bench_result_more_info(b) ); - g_free(ckey); + g_free(lbl); + g_free(elbl); g_free(rkey); + g_free(this_marker); } gint bench_result_sort (gconstpointer a, gconstpointer b) { -- cgit v1.2.3