From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932185AbcEKPpI (ORCPT <rfc822;w@1wt.eu>);
	Wed, 11 May 2016 11:45:08 -0400
Received: from mail.kernel.org ([198.145.29.136]:58486 "EHLO mail.kernel.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751338AbcEKPpF (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Wed, 11 May 2016 11:45:05 -0400
Date: Wed, 11 May 2016 12:45:00 -0300
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Masami Hiramatsu <mhiramat@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung@kernel.org>,
        Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>,
        Hemant Kumar <hemant@linux.vnet.ibm.com>,
        Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>,
        Brendan Gregg <brendan.d.gregg@gmail.com>
Subject: Re: [PATCH perf/core v7 02/21] perf buildid: Fix to set correct dso
 name for kallsyms
Message-ID: <20160511154500.GF3619@kernel.org>
References: <20160511135110.23943.38738.stgit@devbox>
 <20160511135136.23943.31500.stgit@devbox>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160511135136.23943.31500.stgit@devbox>
X-Url: http://acmel.wordpress.com
User-Agent: Mutt/1.6.0 (2016-04-01)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Em Wed, May 11, 2016 at 10:51:37PM +0900, Masami Hiramatsu escreveu:
> Fix to set correct dso name ("[kernel.kallsyms]") for
> kallsyms, as for vdso does.

Can you rewrite the above comment and also break this down in two
patches, probably decribing what is the problem that it fixes?

- Arnaldo
 
> Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
> ---
>  tools/perf/util/build-id.c |   12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
> index b6ecf87..234d8a1 100644
> --- a/tools/perf/util/build-id.c
> +++ b/tools/perf/util/build-id.c
> @@ -343,21 +343,25 @@ void disable_buildid_cache(void)
>  static char *build_id_cache__dirname_from_path(const char *name,
>  					       bool is_kallsyms, bool is_vdso)
>  {
> -	char *realname = (char *)name, *filename;
> +	const char *realname = name;
> +	char *filename;
>  	bool slash = is_kallsyms || is_vdso;
>  
>  	if (!slash) {
>  		realname = realpath(name, NULL);
>  		if (!realname)
>  			return NULL;
> -	}
> +	} else if (is_vdso)
> +		realname = DSO__NAME_VDSO;
> +	else
> +		realname = "[kernel.kallsyms]";
>  
>  	if (asprintf(&filename, "%s%s%s", buildid_dir, slash ? "/" : "",
> -		     is_vdso ? DSO__NAME_VDSO : realname) < 0)
> +		     realname) < 0)
>  		filename = NULL;
>  
>  	if (!slash)
> -		free(realname);
> +		free((char *)realname);
>  
>  	return filename;
>  }