rteval: Add measurement and load location to run report
PATCH v3 1/1 rteval: Add measurement and load location to run report
The run report produced at the end of a run does not contain information on load and measurement thread locations.
Adjust MakeReport() functions of LoadModules and MeasurementModules class so that new properties with number of loads and cpu information are added to the XML report and can be read by rteval_text.xsl.
rteval/modules/loads/__init__.py +8 -0
@@ -30,6 +30,7 @@ import libxml2 from rteval.Log import Log from rteval.rtevalConfig import rtevalCfgSection from rteval.modules import RtEvalModules, rtevalModulePrototype +from rteval.systopology import collapse_cpulist, CpuList, SysTopology as SysTop class LoadThread(rtevalModulePrototype): def __init__(self, name, config, logger=None):
@@ -131,6 +132,13 @@ class LoadModules(RtEvalModules): def MakeReport(self): rep_n = RtEvalModules.MakeReport(self) rep_n.newProp("load_average", str(self.GetLoadAvg())) + rep_n.newProp("loads", str(self.ModulesLoaded())) + cpulist = self._cfg.GetSection(self._module_config).cpulist + if cpulist: + cpulist = CpuList(cpulist).cpulist + else: + cpulist = SysTop().online_cpus() + rep_n.newProp("loadcpus", collapse_cpulist(cpulist)) return rep_n
rteval/modules/measurement/__init__.py +8 -1
@@ -24,7 +24,7 @@ import libxml2 from rteval.modules import RtEvalModules, ModuleContainer - +from rteval.systopology import collapse_cpulist, CpuList, SysTopology as SysTop class MeasurementProfile(RtEvalModules): """Keeps and controls all the measurement modules with the same measurement profile"""
@@ -189,6 +189,13 @@ measurement profiles, based on their characteristics""" # Get the reports from all meaurement modules in all measurement profiles rep_n = libxml2.newNode("Measurements") + cpulist = self.__cfg.GetSection("measurement").cpulist + if cpulist: + cpulist = CpuList(cpulist).cpulist + else: + cpulist = SysTop().online_cpus() + rep_n.newProp("measurecpus", collapse_cpulist(cpulist)) + for mp in self.__measureprofiles: mprep_n = mp.MakeReport() if mprep_n:
rteval/rteval_text.xsl +8 -0
@@ -13,6 +13,14 @@ <xsl:value-of select="run_info/date"/><xsl:text> </xsl:text><xsl:value-of select="run_info/time"/> <xsl:text> </xsl:text> + <xsl:text> Loads: </xsl:text> + <xsl:value-of select="loads/@loads"/><xsl:text> loads run on cores </xsl:text><xsl:value-of select="loads/@loadcpus"/> + <xsl:text> </xsl:text> + + <xsl:text> Measurement: </xsl:text> + <xsl:text>measurement threads run on cores </xsl:text><xsl:value-of select="Measurements/@measurecpus"/> + <xsl:text> </xsl:text> + <xsl:text> Run time: </xsl:text> <xsl:value-of select="run_info/@days"/><xsl:text> days </xsl:text> <xsl:value-of select="run_info/@hours"/><xsl:text>h </xsl:text>
Signature · 1 line
2.31.1
Quoted 85 lines · Leah Leshchinsky
The run report produced at the end of a run does not contain information on load and measurement thread locations.
Adjust
MakeReport()functions of LoadModules and MeasurementModules class so that new properties with number of loads and cpu information are added to the XML report and can be read by rteval_text.xsl.Signed-off-by Leah Leshchinsky <[email protected]>rteval/modules/loads/__init__.py +8
-0@@ -30,6 +30,7 @@ import libxml2 from rteval.Log import Log from rteval.rtevalConfig import rtevalCfgSection from rteval.modules import RtEvalModules, rtevalModulePrototype +from rteval.systopology import collapse_cpulist, CpuList, SysTopology as SysTop class LoadThread(rtevalModulePrototype): def __init__(self, name, config, logger=None):@@ -131,6 +132,13 @@ class LoadModules(RtEvalModules): def MakeReport(self): rep_n = RtEvalModules.MakeReport(self) rep_n.newProp("load_average", str(self.GetLoadAvg())) + rep_n.newProp("loads", str(self.ModulesLoaded())) + cpulist = self._cfg.GetSection(self._module_config).cpulist + if cpulist: + cpulist = CpuList(cpulist).cpulist + else: + cpulist = SysTop().online_cpus() + rep_n.newProp("loadcpus", collapse_cpulist(cpulist)) return rep_nrteval/modules/measurement/__init__.py +8
-1@@ -24,7 +24,7 @@ import libxml2 from rteval.modules import RtEvalModules, ModuleContainer - +from rteval.systopology import collapse_cpulist, CpuList, SysTopology as SysTop class MeasurementProfile(RtEvalModules): """Keeps and controls all the measurement modules with the same measurement profile"""@@ -189,6 +189,13 @@ measurement profiles, based on their characteristics""" # Get the reports from all meaurement modules in all measurement profiles rep_n = libxml2.newNode("Measurements") + cpulist = self.__cfg.GetSection("measurement").cpulist + if cpulist: + cpulist = CpuList(cpulist).cpulist + else: + cpulist = SysTop().online_cpus() + rep_n.newProp("measurecpus", collapse_cpulist(cpulist)) + for mp in self.__measureprofiles: mprep_n = mp.MakeReport() if mprep_n:rteval/rteval_text.xsl +8
-0@@ -13,6 +13,14 @@ <xsl:value-of select="run_info/date"/><xsl:text> </xsl:text><xsl:value-of select="run_info/time"/> <xsl:text> </xsl:text> + <xsl:text> Loads: </xsl:text> + <xsl:value-of select="loads/@loads"/><xsl:text> loads run on cores </xsl:text><xsl:value-of select="loads/@loadcpus"/> + <xsl:text> </xsl:text> + + <xsl:text> Measurement: </xsl:text> + <xsl:text>measurement threads run on cores </xsl:text><xsl:value-of select="Measurements/@measurecpus"/> + <xsl:text> </xsl:text> + <xsl:text> Run time: </xsl:text> <xsl:value-of select="run_info/@days"/><xsl:text> days </xsl:text> <xsl:value-of select="run_info/@hours"/><xsl:text>h </xsl:text>Signature · 1 line
2.31.1
Great!
I tested this with:
no args
--measurement-cpulist=CPULIST --loads-cpulist=CPULIST
--measurement-cpulist =CPULIST1 --loads-cpulist=CPULIST2 and they all worked as expected.
Then I repeated all of the above after turning off cpu3
The only thing I would request is to add a hash style comment above the two lines
cpulist = CpuList(cpulist).cpulist
to explain that this takes a string and transforms it to a list and removes any cpus that are offline. I'll let you figure out how to say that succinctly! After that it's ready to be integrated.
Thanks
John