Re: [PATCH 09/14] perf tools: Use kmod_path__parse in decompress_kmodule

[Jiri Olsa]

On Wed, Mar 04, 2015 at 10:42:21AM +0900, Namhyung Kim wrote:
> Hi Jiri,
> 
> On Tue, Mar 03, 2015 at 04:29:36PM +0100, Jiri Olsa wrote:
> > Replacing the file name parsing with kmod_path__parse.
> > 
> > Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
> > Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> > Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> > Cc: Corey Ashford <cjashfor@xxxxxxxxxxxxxxxxxx>
> > Cc: David Ahern <dsahern@xxxxxxxxx>
> > Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
> > Cc: Ingo Molnar <mingo@xxxxxxxxxx>
> > Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
> > Cc: Paul Mackerras <paulus@xxxxxxxxx>
> > Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
> > Cc: Stephane Eranian <eranian@xxxxxxxxxx>
> > ---
> >  tools/perf/util/symbol-elf.c | 25 +++++++++++++++++--------
> >  1 file changed, 17 insertions(+), 8 deletions(-)
> > 
> > diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
> > index ada16762fac2..8dd530ce20c5 100644
> > --- a/tools/perf/util/symbol-elf.c
> > +++ b/tools/perf/util/symbol-elf.c
> > @@ -579,32 +579,41 @@ static int dso__swap_init(struct dso *dso, unsigned char eidata)
> >  static int decompress_kmodule(struct dso *dso, const char *name,
> >  			      enum dso_binary_type type)
> >  {
> > -	int fd;
> > -	const char *ext = strrchr(name, '.');
> > +	int fd = -1, try = 2;
> >  	char tmpbuf[] = "/tmp/perf-kmod-XXXXXX";
> > +	struct kmod_path m;
> >  
> >  	if (type != DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE_COMP &&
> >  	    type != DSO_BINARY_TYPE__GUEST_KMODULE_COMP &&
> >  	    type != DSO_BINARY_TYPE__BUILD_ID_CACHE)
> >  		return -1;
> >  
> > -	if (!ext || !is_supported_compression(ext + 1)) {
> > -		ext = strrchr(dso->name, '.');
> > -		if (!ext || !is_supported_compression(ext + 1))
> > -			return -1;
> > +again:
> > +	if (kmod_path__parse_ext(&m, name))
> > +		return -1;
> > +
> > +	if (!m.comp) {
> > +		if (!--try)
> > +			goto out;
> > +
> > +		free(m.ext);
> > +		name = dso->name;
> > +		goto again;
> >  	}
> 
> Maybe we can do like this instead:
> 
> 	if (type == DSO_BINARY_TYPE__BUILD_ID_CACHE)
> 		name = dso->name;
> 
> 	if (kmod_path__parse_ext(&m, name))
> 		return -1;

right, looks lot simpler ;-) I'll check

thanks,
jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/