[PATCH 11/12] rteval: Add --measurement-module command-line argument

[John Kacur <jkacur@redhat.com>]

Add a new command-line argument to select between cyclictest and
timerlat measurement modules, overriding the config file setting.

The argument is part of the "Group Options for measurement modules"
in the argument parser, making it consistent with other measurement
options like --measurement-cpulist and --measurement-run-on-isolcpus.

Usage:
  rteval --measurement-module cyclictest
  rteval --measurement-module timerlat

Implementation details:
- Added --measurement-module to measurement argument group in
  rteval/modules/__init__.py (SetupModuleOptions)
- Added early argument parsing in rteval-cmd to apply the override
  before modules are loaded
- The selected module is enabled while the other is disabled
- Fixed module loading to handle None values when modules are disabled

Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: John Kacur <jkacur@redhat.com>
---
 rteval-cmd                             | 18 ++++++++++++++++++
 rteval/modules/__init__.py             |  7 +++++++
 rteval/modules/measurement/__init__.py |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/rteval-cmd b/rteval-cmd
index 00873ce1196b..855934e42192 100755
--- a/rteval-cmd
+++ b/rteval-cmd
@@ -223,6 +223,24 @@ if __name__ == '__main__':
                 'cyclictest' : 'module',
                 'sysstat' : 'module'})
 
+        # Check for --measurement-module argument early to override config file
+        measurement_parser = argparse.ArgumentParser(add_help=False)
+        measurement_parser.add_argument('--measurement-module', dest='measurement_module',
+                                        type=str, choices=['cyclictest', 'timerlat'])
+        early_args, _ = measurement_parser.parse_known_args()
+
+        if early_args.measurement_module:
+            # Override measurement config based on command-line argument
+            msrcfg = config.GetSection('measurement')
+            # Disable both cyclictest and timerlat first
+            if 'cyclictest' in msrcfg:
+                msrcfg.cyclictest = None
+            if 'timerlat' in msrcfg:
+                msrcfg.timerlat = None
+            # Enable the selected measurement module
+            setattr(msrcfg, early_args.measurement_module, 'module')
+            logger.log(Log.INFO, f"Using measurement module: {early_args.measurement_module} (from command line)")
+
         # Prepare log levels before loading modules, not to have unwanted log messages
         # Use a minimal parser to extract logging-related flags early
         rtevcfg = config.GetSection('rteval')
diff --git a/rteval/modules/__init__.py b/rteval/modules/__init__.py
index d60877783670..7e5916c52965 100644
--- a/rteval/modules/__init__.py
+++ b/rteval/modules/__init__.py
@@ -303,6 +303,13 @@ reference from the first import"""
                                   metavar='IDLESTATE',
                                   default=None,
                                   help='Idle state depth to set on cpus running measurement modules')
+            grparser.add_argument('--measurement-module',
+                                  dest='measurement___measurement_module',
+                                  type=str,
+                                  choices=['cyclictest', 'timerlat'],
+                                  metavar='MODULE',
+                                  default=None,
+                                  help='Select measurement module: cyclictest or timerlat (overrides config file)')
 
         for (modname, mod) in list(self.__modsloaded.items()):
             opts = mod.ModuleParameters()
diff --git a/rteval/modules/measurement/__init__.py b/rteval/modules/measurement/__init__.py
index 44708ce0b035..e09dca683dbf 100644
--- a/rteval/modules/measurement/__init__.py
+++ b/rteval/modules/measurement/__init__.py
@@ -24,7 +24,7 @@ class MeasurementModules(RtEvalModules):
         for m in modcfg:
             # hope to eventually have different kinds but module is only on
             # for now (jcw)
-            if m[1].lower() == 'module':
+            if m[1] and m[1].lower() == 'module':
                 self._LoadModule(m[0])
 
     def SetupModuleOptions(self, parser):
-- 
2.51.1