diff --git a/0001-Improve-threading-performance-by-sharing-NodeInfo-ac.patch b/0001-Improve-threading-performance-by-sharing-NodeInfo-ac.patch new file mode 100644 index 0000000000000000000000000000000000000000..ee4c44306ad2d03b3a28bb88a9a02f1b67b978a6 --- /dev/null +++ b/0001-Improve-threading-performance-by-sharing-NodeInfo-ac.patch @@ -0,0 +1,60 @@ +From 7914dc4b0851d54df467842364b76cbe23336f09 Mon Sep 17 00:00:00 2001 +From: Mathew Robinson +Date: Mon, 19 Aug 2019 13:37:12 -0400 +Subject: [PATCH] Improve threading performance by sharing NodeInfo across + threads + +--- + src/engine/SCons/Node/FSTests.py | 7 +++---- + src/engine/SCons/Node/__init__.py | 8 ++++---- + 2 files changed, 7 insertions(+), 8 deletions(-) + +diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py +index 72eaba7..eddfdf0 100644 +--- a/src/engine/SCons/Node/FSTests.py ++++ b/src/engine/SCons/Node/FSTests.py +@@ -2545,11 +2545,10 @@ class FileTestCase(_tempdirTestCase): + + def get_ninfo(self): + """ mocked to ensure csig will equal the filename""" +- try: +- return self.ninfo +- except AttributeError: +- self.ninfo = FakeNodeInfo(self.name, self.timestamp) ++ if self.ninfo is not None: + return self.ninfo ++ self.ninfo = FakeNodeInfo(self.name, self.timestamp) ++ return self.ninfo + + def get_csig(self): + ninfo = self.get_ninfo() +diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py +index 572465f..daf79ba 100644 +--- a/src/engine/SCons/Node/__init__.py ++++ b/src/engine/SCons/Node/__init__.py +@@ -614,6 +614,7 @@ class Node(object, with_metaclass(NoSlotsPyPy)): + self._func_rexists = 1 + self._func_get_contents = 0 + self._func_target_from_source = 0 ++ self.ninfo = None + + self.clear_memoized_values() + +@@ -1131,11 +1132,10 @@ class Node(object, with_metaclass(NoSlotsPyPy)): + return ninfo + + def get_ninfo(self): +- try: +- return self.ninfo +- except AttributeError: +- self.ninfo = self.new_ninfo() ++ if self.ninfo is not None: + return self.ninfo ++ self.ninfo = self.new_ninfo() ++ return self.ninfo + + def new_binfo(self): + binfo = self.BuildInfo() +-- +2.39.0.windows.2 + diff --git a/python-scons.spec b/python-scons.spec index f47552a2cf0128a965bbe2e8c312863c0437470a..78068c6ca7a1707884c5832d03d989d4656b036f 100644 --- a/python-scons.spec +++ b/python-scons.spec @@ -1,11 +1,12 @@ Name: scons Version: 3.1.1 -Release: 5 +Release: 6 Summary: An Open Source software construction tool License: MIT URL: http://www.scons.org Source0: https://github.com/SCons/scons/archive/scons-%{version}.tar.gz Source1: https://scons.org/doc/%{version}/scons-doc-%{version}.tar.gz +Patch01: 0001-Improve-threading-performance-by-sharing-NodeInfo-ac.patch BuildArch: noarch %description @@ -161,6 +162,8 @@ popd %{_mandir}/man?/* %changelog +* Thu Nov 02 2023 zhangliangpengkun - 3.1.1-6 + * Wed Dec 23 2020 lingsheng - 3.1.1-5 - Keep spec name same as package