lkml.org 
[lkml]   [2022]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH 09/35] perf buildid-cache: Do not require purge files to also be in the file system
On Mon, Jul 11, 2022 at 2:33 AM Adrian Hunter <adrian.hunter@intel.com> wrote:
>
> realname() returns NULL if the file is not in the file system, but we can
> still remove it from the build ID cache in that case, so continue and
> attempt the purge with the name provided.
>
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
> tools/perf/util/build-id.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
> index 7c9f441936ee..9e176146eb10 100644
> --- a/tools/perf/util/build-id.c
> +++ b/tools/perf/util/build-id.c
> @@ -561,14 +561,11 @@ char *build_id_cache__cachedir(const char *sbuild_id, const char *name,
> char *realname = (char *)name, *filename;
> bool slash = is_kallsyms || is_vdso;
>
> - if (!slash) {
> + if (!slash)
> realname = nsinfo__realpath(name, nsi);
> - if (!realname)
> - return NULL;
> - }
>
> if (asprintf(&filename, "%s%s%s%s%s", buildid_dir, slash ? "/" : "",
> - is_vdso ? DSO__NAME_VDSO : realname,
> + is_vdso ? DSO__NAME_VDSO : (realname ? realname : name),

nit: is_vdso ? DSO__NAME_VDSO : (realname ?: name),

Thanks,
Ian

> sbuild_id ? "/" : "", sbuild_id ?: "") < 0)
> filename = NULL;
>
> --
> 2.25.1
>

\
 
 \ /
  Last update: 2022-07-19 19:45    [W:1.091 / U:0.504 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site