Messages in this thread | | | Date | Fri, 9 Jun 2023 11:18:46 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH v2 05/26] perf addr_location: Move to its own header |
| |
Em Thu, Jun 08, 2023 at 04:28:02PM -0700, Ian Rogers escreveu: > addr_location is a common abstraction, move it into its own header and > source file in preparation for wider clean up.
Thanks, applied.
- Arnaldo
> Signed-off-by: Ian Rogers <irogers@google.com> > --- > tools/perf/util/Build | 1 + > tools/perf/util/addr_location.c | 16 ++++++++++++++++ > tools/perf/util/addr_location.h | 28 ++++++++++++++++++++++++++++ > tools/perf/util/event.c | 12 ------------ > tools/perf/util/symbol.h | 17 +---------------- > 5 files changed, 46 insertions(+), 28 deletions(-) > create mode 100644 tools/perf/util/addr_location.c > create mode 100644 tools/perf/util/addr_location.h > > diff --git a/tools/perf/util/Build b/tools/perf/util/Build > index c449741adf30..ff2fd1a36bb8 100644 > --- a/tools/perf/util/Build > +++ b/tools/perf/util/Build > @@ -1,4 +1,5 @@ > perf-y += arm64-frame-pointer-unwind-support.o > +perf-y += addr_location.o > perf-y += annotate.o > perf-y += block-info.o > perf-y += block-range.o > diff --git a/tools/perf/util/addr_location.c b/tools/perf/util/addr_location.c > new file mode 100644 > index 000000000000..c73fc2aa236c > --- /dev/null > +++ b/tools/perf/util/addr_location.c > @@ -0,0 +1,16 @@ > +// SPDX-License-Identifier: GPL-2.0 > +#include "addr_location.h" > +#include "map.h" > +#include "thread.h" > + > +/* > + * The preprocess_sample method will return with reference counts for the > + * in it, when done using (and perhaps getting ref counts if needing to > + * keep a pointer to one of those entries) it must be paired with > + * addr_location__put(), so that the refcounts can be decremented. > + */ > +void addr_location__put(struct addr_location *al) > +{ > + map__zput(al->map); > + thread__zput(al->thread); > +} > diff --git a/tools/perf/util/addr_location.h b/tools/perf/util/addr_location.h > new file mode 100644 > index 000000000000..7dfa7417c0fe > --- /dev/null > +++ b/tools/perf/util/addr_location.h > @@ -0,0 +1,28 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +#ifndef __PERF_ADDR_LOCATION > +#define __PERF_ADDR_LOCATION 1 > + > +#include <linux/types.h> > + > +struct thread; > +struct maps; > +struct map; > +struct symbol; > + > +struct addr_location { > + struct thread *thread; > + struct maps *maps; > + struct map *map; > + struct symbol *sym; > + const char *srcline; > + u64 addr; > + char level; > + u8 filtered; > + u8 cpumode; > + s32 cpu; > + s32 socket; > +}; > + > +void addr_location__put(struct addr_location *al); > + > +#endif /* __PERF_ADDR_LOCATION */ > diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c > index e1ce7cb5e421..6ee23145ee7e 100644 > --- a/tools/perf/util/event.c > +++ b/tools/perf/util/event.c > @@ -767,18 +767,6 @@ int machine__resolve(struct machine *machine, struct addr_location *al, > return 0; > } > > -/* > - * The preprocess_sample method will return with reference counts for the > - * in it, when done using (and perhaps getting ref counts if needing to > - * keep a pointer to one of those entries) it must be paired with > - * addr_location__put(), so that the refcounts can be decremented. > - */ > -void addr_location__put(struct addr_location *al) > -{ > - map__zput(al->map); > - thread__zput(al->thread); > -} > - > bool is_bts_event(struct perf_event_attr *attr) > { > return attr->type == PERF_TYPE_HARDWARE && > diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h > index 7558735543c2..5ca8665dd2c1 100644 > --- a/tools/perf/util/symbol.h > +++ b/tools/perf/util/symbol.h > @@ -9,6 +9,7 @@ > #include <linux/list.h> > #include <linux/rbtree.h> > #include <stdio.h> > +#include "addr_location.h" > #include "path.h" > #include "symbol_conf.h" > #include "spark.h" > @@ -120,22 +121,6 @@ struct ref_reloc_sym { > u64 unrelocated_addr; > }; > > -struct addr_location { > - struct thread *thread; > - struct maps *maps; > - struct map *map; > - struct symbol *sym; > - const char *srcline; > - u64 addr; > - char level; > - u8 filtered; > - u8 cpumode; > - s32 cpu; > - s32 socket; > -}; > - > -void addr_location__put(struct addr_location *al); > - > int dso__load(struct dso *dso, struct map *map); > int dso__load_vmlinux(struct dso *dso, struct map *map, > const char *vmlinux, bool vmlinux_allocated); > -- > 2.41.0.162.gfafddb0af9-goog >
--
- Arnaldo
| |