From a6711d1095e0f0ccfab587b12e9f85380a5a2ab7 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Fri, 11 Feb 2022 05:32:26 +0000
Subject: [PATCH] import rteval-3.3-5.el8

---
 ...trict-measurement-threads-to-inherit.patch | 51 +++++++++++++++++++
 SPECS/rteval.spec                             |  8 ++-
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/rteval-Don-t-restrict-measurement-threads-to-inherit.patch

diff --git a/SOURCES/rteval-Don-t-restrict-measurement-threads-to-inherit.patch b/SOURCES/rteval-Don-t-restrict-measurement-threads-to-inherit.patch
new file mode 100644
index 0000000..b4a8f80
--- /dev/null
+++ b/SOURCES/rteval-Don-t-restrict-measurement-threads-to-inherit.patch
@@ -0,0 +1,51 @@
+From 75667f4b92e3120bced7ae5464d97941edffd802 Mon Sep 17 00:00:00 2001
+From: John Kacur <jkacur@redhat.com>
+Date: Mon, 7 Feb 2022 16:09:13 -0500
+Subject: [PATCH] rteval: Don't restrict measurement threads to inherited
+ cpumask
+
+This patch reverses be811d28a471cfcaf7960289e00960e7f5b18f03
+
+This patch syncs rteval to 795433f50f20ef7598db5cfe991b5386e4080d41 in
+rt-tests
+
+If the user does not specify a cpumask, rteval will still run on the
+cpus according to the cpumask inherited from the runtime environment.
+However, if the user specifies a cpumask, then it will overwrite the
+runtime environment where allowed.
+
+This will allow the user to run measurement threads on isolated cpus.
+
+Signed-off-by: John Kacur <jkacur@redhat.com>
+---
+ rteval/modules/measurement/cyclictest.py | 12 +-----------
+ 1 file changed, 1 insertion(+), 11 deletions(-)
+
+diff --git a/rteval/modules/measurement/cyclictest.py b/rteval/modules/measurement/cyclictest.py
+index 5330d1466302..4ca310bf7490 100644
+--- a/rteval/modules/measurement/cyclictest.py
++++ b/rteval/modules/measurement/cyclictest.py
+@@ -217,19 +217,9 @@ class Cyclictest(rtevalModulePrototype):
+         else:
+             self.__cpus = online_cpus()
+ 
+-        # Sort the list of cpus to align with the order reported by
+-        # cyclictest
++        # Sort the list of cpus to align with the order reported by cyclictest
+         self.__cpus.sort(key=int)
+ 
+-        # Get the cpuset from the environment
+-        cpuset = os.sched_getaffinity(0)
+-
+-        # Convert the elements to strings
+-        cpuset = [str(c) for c in cpuset]
+-
+-        # Only include cpus that are in the cpuset
+-        self.__cpus = [c for c in self.__cpus if c in cpuset]
+-
+         self.__numcores = len(self.__cpus)
+ 
+         info = cpuinfo()
+-- 
+2.34.1
+
diff --git a/SPECS/rteval.spec b/SPECS/rteval.spec
index e69638e..197aaf7 100644
--- a/SPECS/rteval.spec
+++ b/SPECS/rteval.spec
@@ -1,6 +1,6 @@
 Name:		rteval
 Version:	3.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Utility to evaluate system suitability for RT Linux
 
 Group:		Development/Tools
@@ -35,6 +35,7 @@ Obsoletes:	rteval-common <= 3.1
 Patch1: rteval-Fix-test-misses-threshold-assignment.patch
 Patch2: rteval-Fix-Popen-for-python3.6-where-text-True-is-no.patch
 Patch3: rteval-Increase-default-buckets-from-2000-to-3500.patch
+Patch4: rteval-Don-t-restrict-measurement-threads-to-inherit.patch
 
 %description
 The rteval script is a utility for measuring various aspects of
@@ -50,6 +51,7 @@ to the screen.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__python3} setup.py build
@@ -87,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python3_sitelib}/rteval/__pycache__/*
 
 %changelog
+* Mon Feb 07 2022 John Kacur <jkacur@redhat.com> - 3.3-2
+- Don't restrict threads to cpumask in environment if user specifies cpumask
+Resolves: rhbz#2012284
+
 * Thu Jan 27 2022 John Kacur <jkacur@redhat.com> - 3.3-4
 - Increase the default number of buckets from 2000 to 3500
 Resolves: rhbz#2046321