diff --git a/SOURCES/rteval-Make-timerlat-the-default-for-rteval.patch b/SOURCES/rteval-Make-timerlat-the-default-for-rteval.patch new file mode 100644 index 0000000..eceff94 --- /dev/null +++ b/SOURCES/rteval-Make-timerlat-the-default-for-rteval.patch @@ -0,0 +1,45 @@ +From 23636bde2236f5d28ce8b10c7b28a880a3e9a2d9 Mon Sep 17 00:00:00 2001 +From: John Kacur +Date: Wed, 18 Jun 2025 14:21:54 -0400 +Subject: [PATCH 2/2] rteval: Make timerlat the default for rteval + +Return timerlat to be the default measurement module for rteval +Also make the default base interval 100us to match cyclictest + +Signed-off-by: John Kacur +--- + rteval.conf | 4 ++-- + rteval/modules/measurement/timerlat.py | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/rteval.conf b/rteval.conf +index 601410b51c28..46a9b1743716 100644 +--- a/rteval.conf ++++ b/rteval.conf +@@ -6,8 +6,8 @@ duration: 60.0 + report_interval: 600 + + [measurement] +-cyclictest: module +-# timerlat: module ++# cyclictest: module ++timerlat: module + + [loads] + kcompile: module +diff --git a/rteval/modules/measurement/timerlat.py b/rteval/modules/measurement/timerlat.py +index fe29f34bccbd..5bfc495217ea 100644 +--- a/rteval/modules/measurement/timerlat.py ++++ b/rteval/modules/measurement/timerlat.py +@@ -509,7 +509,7 @@ class Timerlat(rtevalModulePrototype): + def ModuleParameters(): + """ default parameters """ + return {"interval": {"descr": "Base interval or period of threads in microseconds", +- "default": 1100, ++ "default": 100, + "metavar": "INTV_US"}, + "priority": {"descr": "Run rtla timerlat with this priority", + "default": 95, +-- +2.49.0 + diff --git a/SOURCES/rteval-services.py-Fix-SyntaxWarning.patch b/SOURCES/rteval-services.py-Fix-SyntaxWarning.patch new file mode 100644 index 0000000..160392f --- /dev/null +++ b/SOURCES/rteval-services.py-Fix-SyntaxWarning.patch @@ -0,0 +1,31 @@ +From e874cc3f757bae50e74af461529179048c1eb4a7 Mon Sep 17 00:00:00 2001 +From: John Kacur +Date: Wed, 4 Jun 2025 13:38:51 -0400 +Subject: [PATCH 1/2] rteval: services.py: Fix SyntaxWarning + +In services.py we get a SyntaxWarning: invalid escape sequence '\(' +using python >= 3.12 + +Fix this by using a raw string. + +Signed-off-by: John Kacur +--- + rteval/sysinfo/services.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rteval/sysinfo/services.py b/rteval/sysinfo/services.py +index e98017804841..c3c155354e07 100644 +--- a/rteval/sysinfo/services.py ++++ b/rteval/sysinfo/services.py +@@ -42,7 +42,7 @@ class SystemServices: + servicename = os.path.basename(service) + if not [1 for p in reject if fnmatch.fnmatch(servicename, p)] \ + and os.access(service, os.X_OK): +- cmd = f'{getcmdpath("grep")} -qs "\(^\|\W\)status)" {service}' ++ cmd = fr'{getcmdpath("grep")} -qs "\(^\|\W\)status)" {service}' + c = subprocess.Popen(cmd, shell=True, encoding='utf-8') + c.wait() + if c.returncode == 0: +-- +2.49.0 + diff --git a/SPECS/rteval.spec b/SPECS/rteval.spec index 4858c0a..b9d063b 100644 --- a/SPECS/rteval.spec +++ b/SPECS/rteval.spec @@ -1,6 +1,6 @@ Name: rteval Version: 3.9 -Release: 3%{?dist} +Release: 5%{?dist} Summary: Utility to evaluate system suitability for RT Linux Group: Development/Tools @@ -36,6 +36,8 @@ BuildArch: noarch Patch1: rteval-Fix-missing-statistics-for-system-with-timerl.patch Patch2: rteval-Change-the-default-interval-for-timerlat-to-1100us.patch Patch3: rteval-Change-default-measurement-module-to-cyclictest.patch +Patch4: rteval-services.py-Fix-SyntaxWarning.patch +Patch5: rteval-Make-timerlat-the-default-for-rteval.patch %description The rteval script is a utility for measuring various aspects of @@ -69,6 +71,15 @@ to the screen. %{_bindir}/rteval %changelog +* Thu Jun 19 2025 John Kacur - 3.9-5 +- Make timerlat the default measurement module +- Make the default interval 100us +Resolves: RHEL-97540 + +* Wed Jun 18 2025 John Kacur - 3.9-4 +- Fix syntax warning when using python >=3.12 +Resolves: RHEL-97825 + * Fri Feb 07 2025 John Kacur - 3.9-3 - Make the default interval for timerlat in rteval 1100us - Make cyclictest the default measurement module for rteval