libbeauty: Introduce strarray__strtoul_flags()
A message that is not in the archive (sent off-list or not yet received): [email protected]
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 154c978d484c610468727c361576b7cfe9c3fec7 Gitweb: https://git.kernel.org/tip/154c978d484c610468727c361576b7cfe9c3fec7 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Sat, 19 Oct 2019 15:17:30 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Sat, 19 Oct 2019 15:35:02 -03:00
libbeauty: Introduce strarray__strtoul_flags()
Counterpart of strarray__scnprintf_flags(), i.e. from a expression like:
# perf trace -e syscalls:sys_enter_mmap --filter="flags==PRIVATE|FIXED|DENYWRITE"
I.e. that "flags==PRIVATE|FIXED|DENYWRITE", turn that into
# perf trace -e syscalls:sys_enter_mmap --filter=0x812
Cc Adrian Hunter <[email protected]>
Cc Andi Kleen <[email protected]>
Cc Brendan Gregg <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Luis Cláudio Gonçalves <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-trace.c | 45 ++++++++++++++++++++++++++++++- tools/perf/trace/beauty/beauty.h | 1 +- 2 files changed, 45 insertions(+), 1 deletion(-)
tools/perf/builtin-trace.c +44 -1
@@ -586,6 +586,49 @@ bool strarray__strtoul(struct strarray *sa, char *bf, size_t size, u64 *ret)return false; } +bool strarray__strtoul_flags (struct strarray *sa,char *bf,size_t size,u64 *ret) +{ +u64 val =0 ; +char *tok = bf, *sep, *end; + + *ret =0 ; + +while (size !=0 ) { +int toklen = size; + + sep =memchr (tok,'|' , size); +if (sep !=NULL ) { + size -= sep - tok +1 ; + + end = sep -1 ; +while (end > tok &&isspace (*end)) + --end; + + toklen = end - tok +1 ; + } + +while (isspace (*tok)) + ++tok; + +if (isalpha (*tok) || *tok =='_' ) { +if (!strarray__strtoul (sa, tok, toklen, &val)) +return false; + }else { +bool is_hexa = tok[0 ] ==0 && (tok[1 ] ='x' || tok[1 ] =='X' ); + + val =strtoul (tok,NULL , is_hexa ?16 :0 ); + } + + *ret |= (1 << (val -1 )); + +if (sep ==NULL ) +break ; + tok = sep +1 ; + } + +return true; +} +bool strarrays__strtoul (struct strarrays *sas,char *bf,size_t size,u64 *ret) {int i;
@@ -3676,7 +3719,7 @@ static int trace__expand_filter(struct trace *trace __maybe_unused, struct evsel } right_end = right +1 ; -while (isalnum (*right_end) || *right_end =='_' ) +while (isalnum (*right_end) || *right_end =='_' || *right_end =='|' ) ++right_end;if (isalpha (*right)) {
tools/perf/trace/beauty/beauty.h +1 -0
@@ -32,6 +32,7 @@ size_t strarray__scnprintf_suffix(struct strarray *sa, char *bf, size_t size, cosize_t strarray__scnprintf_flags (struct strarray *sa,char *bf,size_t size,bool show_prefix,unsigned long flags);bool strarray__strtoul (struct strarray *sa,char *bf,size_t size,u64 *ret); +bool strarray__strtoul_flags (struct strarray *sa,char *bf,size_t size,u64 *ret);struct trace ;struct thread ;