Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1237913 > unrolled thread
| Started by | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| First post | 2015-10-02 07:30 +0200 |
| Last post | 2015-10-02 07:40 +0200 |
| Articles | 20 on this page of 33 — 4 participants |
Back to article view | Back to linux.kernel
[RFC/PATCH 00/38] perf tools: Speed-up perf report by using multi thread (v5) Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
[RFC/PATCH 04/38] perf tools: pass perf_mmap desc directly Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
Re: [RFC/PATCH 04/38] perf tools: pass perf_mmap desc directly Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-10-02 20:50 +0200
[RFC/PATCH 27/38] perf hists: Pass hists struct to hist_entry_iter struct Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
[RFC/PATCH 06/38] perf tools: Extend perf_evlist__mmap_ex() to use track mmap Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
[RFC/PATCH 18/38] perf tools: Introduce thread__find_addr_location_by_time() and friends Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
[RFC/PATCH 21/38] perf tools: Save timestamp of a map creation Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
[RFC/PATCH 15/38] perf tools: Introduce machine__find*_thread_by_time() Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
[RFC/PATCH 01/38] perf tools: Use a software dummy event to track task/mmap events Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
Re: [RFC/PATCH 01/38] perf tools: Use a software dummy event to track task/mmap events Jiri Olsa <jolsa@redhat.com> - 2015-10-05 15:00 +0200
[RFC/PATCH 28/38] perf tools: Move BUILD_ID_SIZE definition to perf.h Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
[RFC/PATCH 13/38] perf tools: Use thread__comm_by_time() when adding hist entries Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
[RFC/PATCH 14/38] perf tools: Convert dead thread list into rbtree Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
[RFC/PATCH 22/38] perf tools: Introduce map_groups__{insert,find}_by_time() Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
[RFC/PATCH 26/38] perf session: Pass struct events stats to event processing functions Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
[RFC/PATCH 09/38] perf record: Add --index option for building index table Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
Re: [RFC/PATCH 09/38] perf record: Add --index option for building index table Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-10-02 21:00 +0200
Re: [RFC/PATCH 09/38] perf record: Add --index option for building index table Jiri Olsa <jolsa@redhat.com> - 2015-10-05 15:50 +0200
[RFC/PATCH 23/38] perf tools: Use map_groups__find_addr_by_time() Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
[RFC/PATCH 28/38] perf tools: Move BUILD_ID_SIZE definition to perf.h Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
[RFC/PATCH 24/38] perf tools: Add testcase for managing maps with time Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
[RFC/PATCH 11/38] perf tools: Introduce thread__comm(_str)_by_time() helpers Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
[RFC/PATCH 17/38] perf tools: Maintain map groups list in a leader thread Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:30 +0200
[RFC/PATCH 08/38] perf tools: Handle indexed data file properly Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:40 +0200
[RFC/PATCH 02/38] perf tools: Save mmap_param.len instead of mask Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:40 +0200
Re: [RFC/PATCH 02/38] perf tools: Save mmap_param.len instead of mask Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-10-02 20:50 +0200
[RFC/PATCH 07/38] perf tools: Add HEADER_DATA_INDEX feature Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:40 +0200
[RFC/PATCH 10/38] perf report: Skip dummy tracking event Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:40 +0200
[RFC/PATCH 03/38] perf tools: Move auxtrace_mmap field to struct perf_evlist Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:40 +0200
Re: [RFC/PATCH 03/38] perf tools: Move auxtrace_mmap field to struct perf_evlist Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-10-02 20:50 +0200
Re: [RFC/PATCH 03/38] perf tools: Move auxtrace_mmap field to struct perf_evlist Adrian Hunter <adrian.hunter@intel.com> - 2015-10-05 13:40 +0200
Re: [RFC/PATCH 03/38] perf tools: Move auxtrace_mmap field to struct perf_evlist Jiri Olsa <jolsa@redhat.com> - 2015-10-05 15:20 +0200
[RFC/PATCH 05/38] perf tools: Create separate mmap for dummy tracking event Namhyung Kim <namhyung@kernel.org> - 2015-10-02 07:40 +0200
Page 1 of 2 [1] 2 Next page →
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Date | 2015-10-02 07:30 +0200 |
| Subject | [RFC/PATCH 00/38] perf tools: Speed-up perf report by using multi thread (v5) |
| Message-ID | <qf14R-2jW-3@gated-at.bofh.it> |
Hello,
This patchset converts perf report to use multiple threads in order to
speed up the processing on large data files. I can see a minimum ~30%
of speedup with this change. The code is still experimental and
contains many rough edges. But I'd like to share and give some
feedbacks.
* changes in v5)
- move struct machines from perf_session to perf_tool (Arnaldo)
- add --num-thread option to perf report (David)
- separate track_mmap code for review (Jiri)
- fix some minor bugs (Jiri)
* changes in v4)
- rename to *_find(new)_by_time()
- also sort struct map by time
- use 'perf_has_index' global variable
- fix an off-by-one bug in index generation
- rebased onto the recent atomic thread refcounting
- remove missing threads tree in favor of thread rwlock
* changes in v3)
- handle header (metadata) same as sample data (at index 0)
- maintain libunwind address space in map_groups instead of thread
- use *_time API only for indexed data file
- resolve callchain with the *_time API
- use dso__data_get/put_fd() to protect access to fd
- synthesize COMM event for command line workload
* changes in v2)
- rework with single indexed data file rather than multiple files in
a directory
The perf report processes (sample) events like below:
1. preprocess sample to get matching thread/dso/symbol info
2. insert it to hists rbtree (with callchain tree) based on the info
3. optionally collapse hist entries that match given sort key(s)
4. resort hist entries (by overhead) for output
5. display the hist entries
The stage 1 is a preprocessing and mostly act like a read-only
operation in that it doesn't change a machine state during the sample
processing. Meta events like fork, comm and mmap can change the
machine/thread state but symbols can be loaded during the processing
(stage 2).
The stage 2 consumes most of the time especially with callchains and
--children option is enabled. And this work can be easily patitioned
as each sample is independent to others. But the resulting hists must
be combined/collapsed to a single global hists before going to further
steps.
The stage 3 is optional and only needed by certain sort keys - but
with stage 2 paralellized, it needs to be done always.
The stage 4 and 5 works on whole hists so must be done serially.
So my approach is like this:
Partially do stage 1 first - but only for meta events that changes
machine state. To do this I add a dummy tracking event to perf record
and make it collect such meta events only. They are saved as normal
data and processed before sample events at perf report time.
This also requires to handle multiple sample data concurrently and to
find a corresponding machine state when processing samples. On a
large profiling session, many tasks were created and exited so pid
might be recycled (even more than once!). To deal with it, I managed
to have thread, map_groups, map and comm in time sorted. The only
remaining thing is symbol loading as it's done lazily when sample
requires it.
With that being done, the stage 2 can be done by multiple threads. I
also save each sample data (per-cpu or per-thread) in separate files
during record and then merge them into a single data file with an
index table. On perf report time, each region of sample data will be
processed by each thread. And symbol loading is protected by a mutex
lock.
For DWARF post-unwinding, dso cache data also needs to be protected by
a lock and this caused a huge contention. I made it to search the
rbtree speculatively first and then, if it didn't find one, search it
again under the dso lock. Please take a look at it if it's acceptable.
The patch 1-9 are to support indexing for data file. With --index
option, perf record will create a intermediate directory and then save
meta events and sample data to separate files. And finally it'll
build an index table and concatenate the data files (and also remove
the intermediate directory).
The patch 10-24 are to manage machine and thread state using timestamp
so that it can be searched when processing samples. The patch 25-35
are to implement parallel report. And on patch 36 I implemented 'perf
data index' command to build an index table for a given data file.
The last two patches are to improve speed when using multi-thread.
This patchset didn't change perf record to use multi-thread. But I
think it can be easily done later if needed.
Note that output has a slight difference to original version when
compared using indexed data file. But they're mostly unresolved
symbols for callchains.
Here is the result:
This is just elapsed time measured by 'perf stat -r 5'. Note that
overall performance in v5 slows down than v4 by ~30% possibly due to
more agressive use of atomic thread refcounting and rwlocks.
The data file was recorded during kernel build with fp callchain and
size is 2.1GB. The machine has 6 core with hyper-threading enabled
and I got a similar result on my laptop too.
perf report --children --no-children + --call-graph none
------------- ------------- -------------------
current 497.568804423 131.312637209 58.972991789
with index 443.527574644 110.671594167 40.755612227
+ --multi-thread 304.064133574 63.175497780 18.815425955
This result is with 7.7GB data file using libunwind for callchain.
perf report --children --no-children + --call-graph none
------------- ------------- -------------------
current 20.600862660 13.723705468 6.865225263
with index 17.926679276 11.492099330 5.254594583
+ --multi-thread 10.549591227 6.891150645 3.261140410
This result is with same file but using libdw for callchain unwind.
perf report --children --no-children + --call-graph none
------------- ------------- -------------------
current 259.553111664 229.953713435 7.083999430
with index 239.071895690 222.996473823 4.967384924
+ --multi-thread 119.465870204 110.833195062 3.144185106
On my archlinux system, callchain unwind using libdw is much slower
than libunwind. I'm using elfutils version 0.161. Also I don't know
why --children takes less time than --no-children. Anyway we can see
the --multi-thread performance is much better for each case.
This patch is based on acme/perf/core - commit ("dbc67409fa91 perf
list: Do event name substring search as last resort when no events
found").
You can get it from 'perf/threaded-v5' branch on my tree at:
git://git.kernel.org/pub/scm/linux/kernel/git/namhyung/linux-perf.git
Please take a look and play with it. Any comments are welcome! :)
Thanks,
Namhyung
Namhyung Kim (38):
perf tools: Use a software dummy event to track task/mmap events
perf tools: Save mmap_param.len instead of mask
perf tools: Move auxtrace_mmap field to struct perf_evlist
perf tools: pass perf_mmap desc directly
perf tools: Create separate mmap for dummy tracking event
perf tools: Extend perf_evlist__mmap_ex() to use track mmap
perf tools: Add HEADER_DATA_INDEX feature
perf tools: Handle indexed data file properly
perf record: Add --index option for building index table
perf report: Skip dummy tracking event
perf tools: Introduce thread__comm(_str)_by_time() helpers
perf tools: Add a test case for thread comm handling
perf tools: Use thread__comm_by_time() when adding hist entries
perf tools: Convert dead thread list into rbtree
perf tools: Introduce machine__find*_thread_by_time()
perf tools: Add a test case for timed thread handling
perf tools: Maintain map groups list in a leader thread
perf tools: Introduce thread__find_addr_location_by_time() and friends
perf callchain: Use thread__find_addr_location_by_time() and friends
perf tools: Add a test case for timed map groups handling
perf tools: Save timestamp of a map creation
perf tools: Introduce map_groups__{insert,find}_by_time()
perf tools: Use map_groups__find_addr_by_time()
perf tools: Add testcase for managing maps with time
perf callchain: Maintain libunwind's address space in map_groups
perf session: Pass struct events stats to event processing functions
perf hists: Pass hists struct to hist_entry_iter struct
perf tools: Move BUILD_ID_SIZE definition to perf.h
perf tools: Introduce machines__new/delete()
perf session: Separate struct machines from session
perf report: Parallelize perf report using multi-thread
perf tools: Fix progress ui to support multi thread
perf report: Add --multi-thread option and config item
perf session: Handle index files generally
perf report: Add --num-thread option to control number of thread
perf data: Implement 'index' subcommand
perf tools: Reduce lock contention in perf_event__preprocess_sample()
perf tools: Skip dso front cache for indexed data file
tools/perf/Documentation/perf-data.txt | 25 +-
tools/perf/Documentation/perf-record.txt | 4 +
tools/perf/Documentation/perf-report.txt | 10 +
tools/perf/builtin-annotate.c | 12 +-
tools/perf/builtin-buildid-cache.c | 14 +-
tools/perf/builtin-buildid-list.c | 16 +-
tools/perf/builtin-data.c | 358 +++++++++++++++++++++++++++-
tools/perf/builtin-diff.c | 16 +-
tools/perf/builtin-evlist.c | 18 +-
tools/perf/builtin-inject.c | 6 +
tools/perf/builtin-kmem.c | 14 +-
tools/perf/builtin-kvm.c | 14 +-
tools/perf/builtin-lock.c | 7 +-
tools/perf/builtin-mem.c | 14 +-
tools/perf/builtin-record.c | 196 +++++++++++++--
tools/perf/builtin-report.c | 102 +++++++-
tools/perf/builtin-sched.c | 8 +-
tools/perf/builtin-script.c | 34 ++-
tools/perf/builtin-timechart.c | 12 +-
tools/perf/builtin-top.c | 26 +-
tools/perf/builtin-trace.c | 10 +-
tools/perf/perf.c | 1 +
tools/perf/perf.h | 6 +
tools/perf/tests/Build | 4 +
tools/perf/tests/builtin-test.c | 16 ++
tools/perf/tests/dwarf-unwind.c | 13 +-
tools/perf/tests/hists_common.c | 3 +-
tools/perf/tests/hists_cumulate.c | 1 +
tools/perf/tests/hists_filter.c | 1 +
tools/perf/tests/hists_link.c | 6 +-
tools/perf/tests/hists_output.c | 1 +
tools/perf/tests/tests.h | 4 +
tools/perf/tests/thread-comm.c | 47 ++++
tools/perf/tests/thread-lookup-time.c | 179 ++++++++++++++
tools/perf/tests/thread-map-time.c | 90 +++++++
tools/perf/tests/thread-mg-share.c | 7 +-
tools/perf/tests/thread-mg-time.c | 93 ++++++++
tools/perf/tests/topology.c | 19 +-
tools/perf/ui/browsers/hists.c | 30 ++-
tools/perf/ui/gtk/hists.c | 3 +
tools/perf/util/build-id.c | 16 +-
tools/perf/util/build-id.h | 3 -
tools/perf/util/data-convert-bt.c | 8 +-
tools/perf/util/dso.c | 2 +-
tools/perf/util/dso.h | 1 +
tools/perf/util/event.c | 144 +++++++++--
tools/perf/util/event.h | 1 -
tools/perf/util/evlist.c | 209 ++++++++++++----
tools/perf/util/evlist.h | 15 +-
tools/perf/util/evsel.h | 15 ++
tools/perf/util/header.c | 68 +++++-
tools/perf/util/header.h | 3 +
tools/perf/util/hist.c | 117 ++++++---
tools/perf/util/hist.h | 7 +-
tools/perf/util/intel-bts.c | 2 +-
tools/perf/util/intel-pt.c | 2 +-
tools/perf/util/machine.c | 320 +++++++++++++++++++++----
tools/perf/util/machine.h | 17 +-
tools/perf/util/map.c | 84 ++++++-
tools/perf/util/map.h | 37 ++-
tools/perf/util/probe-event.c | 2 +-
tools/perf/util/session.c | 394 +++++++++++++++++++++++++++----
tools/perf/util/session.h | 9 +-
tools/perf/util/symbol-elf.c | 2 +-
tools/perf/util/symbol.c | 7 +-
tools/perf/util/thread.c | 205 +++++++++++++++-
tools/perf/util/thread.h | 28 ++-
tools/perf/util/tool.h | 16 ++
tools/perf/util/unwind-libdw.c | 12 +-
tools/perf/util/unwind-libunwind.c | 55 +++--
tools/perf/util/unwind.h | 15 +-
71 files changed, 2868 insertions(+), 388 deletions(-)
create mode 100644 tools/perf/tests/thread-comm.c
create mode 100644 tools/perf/tests/thread-lookup-time.c
create mode 100644 tools/perf/tests/thread-map-time.c
create mode 100644 tools/perf/tests/thread-mg-time.c
--
2.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Date | 2015-10-02 07:30 +0200 |
| Subject | [RFC/PATCH 04/38] perf tools: pass perf_mmap desc directly |
| Message-ID | <qf14S-2jW-15@gated-at.bofh.it> |
| In reply to | #1237913 |
Pass struct perf_mmap to mmap handling functions directly. This will
be used by both of normal mmap and track mmap later.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/evlist.c | 24 +++++++++++++++---------
tools/perf/util/evlist.h | 1 +
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 042dffc67986..8d31883cbeb8 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -921,8 +921,8 @@ struct mmap_params {
struct auxtrace_mmap_params auxtrace_mp;
};
-static int __perf_evlist__mmap(struct perf_evlist *evlist, int idx,
- struct mmap_params *mp, int fd)
+static int perf_mmap__mmap(struct perf_mmap *desc,
+ struct mmap_params *mp, int fd)
{
/*
* The last one will be done at perf_evlist__mmap_consume(), so that we
@@ -937,21 +937,26 @@ static int __perf_evlist__mmap(struct perf_evlist *evlist, int idx,
* evlist layer can't just drop it when filtering events in
* perf_evlist__filter_pollfd().
*/
- atomic_set(&evlist->mmap[idx].refcnt, 2);
- evlist->mmap[idx].prev = 0;
- evlist->mmap[idx].mask = perf_evlist__mmap_mask(mp->len);
- evlist->mmap[idx].base = mmap(NULL, mp->len, mp->prot,
+ atomic_set(&desc->refcnt, 2);
+ desc->prev = 0;
+ desc->mask = perf_evlist__mmap_mask(mp->len);
+ desc->base = mmap(NULL, mp->len, mp->prot,
MAP_SHARED, fd, 0);
- if (evlist->mmap[idx].base == MAP_FAILED) {
+ if (desc->base == MAP_FAILED) {
pr_debug2("failed to mmap perf event ring buffer, error %d\n",
errno);
- evlist->mmap[idx].base = NULL;
+ desc->base = NULL;
return -1;
}
return 0;
}
+struct perf_mmap *perf_evlist__mmap_desc(struct perf_evlist *evlist, int idx)
+{
+ return &evlist->mmap[idx];
+}
+
static int perf_evlist__mmap_per_evsel(struct perf_evlist *evlist, int idx,
struct mmap_params *mp, int cpu,
int thread, int *output)
@@ -960,6 +965,7 @@ static int perf_evlist__mmap_per_evsel(struct perf_evlist *evlist, int idx,
evlist__for_each(evlist, evsel) {
int fd;
+ struct perf_mmap *desc = perf_evlist__mmap_desc(evlist, idx);
if (evsel->system_wide && thread)
continue;
@@ -968,7 +974,7 @@ static int perf_evlist__mmap_per_evsel(struct perf_evlist *evlist, int idx,
if (*output == -1) {
*output = fd;
- if (__perf_evlist__mmap(evlist, idx, mp, *output) < 0)
+ if (perf_mmap__mmap(desc, mp, *output) < 0)
return -1;
if (auxtrace_mmap__mmap(&evlist->auxtrace_mmap[idx],
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 51574ce8ac69..79f8245300ad 100644
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -145,6 +145,7 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages,
int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,
bool overwrite);
void perf_evlist__munmap(struct perf_evlist *evlist);
+struct perf_mmap *perf_evlist__mmap_desc(struct perf_evlist *evlist, int idx);
void perf_evlist__disable(struct perf_evlist *evlist);
void perf_evlist__enable(struct perf_evlist *evlist);
--
2.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Date | 2015-10-02 20:50 +0200 |
| Subject | Re: [RFC/PATCH 04/38] perf tools: pass perf_mmap desc directly |
| Message-ID | <qfdz4-3iS-25@gated-at.bofh.it> |
| In reply to | #1237914 |
Em Fri, Oct 02, 2015 at 02:18:45PM +0900, Namhyung Kim escreveu:
> Pass struct perf_mmap to mmap handling functions directly. This will
> be used by both of normal mmap and track mmap later.
>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
> tools/perf/util/evlist.c | 24 +++++++++++++++---------
> tools/perf/util/evlist.h | 1 +
> 2 files changed, 16 insertions(+), 9 deletions(-)
>
> diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> index 042dffc67986..8d31883cbeb8 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -921,8 +921,8 @@ struct mmap_params {
> struct auxtrace_mmap_params auxtrace_mp;
> };
>
> -static int __perf_evlist__mmap(struct perf_evlist *evlist, int idx,
> - struct mmap_params *mp, int fd)
> +static int perf_mmap__mmap(struct perf_mmap *desc,
> + struct mmap_params *mp, int fd)
> {
> /*
> * The last one will be done at perf_evlist__mmap_consume(), so that we
> @@ -937,21 +937,26 @@ static int __perf_evlist__mmap(struct perf_evlist *evlist, int idx,
> * evlist layer can't just drop it when filtering events in
> * perf_evlist__filter_pollfd().
> */
> - atomic_set(&evlist->mmap[idx].refcnt, 2);
> - evlist->mmap[idx].prev = 0;
> - evlist->mmap[idx].mask = perf_evlist__mmap_mask(mp->len);
> - evlist->mmap[idx].base = mmap(NULL, mp->len, mp->prot,
> + atomic_set(&desc->refcnt, 2);
> + desc->prev = 0;
> + desc->mask = perf_evlist__mmap_mask(mp->len);
> + desc->base = mmap(NULL, mp->len, mp->prot,
> MAP_SHARED, fd, 0);
> - if (evlist->mmap[idx].base == MAP_FAILED) {
> + if (desc->base == MAP_FAILED) {
> pr_debug2("failed to mmap perf event ring buffer, error %d\n",
> errno);
> - evlist->mmap[idx].base = NULL;
> + desc->base = NULL;
> return -1;
> }
>
> return 0;
> }
>
> +struct perf_mmap *perf_evlist__mmap_desc(struct perf_evlist *evlist, int idx)
> +{
> + return &evlist->mmap[idx];
> +}
> +
What does 'desc' stands for? Why not just use evlist->mmap[idx]?
> static int perf_evlist__mmap_per_evsel(struct perf_evlist *evlist, int idx,
> struct mmap_params *mp, int cpu,
> int thread, int *output)
> @@ -960,6 +965,7 @@ static int perf_evlist__mmap_per_evsel(struct perf_evlist *evlist, int idx,
>
> evlist__for_each(evlist, evsel) {
> int fd;
> + struct perf_mmap *desc = perf_evlist__mmap_desc(evlist, idx);
>
> if (evsel->system_wide && thread)
> continue;
> @@ -968,7 +974,7 @@ static int perf_evlist__mmap_per_evsel(struct perf_evlist *evlist, int idx,
>
> if (*output == -1) {
> *output = fd;
> - if (__perf_evlist__mmap(evlist, idx, mp, *output) < 0)
> + if (perf_mmap__mmap(desc, mp, *output) < 0)
> return -1;
>
> if (auxtrace_mmap__mmap(&evlist->auxtrace_mmap[idx],
> diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
> index 51574ce8ac69..79f8245300ad 100644
> --- a/tools/perf/util/evlist.h
> +++ b/tools/perf/util/evlist.h
> @@ -145,6 +145,7 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages,
> int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,
> bool overwrite);
> void perf_evlist__munmap(struct perf_evlist *evlist);
> +struct perf_mmap *perf_evlist__mmap_desc(struct perf_evlist *evlist, int idx);
>
> void perf_evlist__disable(struct perf_evlist *evlist);
> void perf_evlist__enable(struct perf_evlist *evlist);
> --
> 2.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Date | 2015-10-02 07:30 +0200 |
| Subject | [RFC/PATCH 27/38] perf hists: Pass hists struct to hist_entry_iter struct |
| Message-ID | <qf14S-2jW-17@gated-at.bofh.it> |
| In reply to | #1237913 |
This is a preparation for perf report multi-thread support. When
multi-thread is enable, each thread will have its own hists during the
sample processing.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/builtin-report.c | 1 +
tools/perf/builtin-top.c | 1 +
tools/perf/tests/hists_cumulate.c | 1 +
tools/perf/tests/hists_filter.c | 1 +
tools/perf/tests/hists_output.c | 1 +
tools/perf/util/hist.c | 22 ++++++++--------------
tools/perf/util/hist.h | 1 +
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index aeced4fa27e8..f6e000b87108 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -145,6 +145,7 @@ static int process_sample_event(struct perf_tool *tool,
struct addr_location al;
struct hist_entry_iter iter = {
.evsel = evsel,
+ .hists = evsel__hists(evsel),
.sample = sample,
.hide_unresolved = rep->hide_unresolved,
.add_entry_cb = hist_iter__report_callback,
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 6f641fd68296..e1ead08755c8 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -787,6 +787,7 @@ static void perf_event__process_sample(struct perf_tool *tool,
struct hists *hists = evsel__hists(evsel);
struct hist_entry_iter iter = {
.evsel = evsel,
+ .hists = evsel__hists(evsel),
.sample = sample,
.add_entry_cb = hist_iter__top_callback,
};
diff --git a/tools/perf/tests/hists_cumulate.c b/tools/perf/tests/hists_cumulate.c
index 7ed737019de7..0c046dde9a64 100644
--- a/tools/perf/tests/hists_cumulate.c
+++ b/tools/perf/tests/hists_cumulate.c
@@ -88,6 +88,7 @@ static int add_hist_entries(struct hists *hists, struct machine *machine)
};
struct hist_entry_iter iter = {
.evsel = evsel,
+ .hists = evsel__hists(evsel),
.sample = &sample,
.hide_unresolved = false,
};
diff --git a/tools/perf/tests/hists_filter.c b/tools/perf/tests/hists_filter.c
index 818acf875dd0..b866a5389a1d 100644
--- a/tools/perf/tests/hists_filter.c
+++ b/tools/perf/tests/hists_filter.c
@@ -65,6 +65,7 @@ static int add_hist_entries(struct perf_evlist *evlist,
};
struct hist_entry_iter iter = {
.evsel = evsel,
+ .hists = evsel__hists(evsel),
.sample = &sample,
.ops = &hist_iter_normal,
.hide_unresolved = false,
diff --git a/tools/perf/tests/hists_output.c b/tools/perf/tests/hists_output.c
index adbebc852cc8..bf9efe145260 100644
--- a/tools/perf/tests/hists_output.c
+++ b/tools/perf/tests/hists_output.c
@@ -58,6 +58,7 @@ static int add_hist_entries(struct hists *hists, struct machine *machine)
};
struct hist_entry_iter iter = {
.evsel = evsel,
+ .hists = evsel__hists(evsel),
.sample = &sample,
.ops = &hist_iter_normal,
.hide_unresolved = false,
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 10454197a508..045313c219b6 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -511,7 +511,7 @@ iter_add_single_mem_entry(struct hist_entry_iter *iter, struct addr_location *al
u64 cost;
struct mem_info *mi = iter->priv;
struct perf_sample *sample = iter->sample;
- struct hists *hists = evsel__hists(iter->evsel);
+ struct hists *hists = iter->hists;
struct hist_entry *he;
if (mi == NULL)
@@ -541,8 +541,7 @@ static int
iter_finish_mem_entry(struct hist_entry_iter *iter,
struct addr_location *al __maybe_unused)
{
- struct perf_evsel *evsel = iter->evsel;
- struct hists *hists = evsel__hists(evsel);
+ struct hists *hists = iter->hists;
struct hist_entry *he = iter->he;
int err = -EINVAL;
@@ -614,8 +613,7 @@ static int
iter_add_next_branch_entry(struct hist_entry_iter *iter, struct addr_location *al)
{
struct branch_info *bi;
- struct perf_evsel *evsel = iter->evsel;
- struct hists *hists = evsel__hists(evsel);
+ struct hists *hists = iter->hists;
struct hist_entry *he = NULL;
int i = iter->curr;
int err = 0;
@@ -663,11 +661,10 @@ iter_prepare_normal_entry(struct hist_entry_iter *iter __maybe_unused,
static int
iter_add_single_normal_entry(struct hist_entry_iter *iter, struct addr_location *al)
{
- struct perf_evsel *evsel = iter->evsel;
struct perf_sample *sample = iter->sample;
struct hist_entry *he;
- he = __hists__add_entry(evsel__hists(evsel), al, iter->parent, NULL, NULL,
+ he = __hists__add_entry(iter->hists, al, iter->parent, NULL, NULL,
sample->period, sample->weight,
sample->transaction, sample->time, true);
if (he == NULL)
@@ -682,7 +679,6 @@ iter_finish_normal_entry(struct hist_entry_iter *iter,
struct addr_location *al __maybe_unused)
{
struct hist_entry *he = iter->he;
- struct perf_evsel *evsel = iter->evsel;
struct perf_sample *sample = iter->sample;
if (he == NULL)
@@ -690,7 +686,7 @@ iter_finish_normal_entry(struct hist_entry_iter *iter,
iter->he = NULL;
- hists__inc_nr_samples(evsel__hists(evsel), he->filtered);
+ hists__inc_nr_samples(iter->hists, he->filtered);
return hist_entry__append_callchain(he, sample);
}
@@ -722,8 +718,7 @@ static int
iter_add_single_cumulative_entry(struct hist_entry_iter *iter,
struct addr_location *al)
{
- struct perf_evsel *evsel = iter->evsel;
- struct hists *hists = evsel__hists(evsel);
+ struct hists *hists = iter->hists;
struct perf_sample *sample = iter->sample;
struct hist_entry **he_cache = iter->priv;
struct hist_entry *he;
@@ -768,12 +763,11 @@ static int
iter_add_next_cumulative_entry(struct hist_entry_iter *iter,
struct addr_location *al)
{
- struct perf_evsel *evsel = iter->evsel;
struct perf_sample *sample = iter->sample;
struct hist_entry **he_cache = iter->priv;
struct hist_entry *he;
struct hist_entry he_tmp = {
- .hists = evsel__hists(evsel),
+ .hists = iter->hists,
.cpu = al->cpu,
.thread = al->thread,
.comm = thread__comm_by_time(al->thread, sample->time),
@@ -803,7 +797,7 @@ iter_add_next_cumulative_entry(struct hist_entry_iter *iter,
}
}
- he = __hists__add_entry(evsel__hists(evsel), al, iter->parent, NULL, NULL,
+ he = __hists__add_entry(iter->hists, al, iter->parent, NULL, NULL,
sample->period, sample->weight,
sample->transaction, sample->time, false);
if (he == NULL)
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 7fbb60857f26..081a1f7ffb84 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -92,6 +92,7 @@ struct hist_entry_iter {
bool hide_unresolved;
int max_stack;
+ struct hists *hists;
struct perf_evsel *evsel;
struct perf_sample *sample;
struct hist_entry *he;
--
2.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Date | 2015-10-02 07:30 +0200 |
| Subject | [RFC/PATCH 06/38] perf tools: Extend perf_evlist__mmap_ex() to use track mmap |
| Message-ID | <qf14S-2jW-19@gated-at.bofh.it> |
| In reply to | #1237913 |
The perf_evlist__mmap_ex function creates data and auxtrace mmaps and
optionally tracking mmaps for events now. It'll be used for perf
record to save events in a separate files and build an index table.
Checking dummy tracking event in perf_evlist__mmap() alone is not
enough as users can specify a dummy event (like in keep tracking
testcase) without the index option.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/builtin-record.c | 2 +-
tools/perf/util/evlist.c | 6 ++++--
tools/perf/util/evlist.h | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 33dc2eafe2b5..90b1237d2525 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -306,7 +306,7 @@ try_again:
if (perf_evlist__mmap_ex(evlist, opts->mmap_pages, false,
opts->auxtrace_mmap_pages,
- opts->auxtrace_snapshot_mode) < 0) {
+ opts->auxtrace_snapshot_mode, false) < 0) {
if (errno == EPERM) {
pr_err("Permission error mapping pages.\n"
"Consider increasing "
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 25a9c3b5f473..61e83d930e92 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1243,6 +1243,7 @@ int perf_evlist__parse_mmap_pages(const struct option *opt, const char *str,
* @overwrite: overwrite older events?
* @auxtrace_pages - auxtrace map length in pages
* @auxtrace_overwrite - overwrite older auxtrace data?
+ * @use_track_mmap: use another mmaps to track meta events
*
* If @overwrite is %false the user needs to signal event consumption using
* perf_mmap__write_tail(). Using perf_evlist__mmap_read() does this
@@ -1255,13 +1256,14 @@ int perf_evlist__parse_mmap_pages(const struct option *opt, const char *str,
*/
int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages,
bool overwrite, unsigned int auxtrace_pages,
- bool auxtrace_overwrite)
+ bool auxtrace_overwrite, bool use_track_mmap)
{
struct perf_evsel *evsel;
const struct cpu_map *cpus = evlist->cpus;
const struct thread_map *threads = evlist->threads;
struct mmap_params mp = {
.prot = PROT_READ | (overwrite ? 0 : PROT_WRITE),
+ .track_mmap = use_track_mmap,
};
if (evlist->mmap == NULL && perf_evlist__alloc_mmap(evlist, mp.track_mmap) < 0)
@@ -1294,7 +1296,7 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages,
int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,
bool overwrite)
{
- return perf_evlist__mmap_ex(evlist, pages, overwrite, 0, false);
+ return perf_evlist__mmap_ex(evlist, pages, overwrite, 0, false, false);
}
int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target)
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index fc53eb817c51..1ed7b7e8b968 100644
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -144,7 +144,7 @@ int perf_evlist__parse_mmap_pages(const struct option *opt,
int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages,
bool overwrite, unsigned int auxtrace_pages,
- bool auxtrace_overwrite);
+ bool auxtrace_overwrite, bool use_track_mmap);
int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,
bool overwrite);
void perf_evlist__munmap(struct perf_evlist *evlist);
--
2.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Date | 2015-10-02 07:30 +0200 |
| Subject | [RFC/PATCH 18/38] perf tools: Introduce thread__find_addr_location_by_time() and friends |
| Message-ID | <qf14S-2jW-23@gated-at.bofh.it> |
| In reply to | #1237913 |
These new functions are for find appropriate map (and symbol) at the
given time when used with an indexed data file. This is based on the
fact that map_groups list is sorted by time in the previous patch.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/event.c | 59 +++++++++++++++++++++++++++++++++++++++--------
tools/perf/util/machine.c | 28 ++++++++++++++--------
tools/perf/util/session.h | 1 +
tools/perf/util/thread.c | 26 +++++++++++++++++++++
tools/perf/util/thread.h | 11 +++++++++
5 files changed, 106 insertions(+), 19 deletions(-)
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 887f18266ab5..c960cbcd30d4 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -895,16 +895,14 @@ int perf_event__process(struct perf_tool *tool __maybe_unused,
return machine__process_event(machine, event, sample);
}
-void thread__find_addr_map(struct thread *thread, u8 cpumode,
- enum map_type type, u64 addr,
- struct addr_location *al)
+static void map_groups__find_addr_map(struct map_groups *mg, u8 cpumode,
+ enum map_type type, u64 addr,
+ struct addr_location *al)
{
- struct map_groups *mg = thread->mg;
struct machine *machine = mg->machine;
bool load_map = false;
al->machine = machine;
- al->thread = thread;
al->addr = addr;
al->cpumode = cpumode;
al->filtered = 0;
@@ -973,6 +971,29 @@ try_again:
}
}
+void thread__find_addr_map(struct thread *thread, u8 cpumode,
+ enum map_type type, u64 addr,
+ struct addr_location *al)
+{
+ al->thread = thread;
+ map_groups__find_addr_map(thread->mg, cpumode, type, addr, al);
+}
+
+void thread__find_addr_map_by_time(struct thread *thread, u8 cpumode,
+ enum map_type type, u64 addr,
+ struct addr_location *al, u64 timestamp)
+{
+ struct map_groups *mg;
+
+ if (perf_has_index)
+ mg = thread__get_map_groups(thread, timestamp);
+ else
+ mg = thread->mg;
+
+ al->thread = thread;
+ map_groups__find_addr_map(mg, cpumode, type, addr, al);
+}
+
void thread__find_addr_location(struct thread *thread,
u8 cpumode, enum map_type type, u64 addr,
struct addr_location *al)
@@ -985,6 +1006,23 @@ void thread__find_addr_location(struct thread *thread,
al->sym = NULL;
}
+void thread__find_addr_location_by_time(struct thread *thread, u8 cpumode,
+ enum map_type type, u64 addr,
+ struct addr_location *al, u64 timestamp)
+{
+ if (perf_has_index)
+ thread__find_addr_map_by_time(thread, cpumode, type, addr, al,
+ timestamp);
+ else
+ thread__find_addr_map(thread, cpumode, type, addr, al);
+
+ if (al->map != NULL)
+ al->sym = map__find_symbol(al->map, al->addr,
+ thread->mg->machine->symbol_filter);
+ else
+ al->sym = NULL;
+}
+
/*
* Callers need to drop the reference to al->thread, obtained in
* machine__findnew_thread()
@@ -1014,7 +1052,9 @@ int perf_event__preprocess_sample(const union perf_event *event,
machine__kernel_map(machine) == NULL)
machine__create_kernel_maps(machine);
- thread__find_addr_map(thread, cpumode, MAP__FUNCTION, sample->ip, al);
+ thread__find_addr_map_by_time(thread, cpumode, MAP__FUNCTION,
+ sample->ip, al, sample->time);
+
dump_printf(" ...... dso: %s\n",
al->map ? al->map->dso->long_name :
al->level == 'H' ? "[hypervisor]" : "<not found>");
@@ -1097,10 +1137,11 @@ void perf_event__preprocess_sample_addr(union perf_event *event,
{
u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
- thread__find_addr_map(thread, cpumode, MAP__FUNCTION, sample->addr, al);
+ thread__find_addr_map_by_time(thread, cpumode, MAP__FUNCTION,
+ sample->addr, al, sample->time);
if (!al->map)
- thread__find_addr_map(thread, cpumode, MAP__VARIABLE,
- sample->addr, al);
+ thread__find_addr_map_by_time(thread, cpumode, MAP__VARIABLE,
+ sample->addr, al, sample->time);
al->cpu = sample->cpu;
al->sym = NULL;
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 3373e8455945..d5e5b9de54b0 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1688,7 +1688,7 @@ static bool symbol__match_regex(struct symbol *sym, regex_t *regex)
static void ip__resolve_ams(struct thread *thread,
struct addr_map_symbol *ams,
- u64 ip)
+ u64 ip, u64 timestamp)
{
struct addr_location al;
@@ -1700,7 +1700,8 @@ static void ip__resolve_ams(struct thread *thread,
* Thus, we have to try consecutively until we find a match
* or else, the symbol is unknown
*/
- thread__find_cpumode_addr_location(thread, MAP__FUNCTION, ip, &al);
+ thread__find_cpumode_addr_location_by_time(thread, MAP__FUNCTION,
+ ip, &al, timestamp);
ams->addr = ip;
ams->al_addr = al.addr;
@@ -1708,21 +1709,25 @@ static void ip__resolve_ams(struct thread *thread,
ams->map = al.map;
}
-static void ip__resolve_data(struct thread *thread,
- u8 m, struct addr_map_symbol *ams, u64 addr)
+static void ip__resolve_data(struct thread *thread, u8 m,
+ struct addr_map_symbol *ams,
+ u64 addr, u64 timestamp)
{
struct addr_location al;
memset(&al, 0, sizeof(al));
- thread__find_addr_location(thread, m, MAP__VARIABLE, addr, &al);
+ thread__find_addr_location_by_time(thread, m, MAP__VARIABLE,
+ addr, &al, timestamp);
+
if (al.map == NULL) {
/*
* some shared data regions have execute bit set which puts
* their mapping in the MAP__FUNCTION type array.
* Check there as a fallback option before dropping the sample.
*/
- thread__find_addr_location(thread, m, MAP__FUNCTION, addr, &al);
+ thread__find_addr_location_by_time(thread, m, MAP__FUNCTION,
+ addr, &al, timestamp);
}
ams->addr = addr;
@@ -1739,8 +1744,9 @@ struct mem_info *sample__resolve_mem(struct perf_sample *sample,
if (!mi)
return NULL;
- ip__resolve_ams(al->thread, &mi->iaddr, sample->ip);
- ip__resolve_data(al->thread, al->cpumode, &mi->daddr, sample->addr);
+ ip__resolve_ams(al->thread, &mi->iaddr, sample->ip, sample->time);
+ ip__resolve_data(al->thread, al->cpumode, &mi->daddr, sample->addr,
+ sample->time);
mi->data_src.val = sample->data_src;
return mi;
@@ -1814,8 +1820,10 @@ struct branch_info *sample__resolve_bstack(struct perf_sample *sample,
return NULL;
for (i = 0; i < bs->nr; i++) {
- ip__resolve_ams(al->thread, &bi[i].to, bs->entries[i].to);
- ip__resolve_ams(al->thread, &bi[i].from, bs->entries[i].from);
+ ip__resolve_ams(al->thread, &bi[i].to,
+ bs->entries[i].to, sample->time);
+ ip__resolve_ams(al->thread, &bi[i].from,
+ bs->entries[i].from, sample->time);
bi[i].flags = bs->entries[i].flags;
}
return bi;
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 3e900c0efc73..1dd864e983d2 100644
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -138,4 +138,5 @@ int perf_event__synthesize_id_index(struct perf_tool *tool,
struct perf_evlist *evlist,
struct machine *machine);
+
#endif /* __PERF_SESSION_H */
diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
index 33de8b010282..efd510d5d966 100644
--- a/tools/perf/util/thread.c
+++ b/tools/perf/util/thread.c
@@ -400,3 +400,29 @@ void thread__find_cpumode_addr_location(struct thread *thread,
break;
}
}
+
+void thread__find_cpumode_addr_location_by_time(struct thread *thread,
+ enum map_type type, u64 addr,
+ struct addr_location *al,
+ u64 timestamp)
+{
+ size_t i;
+ const u8 const cpumodes[] = {
+ PERF_RECORD_MISC_USER,
+ PERF_RECORD_MISC_KERNEL,
+ PERF_RECORD_MISC_GUEST_USER,
+ PERF_RECORD_MISC_GUEST_KERNEL
+ };
+
+ if (!perf_has_index) {
+ thread__find_cpumode_addr_location(thread, type, addr, al);
+ return;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(cpumodes); i++) {
+ thread__find_addr_location_by_time(thread, cpumodes[i], type,
+ addr, al, timestamp);
+ if (al->map)
+ break;
+ }
+}
diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
index c8463d08a6dd..8815ac7bba3c 100644
--- a/tools/perf/util/thread.h
+++ b/tools/perf/util/thread.h
@@ -81,14 +81,25 @@ size_t thread__fprintf(struct thread *thread, FILE *fp);
void thread__find_addr_map(struct thread *thread,
u8 cpumode, enum map_type type, u64 addr,
struct addr_location *al);
+void thread__find_addr_map_by_time(struct thread *thread, u8 cpumode,
+ enum map_type type, u64 addr,
+ struct addr_location *al, u64 timestamp);
void thread__find_addr_location(struct thread *thread,
u8 cpumode, enum map_type type, u64 addr,
struct addr_location *al);
+void thread__find_addr_location_by_time(struct thread *thread, u8 cpumode,
+ enum map_type type, u64 addr,
+ struct addr_location *al,
+ u64 timestamp);
void thread__find_cpumode_addr_location(struct thread *thread,
enum map_type type, u64 addr,
struct addr_location *al);
+void thread__find_cpumode_addr_location_by_time(struct thread *thread,
+ enum map_type type, u64 addr,
+ struct addr_location *al,
+ u64 timestamp);
static inline void *thread__priv(struct thread *thread)
{
--
2.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Date | 2015-10-02 07:30 +0200 |
| Subject | [RFC/PATCH 21/38] perf tools: Save timestamp of a map creation |
| Message-ID | <qf14S-2jW-27@gated-at.bofh.it> |
| In reply to | #1237913 |
It'll be used to support multiple maps on a same address like dlopen()
and/or JIT compile cases.
Cc: Stephane Eranian <eranian@google.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/dso.c | 2 +-
tools/perf/util/machine.c | 29 +++++++++++++++++------------
tools/perf/util/machine.h | 2 +-
tools/perf/util/map.c | 12 +++++++-----
tools/perf/util/map.h | 9 ++++++---
tools/perf/util/probe-event.c | 2 +-
tools/perf/util/symbol-elf.c | 2 +-
tools/perf/util/symbol.c | 4 ++--
8 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index 7c0c08386a1d..6cf2c0b095cf 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -859,7 +859,7 @@ struct map *dso__new_map(const char *name)
struct dso *dso = dso__new(name);
if (dso)
- map = map__new2(0, dso, MAP__FUNCTION);
+ map = map__new2(0, dso, MAP__FUNCTION, 0);
return map;
}
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 761b04b970ad..57f9aa1800a2 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -709,7 +709,7 @@ int machine__process_switch_event(struct machine *machine __maybe_unused,
}
struct map *machine__findnew_module_map(struct machine *machine, u64 start,
- const char *filename)
+ const char *filename, u64 timestamp)
{
struct map *map = NULL;
struct dso *dso;
@@ -727,7 +727,7 @@ struct map *machine__findnew_module_map(struct machine *machine, u64 start,
if (dso == NULL)
goto out;
- map = map__new2(start, dso, MAP__FUNCTION);
+ map = map__new2(start, dso, MAP__FUNCTION, timestamp);
if (map == NULL)
goto out;
@@ -892,7 +892,7 @@ int __machine__create_kernel_maps(struct machine *machine, struct dso *kernel)
struct kmap *kmap;
struct map *map;
- machine->vmlinux_maps[type] = map__new2(start, kernel, type);
+ machine->vmlinux_maps[type] = map__new2(start, kernel, type, 0);
if (machine->vmlinux_maps[type] == NULL)
return -1;
@@ -1192,7 +1192,7 @@ static int machine__create_module(void *arg, const char *name, u64 start)
struct machine *machine = arg;
struct map *map;
- map = machine__findnew_module_map(machine, start, name);
+ map = machine__findnew_module_map(machine, start, name, 0);
if (map == NULL)
return -1;
@@ -1293,7 +1293,8 @@ static bool machine__uses_kcore(struct machine *machine)
}
static int machine__process_kernel_mmap_event(struct machine *machine,
- union perf_event *event)
+ union perf_event *event,
+ u64 timestamp)
{
struct map *map;
char kmmap_prefix[PATH_MAX];
@@ -1316,7 +1317,8 @@ static int machine__process_kernel_mmap_event(struct machine *machine,
if (event->mmap.filename[0] == '/' ||
(!is_kernel_mmap && event->mmap.filename[0] == '[')) {
map = machine__findnew_module_map(machine, event->mmap.start,
- event->mmap.filename);
+ event->mmap.filename,
+ timestamp);
if (map == NULL)
goto out_problem;
@@ -1404,7 +1406,7 @@ out_problem:
int machine__process_mmap2_event(struct machine *machine,
union perf_event *event,
- struct perf_sample *sample __maybe_unused)
+ struct perf_sample *sample)
{
u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
struct thread *thread;
@@ -1417,7 +1419,8 @@ int machine__process_mmap2_event(struct machine *machine,
if (cpumode == PERF_RECORD_MISC_GUEST_KERNEL ||
cpumode == PERF_RECORD_MISC_KERNEL) {
- ret = machine__process_kernel_mmap_event(machine, event);
+ ret = machine__process_kernel_mmap_event(machine, event,
+ sample->time);
if (ret < 0)
goto out_problem;
return 0;
@@ -1440,7 +1443,8 @@ int machine__process_mmap2_event(struct machine *machine,
event->mmap2.ino_generation,
event->mmap2.prot,
event->mmap2.flags,
- event->mmap2.filename, type, thread);
+ event->mmap2.filename, type, thread,
+ sample->time);
if (map == NULL)
goto out_problem_map;
@@ -1458,7 +1462,7 @@ out_problem:
}
int machine__process_mmap_event(struct machine *machine, union perf_event *event,
- struct perf_sample *sample __maybe_unused)
+ struct perf_sample *sample)
{
u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
struct thread *thread;
@@ -1471,7 +1475,8 @@ int machine__process_mmap_event(struct machine *machine, union perf_event *event
if (cpumode == PERF_RECORD_MISC_GUEST_KERNEL ||
cpumode == PERF_RECORD_MISC_KERNEL) {
- ret = machine__process_kernel_mmap_event(machine, event);
+ ret = machine__process_kernel_mmap_event(machine, event,
+ sample->time);
if (ret < 0)
goto out_problem;
return 0;
@@ -1491,7 +1496,7 @@ int machine__process_mmap_event(struct machine *machine, union perf_event *event
event->mmap.len, event->mmap.pgoff,
event->mmap.pid, 0, 0, 0, 0, 0, 0,
event->mmap.filename,
- type, thread);
+ type, thread, sample->time);
if (map == NULL)
goto out_problem_map;
diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h
index f0c2cc9c90ae..98ade93f433f 100644
--- a/tools/perf/util/machine.h
+++ b/tools/perf/util/machine.h
@@ -205,7 +205,7 @@ struct symbol *machine__find_kernel_function_by_name(struct machine *machine,
}
struct map *machine__findnew_module_map(struct machine *machine, u64 start,
- const char *filename);
+ const char *filename, u64 timestamp);
int machine__load_kallsyms(struct machine *machine, const char *filename,
enum map_type type, symbol_filter_t filter);
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index addd4b323027..2034127ac3f0 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -125,7 +125,7 @@ static inline bool replace_android_lib(const char *filename, char *newfilename)
}
void map__init(struct map *map, enum map_type type,
- u64 start, u64 end, u64 pgoff, struct dso *dso)
+ u64 start, u64 end, u64 pgoff, struct dso *dso, u64 timestamp)
{
map->type = type;
map->start = start;
@@ -138,13 +138,14 @@ void map__init(struct map *map, enum map_type type,
RB_CLEAR_NODE(&map->rb_node);
map->groups = NULL;
map->erange_warned = false;
+ map->timestamp = timestamp;
atomic_set(&map->refcnt, 1);
}
struct map *map__new(struct machine *machine, u64 start, u64 len,
u64 pgoff, u32 pid, u32 d_maj, u32 d_min, u64 ino,
u64 ino_gen, u32 prot, u32 flags, char *filename,
- enum map_type type, struct thread *thread)
+ enum map_type type, struct thread *thread, u64 timestamp)
{
struct map *map = malloc(sizeof(*map));
@@ -184,7 +185,7 @@ struct map *map__new(struct machine *machine, u64 start, u64 len,
if (dso == NULL)
goto out_delete;
- map__init(map, type, start, start + len, pgoff, dso);
+ map__init(map, type, start, start + len, pgoff, dso, timestamp);
if (anon || no_dso) {
map->map_ip = map->unmap_ip = identity__map_ip;
@@ -210,7 +211,8 @@ out_delete:
* they are loaded) and for vmlinux, where only after we load all the
* symbols we'll know where it starts and ends.
*/
-struct map *map__new2(u64 start, struct dso *dso, enum map_type type)
+struct map *map__new2(u64 start, struct dso *dso, enum map_type type,
+ u64 timestamp)
{
struct map *map = calloc(1, (sizeof(*map) +
(dso->kernel ? sizeof(struct kmap) : 0)));
@@ -218,7 +220,7 @@ struct map *map__new2(u64 start, struct dso *dso, enum map_type type)
/*
* ->end will be filled after we load all the symbols
*/
- map__init(map, type, start, 0, 0, dso);
+ map__init(map, type, start, 0, 0, dso, timestamp);
}
return map;
diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h
index 1e3313a22d3a..858f700ea5a3 100644
--- a/tools/perf/util/map.h
+++ b/tools/perf/util/map.h
@@ -43,6 +43,7 @@ struct map {
u32 maj, min; /* only valid for MMAP2 record */
u64 ino; /* only valid for MMAP2 record */
u64 ino_generation;/* only valid for MMAP2 record */
+ u64 timestamp;
/* ip -> dso rip */
u64 (*map_ip)(struct map *, u64);
@@ -143,12 +144,14 @@ typedef int (*symbol_filter_t)(struct map *map, struct symbol *sym);
int arch__compare_symbol_names(const char *namea, const char *nameb);
void map__init(struct map *map, enum map_type type,
- u64 start, u64 end, u64 pgoff, struct dso *dso);
+ u64 start, u64 end, u64 pgoff, struct dso *dso, u64 timestamp);
struct map *map__new(struct machine *machine, u64 start, u64 len,
u64 pgoff, u32 pid, u32 d_maj, u32 d_min, u64 ino,
u64 ino_gen, u32 prot, u32 flags,
- char *filename, enum map_type type, struct thread *thread);
-struct map *map__new2(u64 start, struct dso *dso, enum map_type type);
+ char *filename, enum map_type type, struct thread *thread,
+ u64 timestamp);
+struct map *map__new2(u64 start, struct dso *dso, enum map_type type,
+ u64 timestamp);
void map__delete(struct map *map);
struct map *map__clone(struct map *map);
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 3010abc071ff..01ecfbfe999a 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -167,7 +167,7 @@ static struct map *kernel_get_module_map(const char *module)
/* A file path -- this is an offline module */
if (module && strchr(module, '/'))
- return machine__findnew_module_map(host_machine, 0, module);
+ return machine__findnew_module_map(host_machine, 0, module, 0);
if (!module)
module = "kernel";
diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
index 475d88d0a1c9..b4443bacf811 100644
--- a/tools/perf/util/symbol-elf.c
+++ b/tools/perf/util/symbol-elf.c
@@ -1025,7 +1025,7 @@ int dso__load_sym(struct dso *dso, struct map *map,
curr_dso->long_name = dso->long_name;
curr_dso->long_name_len = dso->long_name_len;
curr_map = map__new2(start, curr_dso,
- map->type);
+ map->type, map->timestamp);
if (curr_map == NULL) {
dso__put(curr_dso);
goto out_elf_end;
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index bcda43bee4d4..ff2a298f1780 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -799,7 +799,7 @@ static int dso__split_kallsyms(struct dso *dso, struct map *map, u64 delta,
ndso->kernel = dso->kernel;
- curr_map = map__new2(pos->start, ndso, map->type);
+ curr_map = map__new2(pos->start, ndso, map->type, 0);
if (curr_map == NULL) {
dso__put(ndso);
return -1;
@@ -1101,7 +1101,7 @@ static int kcore_mapfn(u64 start, u64 len, u64 pgoff, void *data)
struct kcore_mapfn_data *md = data;
struct map *map;
- map = map__new2(start, md->dso, md->type);
+ map = map__new2(start, md->dso, md->type, 0);
if (map == NULL)
return -ENOMEM;
--
2.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Date | 2015-10-02 07:30 +0200 |
| Subject | [RFC/PATCH 15/38] perf tools: Introduce machine__find*_thread_by_time() |
| Message-ID | <qf14S-2jW-33@gated-at.bofh.it> |
| In reply to | #1237913 |
With data file indexing is enabled, it needs to search thread based on
sample time since sample processing is done after other (task, comm and
mmap) events are processed. This can be a problem if a session is very
long and pid is recycled - in that case it'll only see the last one.
So keep thread start time in it, and search thread based on the time.
This patch introduces machine__find{,new}_thread_by_time() function
for this. It'll first search current (i.e. recent) thread rbtree and
then dead thread tree (and tid list). If it couldn't find anyone,
it'll create a new (missing) thread.
The sample timestamp of 0 means that this is called from synthesized
event so just use current rbtree. The timestamp will be -1 if sample
didn't record the timestamp so will see current threads automatically.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/tests/dwarf-unwind.c | 8 +--
tools/perf/tests/hists_common.c | 3 +-
tools/perf/tests/hists_link.c | 2 +-
tools/perf/util/event.c | 6 +-
tools/perf/util/machine.c | 126 +++++++++++++++++++++++++++++++++++++++-
tools/perf/util/machine.h | 10 +++-
tools/perf/util/thread.c | 4 ++
tools/perf/util/thread.h | 1 +
8 files changed, 148 insertions(+), 12 deletions(-)
diff --git a/tools/perf/tests/dwarf-unwind.c b/tools/perf/tests/dwarf-unwind.c
index 40b36c462427..b9ca0a72fc4d 100644
--- a/tools/perf/tests/dwarf-unwind.c
+++ b/tools/perf/tests/dwarf-unwind.c
@@ -16,10 +16,10 @@
static int mmap_handler(struct perf_tool *tool __maybe_unused,
union perf_event *event,
- struct perf_sample *sample __maybe_unused,
+ struct perf_sample *sample,
struct machine *machine)
{
- return machine__process_mmap2_event(machine, event, NULL);
+ return machine__process_mmap2_event(machine, event, sample);
}
static int init_live_machine(struct machine *machine)
@@ -66,12 +66,10 @@ static int unwind_entry(struct unwind_entry *entry, void *arg)
__attribute__ ((noinline))
static int unwind_thread(struct thread *thread)
{
- struct perf_sample sample;
+ struct perf_sample sample = { .time = -1ULL, };
unsigned long cnt = 0;
int err = -1;
- memset(&sample, 0, sizeof(sample));
-
if (test__arch_unwind_sample(&sample, thread)) {
pr_debug("failed to get unwind sample\n");
goto out;
diff --git a/tools/perf/tests/hists_common.c b/tools/perf/tests/hists_common.c
index ce80b274b097..1d657fa2830f 100644
--- a/tools/perf/tests/hists_common.c
+++ b/tools/perf/tests/hists_common.c
@@ -80,6 +80,7 @@ static struct {
struct machine *setup_fake_machine(struct machines *machines)
{
struct machine *machine = machines__find(machines, HOST_KERNEL_ID);
+ struct perf_sample sample = { .time = -1ULL, };
size_t i;
if (machine == NULL) {
@@ -114,7 +115,7 @@ struct machine *setup_fake_machine(struct machines *machines)
strcpy(fake_mmap_event.mmap.filename,
fake_mmap_info[i].filename);
- machine__process_mmap_event(machine, &fake_mmap_event, NULL);
+ machine__process_mmap_event(machine, &fake_mmap_event, &sample);
}
for (i = 0; i < ARRAY_SIZE(fake_symbols); i++) {
diff --git a/tools/perf/tests/hists_link.c b/tools/perf/tests/hists_link.c
index 27bae90c9a95..cacc8617bf02 100644
--- a/tools/perf/tests/hists_link.c
+++ b/tools/perf/tests/hists_link.c
@@ -64,7 +64,7 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
struct perf_evsel *evsel;
struct addr_location al;
struct hist_entry *he;
- struct perf_sample sample = { .period = 1, };
+ struct perf_sample sample = { .period = 1, .time = -1ULL, };
size_t i = 0, k;
/*
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index cb98b5af9e17..3dff1b5cd4cc 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -9,6 +9,7 @@
#include "strlist.h"
#include "thread.h"
#include "thread_map.h"
+#include "session.h"
#include "symbol/kallsyms.h"
static const char *perf_event__names[] = {
@@ -992,9 +993,10 @@ int perf_event__preprocess_sample(const union perf_event *event,
struct perf_sample *sample)
{
u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
- struct thread *thread = machine__findnew_thread(machine, sample->pid,
- sample->tid);
+ struct thread *thread;
+ thread = machine__findnew_thread_by_time(machine, sample->pid,
+ sample->tid, sample->time);
if (thread == NULL)
return -1;
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 2b9fbe55c896..7cfaa2c3f131 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -475,6 +475,120 @@ struct thread *machine__find_thread(struct machine *machine, pid_t pid,
return th;
}
+static struct thread *
+__machine__findnew_thread_by_time(struct machine *machine, pid_t pid, pid_t tid,
+ u64 timestamp, bool create)
+{
+ struct thread *curr, *pos, *new;
+ struct thread *th = NULL;
+ struct rb_node **p;
+ struct rb_node *parent = NULL;
+
+ if (!perf_has_index)
+ return ____machine__findnew_thread(machine, pid, tid, create);
+
+ /* lookup current thread first */
+ curr = ____machine__findnew_thread(machine, pid, tid, false);
+ if (curr && timestamp >= curr->start_time)
+ return curr;
+
+ /* and then check dead threads tree & list */
+ p = &machine->dead_threads.rb_node;
+ while (*p != NULL) {
+ parent = *p;
+ th = rb_entry(parent, struct thread, rb_node);
+
+ if (th->tid == tid) {
+ list_for_each_entry(pos, &th->tid_list, tid_list) {
+ if (timestamp >= pos->start_time &&
+ pos->start_time > th->start_time) {
+ th = pos;
+ break;
+ }
+ }
+
+ if (timestamp >= th->start_time) {
+ machine__update_thread_pid(machine, th, pid);
+ return th;
+ }
+ break;
+ }
+
+ if (tid < th->tid)
+ p = &(*p)->rb_left;
+ else
+ p = &(*p)->rb_right;
+ }
+
+ if (!create)
+ return NULL;
+
+ if (!curr && !*p) {
+ /* found no thread. create one as current thread */
+ return __machine__findnew_thread(machine, pid, tid);
+ }
+
+ new = thread__new(pid, tid);
+ if (new == NULL)
+ return NULL;
+
+ new->dead = true;
+ new->start_time = timestamp;
+
+ if (*p) {
+ list_for_each_entry(pos, &th->tid_list, tid_list) {
+ /* sort by time */
+ if (timestamp >= pos->start_time) {
+ th = pos;
+ break;
+ }
+ }
+ list_add_tail(&new->tid_list, &th->tid_list);
+ } else {
+ rb_link_node(&new->rb_node, parent, p);
+ rb_insert_color(&new->rb_node, &machine->dead_threads);
+ }
+
+ thread__get(new);
+
+ /*
+ * We have to initialize map_groups separately
+ * after rb tree is updated.
+ *
+ * The reason is that we call machine__findnew_thread
+ * within thread__init_map_groups to find the thread
+ * leader and that would screwed the rb tree.
+ */
+ if (thread__init_map_groups(new, machine))
+ thread__zput(new);
+
+ return new;
+}
+
+struct thread *machine__find_thread_by_time(struct machine *machine, pid_t pid,
+ pid_t tid, u64 timestamp)
+{
+ struct thread *th;
+
+ pthread_rwlock_rdlock(&machine->threads_lock);
+ th = thread__get(__machine__findnew_thread_by_time(machine, pid, tid,
+ timestamp, false));
+ pthread_rwlock_unlock(&machine->threads_lock);
+ return th;
+}
+
+struct thread *machine__findnew_thread_by_time(struct machine *machine, pid_t pid,
+ pid_t tid, u64 timestamp)
+{
+ struct thread *th;
+
+ pthread_rwlock_wrlock(&machine->threads_lock);
+ th = thread__get(__machine__findnew_thread_by_time(machine, pid, tid,
+ timestamp, true));
+ pthread_rwlock_unlock(&machine->threads_lock);
+ return th;
+}
+
struct comm *machine__thread_exec_comm(struct machine *machine,
struct thread *thread)
{
@@ -1299,7 +1413,7 @@ int machine__process_mmap2_event(struct machine *machine,
}
thread = machine__findnew_thread(machine, event->mmap2.pid,
- event->mmap2.tid);
+ event->mmap2.tid);
if (thread == NULL)
goto out_problem;
@@ -1419,6 +1533,16 @@ static void __machine__remove_thread(struct machine *machine, struct thread *th,
pos = rb_entry(parent, struct thread, rb_node);
if (pos->tid == th->tid) {
+ struct thread *old;
+
+ /* sort by time */
+ list_for_each_entry(old, &pos->tid_list, tid_list) {
+ if (th->start_time >= old->start_time) {
+ pos = old;
+ break;
+ }
+ }
+
list_add_tail(&th->tid_list, &pos->tid_list);
goto out;
}
diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h
index 23242de926df..f0c2cc9c90ae 100644
--- a/tools/perf/util/machine.h
+++ b/tools/perf/util/machine.h
@@ -75,8 +75,6 @@ static inline bool machine__kernel_ip(struct machine *machine, u64 ip)
return ip >= kernel_start;
}
-struct thread *machine__find_thread(struct machine *machine, pid_t pid,
- pid_t tid);
struct comm *machine__thread_exec_comm(struct machine *machine,
struct thread *thread);
@@ -164,6 +162,14 @@ static inline bool machine__is_host(struct machine *machine)
struct thread *__machine__findnew_thread(struct machine *machine, pid_t pid, pid_t tid);
struct thread *machine__findnew_thread(struct machine *machine, pid_t pid, pid_t tid);
+struct thread *machine__find_thread(struct machine *machine, pid_t pid,
+ pid_t tid);
+struct thread *machine__findnew_thread_by_time(struct machine *machine,
+ pid_t pid, pid_t tid,
+ u64 timestamp);
+struct thread *machine__find_thread_by_time(struct machine *machine,
+ pid_t pid, pid_t tid,
+ u64 timestamp);
struct dso *machine__findnew_dso(struct machine *machine, const char *filename);
diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
index 674792e8fa2f..ad7c2a00bff8 100644
--- a/tools/perf/util/thread.c
+++ b/tools/perf/util/thread.c
@@ -160,6 +160,9 @@ int __thread__set_comm(struct thread *thread, const char *str, u64 timestamp,
/* Override the default :tid entry */
if (!thread->comm_set) {
+ if (!thread->start_time)
+ thread->start_time = timestamp;
+
err = comm__override(curr, str, timestamp, exec);
if (err)
return err;
@@ -266,6 +269,7 @@ int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp)
}
thread->ppid = parent->tid;
+ thread->start_time = timestamp;
return thread__clone_map_groups(thread, parent);
}
diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
index b8f794d97b75..97026a9660ec 100644
--- a/tools/perf/util/thread.h
+++ b/tools/perf/util/thread.h
@@ -28,6 +28,7 @@ struct thread {
bool dead; /* thread is in dead_threads list */
struct list_head comm_list;
u64 db_id;
+ u64 start_time;
void *priv;
struct thread_stack *ts;
--
2.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Date | 2015-10-02 07:30 +0200 |
| Subject | [RFC/PATCH 01/38] perf tools: Use a software dummy event to track task/mmap events |
| Message-ID | <qf14S-2jW-29@gated-at.bofh.it> |
| In reply to | #1237913 |
Add APIs for software dummy event to track task/comm/mmap events
separately. The perf record will use them to save such events in a
separate mmap buffer to make it easy to index. This is a preparation of
multi-thread support which will come later.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/evlist.c | 30 ++++++++++++++++++++++++++++++
tools/perf/util/evlist.h | 1 +
tools/perf/util/evsel.h | 15 +++++++++++++++
3 files changed, 46 insertions(+)
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index e7e195d867ea..c5180a29db1b 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -248,6 +248,36 @@ error:
return -ENOMEM;
}
+int perf_evlist__add_dummy_tracking(struct perf_evlist *evlist)
+{
+ struct perf_event_attr attr = {
+ .type = PERF_TYPE_SOFTWARE,
+ .config = PERF_COUNT_SW_DUMMY,
+ .exclude_kernel = 1,
+ };
+ struct perf_evsel *evsel;
+
+ event_attr_init(&attr);
+
+ evsel = perf_evsel__new(&attr);
+ if (evsel == NULL)
+ goto error;
+
+ /* use strdup() because free(evsel) assumes name is allocated */
+ evsel->name = strdup("dummy");
+ if (!evsel->name)
+ goto error_free;
+
+ perf_evlist__add(evlist, evsel);
+ perf_evlist__set_tracking_event(evlist, evsel);
+
+ return 0;
+error_free:
+ perf_evsel__delete(evsel);
+error:
+ return -ENOMEM;
+}
+
static int perf_evlist__add_attrs(struct perf_evlist *evlist,
struct perf_event_attr *attrs, size_t nr_attrs)
{
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 66bc9d4c0869..414e383885f5 100644
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -75,6 +75,7 @@ void perf_evlist__delete(struct perf_evlist *evlist);
void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry);
void perf_evlist__remove(struct perf_evlist *evlist, struct perf_evsel *evsel);
int perf_evlist__add_default(struct perf_evlist *evlist);
+int perf_evlist__add_dummy_tracking(struct perf_evlist *evlist);
int __perf_evlist__add_default_attrs(struct perf_evlist *evlist,
struct perf_event_attr *attrs, size_t nr_attrs);
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 7906666580da..8d2445347b0f 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -359,6 +359,21 @@ static inline bool perf_evsel__is_function_event(struct perf_evsel *evsel)
#undef FUNCTION_EVENT
}
+/**
+ * perf_evsel__is_dummy_tracking - Return whether given evsel is a dummy
+ * event for tracking meta events only
+ *
+ * @evsel - evsel selector to be tested
+ *
+ * Return %true if event is a dummy tracking event
+ */
+static inline bool perf_evsel__is_dummy_tracking(struct perf_evsel *evsel)
+{
+ return evsel->attr.type == PERF_TYPE_SOFTWARE &&
+ evsel->attr.config == PERF_COUNT_SW_DUMMY &&
+ evsel->attr.task == 1 && evsel->attr.mmap == 1;
+}
+
struct perf_attr_details {
bool freq;
bool verbose;
--
2.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Jiri Olsa <jolsa@redhat.com> |
|---|---|
| Date | 2015-10-05 15:00 +0200 |
| Subject | Re: [RFC/PATCH 01/38] perf tools: Use a software dummy event to track task/mmap events |
| Message-ID | <qgdwZ-7MJ-7@gated-at.bofh.it> |
| In reply to | #1237922 |
On Fri, Oct 02, 2015 at 02:18:42PM +0900, Namhyung Kim wrote:
SNIP
>
> +/**
> + * perf_evsel__is_dummy_tracking - Return whether given evsel is a dummy
> + * event for tracking meta events only
> + *
> + * @evsel - evsel selector to be tested
> + *
> + * Return %true if event is a dummy tracking event
> + */
> +static inline bool perf_evsel__is_dummy_tracking(struct perf_evsel *evsel)
> +{
> + return evsel->attr.type == PERF_TYPE_SOFTWARE &&
> + evsel->attr.config == PERF_COUNT_SW_DUMMY &&
> + evsel->attr.task == 1 && evsel->attr.mmap == 1;
should this use now check for evsel->tracking ?
jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Date | 2015-10-02 07:30 +0200 |
| Subject | [RFC/PATCH 28/38] perf tools: Move BUILD_ID_SIZE definition to perf.h |
| Message-ID | <qf14T-2jW-35@gated-at.bofh.it> |
| In reply to | #1237913 |
The util/event.h includes util/build-id.h only for BUILD_ID_SIZE.
This is a problem when I include util/event.h from util/tool.h which
is also included by util/build-id.h since it now makes a circular
dependency resulting in incomplete type error.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/perf.h | 3 +++
tools/perf/util/build-id.h | 3 ---
tools/perf/util/dso.h | 1 +
tools/perf/util/event.h | 1 -
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index df7c208abb74..d21b5c63f244 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -31,6 +31,9 @@ static inline unsigned long long rdclock(void)
#define MAX_NR_CPUS 1024
+#define BUILD_ID_SIZE 20
+#define SBUILD_ID_SIZE (BUILD_ID_SIZE * 2 + 1)
+
extern const char *input_name;
extern bool perf_host, perf_guest;
extern const char perf_version_string[];
diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h
index 27a14a8a945b..8f9a5720bc5e 100644
--- a/tools/perf/util/build-id.h
+++ b/tools/perf/util/build-id.h
@@ -1,9 +1,6 @@
#ifndef PERF_BUILD_ID_H_
#define PERF_BUILD_ID_H_ 1
-#define BUILD_ID_SIZE 20
-#define SBUILD_ID_SIZE (BUILD_ID_SIZE * 2 + 1)
-
#include "tool.h"
#include "strlist.h"
#include <linux/types.h>
diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
index fc8db9c764ac..416b9a57fcb9 100644
--- a/tools/perf/util/dso.h
+++ b/tools/perf/util/dso.h
@@ -9,6 +9,7 @@
#include <linux/types.h>
#include <linux/bitops.h>
#include "map.h"
+#include "perf.h"
#include "build-id.h"
enum dso_binary_type {
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index a0dbcbd4f6d8..3812d645362c 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -6,7 +6,6 @@
#include "../perf.h"
#include "map.h"
-#include "build-id.h"
#include "perf_regs.h"
struct mmap_event {
--
2.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Date | 2015-10-02 07:30 +0200 |
| Subject | [RFC/PATCH 13/38] perf tools: Use thread__comm_by_time() when adding hist entries |
| Message-ID | <qf14T-2jW-37@gated-at.bofh.it> |
| In reply to | #1237913 |
Now thread->comm can be handled with time properly, use it to find
the correct comm at the time when adding hist entries.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/builtin-annotate.c | 5 +++--
tools/perf/builtin-diff.c | 8 ++++----
tools/perf/tests/hists_link.c | 4 ++--
tools/perf/util/hist.c | 19 ++++++++++---------
tools/perf/util/hist.h | 2 +-
5 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 2bf9b3fd9e61..3afb858eac6e 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -47,7 +47,7 @@ struct perf_annotate {
};
static int perf_evsel__add_sample(struct perf_evsel *evsel,
- struct perf_sample *sample __maybe_unused,
+ struct perf_sample *sample,
struct addr_location *al,
struct perf_annotate *ann)
{
@@ -72,7 +72,8 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel,
return 0;
}
- he = __hists__add_entry(hists, al, NULL, NULL, NULL, 1, 1, 0, true);
+ he = __hists__add_entry(hists, al, NULL, NULL, NULL, 1, 1, 0,
+ sample->time, true);
if (he == NULL)
return -ENOMEM;
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 0b180a885ba3..623ecc53c0c9 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -312,10 +312,10 @@ static int formula_fprintf(struct hist_entry *he, struct hist_entry *pair,
static int hists__add_entry(struct hists *hists,
struct addr_location *al, u64 period,
- u64 weight, u64 transaction)
+ u64 weight, u64 transaction, u64 timestamp)
{
if (__hists__add_entry(hists, al, NULL, NULL, NULL, period, weight,
- transaction, true) != NULL)
+ transaction, timestamp, true) != NULL)
return 0;
return -ENOMEM;
}
@@ -336,8 +336,8 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,
return -1;
}
- if (hists__add_entry(hists, &al, sample->period,
- sample->weight, sample->transaction)) {
+ if (hists__add_entry(hists, &al, sample->period, sample->weight,
+ sample->transaction, sample->time)) {
pr_warning("problem incrementing symbol period, skipping event\n");
goto out_put;
}
diff --git a/tools/perf/tests/hists_link.c b/tools/perf/tests/hists_link.c
index 8c102b011424..27bae90c9a95 100644
--- a/tools/perf/tests/hists_link.c
+++ b/tools/perf/tests/hists_link.c
@@ -90,7 +90,7 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
goto out;
he = __hists__add_entry(hists, &al, NULL,
- NULL, NULL, 1, 1, 0, true);
+ NULL, NULL, 1, 1, 0, -1, true);
if (he == NULL) {
addr_location__put(&al);
goto out;
@@ -116,7 +116,7 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
goto out;
he = __hists__add_entry(hists, &al, NULL,
- NULL, NULL, 1, 1, 0, true);
+ NULL, NULL, 1, 1, 0, -1, true);
if (he == NULL) {
addr_location__put(&al);
goto out;
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index c346b331b892..10454197a508 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -447,11 +447,11 @@ struct hist_entry *__hists__add_entry(struct hists *hists,
struct branch_info *bi,
struct mem_info *mi,
u64 period, u64 weight, u64 transaction,
- bool sample_self)
+ u64 timestamp, bool sample_self)
{
struct hist_entry entry = {
.thread = al->thread,
- .comm = thread__comm(al->thread),
+ .comm = thread__comm_by_time(al->thread, timestamp),
.ms = {
.map = al->map,
.sym = al->sym,
@@ -510,13 +510,14 @@ iter_add_single_mem_entry(struct hist_entry_iter *iter, struct addr_location *al
{
u64 cost;
struct mem_info *mi = iter->priv;
+ struct perf_sample *sample = iter->sample;
struct hists *hists = evsel__hists(iter->evsel);
struct hist_entry *he;
if (mi == NULL)
return -EINVAL;
- cost = iter->sample->weight;
+ cost = sample->weight;
if (!cost)
cost = 1;
@@ -528,7 +529,7 @@ iter_add_single_mem_entry(struct hist_entry_iter *iter, struct addr_location *al
* and the he_stat__add_period() function.
*/
he = __hists__add_entry(hists, al, iter->parent, NULL, mi,
- cost, cost, 0, true);
+ cost, cost, 0, sample->time, true);
if (!he)
return -ENOMEM;
@@ -630,7 +631,7 @@ iter_add_next_branch_entry(struct hist_entry_iter *iter, struct addr_location *a
*/
he = __hists__add_entry(hists, al, iter->parent, &bi[i], NULL,
1, bi->flags.cycles ? bi->flags.cycles : 1,
- 0, true);
+ 0, iter->sample->time, true);
if (he == NULL)
return -ENOMEM;
@@ -668,7 +669,7 @@ iter_add_single_normal_entry(struct hist_entry_iter *iter, struct addr_location
he = __hists__add_entry(evsel__hists(evsel), al, iter->parent, NULL, NULL,
sample->period, sample->weight,
- sample->transaction, true);
+ sample->transaction, sample->time, true);
if (he == NULL)
return -ENOMEM;
@@ -730,7 +731,7 @@ iter_add_single_cumulative_entry(struct hist_entry_iter *iter,
he = __hists__add_entry(hists, al, iter->parent, NULL, NULL,
sample->period, sample->weight,
- sample->transaction, true);
+ sample->transaction, sample->time, true);
if (he == NULL)
return -ENOMEM;
@@ -775,7 +776,7 @@ iter_add_next_cumulative_entry(struct hist_entry_iter *iter,
.hists = evsel__hists(evsel),
.cpu = al->cpu,
.thread = al->thread,
- .comm = thread__comm(al->thread),
+ .comm = thread__comm_by_time(al->thread, sample->time),
.ip = al->addr,
.ms = {
.map = al->map,
@@ -804,7 +805,7 @@ iter_add_next_cumulative_entry(struct hist_entry_iter *iter,
he = __hists__add_entry(evsel__hists(evsel), al, iter->parent, NULL, NULL,
sample->period, sample->weight,
- sample->transaction, false);
+ sample->transaction, sample->time, false);
if (he == NULL)
return -ENOMEM;
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 8c20a8f6b214..7fbb60857f26 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -115,7 +115,7 @@ struct hist_entry *__hists__add_entry(struct hists *hists,
struct branch_info *bi,
struct mem_info *mi, u64 period,
u64 weight, u64 transaction,
- bool sample_self);
+ u64 timestamp, bool sample_self);
int hist_entry_iter__add(struct hist_entry_iter *iter, struct addr_location *al,
int max_stack_depth, void *arg);
--
2.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Date | 2015-10-02 07:30 +0200 |
| Subject | [RFC/PATCH 14/38] perf tools: Convert dead thread list into rbtree |
| Message-ID | <qf14T-2jW-41@gated-at.bofh.it> |
| In reply to | #1237913 |
Currently perf maintains dead threads in a linked list but this can be
a problem if someone needs to search from it especially in a large
session which might have many dead threads. Convert it to a rbtree
like normal threads and it'll be used later with multi-thread changes.
The list node is now used for chaining dead threads of same tid since
it's easier to handle such threads in time order.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/machine.c | 82 +++++++++++++++++++++++++++++++++++++++++------
tools/perf/util/machine.h | 2 +-
tools/perf/util/thread.c | 18 ++++++++++-
tools/perf/util/thread.h | 11 +++----
4 files changed, 96 insertions(+), 17 deletions(-)
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 5ef90be2a249..2b9fbe55c896 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -30,8 +30,8 @@ int machine__init(struct machine *machine, const char *root_dir, pid_t pid)
dsos__init(&machine->dsos);
machine->threads = RB_ROOT;
+ machine->dead_threads = RB_ROOT;
pthread_rwlock_init(&machine->threads_lock, NULL);
- INIT_LIST_HEAD(&machine->dead_threads);
machine->last_match = NULL;
machine->vdso_info = NULL;
@@ -104,6 +104,28 @@ static void dsos__exit(struct dsos *dsos)
pthread_rwlock_destroy(&dsos->lock);
}
+static void machine__delete_dead_threads(struct machine *machine)
+{
+ struct rb_node *nd = rb_first(&machine->dead_threads);
+
+ while (nd) {
+ struct thread *t = rb_entry(nd, struct thread, rb_node);
+ struct thread *pos;
+
+ nd = rb_next(nd);
+ rb_erase_init(&t->rb_node, &machine->dead_threads);
+
+ while (!list_empty(&t->tid_list)) {
+ pos = list_first_entry(&t->tid_list,
+ struct thread, tid_list);
+ list_del_init(&pos->tid_list);
+ thread__delete(pos);
+ }
+
+ thread__delete(t);
+ }
+}
+
void machine__delete_threads(struct machine *machine)
{
struct rb_node *nd;
@@ -117,6 +139,8 @@ void machine__delete_threads(struct machine *machine)
__machine__remove_thread(machine, t, false);
}
pthread_rwlock_unlock(&machine->threads_lock);
+
+ machine__delete_dead_threads(machine);
}
void machine__exit(struct machine *machine)
@@ -1361,6 +1385,10 @@ out_problem:
static void __machine__remove_thread(struct machine *machine, struct thread *th, bool lock)
{
+ struct rb_node **p = &machine->dead_threads.rb_node;
+ struct rb_node *parent = NULL;
+ struct thread *pos;
+
if (machine->last_match == th)
machine->last_match = NULL;
@@ -1368,16 +1396,45 @@ static void __machine__remove_thread(struct machine *machine, struct thread *th,
if (lock)
pthread_rwlock_wrlock(&machine->threads_lock);
rb_erase_init(&th->rb_node, &machine->threads);
- RB_CLEAR_NODE(&th->rb_node);
+
+ th->dead = true;
+
/*
- * Move it first to the dead_threads list, then drop the reference,
- * if this is the last reference, then the thread__delete destructor
- * will be called and we will remove it from the dead_threads list.
+ * No need to have an additional reference for non-index file
+ * as they can be released when reference holders died and
+ * there will be no more new references.
*/
- list_add_tail(&th->node, &machine->dead_threads);
+ if (!perf_has_index) {
+ thread__put(th);
+ goto out;
+ }
+
+ /*
+ * For indexed file, We may have references to this (dead)
+ * thread, as samples are processed after fork/exit events.
+ * Just move them to a separate rbtree and keep a reference.
+ */
+ while (*p != NULL) {
+ parent = *p;
+ pos = rb_entry(parent, struct thread, rb_node);
+
+ if (pos->tid == th->tid) {
+ list_add_tail(&th->tid_list, &pos->tid_list);
+ goto out;
+ }
+
+ if (th->tid < pos->tid)
+ p = &(*p)->rb_left;
+ else
+ p = &(*p)->rb_right;
+ }
+
+ rb_link_node(&th->rb_node, parent, p);
+ rb_insert_color(&th->rb_node, &machine->dead_threads);
+
+out:
if (lock)
pthread_rwlock_unlock(&machine->threads_lock);
- thread__put(th);
}
void machine__remove_thread(struct machine *machine, struct thread *th)
@@ -1899,7 +1956,7 @@ int machine__for_each_thread(struct machine *machine,
void *priv)
{
struct rb_node *nd;
- struct thread *thread;
+ struct thread *thread, *pos;
int rc = 0;
for (nd = rb_first(&machine->threads); nd; nd = rb_next(nd)) {
@@ -1909,10 +1966,17 @@ int machine__for_each_thread(struct machine *machine,
return rc;
}
- list_for_each_entry(thread, &machine->dead_threads, node) {
+ for (nd = rb_first(&machine->dead_threads); nd; nd = rb_next(nd)) {
+ thread = rb_entry(nd, struct thread, rb_node);
rc = fn(thread, priv);
if (rc != 0)
return rc;
+
+ list_for_each_entry(pos, &thread->tid_list, tid_list) {
+ rc = fn(pos, priv);
+ if (rc != 0)
+ return rc;
+ }
}
return rc;
}
diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h
index 2c2b443df5ba..23242de926df 100644
--- a/tools/perf/util/machine.h
+++ b/tools/perf/util/machine.h
@@ -30,8 +30,8 @@ struct machine {
bool comm_exec;
char *root_dir;
struct rb_root threads;
+ struct rb_root dead_threads;
pthread_rwlock_t threads_lock;
- struct list_head dead_threads;
struct thread *last_match;
struct vdso_info *vdso_info;
struct perf_env *env;
diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
index 8244397753fd..674792e8fa2f 100644
--- a/tools/perf/util/thread.c
+++ b/tools/perf/util/thread.c
@@ -9,6 +9,7 @@
#include "debug.h"
#include "comm.h"
#include "unwind.h"
+#include "machine.h"
int thread__init_map_groups(struct thread *thread, struct machine *machine)
{
@@ -54,6 +55,7 @@ struct thread *thread__new(pid_t pid, pid_t tid)
list_add(&comm->list, &thread->comm_list);
atomic_set(&thread->refcnt, 0);
+ INIT_LIST_HEAD(&thread->tid_list);
RB_CLEAR_NODE(&thread->rb_node);
}
@@ -69,6 +71,7 @@ void thread__delete(struct thread *thread)
struct comm *comm, *tmp;
BUG_ON(!RB_EMPTY_NODE(&thread->rb_node));
+ BUG_ON(!list_empty(&thread->tid_list));
thread_stack__free(thread);
@@ -95,7 +98,20 @@ struct thread *thread__get(struct thread *thread)
void thread__put(struct thread *thread)
{
if (thread && atomic_dec_and_test(&thread->refcnt)) {
- list_del_init(&thread->node);
+ if (!RB_EMPTY_NODE(&thread->rb_node)) {
+ struct machine *machine = thread->mg->machine;
+
+ if (thread->dead) {
+ rb_erase(&thread->rb_node,
+ &machine->dead_threads);
+ } else {
+ rb_erase(&thread->rb_node,
+ &machine->threads);
+ }
+ RB_CLEAR_NODE(&thread->rb_node);
+ }
+
+ list_del_init(&thread->tid_list);
thread__delete(thread);
}
}
diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
index 33418e6dc64a..b8f794d97b75 100644
--- a/tools/perf/util/thread.h
+++ b/tools/perf/util/thread.h
@@ -13,10 +13,8 @@
struct thread_stack;
struct thread {
- union {
- struct rb_node rb_node;
- struct list_head node;
- };
+ struct rb_node rb_node;
+ struct list_head tid_list;
struct map_groups *mg;
pid_t pid_; /* Not all tools update this */
pid_t tid;
@@ -26,7 +24,8 @@ struct thread {
char shortname[3];
bool comm_set;
int comm_len;
- bool dead; /* if set thread has exited */
+ bool exited; /* if set thread has exited */
+ bool dead; /* thread is in dead_threads list */
struct list_head comm_list;
u64 db_id;
@@ -54,7 +53,7 @@ static inline void __thread__zput(struct thread **thread)
static inline void thread__exited(struct thread *thread)
{
- thread->dead = true;
+ thread->exited = true;
}
int __thread__set_comm(struct thread *thread, const char *comm, u64 timestamp,
--
2.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Date | 2015-10-02 07:30 +0200 |
| Subject | [RFC/PATCH 22/38] perf tools: Introduce map_groups__{insert,find}_by_time() |
| Message-ID | <qf14T-2jW-39@gated-at.bofh.it> |
| In reply to | #1237913 |
It'll manage maps using timestamp so that it can find correct
map/symbol for sample at a certain time. With this API, it can
maintain overlapping maps in a map_groups.
Cc: Stephane Eranian <eranian@google.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/map.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++
tools/perf/util/map.h | 25 ++++++++++++++++++++
2 files changed, 89 insertions(+)
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 2034127ac3f0..c0f8933f29f0 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -777,6 +777,41 @@ void maps__insert(struct maps *maps, struct map *map)
pthread_rwlock_unlock(&maps->lock);
}
+static void __maps__insert_by_time(struct maps *maps, struct map *map)
+{
+ struct rb_node **p = &maps->entries.rb_node;
+ struct rb_node *parent = NULL;
+ const u64 ip = map->start;
+ const u64 timestamp = map->timestamp;
+ struct map *m;
+
+ while (*p != NULL) {
+ parent = *p;
+ m = rb_entry(parent, struct map, rb_node);
+ if (ip < m->start)
+ p = &(*p)->rb_left;
+ else if (ip > m->start)
+ p = &(*p)->rb_right;
+ else if (timestamp > m->timestamp)
+ p = &(*p)->rb_left;
+ else if (timestamp < m->timestamp)
+ p = &(*p)->rb_right;
+ else
+ BUG_ON(1);
+ }
+
+ rb_link_node(&map->rb_node, parent, p);
+ rb_insert_color(&map->rb_node, &maps->entries);
+ map__get(map);
+}
+
+void maps__insert_by_time(struct maps *maps, struct map *map)
+{
+ pthread_rwlock_wrlock(&maps->lock);
+ __maps__insert_by_time(maps, map);
+ pthread_rwlock_unlock(&maps->lock);
+}
+
static void __maps__remove(struct maps *maps, struct map *map)
{
rb_erase_init(&map->rb_node, &maps->entries);
@@ -815,6 +850,35 @@ out:
return m;
}
+struct map *maps__find_by_time(struct maps *maps, u64 ip, u64 timestamp)
+{
+ struct rb_node **p;
+ struct rb_node *parent = NULL;
+ struct map *m;
+ struct map *best = NULL;
+
+ pthread_rwlock_rdlock(&maps->lock);
+
+ p = &maps->entries.rb_node;
+ while (*p != NULL) {
+ parent = *p;
+ m = rb_entry(parent, struct map, rb_node);
+ if (ip < m->start)
+ p = &(*p)->rb_left;
+ else if (ip >= m->end)
+ p = &(*p)->rb_right;
+ else if (timestamp >= m->timestamp) {
+ if (!best || best->timestamp < m->timestamp)
+ best = m;
+ p = &(*p)->rb_left;
+ } else
+ p = &(*p)->rb_right;
+ }
+
+ pthread_rwlock_unlock(&maps->lock);
+ return best;
+}
+
struct map *maps__first(struct maps *maps)
{
struct rb_node *first = rb_first(&maps->entries);
diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h
index 858f700ea5a3..41a9a39f1027 100644
--- a/tools/perf/util/map.h
+++ b/tools/perf/util/map.h
@@ -10,6 +10,8 @@
#include <stdbool.h>
#include <linux/types.h>
+#include "perf.h" /* for perf_has_index */
+
enum map_type {
MAP__FUNCTION = 0,
MAP__VARIABLE,
@@ -191,8 +193,10 @@ void map__reloc_vmlinux(struct map *map);
size_t __map_groups__fprintf_maps(struct map_groups *mg, enum map_type type,
FILE *fp);
void maps__insert(struct maps *maps, struct map *map);
+void maps__insert_by_time(struct maps *maps, struct map *map);
void maps__remove(struct maps *maps, struct map *map);
struct map *maps__find(struct maps *maps, u64 addr);
+struct map *maps__find_by_time(struct maps *maps, u64 addr, u64 timestamp);
struct map *maps__first(struct maps *maps);
struct map *map__next(struct map *map);
struct symbol *maps__find_symbol_by_name(struct maps *maps, const char *name,
@@ -212,6 +216,17 @@ static inline void map_groups__insert(struct map_groups *mg, struct map *map)
map->groups = mg;
}
+static inline void map_groups__insert_by_time(struct map_groups *mg,
+ struct map *map)
+{
+ if (perf_has_index)
+ maps__insert_by_time(&mg->maps[map->type], map);
+ else
+ maps__insert(&mg->maps[map->type], map);
+
+ map->groups = mg;
+}
+
static inline void map_groups__remove(struct map_groups *mg, struct map *map)
{
maps__remove(&mg->maps[map->type], map);
@@ -223,6 +238,16 @@ static inline struct map *map_groups__find(struct map_groups *mg,
return maps__find(&mg->maps[type], addr);
}
+static inline struct map *map_groups__find_by_time(struct map_groups *mg,
+ enum map_type type, u64 addr,
+ u64 timestamp)
+{
+ if (!perf_has_index)
+ return maps__find(&mg->maps[type], addr);
+
+ return maps__find_by_time(&mg->maps[type], addr, timestamp);
+}
+
static inline struct map *map_groups__first(struct map_groups *mg,
enum map_type type)
{
--
2.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Date | 2015-10-02 07:30 +0200 |
| Subject | [RFC/PATCH 26/38] perf session: Pass struct events stats to event processing functions |
| Message-ID | <qf14T-2jW-43@gated-at.bofh.it> |
| In reply to | #1237913 |
Pass stats structure so that it can point separate object when used in
multi-thread environment.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/session.c | 71 ++++++++++++++++++++++++++++++-----------------
1 file changed, 45 insertions(+), 26 deletions(-)
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 7546c4d147b9..8cafc679096b 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -19,6 +19,7 @@
#include "thread-stack.h"
static int perf_session__deliver_event(struct perf_session *session,
+ struct events_stats *stats,
union perf_event *event,
struct perf_sample *sample,
struct perf_tool *tool,
@@ -107,7 +108,8 @@ static int ordered_events__deliver_event(struct ordered_events *oe,
return ret;
}
- return perf_session__deliver_event(session, event->event, &sample,
+ return perf_session__deliver_event(session, &session->evlist->stats,
+ event->event, &sample,
session->tool, event->file_offset);
}
@@ -981,6 +983,7 @@ static struct machine *machines__find_for_cpumode(struct machines *machines,
}
static int deliver_sample_value(struct perf_evlist *evlist,
+ struct events_stats *stats,
struct perf_tool *tool,
union perf_event *event,
struct perf_sample *sample,
@@ -996,7 +999,7 @@ static int deliver_sample_value(struct perf_evlist *evlist,
}
if (!sid || sid->evsel == NULL) {
- ++evlist->stats.nr_unknown_id;
+ ++stats->nr_unknown_id;
return 0;
}
@@ -1004,6 +1007,7 @@ static int deliver_sample_value(struct perf_evlist *evlist,
}
static int deliver_sample_group(struct perf_evlist *evlist,
+ struct events_stats *stats,
struct perf_tool *tool,
union perf_event *event,
struct perf_sample *sample,
@@ -1013,7 +1017,7 @@ static int deliver_sample_group(struct perf_evlist *evlist,
u64 i;
for (i = 0; i < sample->read.group.nr; i++) {
- ret = deliver_sample_value(evlist, tool, event, sample,
+ ret = deliver_sample_value(evlist, stats, tool, event, sample,
&sample->read.group.values[i],
machine);
if (ret)
@@ -1025,6 +1029,7 @@ static int deliver_sample_group(struct perf_evlist *evlist,
static int
perf_evlist__deliver_sample(struct perf_evlist *evlist,
+ struct events_stats *stats,
struct perf_tool *tool,
union perf_event *event,
struct perf_sample *sample,
@@ -1041,14 +1046,15 @@ static int
/* For PERF_SAMPLE_READ we have either single or group mode. */
if (read_format & PERF_FORMAT_GROUP)
- return deliver_sample_group(evlist, tool, event, sample,
+ return deliver_sample_group(evlist, stats, tool, event, sample,
machine);
else
- return deliver_sample_value(evlist, tool, event, sample,
+ return deliver_sample_value(evlist, stats, tool, event, sample,
&sample->read.one, machine);
}
static int machines__deliver_event(struct machines *machines,
+ struct events_stats *stats,
struct perf_evlist *evlist,
union perf_event *event,
struct perf_sample *sample,
@@ -1066,15 +1072,16 @@ static int machines__deliver_event(struct machines *machines,
switch (event->header.type) {
case PERF_RECORD_SAMPLE:
if (evsel == NULL) {
- ++evlist->stats.nr_unknown_id;
+ ++stats->nr_unknown_id;
return 0;
}
dump_sample(evsel, event, sample);
if (machine == NULL) {
- ++evlist->stats.nr_unprocessable_samples;
+ ++stats->nr_unprocessable_samples;
return 0;
}
- return perf_evlist__deliver_sample(evlist, tool, event, sample, evsel, machine);
+ return perf_evlist__deliver_sample(evlist, stats, tool, event,
+ sample, evsel, machine);
case PERF_RECORD_MMAP:
return tool->mmap(tool, event, sample, machine);
case PERF_RECORD_MMAP2:
@@ -1089,7 +1096,7 @@ static int machines__deliver_event(struct machines *machines,
return tool->exit(tool, event, sample, machine);
case PERF_RECORD_LOST:
if (tool->lost == perf_event__process_lost)
- evlist->stats.total_lost += event->lost.lost;
+ stats->total_lost += event->lost.lost;
return tool->lost(tool, event, sample, machine);
case PERF_RECORD_LOST_SAMPLES:
if (tool->lost_samples == perf_event__process_lost_samples)
@@ -1112,12 +1119,13 @@ static int machines__deliver_event(struct machines *machines,
case PERF_RECORD_SWITCH_CPU_WIDE:
return tool->context_switch(tool, event, sample, machine);
default:
- ++evlist->stats.nr_unknown_events;
+ ++stats->nr_unknown_events;
return -1;
}
}
static int perf_session__deliver_event(struct perf_session *session,
+ struct events_stats *stats,
union perf_event *event,
struct perf_sample *sample,
struct perf_tool *tool,
@@ -1131,8 +1139,9 @@ static int perf_session__deliver_event(struct perf_session *session,
if (ret > 0)
return 0;
- return machines__deliver_event(&session->machines, session->evlist,
- event, sample, tool, file_offset);
+ return machines__deliver_event(&session->machines, stats,
+ session->evlist, event, sample,
+ tool, file_offset);
}
static s64 perf_session__process_user_event(struct perf_session *session,
@@ -1197,7 +1206,8 @@ int perf_session__deliver_synth_event(struct perf_session *session,
if (event->header.type >= PERF_RECORD_USER_TYPE_START)
return perf_session__process_user_event(session, event, 0);
- return machines__deliver_event(&session->machines, evlist, event, sample, tool, 0);
+ return machines__deliver_event(&session->machines, &evlist->stats,
+ evlist, event, sample, tool, 0);
}
static void event_swap(union perf_event *event, bool sample_id_all)
@@ -1265,7 +1275,9 @@ out_parse_sample:
}
static s64 perf_session__process_event(struct perf_session *session,
- union perf_event *event, u64 file_offset)
+ struct events_stats *stats,
+ union perf_event *event,
+ u64 file_offset)
{
struct perf_evlist *evlist = session->evlist;
struct perf_tool *tool = session->tool;
@@ -1278,7 +1290,7 @@ static s64 perf_session__process_event(struct perf_session *session,
if (event->header.type >= PERF_RECORD_HEADER_MAX)
return -EINVAL;
- events_stats__inc(&evlist->stats, event->header.type);
+ events_stats__inc(stats, event->header.type);
if (event->header.type >= PERF_RECORD_USER_TYPE_START)
return perf_session__process_user_event(session, event, file_offset);
@@ -1296,8 +1308,8 @@ static s64 perf_session__process_event(struct perf_session *session,
return ret;
}
- return perf_session__deliver_event(session, event, &sample, tool,
- file_offset);
+ return perf_session__deliver_event(session, stats, event,
+ &sample, tool, file_offset);
}
void perf_event_header__bswap(struct perf_event_header *hdr)
@@ -1325,9 +1337,9 @@ struct thread *perf_session__register_idle_thread(struct perf_session *session)
return thread;
}
-static void perf_session__warn_about_errors(const struct perf_session *session)
+static void perf_session__warn_about_errors(const struct perf_session *session,
+ const struct events_stats *stats)
{
- const struct events_stats *stats = &session->evlist->stats;
const struct ordered_events *oe = &session->ordered_events;
if (session->tool->lost == perf_event__process_lost &&
@@ -1420,6 +1432,7 @@ volatile int session_done;
static int __perf_session__process_pipe_events(struct perf_session *session)
{
struct ordered_events *oe = &session->ordered_events;
+ struct events_stats *stats = &session->evlist->stats;
struct perf_tool *tool = session->tool;
int fd = perf_data_file__fd(session->file);
union perf_event *event;
@@ -1484,7 +1497,8 @@ more:
}
}
- if ((skip = perf_session__process_event(session, event, head)) < 0) {
+ if ((skip = perf_session__process_event(session, stats, event,
+ head)) < 0) {
pr_err("%#" PRIx64 " [%#x]: failed to process type: %d\n",
head, event->header.size, event->header.type);
err = -EINVAL;
@@ -1509,7 +1523,7 @@ done:
err = perf_session__flush_thread_stacks(session);
out_err:
free(buf);
- perf_session__warn_about_errors(session);
+ perf_session__warn_about_errors(session, stats);
ordered_events__free(&session->ordered_events);
auxtrace__free_events(session);
return err;
@@ -1556,6 +1570,7 @@ fetch_mmaped_event(struct perf_session *session,
#endif
static int __perf_session__process_events(struct perf_session *session,
+ struct events_stats *stats,
u64 data_offset, u64 data_size,
u64 file_size)
{
@@ -1634,7 +1649,8 @@ more:
size = event->header.size;
if (size < sizeof(struct perf_event_header) ||
- (skip = perf_session__process_event(session, event, file_pos)) < 0) {
+ (skip = perf_session__process_event(session, stats, event,
+ file_pos)) < 0) {
pr_err("%#" PRIx64 " [%#x]: failed to process type: %d\n",
file_offset + head, event->header.size,
event->header.type);
@@ -1678,6 +1694,7 @@ static int __perf_session__process_indexed_events(struct perf_session *session)
struct perf_data_file *file = session->file;
struct perf_tool *tool = session->tool;
u64 size = perf_data_file__size(file);
+ struct events_stats *stats = &session->evlist->stats;
int err = 0, i;
for (i = 0; i < (int)session->header.nr_index; i++) {
@@ -1694,13 +1711,14 @@ static int __perf_session__process_indexed_events(struct perf_session *session)
if (i > 0)
tool->ordered_events = false;
- err = __perf_session__process_events(session, idx->offset,
+ err = __perf_session__process_events(session, stats,
+ idx->offset,
idx->size, size);
if (err < 0)
break;
}
- perf_session__warn_about_errors(session);
+ perf_session__warn_about_errors(session, stats);
return err;
}
@@ -1708,6 +1726,7 @@ int perf_session__process_events(struct perf_session *session)
{
struct perf_data_file *file = session->file;
u64 size = perf_data_file__size(file);
+ struct events_stats *stats = &session->evlist->stats;
int err;
if (perf_session__register_idle_thread(session) == NULL)
@@ -1718,12 +1737,12 @@ int perf_session__process_events(struct perf_session *session)
if (perf_has_index)
return __perf_session__process_indexed_events(session);
- err = __perf_session__process_events(session,
+ err = __perf_session__process_events(session, stats,
session->header.data_offset,
session->header.data_size,
size);
- perf_session__warn_about_errors(session);
+ perf_session__warn_about_errors(session, stats);
return err;
}
--
2.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Date | 2015-10-02 07:30 +0200 |
| Subject | [RFC/PATCH 09/38] perf record: Add --index option for building index table |
| Message-ID | <qf14T-2jW-49@gated-at.bofh.it> |
| In reply to | #1237913 |
The new --index option will create indexed data file which can be
processed by multiple threads parallelly. It saves meta event and
sample data in separate files and merges them with an index table.
If there's an index table in the data file, the HEADER_DATA_INDEX
feature bit is set and session->header.index[0] will point to the meta
event area, and rest are sample data. It'd look like below:
+---------------------+
| file header |
|---------------------|
| |
| meta events[0] <-+--+
| | |
|---------------------| |
| | |
| sample data[1] <-+--+
| | |
|---------------------| |
| | |
| sample data[2] <-|--+
| | |
|---------------------| |
| ... | ...
|---------------------| |
| feature data | |
| (contains index) -+--+
+---------------------+
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/Documentation/perf-record.txt | 4 +
tools/perf/builtin-record.c | 178 ++++++++++++++++++++++++++++---
tools/perf/perf.h | 1 +
tools/perf/util/header.c | 2 +
tools/perf/util/session.c | 1 +
5 files changed, 173 insertions(+), 13 deletions(-)
diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt
index 2e9ce77b5e14..71a9520b10b0 100644
--- a/tools/perf/Documentation/perf-record.txt
+++ b/tools/perf/Documentation/perf-record.txt
@@ -308,6 +308,10 @@ This option sets the time out limit. The default value is 500 ms.
Record context switch events i.e. events of type PERF_RECORD_SWITCH or
PERF_RECORD_SWITCH_CPU_WIDE.
+--index::
+Build an index table for sample data. This will speed up perf report by
+parallel processing.
+
SEE ALSO
--------
linkperf:perf-stat[1], linkperf:perf-list[1]
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 623984c81478..096634c4c5ea 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -43,6 +43,7 @@ struct record {
u64 bytes_written;
struct perf_data_file file;
struct auxtrace_record *itr;
+ int *fds;
struct perf_evlist *evlist;
struct perf_session *session;
const char *progname;
@@ -52,9 +53,16 @@ struct record {
long samples;
};
-static int record__write(struct record *rec, void *bf, size_t size)
+static int record__write(struct record *rec, void *bf, size_t size, int idx)
{
- if (perf_data_file__write(rec->session->file, bf, size) < 0) {
+ int fd;
+
+ if (rec->fds && idx >= 0)
+ fd = rec->fds[idx];
+ else
+ fd = perf_data_file__fd(rec->session->file);
+
+ if (writen(fd, bf, size) < 0) {
pr_err("failed to write perf data, error: %m\n");
return -1;
}
@@ -69,7 +77,7 @@ static int process_synthesized_event(struct perf_tool *tool,
struct machine *machine __maybe_unused)
{
struct record *rec = container_of(tool, struct record, tool);
- return record__write(rec, event, event->header.size);
+ return record__write(rec, event, event->header.size, -1);
}
static int record__mmap_read(struct record *rec, int idx)
@@ -94,7 +102,7 @@ static int record__mmap_read(struct record *rec, int idx)
size = md->mask + 1 - (old & md->mask);
old += size;
- if (record__write(rec, buf, size) < 0) {
+ if (record__write(rec, buf, size, idx) < 0) {
rc = -1;
goto out;
}
@@ -104,7 +112,7 @@ static int record__mmap_read(struct record *rec, int idx)
size = head - old;
old += size;
- if (record__write(rec, buf, size) < 0) {
+ if (record__write(rec, buf, size, idx) < 0) {
rc = -1;
goto out;
}
@@ -151,6 +159,7 @@ static int record__process_auxtrace(struct perf_tool *tool,
struct perf_data_file *file = &rec->file;
size_t padding;
u8 pad[8] = {0};
+ int idx = event->auxtrace.idx;
if (!perf_data_file__is_pipe(file)) {
off_t file_offset;
@@ -171,11 +180,11 @@ static int record__process_auxtrace(struct perf_tool *tool,
if (padding)
padding = 8 - padding;
- record__write(rec, event, event->header.size);
- record__write(rec, data1, len1);
+ record__write(rec, event, event->header.size, idx);
+ record__write(rec, data1, len1, idx);
if (len2)
- record__write(rec, data2, len2);
- record__write(rec, &pad, padding);
+ record__write(rec, data2, len2, idx);
+ record__write(rec, &pad, padding, idx);
return 0;
}
@@ -268,6 +277,110 @@ int auxtrace_record__snapshot_start(struct auxtrace_record *itr __maybe_unused)
#endif
+#define INDEX_FILE_FMT "%s.dir/perf.data.%d"
+
+static int record__create_index_files(struct record *rec, int nr_index)
+{
+ int i = 0;
+ int ret = -1;
+ char path[PATH_MAX];
+ struct perf_data_file *file = &rec->file;
+
+ rec->fds = malloc(nr_index * sizeof(int));
+ if (rec->fds == NULL)
+ return -ENOMEM;
+
+ scnprintf(path, sizeof(path), "%s.dir", file->path);
+ if (rm_rf(path) < 0 || mkdir(path, S_IRWXU) < 0)
+ goto out_err;
+
+ for (i = 0; i < nr_index; i++) {
+ scnprintf(path, sizeof(path), INDEX_FILE_FMT, file->path, i);
+ ret = open(path, O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR);
+ if (ret < 0)
+ goto out_err;
+
+ rec->fds[i] = ret;
+ }
+ return 0;
+
+out_err:
+ while (--i >= 1)
+ close(rec->fds[i]);
+ zfree(&rec->fds);
+
+ scnprintf(path, sizeof(path), "%s.dir", file->path);
+ rm_rf(path);
+
+ return ret;
+}
+
+static int record__merge_index_files(struct record *rec, int nr_index)
+{
+ int i;
+ int ret = -ENOMEM;
+ u64 offset;
+ char path[PATH_MAX];
+ struct perf_file_section *idx;
+ struct perf_data_file *file = &rec->file;
+ struct perf_session *session = rec->session;
+ int output_fd = perf_data_file__fd(file);
+
+ /* +1 for header file itself */
+ nr_index++;
+
+ idx = calloc(nr_index, sizeof(*idx));
+ if (idx == NULL)
+ goto out_close;
+
+ offset = lseek(output_fd, 0, SEEK_END);
+
+ idx[0].offset = session->header.data_offset;
+ idx[0].size = offset - idx[0].offset;
+
+ for (i = 1; i < nr_index; i++) {
+ struct stat stbuf;
+ int fd = rec->fds[i - 1];
+
+ ret = fstat(fd, &stbuf);
+ if (ret < 0)
+ goto out_close;
+
+ idx[i].offset = offset;
+ idx[i].size = stbuf.st_size;
+
+ offset += stbuf.st_size;
+
+ if (idx[i].size == 0)
+ continue;
+
+ ret = copyfile_offset(fd, 0, output_fd, idx[i].offset,
+ idx[i].size);
+ if (ret < 0)
+ goto out_close;
+ }
+
+ session->header.index = idx;
+ session->header.nr_index = nr_index;
+
+ perf_has_index = true;
+
+ ret = 0;
+
+out_close:
+ if (ret < 0)
+ pr_err("failed to merge index files: %d\n", ret);
+
+ for (i = 0; i < nr_index - 1; i++)
+ close(rec->fds[i]);
+
+ scnprintf(path, sizeof(path), "%s.dir", file->path);
+ rm_rf(path);
+
+ zfree(&rec->fds);
+ return ret;
+}
+
static int record__open(struct record *rec)
{
char msg[512];
@@ -306,7 +419,8 @@ try_again:
if (perf_evlist__mmap_ex(evlist, opts->mmap_pages, false,
opts->auxtrace_mmap_pages,
- opts->auxtrace_snapshot_mode, false) < 0) {
+ opts->auxtrace_snapshot_mode,
+ opts->index) < 0) {
if (errno == EPERM) {
pr_err("Permission error mapping pages.\n"
"Consider increasing "
@@ -323,6 +437,14 @@ try_again:
goto out;
}
+ if (opts->index) {
+ rc = record__create_index_files(rec, evlist->nr_mmaps);
+ if (rc < 0) {
+ pr_err("failed to create index file: %d\n", rc);
+ goto out;
+ }
+ }
+
session->evlist = evlist;
perf_session__set_id_hdr_size(session);
out:
@@ -347,7 +469,9 @@ static int process_buildids(struct record *rec)
struct perf_data_file *file = &rec->file;
struct perf_session *session = rec->session;
- if (file->size == 0)
+ /* update file size after merging sample files with index */
+ u64 size = lseek(perf_data_file__fd(file), 0, SEEK_END);
+ if (size == 0)
return 0;
/*
@@ -414,6 +538,13 @@ static int record__mmap_read_all(struct record *rec)
}
}
+ if (rec->evlist->track_mmap && rec->evlist->track_mmap[i].base) {
+ if (record__mmap_read(rec, track_mmap_idx(i)) != 0) {
+ rc = -1;
+ goto out;
+ }
+ }
+
if (mm->base && !rec->opts.auxtrace_snapshot_mode &&
record__auxtrace_mmap_read(rec, mm) != 0) {
rc = -1;
@@ -426,7 +557,8 @@ static int record__mmap_read_all(struct record *rec)
* at least one event.
*/
if (bytes_written != rec->bytes_written)
- rc = record__write(rec, &finished_round_event, sizeof(finished_round_event));
+ rc = record__write(rec, &finished_round_event,
+ sizeof(finished_round_event), -1);
out:
return rc;
@@ -452,7 +584,8 @@ static void record__init_features(struct record *rec)
if (!rec->opts.full_auxtrace)
perf_header__clear_feat(&session->header, HEADER_AUXTRACE);
- perf_header__clear_feat(&session->header, HEADER_DATA_INDEX);
+ if (!rec->opts.index)
+ perf_header__clear_feat(&session->header, HEADER_DATA_INDEX);
}
static volatile int workload_exec_errno;
@@ -520,6 +653,11 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
}
}
+ if (file->is_pipe && opts->index) {
+ pr_warning("Indexing is disabled for pipe output\n");
+ opts->index = false;
+ }
+
if (record__open(rec) != 0) {
err = -1;
goto out_child;
@@ -753,6 +891,9 @@ out_child:
rec->session->header.data_size += rec->bytes_written;
file->size = lseek(perf_data_file__fd(file), 0, SEEK_CUR);
+ if (rec->opts.index)
+ record__merge_index_files(rec, rec->evlist->nr_mmaps);
+
if (!rec->no_buildid) {
process_buildids(rec);
/*
@@ -1119,6 +1260,8 @@ struct option __record_options[] = {
"per thread proc mmap processing timeout in ms"),
OPT_BOOLEAN(0, "switch-events", &record.opts.record_switch_events,
"Record context switch events"),
+ OPT_BOOLEAN(0, "index", &record.opts.index,
+ "make index for sample data to speed-up processing"),
OPT_END()
};
@@ -1186,6 +1329,15 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)
goto out_symbol_exit;
}
+ if (rec->opts.index) {
+ if (!rec->opts.sample_time) {
+ pr_err("Sample timestamp is required for indexing\n");
+ goto out_symbol_exit;
+ }
+
+ perf_evlist__add_dummy_tracking(rec->evlist);
+ }
+
if (rec->opts.target.tid && !rec->opts.no_inherit_set)
rec->opts.no_inherit = true;
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index f4b4d7d8752c..df7c208abb74 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -60,6 +60,7 @@ struct record_opts {
bool full_auxtrace;
bool auxtrace_snapshot_mode;
bool record_switch_events;
+ bool index;
unsigned int freq;
unsigned int mmap_pages;
unsigned int auxtrace_mmap_pages;
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index c357f7f47d32..13ba1402ec1b 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -2706,6 +2706,8 @@ int perf_session__read_header(struct perf_session *session)
session->tevent.pevent))
goto out_delete_evlist;
+ perf_has_index = perf_header__has_feat(&session->header, HEADER_DATA_INDEX);
+
return 0;
out_errno:
return -errno;
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 91fa9647f565..7546c4d147b9 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -182,6 +182,7 @@ void perf_session__delete(struct perf_session *session)
machines__exit(&session->machines);
if (session->file)
perf_data_file__close(session->file);
+ free(session->header.index);
free(session);
}
--
2.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Date | 2015-10-02 21:00 +0200 |
| Subject | Re: [RFC/PATCH 09/38] perf record: Add --index option for building index table |
| Message-ID | <qfdIK-3ul-13@gated-at.bofh.it> |
| In reply to | #1237928 |
Em Fri, Oct 02, 2015 at 02:18:50PM +0900, Namhyung Kim escreveu:
> The new --index option will create indexed data file which can be
> processed by multiple threads parallelly. It saves meta event and
> sample data in separate files and merges them with an index table.
>
> If there's an index table in the data file, the HEADER_DATA_INDEX
> feature bit is set and session->header.index[0] will point to the meta
> event area, and rest are sample data. It'd look like below:
So this is all about perf.data files, i.e. we will traverse it all
looking for metadata events, then the samples itself will be processed
using multiple threads. I.e. two stages, touching the whole perf.data
file looking for the metadata events, then touching it all again to
process the files, right?
The model processing events for 'perf report' and for 'perf top' will
differ, right?
Can't we have one thread reading the events, another batching then to
merge up to those FINISHED_ROUND when it needs to sort things (in
parallel with reading more events for the next round) and then pass the
sorted batch to one thread per CPU to actually process the samples as in
hist processing, etc?
Need to try this, see if 'perf top' works, which I think it will, but
you haven't mentioned anything about it in the cover letter for this
patchkit.
But no speedups should be expected there, as no 'perf.data' file is
involved...
- Arnaldo
> +---------------------+
> | file header |
> |---------------------|
> | |
> | meta events[0] <-+--+
> | | |
> |---------------------| |
> | | |
> | sample data[1] <-+--+
> | | |
> |---------------------| |
> | | |
> | sample data[2] <-|--+
> | | |
> |---------------------| |
> | ... | ...
> |---------------------| |
> | feature data | |
> | (contains index) -+--+
> +---------------------+
>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
> tools/perf/Documentation/perf-record.txt | 4 +
> tools/perf/builtin-record.c | 178 ++++++++++++++++++++++++++++---
> tools/perf/perf.h | 1 +
> tools/perf/util/header.c | 2 +
> tools/perf/util/session.c | 1 +
> 5 files changed, 173 insertions(+), 13 deletions(-)
>
> diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt
> index 2e9ce77b5e14..71a9520b10b0 100644
> --- a/tools/perf/Documentation/perf-record.txt
> +++ b/tools/perf/Documentation/perf-record.txt
> @@ -308,6 +308,10 @@ This option sets the time out limit. The default value is 500 ms.
> Record context switch events i.e. events of type PERF_RECORD_SWITCH or
> PERF_RECORD_SWITCH_CPU_WIDE.
>
> +--index::
> +Build an index table for sample data. This will speed up perf report by
> +parallel processing.
> +
> SEE ALSO
> --------
> linkperf:perf-stat[1], linkperf:perf-list[1]
> diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
> index 623984c81478..096634c4c5ea 100644
> --- a/tools/perf/builtin-record.c
> +++ b/tools/perf/builtin-record.c
> @@ -43,6 +43,7 @@ struct record {
> u64 bytes_written;
> struct perf_data_file file;
> struct auxtrace_record *itr;
> + int *fds;
> struct perf_evlist *evlist;
> struct perf_session *session;
> const char *progname;
> @@ -52,9 +53,16 @@ struct record {
> long samples;
> };
>
> -static int record__write(struct record *rec, void *bf, size_t size)
> +static int record__write(struct record *rec, void *bf, size_t size, int idx)
> {
> - if (perf_data_file__write(rec->session->file, bf, size) < 0) {
> + int fd;
> +
> + if (rec->fds && idx >= 0)
> + fd = rec->fds[idx];
> + else
> + fd = perf_data_file__fd(rec->session->file);
> +
> + if (writen(fd, bf, size) < 0) {
> pr_err("failed to write perf data, error: %m\n");
> return -1;
> }
> @@ -69,7 +77,7 @@ static int process_synthesized_event(struct perf_tool *tool,
> struct machine *machine __maybe_unused)
> {
> struct record *rec = container_of(tool, struct record, tool);
> - return record__write(rec, event, event->header.size);
> + return record__write(rec, event, event->header.size, -1);
> }
>
> static int record__mmap_read(struct record *rec, int idx)
> @@ -94,7 +102,7 @@ static int record__mmap_read(struct record *rec, int idx)
> size = md->mask + 1 - (old & md->mask);
> old += size;
>
> - if (record__write(rec, buf, size) < 0) {
> + if (record__write(rec, buf, size, idx) < 0) {
> rc = -1;
> goto out;
> }
> @@ -104,7 +112,7 @@ static int record__mmap_read(struct record *rec, int idx)
> size = head - old;
> old += size;
>
> - if (record__write(rec, buf, size) < 0) {
> + if (record__write(rec, buf, size, idx) < 0) {
> rc = -1;
> goto out;
> }
> @@ -151,6 +159,7 @@ static int record__process_auxtrace(struct perf_tool *tool,
> struct perf_data_file *file = &rec->file;
> size_t padding;
> u8 pad[8] = {0};
> + int idx = event->auxtrace.idx;
>
> if (!perf_data_file__is_pipe(file)) {
> off_t file_offset;
> @@ -171,11 +180,11 @@ static int record__process_auxtrace(struct perf_tool *tool,
> if (padding)
> padding = 8 - padding;
>
> - record__write(rec, event, event->header.size);
> - record__write(rec, data1, len1);
> + record__write(rec, event, event->header.size, idx);
> + record__write(rec, data1, len1, idx);
> if (len2)
> - record__write(rec, data2, len2);
> - record__write(rec, &pad, padding);
> + record__write(rec, data2, len2, idx);
> + record__write(rec, &pad, padding, idx);
>
> return 0;
> }
> @@ -268,6 +277,110 @@ int auxtrace_record__snapshot_start(struct auxtrace_record *itr __maybe_unused)
>
> #endif
>
> +#define INDEX_FILE_FMT "%s.dir/perf.data.%d"
> +
> +static int record__create_index_files(struct record *rec, int nr_index)
> +{
> + int i = 0;
> + int ret = -1;
> + char path[PATH_MAX];
> + struct perf_data_file *file = &rec->file;
> +
> + rec->fds = malloc(nr_index * sizeof(int));
> + if (rec->fds == NULL)
> + return -ENOMEM;
> +
> + scnprintf(path, sizeof(path), "%s.dir", file->path);
> + if (rm_rf(path) < 0 || mkdir(path, S_IRWXU) < 0)
> + goto out_err;
> +
> + for (i = 0; i < nr_index; i++) {
> + scnprintf(path, sizeof(path), INDEX_FILE_FMT, file->path, i);
> + ret = open(path, O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR);
> + if (ret < 0)
> + goto out_err;
> +
> + rec->fds[i] = ret;
> + }
> + return 0;
> +
> +out_err:
> + while (--i >= 1)
> + close(rec->fds[i]);
> + zfree(&rec->fds);
> +
> + scnprintf(path, sizeof(path), "%s.dir", file->path);
> + rm_rf(path);
> +
> + return ret;
> +}
> +
> +static int record__merge_index_files(struct record *rec, int nr_index)
> +{
> + int i;
> + int ret = -ENOMEM;
> + u64 offset;
> + char path[PATH_MAX];
> + struct perf_file_section *idx;
> + struct perf_data_file *file = &rec->file;
> + struct perf_session *session = rec->session;
> + int output_fd = perf_data_file__fd(file);
> +
> + /* +1 for header file itself */
> + nr_index++;
> +
> + idx = calloc(nr_index, sizeof(*idx));
> + if (idx == NULL)
> + goto out_close;
> +
> + offset = lseek(output_fd, 0, SEEK_END);
> +
> + idx[0].offset = session->header.data_offset;
> + idx[0].size = offset - idx[0].offset;
> +
> + for (i = 1; i < nr_index; i++) {
> + struct stat stbuf;
> + int fd = rec->fds[i - 1];
> +
> + ret = fstat(fd, &stbuf);
> + if (ret < 0)
> + goto out_close;
> +
> + idx[i].offset = offset;
> + idx[i].size = stbuf.st_size;
> +
> + offset += stbuf.st_size;
> +
> + if (idx[i].size == 0)
> + continue;
> +
> + ret = copyfile_offset(fd, 0, output_fd, idx[i].offset,
> + idx[i].size);
> + if (ret < 0)
> + goto out_close;
> + }
> +
> + session->header.index = idx;
> + session->header.nr_index = nr_index;
> +
> + perf_has_index = true;
> +
> + ret = 0;
> +
> +out_close:
> + if (ret < 0)
> + pr_err("failed to merge index files: %d\n", ret);
> +
> + for (i = 0; i < nr_index - 1; i++)
> + close(rec->fds[i]);
> +
> + scnprintf(path, sizeof(path), "%s.dir", file->path);
> + rm_rf(path);
> +
> + zfree(&rec->fds);
> + return ret;
> +}
> +
> static int record__open(struct record *rec)
> {
> char msg[512];
> @@ -306,7 +419,8 @@ try_again:
>
> if (perf_evlist__mmap_ex(evlist, opts->mmap_pages, false,
> opts->auxtrace_mmap_pages,
> - opts->auxtrace_snapshot_mode, false) < 0) {
> + opts->auxtrace_snapshot_mode,
> + opts->index) < 0) {
> if (errno == EPERM) {
> pr_err("Permission error mapping pages.\n"
> "Consider increasing "
> @@ -323,6 +437,14 @@ try_again:
> goto out;
> }
>
> + if (opts->index) {
> + rc = record__create_index_files(rec, evlist->nr_mmaps);
> + if (rc < 0) {
> + pr_err("failed to create index file: %d\n", rc);
> + goto out;
> + }
> + }
> +
> session->evlist = evlist;
> perf_session__set_id_hdr_size(session);
> out:
> @@ -347,7 +469,9 @@ static int process_buildids(struct record *rec)
> struct perf_data_file *file = &rec->file;
> struct perf_session *session = rec->session;
>
> - if (file->size == 0)
> + /* update file size after merging sample files with index */
> + u64 size = lseek(perf_data_file__fd(file), 0, SEEK_END);
> + if (size == 0)
> return 0;
>
> /*
> @@ -414,6 +538,13 @@ static int record__mmap_read_all(struct record *rec)
> }
> }
>
> + if (rec->evlist->track_mmap && rec->evlist->track_mmap[i].base) {
> + if (record__mmap_read(rec, track_mmap_idx(i)) != 0) {
> + rc = -1;
> + goto out;
> + }
> + }
> +
> if (mm->base && !rec->opts.auxtrace_snapshot_mode &&
> record__auxtrace_mmap_read(rec, mm) != 0) {
> rc = -1;
> @@ -426,7 +557,8 @@ static int record__mmap_read_all(struct record *rec)
> * at least one event.
> */
> if (bytes_written != rec->bytes_written)
> - rc = record__write(rec, &finished_round_event, sizeof(finished_round_event));
> + rc = record__write(rec, &finished_round_event,
> + sizeof(finished_round_event), -1);
>
> out:
> return rc;
> @@ -452,7 +584,8 @@ static void record__init_features(struct record *rec)
> if (!rec->opts.full_auxtrace)
> perf_header__clear_feat(&session->header, HEADER_AUXTRACE);
>
> - perf_header__clear_feat(&session->header, HEADER_DATA_INDEX);
> + if (!rec->opts.index)
> + perf_header__clear_feat(&session->header, HEADER_DATA_INDEX);
> }
>
> static volatile int workload_exec_errno;
> @@ -520,6 +653,11 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
> }
> }
>
> + if (file->is_pipe && opts->index) {
> + pr_warning("Indexing is disabled for pipe output\n");
> + opts->index = false;
> + }
> +
> if (record__open(rec) != 0) {
> err = -1;
> goto out_child;
> @@ -753,6 +891,9 @@ out_child:
> rec->session->header.data_size += rec->bytes_written;
> file->size = lseek(perf_data_file__fd(file), 0, SEEK_CUR);
>
> + if (rec->opts.index)
> + record__merge_index_files(rec, rec->evlist->nr_mmaps);
> +
> if (!rec->no_buildid) {
> process_buildids(rec);
> /*
> @@ -1119,6 +1260,8 @@ struct option __record_options[] = {
> "per thread proc mmap processing timeout in ms"),
> OPT_BOOLEAN(0, "switch-events", &record.opts.record_switch_events,
> "Record context switch events"),
> + OPT_BOOLEAN(0, "index", &record.opts.index,
> + "make index for sample data to speed-up processing"),
> OPT_END()
> };
>
> @@ -1186,6 +1329,15 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)
> goto out_symbol_exit;
> }
>
> + if (rec->opts.index) {
> + if (!rec->opts.sample_time) {
> + pr_err("Sample timestamp is required for indexing\n");
> + goto out_symbol_exit;
> + }
> +
> + perf_evlist__add_dummy_tracking(rec->evlist);
> + }
> +
> if (rec->opts.target.tid && !rec->opts.no_inherit_set)
> rec->opts.no_inherit = true;
>
> diff --git a/tools/perf/perf.h b/tools/perf/perf.h
> index f4b4d7d8752c..df7c208abb74 100644
> --- a/tools/perf/perf.h
> +++ b/tools/perf/perf.h
> @@ -60,6 +60,7 @@ struct record_opts {
> bool full_auxtrace;
> bool auxtrace_snapshot_mode;
> bool record_switch_events;
> + bool index;
> unsigned int freq;
> unsigned int mmap_pages;
> unsigned int auxtrace_mmap_pages;
> diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
> index c357f7f47d32..13ba1402ec1b 100644
> --- a/tools/perf/util/header.c
> +++ b/tools/perf/util/header.c
> @@ -2706,6 +2706,8 @@ int perf_session__read_header(struct perf_session *session)
> session->tevent.pevent))
> goto out_delete_evlist;
>
> + perf_has_index = perf_header__has_feat(&session->header, HEADER_DATA_INDEX);
> +
> return 0;
> out_errno:
> return -errno;
> diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
> index 91fa9647f565..7546c4d147b9 100644
> --- a/tools/perf/util/session.c
> +++ b/tools/perf/util/session.c
> @@ -182,6 +182,7 @@ void perf_session__delete(struct perf_session *session)
> machines__exit(&session->machines);
> if (session->file)
> perf_data_file__close(session->file);
> + free(session->header.index);
> free(session);
> }
>
> --
> 2.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Jiri Olsa <jolsa@redhat.com> |
|---|---|
| Date | 2015-10-05 15:50 +0200 |
| Subject | Re: [RFC/PATCH 09/38] perf record: Add --index option for building index table |
| Message-ID | <qgejn-uJ-3@gated-at.bofh.it> |
| In reply to | #1237928 |
On Fri, Oct 02, 2015 at 02:18:50PM +0900, Namhyung Kim wrote:
SNIP
> +static int record__merge_index_files(struct record *rec, int nr_index)
> +{
> + int i;
> + int ret = -ENOMEM;
> + u64 offset;
> + char path[PATH_MAX];
> + struct perf_file_section *idx;
> + struct perf_data_file *file = &rec->file;
> + struct perf_session *session = rec->session;
> + int output_fd = perf_data_file__fd(file);
> +
> + /* +1 for header file itself */
> + nr_index++;
> +
> + idx = calloc(nr_index, sizeof(*idx));
> + if (idx == NULL)
> + goto out_close;
> +
> + offset = lseek(output_fd, 0, SEEK_END);
> +
> + idx[0].offset = session->header.data_offset;
> + idx[0].size = offset - idx[0].offset;
> +
> + for (i = 1; i < nr_index; i++) {
> + struct stat stbuf;
> + int fd = rec->fds[i - 1];
> +
> + ret = fstat(fd, &stbuf);
> + if (ret < 0)
> + goto out_close;
> +
> + idx[i].offset = offset;
> + idx[i].size = stbuf.st_size;
> +
> + offset += stbuf.st_size;
> +
> + if (idx[i].size == 0)
> + continue;
> +
> + ret = copyfile_offset(fd, 0, output_fd, idx[i].offset,
> + idx[i].size);
> + if (ret < 0)
> + goto out_close;
> + }
> +
> + session->header.index = idx;
> + session->header.nr_index = nr_index;
> +
> + perf_has_index = true;
I might have asked earlier, but why is this global? seems like
perf_session member to me..
thanks,
jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Date | 2015-10-02 07:30 +0200 |
| Subject | [RFC/PATCH 23/38] perf tools: Use map_groups__find_addr_by_time() |
| Message-ID | <qf14T-2jW-51@gated-at.bofh.it> |
| In reply to | #1237913 |
Use timestamp to find a corresponding map so that it can find a match
symbol eventually.
Cc: Stephane Eranian <eranian@google.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/event.c | 81 ++++++++++++++++++++++++++++++++++++++++++------
tools/perf/util/thread.c | 8 +++--
2 files changed, 77 insertions(+), 12 deletions(-)
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index c960cbcd30d4..d7997105ee7a 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -895,12 +895,11 @@ int perf_event__process(struct perf_tool *tool __maybe_unused,
return machine__process_event(machine, event, sample);
}
-static void map_groups__find_addr_map(struct map_groups *mg, u8 cpumode,
- enum map_type type, u64 addr,
- struct addr_location *al)
+static bool map_groups__set_addr_location(struct map_groups *mg,
+ struct addr_location *al,
+ u8 cpumode, u64 addr)
{
struct machine *machine = mg->machine;
- bool load_map = false;
al->machine = machine;
al->addr = addr;
@@ -909,21 +908,17 @@ static void map_groups__find_addr_map(struct map_groups *mg, u8 cpumode,
if (machine == NULL) {
al->map = NULL;
- return;
+ return true;
}
BUG_ON(mg == NULL);
if (cpumode == PERF_RECORD_MISC_KERNEL && perf_host) {
al->level = 'k';
- mg = &machine->kmaps;
- load_map = true;
} else if (cpumode == PERF_RECORD_MISC_USER && perf_host) {
al->level = '.';
} else if (cpumode == PERF_RECORD_MISC_GUEST_KERNEL && perf_guest) {
al->level = 'g';
- mg = &machine->kmaps;
- load_map = true;
} else if (cpumode == PERF_RECORD_MISC_GUEST_USER && perf_guest) {
al->level = 'u';
} else {
@@ -939,8 +934,27 @@ static void map_groups__find_addr_map(struct map_groups *mg, u8 cpumode,
!perf_host)
al->filtered |= (1 << HIST_FILTER__HOST);
+ return true;
+ }
+ return false;
+}
+
+static void map_groups__find_addr_map(struct map_groups *mg, u8 cpumode,
+ enum map_type type, u64 addr,
+ struct addr_location *al)
+{
+ struct machine *machine = mg->machine;
+ bool load_map = false;
+
+ if (map_groups__set_addr_location(mg, al, cpumode, addr))
return;
+
+ if ((cpumode == PERF_RECORD_MISC_KERNEL && perf_host) ||
+ (cpumode == PERF_RECORD_MISC_GUEST_KERNEL && perf_guest)) {
+ mg = &machine->kmaps;
+ load_map = true;
}
+
try_again:
al->map = map_groups__find(mg, type, al->addr);
if (al->map == NULL) {
@@ -971,6 +985,53 @@ try_again:
}
}
+static void map_groups__find_addr_map_by_time(struct map_groups *mg, u8 cpumode,
+ enum map_type type, u64 addr,
+ struct addr_location *al,
+ u64 timestamp)
+{
+ struct machine *machine = mg->machine;
+ bool load_map = false;
+
+ if (map_groups__set_addr_location(mg, al, cpumode, addr))
+ return;
+
+ if ((cpumode == PERF_RECORD_MISC_KERNEL && perf_host) ||
+ (cpumode == PERF_RECORD_MISC_GUEST_KERNEL && perf_guest)) {
+ mg = &machine->kmaps;
+ load_map = true;
+ }
+
+try_again:
+ al->map = map_groups__find_by_time(mg, type, al->addr, timestamp);
+ if (al->map == NULL) {
+ /*
+ * If this is outside of all known maps, and is a negative
+ * address, try to look it up in the kernel dso, as it might be
+ * a vsyscall or vdso (which executes in user-mode).
+ *
+ * XXX This is nasty, we should have a symbol list in the
+ * "[vdso]" dso, but for now lets use the old trick of looking
+ * in the whole kernel symbol list.
+ */
+ if (cpumode == PERF_RECORD_MISC_USER && machine &&
+ mg != &machine->kmaps &&
+ machine__kernel_ip(machine, al->addr)) {
+ mg = &machine->kmaps;
+ load_map = true;
+ goto try_again;
+ }
+ } else {
+ /*
+ * Kernel maps might be changed when loading symbols so loading
+ * must be done prior to using kernel maps.
+ */
+ if (load_map)
+ map__load(al->map, machine->symbol_filter);
+ al->addr = al->map->map_ip(al->map, al->addr);
+ }
+}
+
void thread__find_addr_map(struct thread *thread, u8 cpumode,
enum map_type type, u64 addr,
struct addr_location *al)
@@ -991,7 +1052,7 @@ void thread__find_addr_map_by_time(struct thread *thread, u8 cpumode,
mg = thread->mg;
al->thread = thread;
- map_groups__find_addr_map(mg, cpumode, type, addr, al);
+ map_groups__find_addr_map_by_time(mg, cpumode, type, addr, al, timestamp);
}
void thread__find_addr_location(struct thread *thread,
diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
index efd510d5d966..21de681415f4 100644
--- a/tools/perf/util/thread.c
+++ b/tools/perf/util/thread.c
@@ -337,8 +337,12 @@ size_t thread__fprintf(struct thread *thread, FILE *fp)
void thread__insert_map(struct thread *thread, struct map *map)
{
- map_groups__fixup_overlappings(thread->mg, map, stderr);
- map_groups__insert(thread->mg, map);
+ if (perf_has_index) {
+ map_groups__insert_by_time(thread->mg, map);
+ } else {
+ map_groups__fixup_overlappings(thread->mg, map, stderr);
+ map_groups__insert(thread->mg, map);
+ }
}
static int thread__clone_map_groups(struct thread *thread,
--
2.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Date | 2015-10-02 07:30 +0200 |
| Subject | [RFC/PATCH 28/38] perf tools: Move BUILD_ID_SIZE definition to perf.h |
| Message-ID | <qf14T-2jW-53@gated-at.bofh.it> |
| In reply to | #1237913 |
The util/event.h includes util/build-id.h only for BUILD_ID_SIZE.
This is a problem when I include util/event.h from util/tool.h which
is also included by util/build-id.h since it now makes a circular
dependency resulting in incomplete type error.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/perf.h | 3 +++
tools/perf/util/build-id.h | 3 ---
tools/perf/util/dso.h | 1 +
tools/perf/util/event.h | 1 -
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index df7c208abb74..d21b5c63f244 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -31,6 +31,9 @@ static inline unsigned long long rdclock(void)
#define MAX_NR_CPUS 1024
+#define BUILD_ID_SIZE 20
+#define SBUILD_ID_SIZE (BUILD_ID_SIZE * 2 + 1)
+
extern const char *input_name;
extern bool perf_host, perf_guest;
extern const char perf_version_string[];
diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h
index 27a14a8a945b..8f9a5720bc5e 100644
--- a/tools/perf/util/build-id.h
+++ b/tools/perf/util/build-id.h
@@ -1,9 +1,6 @@
#ifndef PERF_BUILD_ID_H_
#define PERF_BUILD_ID_H_ 1
-#define BUILD_ID_SIZE 20
-#define SBUILD_ID_SIZE (BUILD_ID_SIZE * 2 + 1)
-
#include "tool.h"
#include "strlist.h"
#include <linux/types.h>
diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
index fc8db9c764ac..416b9a57fcb9 100644
--- a/tools/perf/util/dso.h
+++ b/tools/perf/util/dso.h
@@ -9,6 +9,7 @@
#include <linux/types.h>
#include <linux/bitops.h>
#include "map.h"
+#include "perf.h"
#include "build-id.h"
enum dso_binary_type {
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index a0dbcbd4f6d8..3812d645362c 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -6,7 +6,6 @@
#include "../perf.h"
#include "map.h"
-#include "build-id.h"
#include "perf_regs.h"
struct mmap_event {
--
2.6.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
Page 1 of 2 [1] 2 Next page →
Back to top | Article view | linux.kernel
csiph-web