From 17a39863e5f89fbaf51dc158bc7e27f46676d46d Mon Sep 17 00:00:00 2001 From: Tomas Glozar Date: Tue, 11 Jun 2024 16:45:53 +0200 Subject: [PATCH] rteval: Fix -aNone being passed to cyclictest When rteval is called via the command line, cpulists for both measurements and loads default to an empty string and are further processed by parse_cpulist_from_config. However, this is not true when rteval is used as a module: in that case, neither the default command-line value is used nor parse_cpulist_from_config is run, leading to None being set to the config property of measurements which is explicitely passed down to the corresponding cyclictest config property. After 64ce7848dfab ("rteval: Add relative cpulists for measurements"), where the check for None was removed from the cyclictest module, rteval passes "-aNone" to cyclictest when being used as a module. Call parse_cpulist_from_config with an empty string to get the default cpulist to pass to cyclictest module if cpulist is empty in the measurement config. Fixes: 64ce7848dfab ("rteval: Add relative cpulists for measurements") Signed-off-by: Tomas Glozar Signed-off-by: John Kacur --- rteval/modules/measurement/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rteval/modules/measurement/__init__.py b/rteval/modules/measurement/__init__.py index 11bd7b0fce69..43c0fda30ce1 100644 --- a/rteval/modules/measurement/__init__.py +++ b/rteval/modules/measurement/__init__.py @@ -148,6 +148,9 @@ measurement profiles, based on their characteristics""" modcfg = self.__cfg.GetSection("measurement") cpulist = modcfg.cpulist run_on_isolcpus = modcfg.run_on_isolcpus + if cpulist is None: + # Get default cpulist value + cpulist = cpulist_utils.collapse_cpulist(parse_cpulist_from_config("", run_on_isolcpus)) for (modname, modtype) in modcfg: if isinstance(modtype, str) and modtype.lower() == 'module': # Only 'module' will be supported (ds) -- 2.45.2