[PATCH OSSTEST] examine/cpu: fix fetching number of threads

Roger Pau Monne posted 1 patch 4 years ago
Failed in applying to current master (apply log)
ts-examine-cpu | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
[PATCH OSSTEST] examine/cpu: fix fetching number of threads
Posted by Roger Pau Monne 4 years ago
The way to fetch the number of threads from the output of xl info is
wrong, as the result of =~ is either true or false, but will never be a
numeric value.

Fix the regex to have a capture group in order to fetch the number of
threads, and store the capture in the threads variable.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
 ts-examine-cpu | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ts-examine-cpu b/ts-examine-cpu
index 81cf7544..fbf01dfb 100755
--- a/ts-examine-cpu
+++ b/ts-examine-cpu
@@ -26,7 +26,8 @@ our ($whhost) = @ARGV;
 $whhost ||= 'host';
 our $ho= selecthost($whhost);
 our $info = target_cmd_output_root($ho, 'xl info', 10);
-our $threads = $info =~ /^threads_per_core\s*:\s.*/m;
+$info =~ /^threads_per_core\s*:\s(.*)$/m or die "missing or malformed info";
+our $threads = $1;
 
 logm("$ho->{Ident} threads per core: $threads");
 hostflag_putative_record($ho, "hw-smt", $threads > 1);
-- 
2.26.0


Re: [PATCH OSSTEST] examine/cpu: fix fetching number of threads
Posted by Ian Jackson 4 years ago
Roger Pau Monne writes ("[PATCH OSSTEST] examine/cpu: fix fetching number of threads"):
> The way to fetch the number of threads from the output of xl info is
> wrong, as the result of =~ is either true or false, but will never be a
> numeric value.
> 
> Fix the regex to have a capture group in order to fetch the number of
> threads, and store the capture in the threads variable.
> 
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

I will push this to pretest.  Hopefully it will go through quickly...