perf disasm: Return a proper error when not determining the file type
Arnaldo Carvalho de Melo
maintainerPATCH 1/1 perf disasm: Return a proper error when not determining the file type
Before:
⬢ [acme@toolbox a]$ perf annotate --stdio2 -i acme-perf-injected.data 'java.lang.String com.fasterxml.jackson.core.sym.CharsToNameCanonicalizer.findSymbol(char[], int, int, int)' Error:
Couldn't annotate java.lang.String com.fasterxml.jackson.core.sym.CharsToNameCanonicalizer.findSymbol(char[], int, int, int):
Internal error: Invalid -1 error code ⬢ [acme@toolbox a]$
After:
⬢ [acme@toolbox a]$ perf annotate --stdio2 -i acme-perf-injected.data 'java.lang.String com.fasterxml.jackson.core.sym.CharsToNameCanonicalizer.findSymbol(char[], int, int, int)' Error:
Couldn't annotate java.lang.String com.fasterxml.jackson.core.sym.CharsToNameCanonicalizer.findSymbol(char[], int, int, int):
Couldn't determine the file /tmp/perf-3308868.map type.
⬢ [acme@toolbox a]$
--- tools/perf/util/annotate.h | 1 + tools/perf/util/disasm.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-)
tools/perf/util/annotate.h +1 -0
@@ -441,6 +441,7 @@ enum symbol_disassemble_errno {SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_REGEXP ,SYMBOL_ANNOTATE_ERRNO__BPF_INVALID_FILE ,SYMBOL_ANNOTATE_ERRNO__BPF_MISSING_BTF , +SYMBOL_ANNOTATE_ERRNO__COULDNT_DETERMINE_FILE_TYPE , __SYMBOL_ANNOTATE_ERRNO__END, };
tools/perf/util/disasm.c +4 -1
@@ -1245,6 +1245,9 @@ int symbol__strerror_disassemble(struct map_symbol *ms, int errnum, char *buf, sscnprintf (buf, buflen,"The %s BPF file has no BTF section, compile with -g or use pahole -J." ,dso__long_name (dso));break ; +case SYMBOL_ANNOTATE_ERRNO__COULDNT_DETERMINE_FILE_TYPE : +scnprintf (buf, buflen,"Couldn't determine the file %s type." ,dso__long_name (dso)); +break ;default :scnprintf (buf, buflen,"Internal error: Invalid %d error code\n" , errnum);break ;
@@ -2289,7 +2292,7 @@ int symbol__disassemble(struct symbol *sym, struct annotate_args *args) }else if (dso__binary_type (dso) ==DSO_BINARY_TYPE__BPF_IMAGE ) {return symbol__disassemble_bpf_image (sym, args); }else if (dso__binary_type (dso) ==DSO_BINARY_TYPE__NOT_FOUND ) { -return -1 ; +return SYMBOL_ANNOTATE_ERRNO__COULDNT_DETERMINE_FILE_TYPE ; }else if (dso__is_kcore (dso)) { kce.addr =map__rip_2objdump (map, sym->start); kce.kcore_filename = symfs_filename;
Signature · 1 line
2.47.0