diff --git a/Hostctl.pm b/Hostctl.pm index af74e9c..6fadd05 100644 --- a/Hostctl.pm +++ b/Hostctl.pm @@ -102,7 +102,7 @@ sub collect_version { my $version = "version-$host.txt"; logeval { logcmd({ cmd => ['ssh', "$user\@$host", 'sysctl', - 'kern.version', 'hw.machine', 'hw.ncpu'], + 'kern.version', 'hw.machine', 'hw.ncpu', 'hw.ncpuonline'], outfile => $version, })}; if ($@) { diff --git a/Html.pm b/Html.pm index 933e5f1..403d414 100644 --- a/Html.pm +++ b/Html.pm @@ -312,6 +312,8 @@ sub parse_version_file { } /^hw.machine=(\w+)$/ and $v{arch} = $1; /^hw.ncpu=(\w+)$/ and $v{ncpu} = $1; + # override if more specific value exists + /^hw.ncpuonline=(\w+)$/ and $v{ncpu} = $1; } return %v; } diff --git a/netlink-html.pl b/netlink-html.pl index 00cbba4..65b055f 100755 --- a/netlink-html.pl +++ b/netlink-html.pl @@ -119,10 +119,13 @@ sub list_dates { sub html_hier_top { my ($html, $date, @cvsdates) = @_; - my $setup = $D{$date}{setup}; + my $dv = $D{$date}; + my $setup = $dv->{setup}; my $link = uri_escape($setup, "^A-Za-z0-9\-\._~/"); my $href = $setup ? "" : ""; my $enda = $href ? "" : ""; + my $hostname = $dv->{host}; + my $ncpu = $dv->{ncpu}; print $html <<"HEADER"; @@ -134,7 +137,11 @@ sub html_hier_top { - + + + + +
$date
setuptest host with cpu cores$hostname/$ncpu
machine setup ${href}info$enda