Skip to contentSkip to conversation

examine/cpu: fix fetching number of threads

PATCH In review Roger Pau Monne 2 participants 2 messages Apr 23, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 ts-examine-cpu | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
ts-examine-cpu +2 -1
index 81cf7544..fbf01dfb 100755
@@ -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);
Signature · 1 line
2.26.0
Acked-by on v1 1/1
#1 lore raw

Roger Pau Monne writes ("[PATCH OSSTEST] examine/cpu: fix fetching number of threads"):

Quoted 8 lines

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.

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