mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02: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 <adrian.hunter@intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Brendan Gregg <brendan.d.gregg@gmail.com> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Luis Cláudio Gonçalves <lclaudio@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Link: https://lkml.kernel.org/n/tip-8xst3zrqqogax7fmfzwymvbl@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
		
							parent
							
								
									f77526be82
								
							
						
					
					
						commit
						154c978d48
					
				
					 2 changed files with 45 additions and 1 deletions
				
			
		| 
						 | 
					@ -586,6 +586,49 @@ bool strarray__strtoul(struct strarray *sa, char *bf, size_t size, u64 *ret)
 | 
				
			||||||
	return false;
 | 
						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)
 | 
					bool strarrays__strtoul(struct strarrays *sas, char *bf, size_t size, u64 *ret)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	int i;
 | 
						int i;
 | 
				
			||||||
| 
						 | 
					@ -3676,7 +3719,7 @@ static int trace__expand_filter(struct trace *trace __maybe_unused, struct evsel
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		right_end = right + 1;
 | 
							right_end = right + 1;
 | 
				
			||||||
		while (isalnum(*right_end) || *right_end == '_')
 | 
							while (isalnum(*right_end) || *right_end == '_' || *right_end == '|')
 | 
				
			||||||
			++right_end;
 | 
								++right_end;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if (isalpha(*right)) {
 | 
							if (isalpha(*right)) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -32,6 +32,7 @@ size_t strarray__scnprintf_suffix(struct strarray *sa, char *bf, size_t size, co
 | 
				
			||||||
size_t strarray__scnprintf_flags(struct strarray *sa, char *bf, size_t size, bool show_prefix, unsigned long flags);
 | 
					size_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(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 trace;
 | 
				
			||||||
struct thread;
 | 
					struct thread;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue