perf stat: Fix JSON output formatting in iostat_prefix()
PATCH RESEND 1/1 perf stat: Fix JSON output formatting in iostat_prefix()
The iostat_prefix() function previously included a TODO noting that its output format was incorrect in JSON mode. This patch corrects that by conditionally formatting the prefix string based on the output mode specified in perf_stat_config.
--- tools/perf/arch/x86/util/iostat.c | 35 ++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 12 deletions(-)
tools/perf/arch/x86/util/iostat.c +23 -12
@@ -403,18 +403,29 @@ void iostat_prefix(struct evlist *evlist,struct iio_root_port *rp = evlist->selected->priv;if (rp) { -/* -* TODO: This is the incorrect format in JSON mode. -* See prepare_timestamp() -*/ -if (ts) -sprintf (prefix,"%6lu.%09lu%s%04x:%02x%s" , - ts->tv_sec, ts->tv_nsec, - config->csv_sep, rp->domain, rp->bus, - config->csv_sep); -else -sprintf (prefix,"%04x:%02x%s" , rp->domain, rp->bus, - config->csv_sep); +if (ts) { +if (config->json_output) +sprintf (prefix, +"\"interval\" : %lu.%09lu, \"device\" : \"%04x:%02x\"" , + (unsigned long )ts->tv_sec, ts->tv_nsec, + rp->domain, rp->bus); +else if (config->csv_output) +sprintf (prefix,"%lu.%09lu%s%04x:%02x%s" , + (unsigned long )ts->tv_sec, ts->tv_nsec, + config->csv_sep, + rp->domain, rp->bus, config->csv_sep); +else +sprintf (prefix,"%6lu.%09lu %04x:%02x%s" , + (unsigned long )ts->tv_sec, ts->tv_nsec, + rp->domain, rp->bus, config->csv_sep); + }else { +if (config->json_output) +sprintf (prefix,"\"device\" : \"%04x:%02x\"" , + rp->domain, rp->bus); +else +sprintf (prefix,"%04x:%02x%s" , rp->domain, + rp->bus, config->csv_sep); + } } }
Signature · 1 line
2.49.0
Arnaldo Carvalho de Melo
maintainerQuoted 4 lines · Suchit Karunakaran
The
iostat_prefix()function previously included a TODO noting that its output format was incorrect in JSON mode. This patch corrects that by conditionally formatting the prefix string based on the output mode specified inperf_stat_config.
O don't have how to test this as I dont have:
access("/sys/bus/event_source/devices/uncore_iio_0", F_OK) = -1 ENOENT (No such file or directory) write(2, ""..., 37Unsupported uncore pmu configuration
) = 37
write(2, ""..., 43
Usage: perf stat [<options>] [<command>]
) = 43
write(2, ""..., 1
<SNIP>
write(2, ""..., 84 measure I/O performance metrics provided by arch/platform
) = 84exit_group(129) = ?
+++ exited with 129 +++
root@x1:~# strace -s0 perf stat --iostat --timeout 1000
Could someone with access to hardware with this capability to try this patch and provide a Tested-by?
- Arnaldo
Quoted 53 lines
Signed-off-by Suchit Karunakaran <[email protected]>--- tools/perf/arch/x86/util/iostat.c | 35 ++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 12 deletions(-)tools/perf/arch/x86/util/iostat.c +23
-12@@ -403,18 +403,29 @@ void iostat_prefix(struct evlist *evlist,struct iio_root_port *rp = evlist->selected->priv;if (rp) { -/* -* TODO: This is the incorrect format in JSON mode. -* See prepare_timestamp() -*/ -if (ts) -sprintf (prefix,"%6lu.%09lu%s%04x:%02x%s" , - ts->tv_sec, ts->tv_nsec, - config->csv_sep, rp->domain, rp->bus, - config->csv_sep); -else -sprintf (prefix,"%04x:%02x%s" , rp->domain, rp->bus, - config->csv_sep); +if (ts) { +if (config->json_output) +sprintf (prefix, +"\"interval\" : %lu.%09lu, \"device\" : \"%04x:%02x\"" , + (unsigned long )ts->tv_sec, ts->tv_nsec, + rp->domain, rp->bus); +else if (config->csv_output) +sprintf (prefix,"%lu.%09lu%s%04x:%02x%s" , + (unsigned long )ts->tv_sec, ts->tv_nsec, + config->csv_sep, + rp->domain, rp->bus, config->csv_sep); +else +sprintf (prefix,"%6lu.%09lu %04x:%02x%s" , + (unsigned long )ts->tv_sec, ts->tv_nsec, + rp->domain, rp->bus, config->csv_sep); + }else { +if (config->json_output) +sprintf (prefix,"\"device\" : \"%04x:%02x\"" , + rp->domain, rp->bus); +else +sprintf (prefix,"%04x:%02x%s" , rp->domain, + rp->bus, config->csv_sep); + } } }Signature · 1 line
2.49.0