hhf/MySQLTuner-perl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve FreeBSD support a bit (patch included) #549

Browse source
This commit is contained in:
Jean-Marie Renouard 2021-07-02 16:55:43 +02:00
parent 52d3fc4d7c
commit 213211aecc
1 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
mysqltuner.pl
View file

@ -1,5 +1,5 @@
#!/usr/bin/env perl #!/usr/bin/env perl
# mysqltuner.pl - Version 1.7.27 # mysqltuner.pl - Version 1.7.28
# High Performance MySQL Tuning Script # High Performance MySQL Tuning Script
# Copyright (C) 2006-2021 Major Hayden - major@mhtx.net # Copyright (C) 2006-2021 Major Hayden - major@mhtx.net
# #
@ -56,7 +56,7 @@ $Data::Dumper::Pair = " : ";
#use Env; #use Env;
# Set up a few variables for use in the script # Set up a few variables for use in the script
my $tunerversion = "1.7.27"; my $tunerversion = "1.7.28";
my ( @adjvars, @generalrec ); my ( @adjvars, @generalrec );
# Set defaults # Set defaults
@ -300,9 +300,18 @@ sub infoprinthcmd {
# Calculates the number of physical cores considering HyperThreading # Calculates the number of physical cores considering HyperThreading
sub cpu_cores { sub cpu_cores {
my $cntCPU = if ($^O eq 'linux') {
`awk -F: '/^core id/ && !P[\$2] { CORES++; P[\$2]=1 }; /^physical id/ && !N[\$2] { CPUs++; N[\$2]=1 }; END { print CPUs*CORES }' /proc/cpuinfo`; my $cntCPU =
return ( $cntCPU == 0 ? `nproc` : $cntCPU ); `awk -F: '/^core id/ && !P[\$2] { CORES++; P[\$2]=1 }; /^physical id/ && !N[\$2] { CPUs++; N[\$2]=1 }; END { print CPUs*CORES }' /proc/cpuinfo`;
return ( $cntCPU == 0 ? `nproc` : $cntCPU );
}
if ($^O eq 'freebsd') {
my $cntCPU = `sysctl -n kern.smp.cores`;
chomp $cntCPU;
return $cntCPU + 0;
}
return 0;
} }
# Calculates the parameter passed in bytes, then rounds it to one decimal place # Calculates the parameter passed in bytes, then rounds it to one decimal place
@ -1169,7 +1178,7 @@ sub get_all_vars {
debugprint Dumper(@mysqlenginelist); debugprint Dumper(@mysqlenginelist);
my @mysqlslave; my @mysqlslave;
if ($mysqlvermajor eq 8 or ($mysqlvermajor eq 10 and $mysqlverminor ge 5)) { if ( mysql_version_eq( 8 ) or mysql_version_ge( 10, 5 ) ) {
@mysqlslave = select_array("SHOW SLAVE STATUS\\G"); @mysqlslave = select_array("SHOW SLAVE STATUS\\G");
} else { } else {
@mysqlslave = select_array("SHOW REPLICA STATUS\\G"); @mysqlslave = select_array("SHOW REPLICA STATUS\\G");
@ -1178,7 +1187,7 @@ sub get_all_vars {
$result{'Replication'}{'Status'} = \%myrepl; $result{'Replication'}{'Status'} = \%myrepl;
my @mysqlslaves; my @mysqlslaves;
if ( $mysqlvermajor eq 8 or ($mysqlvermajor eq 10 and $mysqlverminor ge 5) ) { if ( mysql_version_eq( 8 ) or mysql_version_ge( 10, 5 ) ) {
@mysqlslaves= select_array "SHOW SLAVE HOSTS"; @mysqlslaves= select_array "SHOW SLAVE HOSTS";
} else { } else {
@mysqlslaves = select_array("SHOW SLAVE STATUS\\G"); @mysqlslaves = select_array("SHOW SLAVE STATUS\\G");
@ -1578,9 +1587,19 @@ sub merge_hash {
} }
sub is_virtual_machine { sub is_virtual_machine {
my $isVm = `grep -Ec '^flags.*\ hypervisor\ ' /proc/cpuinfo`; if ($^O eq 'linux') {
return ( $isVm == 0 ? 0 : 1 ); my $isVm = `grep -Ec '^flags.*\ hypervisor\ ' /proc/cpuinfo`;
} return ( $isVm == 0 ? 0 : 1 );
}
if ($^O eq 'freebsd') {
my $isVm = `sysctl -n kern.vm_guest`;
chomp $isVm;
print "FARK DEBUG isVm=[$isVm]";
return ( $isVm eq 'none' ? 0 : 1);
}
return 0;
}
sub infocmd { sub infocmd {
my $cmd = "@_"; my $cmd = "@_";
@ -6511,7 +6530,7 @@ __END__
=head1 NAME =head1 NAME
MySQLTuner 1.7.27 - MySQL High Performance Tuning Script MySQLTuner 1.7.28 - MySQL High Performance Tuning Script
=head1 IMPORTANT USAGE GUIDELINES =head1 IMPORTANT USAGE GUIDELINES