Messages in this thread | | | Date | Tue, 21 Mar 2023 09:38:55 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH] perf jevents: Sort list of input files |
| |
Em Tue, Mar 21, 2023 at 07:30:32AM +0100, Bernhard M. Wiedemann escreveu: > Without this, pmu-events.c would be generated with variations in ordering > depending on non-deterministic filesystem readdir order. > > I tested that pmu-events.c still has the same number of lines > and that perf list output works. > > This patch was done while working on reproducible builds for openSUSE, > but also solves issues in Debian [1] and other distributions. > > [1] https://tests.reproducible-builds.org/debian/rb-pkg/unstable/i386/linux.html
Thanks, applied.
- Arnaldo
> Signed-off-by: Bernhard M. Wiedemann <bwiedemann@suse.de> > CC: Ian Rogers <irogers@google.com> > --- > tools/perf/pmu-events/jevents.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py > index 2bcd07ce609f..736ee0a75cf8 100755 > --- a/tools/perf/pmu-events/jevents.py > +++ b/tools/perf/pmu-events/jevents.py > @@ -889,7 +889,7 @@ def main() -> None: > def ftw(path: str, parents: Sequence[str], > action: Callable[[Sequence[str], os.DirEntry], None]) -> None: > """Replicate the directory/file walking behavior of C's file tree walk.""" > - for item in os.scandir(path): > + for item in sorted(os.scandir(path), key=lambda e: e.name): > if _args.model != 'all' and item.is_dir(): > # Check if the model matches one in _args.model. > if len(parents) == _args.model.split(',')[0].count('/'): > -- > 2.35.3 >
--
- Arnaldo
| |