From: James Clark <james.clark@arm.com>
To: Leo Yan <leo.yan@linaro.org>
Cc: linux-perf-users@vger.kernel.org, tanmay@marvell.com,
sgoutham@marvell.com, gcherian@marvell.com, lcherian@marvell.com,
bbhushan2@marvell.com,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Mike Leach <mike.leach@linaro.org>,
John Garry <john.g.garry@oracle.com>,
Will Deacon <will@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 2/7] perf: Use perf_pmu__open_file() and perf_pmu__scan_file()
Date: Tue, 3 Jan 2023 16:21:41 +0000 [thread overview]
Message-ID: <800a1f42-319c-9098-ef1a-cb1e57159d13@arm.com> (raw)
In-Reply-To: <Y6UkUQ9dcQQwvRpz@leoy-yangtze.lan>
On 23/12/2022 03:45, Leo Yan wrote:
> On Thu, Dec 22, 2022 at 04:03:22PM +0000, James Clark wrote:
>> Remove some code that duplicates existing methods. This requires that
>> some consts are removed because one of the existing helper methods takes
>> a struct perf_pmu instead of a name which has a non const name field.
>> But except for the tests, the strings were already non const.
>>
>> No functional changes.
>>
>> Signed-off-by: James Clark <james.clark@arm.com>
>> ---
>> tools/perf/tests/evsel-roundtrip-name.c | 3 +-
>> tools/perf/tests/parse-events.c | 3 +-
>> tools/perf/util/cputopo.c | 9 +-----
>> tools/perf/util/pmu-hybrid.c | 27 +++-------------
>> tools/perf/util/pmu-hybrid.h | 2 +-
>> tools/perf/util/pmu.c | 42 +++++++------------------
>> tools/perf/util/pmu.h | 3 +-
>> 7 files changed, 24 insertions(+), 65 deletions(-)
>>
>> diff --git a/tools/perf/tests/evsel-roundtrip-name.c b/tools/perf/tests/evsel-roundtrip-name.c
>> index e94fed901992..9bccf177f481 100644
>> --- a/tools/perf/tests/evsel-roundtrip-name.c
>> +++ b/tools/perf/tests/evsel-roundtrip-name.c
>> @@ -103,8 +103,9 @@ static int test__perf_evsel__roundtrip_name_test(struct test_suite *test __maybe
>> int subtest __maybe_unused)
>> {
>> int err = 0, ret = 0;
>> + char cpu_atom[] = "cpu_atom";
>>
>> - if (perf_pmu__has_hybrid() && perf_pmu__hybrid_mounted("cpu_atom"))
>> + if (perf_pmu__has_hybrid() && perf_pmu__hybrid_mounted(cpu_atom))
>
> After change the parameter 'name' to non const type in function
> perf_pmu__hybrid_mounted(), at here we still can pass string "cpu_atom"
> without warning, right? If so, we don't need to define a local
> variable 'cpu_atom'.
>
> [...]
>
>> -bool perf_pmu__hybrid_mounted(const char *name)
>> +bool perf_pmu__hybrid_mounted(char *name)
>> {
>> - char path[PATH_MAX];
>> - const char *sysfs;
>> - FILE *file;
>> - int n, cpu;
>> + int cpu;
>> + struct perf_pmu pmu = {.name = name};
>>
>> if (strncmp(name, "cpu_", 4))
>> return false;
>>
>> - sysfs = sysfs__mountpoint();
>> - if (!sysfs)
>> - return false;
>> -
>> - snprintf(path, PATH_MAX, CPUS_TEMPLATE_CPU, sysfs, name);
>> - if (!file_available(path))
>> - return false;
>> -
>> - file = fopen(path, "r");
>> - if (!file)
>> - return false;
>> -
>> - n = fscanf(file, "%u", &cpu);
>> - fclose(file);
>> - if (n <= 0)
>> - return false;
>> -
>> - return true;
>> + return perf_pmu__scan_file(&pmu, "cpus", "%u", &cpu) > 0;
>
> It's not necessarily to change the parameter 'name' to non const type,
> we can handle this case in two different ways.
>
> The first option is to refine the code with using the function
> perf_pmu__pathname_scnprintf() which is introduced in patch 01, thus
> we can keep using fopen() and fscanf() to read out value from 'cpus'
> entry.
>
> Another option is to define a local array 'pmu_name[PATH_MAX]' and
> then copy the input string to this array, something like:
>
> bool perf_pmu__hybrid_mounted(const char *name)
> {
> char pmu_name[PATH_MAX];
> struct perf_pmu pmu;
> int cpu;
>
> strncpy(pmu_name, name, sizeof(pmu_name));
> pmu.name = pmu_name;
>
> return perf_pmu__scan_file(&pmu, "cpus", "%u", &cpu) > 0;
> }
>
> We even can consider to dynamically allocate buffer and copy string from
> 'name' to the allocated buffer.
>
I went with the string copy way and put the consts back in V3. One minor
difference is that I had to use strlcpy() instead of strncpy() to avoid
a compiler warning about the destination buffer being the same size.
James
[...]
>> -static struct perf_cpu_map *pmu_cpumask(const char *name)
>> +static struct perf_cpu_map *pmu_cpumask(char *name)
>> {
>> - char path[PATH_MAX];
>> struct perf_cpu_map *cpus;
>> - const char *sysfs = sysfs__mountpoint();
>> const char *templates[] = {
>> - CPUS_TEMPLATE_UNCORE,
>> - CPUS_TEMPLATE_CPU,
>> + "cpumask",
>> + "cpus",
>> NULL
>> };
>> const char **template;
>> -
>> - if (!sysfs)
>> - return NULL;
>> + struct perf_pmu pmu = {.name = name};
>
> Here we also can define a local array and copy string from 'name' to
> the local array. This can allow us to provide a friendly function and
> caller doesn't need to explictly pass non const string.
>
Done
next prev parent reply other threads:[~2023-01-03 16:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-22 16:03 [PATCH v2 0/7] perf cs_etm: Basic support for virtual/kernel timestamps James Clark
2022-12-22 16:03 ` [PATCH v2 1/7] perf: Remove duplication around EVENT_SOURCE_DEVICE_PATH James Clark
2022-12-23 2:39 ` Leo Yan
2023-01-03 16:21 ` James Clark
2022-12-22 16:03 ` [PATCH v2 2/7] perf: Use perf_pmu__open_file() and perf_pmu__scan_file() James Clark
2022-12-23 3:45 ` Leo Yan
2022-12-23 3:59 ` Leo Yan
2023-01-03 16:21 ` James Clark [this message]
2022-12-22 16:03 ` [PATCH v2 3/7] perf: Remove remaining duplication of bus/event_source/devices/ James Clark
2022-12-23 6:10 ` Leo Yan
2022-12-22 16:03 ` [PATCH v2 4/7] perf pmu: Add function to check if a pmu file exists James Clark
2022-12-23 6:26 ` Leo Yan
2023-01-03 16:22 ` James Clark
2022-12-22 16:03 ` [PATCH v2 5/7] perf cs_etm: Keep separate symbols for ETMv4 and ETE parameters James Clark
2022-12-23 9:54 ` Mike Leach
2022-12-22 16:03 ` [PATCH v2 6/7] perf cs_etm: Record ts_source in AUXTRACE_INFO for ETMv4 and ETE James Clark
2022-12-23 9:28 ` Mike Leach
2023-01-03 11:49 ` James Clark
2023-01-03 15:15 ` Suzuki K Poulose
2022-12-22 16:03 ` [PATCH v2 7/7] perf cs_etm: Set the time field in the synthetic samples James Clark
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=800a1f42-319c-9098-ef1a-cb1e57159d13@arm.com \
--to=james.clark@arm.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=bbhushan2@marvell.com \
--cc=coresight@lists.linaro.org \
--cc=gcherian@marvell.com \
--cc=john.g.garry@oracle.com \
--cc=jolsa@kernel.org \
--cc=lcherian@marvell.com \
--cc=leo.yan@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=mike.leach@linaro.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=sgoutham@marvell.com \
--cc=suzuki.poulose@arm.com \
--cc=tanmay@marvell.com \
--cc=will@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
all inboxes | Powered by JetHome®