Re: [PATCH 05/14] perf tools: Add dsos__new function

[Arnaldo Carvalho de Melo <acme@redhat.com>]

Em Tue, Mar 03, 2015 at 04:29:32PM +0100, Jiri Olsa escreveu:
> Separate the creation of new dso object and its addition
> to the dsos list. It will be used in following patch.
> 
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> Cc: Adrian Hunter <adrian.hunter@intel.com>
> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
> Cc: David Ahern <dsahern@gmail.com>
> Cc: Frederic Weisbecker <fweisbec@gmail.com>
> Cc: Ingo Molnar <mingo@kernel.org>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> Cc: Stephane Eranian <eranian@google.com>
> ---
>  tools/perf/util/dso.c | 21 ++++++++++++---------
>  tools/perf/util/dso.h |  1 +
>  2 files changed, 13 insertions(+), 9 deletions(-)
> 
> diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
> index be368414036c..fc54cb81c7f8 100644
> --- a/tools/perf/util/dso.c
> +++ b/tools/perf/util/dso.c
> @@ -1005,21 +1005,24 @@ struct dso *dsos__find(const struct dsos *dsos, const char *name,
>  	return dso__find_by_longname(&dsos->root, name);
>  }
>  
> -struct dso *__dsos__findnew(struct dsos *dsos, const char *name)
> +struct dso *dsos__new(struct dsos *dsos, const char *name)

When I read dsos__new() I think that it will surely return a 'struct dsos'
pointer, as it is the constructor ('__new') for the 'dsos' class. :-)

Right now we don't have a constructor for dsos, because its only used in
machine where they are not m'allocated, i.e. we use just dsos__init(),
but if we ever need a constructor for it, it will be called dsos__new().

So, to use the same rationale for dsos__findnew(), we can call it
dsos__addnew(), because it will not find anything, just add a new dso.

- Arnaldo

>  {
> -	struct dso *dso = dsos__find(dsos, name, false);
> +	struct dso *dso = dso__new(name);
>  
> -	if (!dso) {
> -		dso = dso__new(name);
> -		if (dso != NULL) {
> -			dsos__add(dsos, dso);
> -			dso__set_basename(dso);
> -		}
> +	if (dso != NULL) {
> +		dsos__add(dsos, dso);
> +		dso__set_basename(dso);
>  	}
> -
>  	return dso;
>  }
>  
> +struct dso *__dsos__findnew(struct dsos *dsos, const char *name)
> +{
> +	struct dso *dso = dsos__find(dsos, name, false);
> +
> +	return dso ? dso : dsos__new(dsos, name);
> +}
> +
>  size_t __dsos__fprintf_buildid(struct list_head *head, FILE *fp,
>  			       bool (skip)(struct dso *dso, int parm), int parm)
>  {
> diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
> index ced92841ff97..a712cbcd3a72 100644
> --- a/tools/perf/util/dso.h
> +++ b/tools/perf/util/dso.h
> @@ -249,6 +249,7 @@ struct dso *dso__kernel_findnew(struct machine *machine, const char *name,
>  				const char *short_name, int dso_type);
>  
>  void dsos__add(struct dsos *dsos, struct dso *dso);
> +struct dso *dsos__new(struct dsos *dsos, const char *name);
>  struct dso *dsos__find(const struct dsos *dsos, const char *name,
>  		       bool cmp_short);
>  struct dso *__dsos__findnew(struct dsos *dsos, const char *name);
> -- 
> 1.9.3