Re: [GIT PULL 00/21] perf/core improvements and fixes

From: Ingo Molnar
Date: Tue Dec 10 2013 - 10:05:49 EST



* Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxxxxxxx> wrote:

> Em Tue, Dec 10, 2013 at 01:18:01PM +0100, Ingo Molnar escreveu:
> >
> > * Adrian Hunter <adrian.hunter@xxxxxxxxx> wrote:
> >
> > > -void dso__set_short_name(struct dso *dso, const char *name)
> > > +void dso__set_short_name(struct dso *dso, const char *name, bool sname_alloc)
> > > {
> > > if (name == NULL)
> > > return;
> > > + if (dso->sname_alloc)
> > > + free((char *)dso->short_name);
> > > + dso->sname_alloc = sname_alloc;
> >
> > Calling the function option the same as the field name is asking for
> > trouble - I'd suggest 'new_sname_alloc' for the parameter, or so.
> >
> > And I'd also remove the 'const' from struct dso::short_name, it
> > probably does not help code generation, because 'dso' is passed in as
> > const in all the non-lifetime methods anyway.
>
> > That way the cast can be dropped from the free().
>
> Not that simple, there are multiple places that pass a constant
> short_name, for instance:
>
> machine__get_kernel()
> kernel = dso__kernel_findnew(machine, vmlinux_name,
> "[kernel]", DSO_TYPE_KERNEL);
> dso__set_short_name(dso, short_name);
>
> So dso->short_name will point to "[kernel]", which is a const char *.

Okay, I guess the free() cast is fine then.

Thanks,

Ingo
--
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/