Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 26 Nov 2020 14:53:47 -0300
From:   Arnaldo Carvalho de Melo <acme@kernel.org>
To:     Jiri Olsa <jolsa@kernel.org>
Cc:     Ian Rogers <irogers@google.com>,
        lkml <linux-kernel@vger.kernel.org>,
        Peter Zijlstra <a.p.zijlstra@chello.nl>,
        Ingo Molnar <mingo@kernel.org>,
        Mark Rutland <mark.rutland@arm.com>,
        Namhyung Kim <namhyung@kernel.org>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Michael Petlan <mpetlan@redhat.com>,
        Song Liu <songliubraving@fb.com>,
        Stephane Eranian <eranian@google.com>,
        Alexey Budankov <alexey.budankov@linux.intel.com>,
        Andi Kleen <ak@linux.intel.com>,
        Adrian Hunter <adrian.hunter@intel.com>
Subject: Re: [PATCH 21/25] perf tools: Add build_id_cache__add function
Message-ID: <20201126175347.GH70905@kernel.org>
References: <20201126170026.2619053-1-jolsa@kernel.org>
 <20201126170026.2619053-22-jolsa@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20201126170026.2619053-22-jolsa@kernel.org>
Precedence: bulk

Em Thu, Nov 26, 2020 at 06:00:22PM +0100, Jiri Olsa escreveu:
> Adding build_id_cache__add function as core function
> that adds file into build id database. It will be
> set from another callers in following changes.

Thanks, applied.

- Arnaldo

 
> Acked-by: Ian Rogers <irogers@google.com>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
>  tools/perf/util/build-id.c | 42 ++++++++++++++++++++++++--------------
>  tools/perf/util/build-id.h |  2 ++
>  2 files changed, 29 insertions(+), 15 deletions(-)
> 
> diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
> index 6bf3cc79c5d5..02df36b30ac5 100644
> --- a/tools/perf/util/build-id.c
> +++ b/tools/perf/util/build-id.c
> @@ -671,24 +671,15 @@ static char *build_id_cache__find_debug(const char *sbuild_id,
>  	return realname;
>  }
>  
> -int build_id_cache__add_s(const char *sbuild_id, const char *name,
> -			  struct nsinfo *nsi, bool is_kallsyms, bool is_vdso)
> +int
> +build_id_cache__add(const char *sbuild_id, const char *name, const char *realname,
> +		    struct nsinfo *nsi, bool is_kallsyms, bool is_vdso)
>  {
>  	const size_t size = PATH_MAX;
> -	char *realname = NULL, *filename = NULL, *dir_name = NULL,
> -	     *linkname = zalloc(size), *tmp;
> +	char *filename = NULL, *dir_name = NULL, *linkname = zalloc(size), *tmp;
>  	char *debugfile = NULL;
>  	int err = -1;
>  
> -	if (!is_kallsyms) {
> -		if (!is_vdso)
> -			realname = nsinfo__realpath(name, nsi);
> -		else
> -			realname = realpath(name, NULL);
> -		if (!realname)
> -			goto out_free;
> -	}
> -
>  	dir_name = build_id_cache__cachedir(sbuild_id, name, nsi, is_kallsyms,
>  					    is_vdso);
>  	if (!dir_name)
> @@ -788,8 +779,6 @@ int build_id_cache__add_s(const char *sbuild_id, const char *name,
>  		pr_debug4("Failed to update/scan SDT cache for %s\n", realname);
>  
>  out_free:
> -	if (!is_kallsyms)
> -		free(realname);
>  	free(filename);
>  	free(debugfile);
>  	free(dir_name);
> @@ -797,6 +786,29 @@ int build_id_cache__add_s(const char *sbuild_id, const char *name,
>  	return err;
>  }
>  
> +int build_id_cache__add_s(const char *sbuild_id, const char *name,
> +			  struct nsinfo *nsi, bool is_kallsyms, bool is_vdso)
> +{
> +	char *realname = NULL;
> +	int err = -1;
> +
> +	if (!is_kallsyms) {
> +		if (!is_vdso)
> +			realname = nsinfo__realpath(name, nsi);
> +		else
> +			realname = realpath(name, NULL);
> +		if (!realname)
> +			goto out_free;
> +	}
> +
> +	err = build_id_cache__add(sbuild_id, name, realname, nsi, is_kallsyms, is_vdso);
> +
> +out_free:
> +	if (!is_kallsyms)
> +		free(realname);
> +	return err;
> +}
> +
>  static int build_id_cache__add_b(const struct build_id *bid,
>  				 const char *name, struct nsinfo *nsi,
>  				 bool is_kallsyms, bool is_vdso)
> diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h
> index c6f10e3d2152..02613f4b2c29 100644
> --- a/tools/perf/util/build-id.h
> +++ b/tools/perf/util/build-id.h
> @@ -63,6 +63,8 @@ char *build_id_cache__complement(const char *incomplete_sbuild_id);
>  int build_id_cache__list_build_ids(const char *pathname, struct nsinfo *nsi,
>  				   struct strlist **result);
>  bool build_id_cache__cached(const char *sbuild_id);
> +int build_id_cache__add(const char *sbuild_id, const char *name, const char *realname,
> +			struct nsinfo *nsi, bool is_kallsyms, bool is_vdso);
>  int build_id_cache__add_s(const char *sbuild_id,
>  			  const char *name, struct nsinfo *nsi,
>  			  bool is_kallsyms, bool is_vdso);
> -- 
> 2.26.2
> 

-- 

- Arnaldo