From: Carsten Haitzler <carsten.haitzler@foss.arm.com>
To: Leo Yan <leo.yan@linaro.org>
Cc: linux-kernel@vger.kernel.org, coresight@lists.linaro.org,
suzuki.poulose@arm.com, mathieu.poirier@linaro.org,
mike.leach@linaro.org, linux-perf-users@vger.kernel.org,
acme@kernel.org
Subject: Re: [PATCH 2/3] perf test: Shell - only run .sh shell files to skip other files
Date: Thu, 21 Apr 2022 17:21:27 +0100 [thread overview]
Message-ID: <9ab780aa-7e78-b0f9-21ed-cf30f41f8fab@foss.arm.com> (raw)
In-Reply-To: <20220410022846.GB14326@leoy-ThinkPad-X240s>
On 4/10/22 03:28, Leo Yan wrote:
> On Wed, Mar 09, 2022 at 12:28:58PM +0000, carsten.haitzler@foss.arm.com wrote:
>> From: Carsten Haitzler <carsten.haitzler@arm.com>
>>
>> You edit your scripts in the tests and end up with your usual shell
>> backup files with ~ or .bak or something else at the end, but then your
>> next perf test run wants to run the backups too. You might also have perf
>> .data files in the directory or something else undesireable as well. You end
>> up chasing which test is the one you edited and the backup and have to keep
>> removing all the backup files, so automatically skip any files that are
>> not plain *.sh scripts to limit the time wasted in chasing ghosts.
>>
>> Signed-off-by: Carsten Haitzler <carsten.haitzler@arm.com>
>>
>> ---
>> tools/perf/tests/builtin-test.c | 17 +++++++++++++++--
>> 1 file changed, 15 insertions(+), 2 deletions(-)
>>
>> diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
>> index 3c34cb766724..3a02ba7a7a89 100644
>> --- a/tools/perf/tests/builtin-test.c
>> +++ b/tools/perf/tests/builtin-test.c
>> @@ -296,9 +296,22 @@ static const char *shell_test__description(char *description, size_t size,
>>
>> #define for_each_shell_test(entlist, nr, base, ent) \
>> for (int __i = 0; __i < nr && (ent = entlist[__i]); __i++) \
>> - if (!is_directory(base, ent) && \
>> + if (ent->d_name[0] != '.' && \
>> + !is_directory(base, ent) && \
>> is_executable_file(base, ent) && \
>> - ent->d_name[0] != '.')
>> + is_shell_script(ent->d_name))
>
> Just nitpick: since multiple conditions are added, seems to me it's good
> to use a single function is_executable_shell_script() to make decision
> if a file is an executable shell script.
I'd certainly make a function if this was being re-used, but as the
"coding pattern" was to do all the tests already inside the if() in only
one place, I kept with the style there and didn't change the code that
didn't need changing. I can rewrite this code and basically make a
function that is just an if ...:
bool is_exe_shell_script(const char *base, struct dirent *ent) {
return ent->d_name[0] != '.' && !is_directory(base, ent) &&
is_executable_file(base, ent) && is_shell_script(ent->d_name);
}
And macro becomes:
#define for_each_shell_test(entlist, nr, base, ent) \
for (int __i = 0; __i < nr && (ent = entlist[__i]); __i++) \
if (is_shell(base, ent))
But one catch... it really should be is_non_hidden_exe_shell_script() as
it's checking that it's not a hidden file AND is a shell script. Or do I
keep the hidden file test outside of the function in the if? If we're
nit picking then I need to know exactly what you want here as your
suggested name is actually incorrect.
> And the condition checking 'ent->d_name[0] != '.'' would be redundant
> after we have checked the file suffix '.sh'.
This isn't actually redundant. You can have .something.sh :) If the idea
is we skip anything with a . at the start first always... then the if
(to me) is obvious.
> Thanks,
> Leo
>
>> +
>> +static bool is_shell_script(const char *file)
>> +{
>> + const char *ext;
>> +
>> + ext = strrchr(file, '.');
>> + if (!ext)
>> + return false;
>> + if (!strcmp(ext, ".sh"))
>> + return true;
>> + return false;
>> +}
>>
>> static const char *shell_tests__dir(char *path, size_t size)
>> {
>> --
>> 2.32.0
>>
next prev parent reply other threads:[~2022-04-21 16:25 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-09 12:28 [PATCH 1/3] perf test: Shell - Limit to only run executable scripts in tests carsten.haitzler
2022-03-09 12:28 ` [PATCH 2/3] perf test: Shell - only run .sh shell files to skip other files carsten.haitzler
2022-04-10 2:28 ` Leo Yan
2022-04-21 16:21 ` Carsten Haitzler [this message]
2022-05-26 10:14 ` Leo Yan
2022-06-13 13:08 ` Carsten Haitzler
2022-06-15 9:14 ` Leo Yan
2022-03-09 12:28 ` [PATCH 3/3] perf test: Add coresight tests to guage quality of data generated carsten.haitzler
2022-04-10 8:30 ` Leo Yan
2022-04-21 17:38 ` Carsten Haitzler
2022-05-26 8:20 ` Leo Yan
2022-05-26 16:08 ` Leo Yan
2022-06-13 14:15 ` Carsten Haitzler
2022-05-30 16:27 ` Mathieu Poirier
2022-05-30 16:47 ` Mathieu Poirier
2022-06-13 12:53 ` Carsten Haitzler
2022-06-13 13:00 ` Carsten Haitzler
2022-04-10 1:24 ` [PATCH 1/3] perf test: Shell - Limit to only run executable scripts in tests Leo Yan
2022-04-11 19:08 ` Arnaldo Carvalho de Melo
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=9ab780aa-7e78-b0f9-21ed-cf30f41f8fab@foss.arm.com \
--to=carsten.haitzler@foss.arm.com \
--cc=acme@kernel.org \
--cc=coresight@lists.linaro.org \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=mike.leach@linaro.org \
--cc=suzuki.poulose@arm.com \
/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).