On Tue, Mar 24, 2015 at 01:19:29PM -0300, Arnaldo Carvalho de Melo wrote:
> From: Arnaldo Carvalho de Melo <a...@redhat.com>
>
> Before, when some problem happened while trying to load the kernel
> symtab, 'perf top' would show:
>
> ┌─Warning:───────────────────────────┐
> │The vmlinux file can't be used. │
> │Kernel samples will not be resolved.│
> │ │
> │ │
> │Press any key... │
> └────────────────────────────────────┘
>
> Now, it reports:
>
> # perf top --vmlinux /dev/null
>
> ┌─Warning:───────────────────────────────────────────┐
> │The /tmp/passwd file can't be used: Invalid ELF file│
> │Kernel samples will not be resolved. │
> │ │
> │ │
> │Press any key... │
> └────────────────────────────────────────────────────┘
>
> This is possible because we now register the reason for not being able
> to load the symtab in the dso->load_errno member, and provide a
> dso__strerror_load() routine to format this error into a strerror like
> string with a short reason for the error while loading.
>
> That can be just forwarding the dso__strerror_load() call to
> strerror_r(), or, for a separate errno range providing a custom message.
>
> Reported-by: Ingo Molnar <mi...@kernel.org>
> Acked-by: Jiri Olsa <jo...@kernel.org>
> Cc: Adrian Hunter <adrian.hun...@intel.com>
> Cc: Borislav Petkov <b...@suse.de>
> Cc: David Ahern <dsah...@gmail.com>
> Cc: Don Zickus <dzic...@redhat.com>
> Cc: Frederic Weisbecker <fweis...@gmail.com>
> Cc: Namhyung Kim <namhy...@kernel.org>
> Cc: Stephane Eranian <eran...@google.com>
> Link: http://lkml.kernel.org/n/tip-u5rb5uq63xqhkfb8uv2lx...@git.kernel.org
> Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
...
> @@ -1137,3 +1137,36 @@ enum dso_type dso__type(struct dso *dso, struct
> machine *machine)
>
> return dso__type_fd(fd);
> }
> +
> +int dso__strerror_load(struct dso *dso, char *buf, size_t buflen)
> +{
> + int idx, errnum = dso->load_errno;
> + /*
> + * This must have a same ordering as the enum dso_load_errno.
> + */
> + static const char *dso_load__error_str[] = {
> + "Internal tools/perf/ library error",
> + "Invalid ELF file",
> + "Can not read build id",
> + "Mismatching build id",
> + "Decompression failure",
> + };
You could define this str array by using the dso_load_errno defines so
that they're always in sync:
static const char *dso_load__error_str[] = {
[DSO_LOAD_ERRNO__INTERNAL_ERROR - __DSO_LOAD_ERRNO__START] =
"Internal tools/perf/ library error",
[DSO_LOAD_ERRNO__INVALID_ELF - __DSO_LOAD_ERRNO__START] =
"Invalid ELF file",
...
and even use a small macro to hide the __DSO_LOAD_ERRNO__START thing.
--
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
