From: Adrian Hunter <adrian.hunter@intel.com>
To: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H . Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Leo Yan <leo.yan@linaro.org>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH RFC 3/6] perf dso: Add dso__data_write_cache_addr()
Date: Tue, 29 Oct 2019 11:20:49 +0200 [thread overview]
Message-ID: <531e096d-2dbf-28e0-1fdc-3a121e18241a@intel.com> (raw)
In-Reply-To: <20191028154503.GB15449@krava>
On 28/10/19 5:45 PM, Jiri Olsa wrote:
> On Fri, Oct 25, 2019 at 03:59:57PM +0300, Adrian Hunter wrote:
> SNIP
>
>>
>> -static ssize_t data_read_offset(struct dso *dso, struct machine *machine,
>> - u64 offset, u8 *data, ssize_t size)
>> +static ssize_t data_read_write_offset(struct dso *dso, struct machine *machine,
>> + u64 offset, u8 *data, ssize_t size,
>> + bool out)
>> {
>> if (dso__data_file_size(dso, machine))
>> return -1;
>> @@ -1034,7 +1037,7 @@ static ssize_t data_read_offset(struct dso *dso, struct machine *machine,
>> if (offset + size < offset)
>> return -1;
>>
>> - return cached_read(dso, machine, offset, data, size);
>> + return cached_io(dso, machine, offset, data, size, out);
>
> you renamed the function as _read_write_ so the bool choosing
> the opration should be named either read or write.. I had to
> go all the way down to find out what 'out' means ;-)
>
Arnaldo already applied it, so here is the diff:
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index 12ab26baba44..505ba78eda3c 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -829,12 +829,12 @@ dso_cache__insert(struct dso *dso, struct dso_cache *new)
}
static ssize_t dso_cache__memcpy(struct dso_cache *cache, u64 offset, u8 *data,
- u64 size, bool out)
+ u64 size, bool read)
{
u64 cache_offset = offset - cache->offset;
u64 cache_size = min(cache->size - cache_offset, size);
- if (out)
+ if (read)
memcpy(data, cache->data + cache_offset, cache_size);
else
memcpy(cache->data + cache_offset, data, cache_size);
@@ -912,14 +912,14 @@ static struct dso_cache *dso_cache__find(struct dso *dso,
}
static ssize_t dso_cache_io(struct dso *dso, struct machine *machine,
- u64 offset, u8 *data, ssize_t size, bool out)
+ u64 offset, u8 *data, ssize_t size, bool read)
{
struct dso_cache *cache = dso_cache__find(dso, machine, offset);
if (IS_ERR_OR_NULL(cache))
return PTR_ERR(cache);
- return dso_cache__memcpy(cache, offset, data, size, out);
+ return dso_cache__memcpy(cache, offset, data, size, read);
}
/*
@@ -928,7 +928,7 @@ static ssize_t dso_cache_io(struct dso *dso, struct machine *machine,
* by cached data. Writes update the cache only, not the backing file.
*/
static ssize_t cached_io(struct dso *dso, struct machine *machine,
- u64 offset, u8 *data, ssize_t size, bool out)
+ u64 offset, u8 *data, ssize_t size, bool read)
{
ssize_t r = 0;
u8 *p = data;
@@ -936,7 +936,7 @@ static ssize_t cached_io(struct dso *dso, struct machine *machine,
do {
ssize_t ret;
- ret = dso_cache_io(dso, machine, offset, p, size, out);
+ ret = dso_cache_io(dso, machine, offset, p, size, read);
if (ret < 0)
return ret;
@@ -1022,7 +1022,7 @@ off_t dso__data_size(struct dso *dso, struct machine *machine)
static ssize_t data_read_write_offset(struct dso *dso, struct machine *machine,
u64 offset, u8 *data, ssize_t size,
- bool out)
+ bool read)
{
if (dso__data_file_size(dso, machine))
return -1;
@@ -1034,7 +1034,7 @@ static ssize_t data_read_write_offset(struct dso *dso, struct machine *machine,
if (offset + size < offset)
return -1;
- return cached_io(dso, machine, offset, data, size, out);
+ return cached_io(dso, machine, offset, data, size, read);
}
/**
next prev parent reply other threads:[~2019-10-29 9:21 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 12:59 [PATCH RFC 0/6] perf/x86: Add perf text poke event Adrian Hunter
2019-10-25 12:59 ` [PATCH RFC 1/6] " Adrian Hunter
2019-10-30 10:47 ` Leo Yan
2019-10-30 12:46 ` Peter Zijlstra
2019-10-30 14:19 ` Leo Yan
2019-10-30 15:00 ` Mike Leach
2019-10-30 16:23 ` Peter Zijlstra
2019-10-31 7:31 ` Leo Yan
2019-11-01 10:04 ` Peter Zijlstra
2019-11-01 10:09 ` Peter Zijlstra
2019-11-04 2:23 ` Leo Yan
2019-11-08 15:05 ` Leo Yan
2019-11-11 14:46 ` Peter Zijlstra
2019-11-11 15:39 ` Will Deacon
2019-11-11 16:05 ` Peter Zijlstra
2019-11-11 17:29 ` Will Deacon
2019-11-11 20:32 ` Peter Zijlstra
[not found] ` <CAJ9a7VgZH7g=rFDpKf=FzEcyBVLS_WjqbrqtRnjOi7WOY4st+w@mail.gmail.com>
2019-11-01 10:06 ` Peter Zijlstra
2019-11-04 10:40 ` Peter Zijlstra
2019-11-04 12:32 ` Adrian Hunter
2019-10-25 12:59 ` [PATCH RFC 2/6] perf dso: Refactor dso_cache__read() Adrian Hunter
2019-10-25 14:54 ` Arnaldo Carvalho de Melo
2019-10-28 15:39 ` Jiri Olsa
2019-10-29 9:19 ` Adrian Hunter
2019-11-12 11:18 ` [tip: perf/core] " tip-bot2 for Adrian Hunter
2019-10-25 12:59 ` [PATCH RFC 3/6] perf dso: Add dso__data_write_cache_addr() Adrian Hunter
2019-10-28 15:45 ` Jiri Olsa
2019-10-29 9:20 ` Adrian Hunter [this message]
2019-11-12 11:18 ` [tip: perf/core] " tip-bot2 for Adrian Hunter
2019-10-25 12:59 ` [PATCH RFC 4/6] perf tools: Add support for PERF_RECORD_TEXT_POKE Adrian Hunter
2019-10-25 12:59 ` [PATCH RFC 5/6] perf auxtrace: Add auxtrace_cache__remove() Adrian Hunter
2019-10-25 14:48 ` Arnaldo Carvalho de Melo
2019-11-12 11:18 ` [tip: perf/core] " tip-bot2 for Adrian Hunter
2019-10-25 13:00 ` [PATCH RFC 6/6] perf intel-pt: Add support for text poke events Adrian Hunter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=531e096d-2dbf-28e0-1fdc-3a121e18241a@intel.com \
--to=adrian.hunter@intel.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).