perf trace beauty: Do not print NULL strarray entries
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: bc972ada4f85450ebf20c4981ee84a1a4b060161 Gitweb: https://git.kernel.org/tip/bc972ada4f85450ebf20c4981ee84a1a4b060161 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Thu, 26 Jul 2018 15:30:33 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 31 Jul 2018 10:52:46 -0300
perf trace beauty: Do not print NULL strarray entries
We may have string tables where not all slots have values, in those cases its better to print the numeric value, for instance:
In the table below we would show "protocol: (null)" for
socket_ipproto[3]
Where it would be better to show "protocol: 3".
$ tools/perf/trace/beauty/socket_ipproto.sh
static const char *socket_ipproto[] = {
[0] = "IP",
[103] = "PIM",
[108] = "COMP",
[12] = "PUP",
[132] = "SCTP",
[136] = "UDPLITE",
[137] = "MPLS",
[17] = "UDP",
[1] = "ICMP",
[22] = "IDP",
[255] = "RAW",
[29] = "TP",
[2] = "IGMP",
[33] = "DCCP",
[41] = "IPV6",
[46] = "RSVP",
[47] = "GRE",
[4] = "IPIP",
[50] = "ESP",
[51] = "AH",
[6] = "TCP",
[8] = "EGP",
[92] = "MTP",
[94] = "BEETPH",
[98] = "ENCAP",
};
$Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-trace.c +1 -1
@@ -291,7 +291,7 @@ size_t strarray__scnprintf(struct strarray *sa, char *bf, size_t size, const cha {int idx = val - sa->offset; -if (idx <0 || idx >= sa->nr_entries) +if (idx <0 || idx >= sa->nr_entries || sa->entries[idx] ==NULL )return scnprintf (bf, size, intfmt, val);return scnprintf (bf, size,"%s" , sa->entries[idx]);