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

Merge pull request #32 from gibas/add-darwin-arch

Browse source 
Add darwin arch
This commit is contained in:
Major Hayden 2014-02-21 11:16:02 -06:00
commit 37d1703b6f
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
mysqltuner.pl
View file

@ -100,6 +100,9 @@ sub usage {
" --port <port> Port to use for connection (default: 3306)\n". " --port <port> Port to use for connection (default: 3306)\n".
" --user <username> Username to use for authentication\n". " --user <username> Username to use for authentication\n".
" --pass <password> Password to use for authentication\n". " --pass <password> Password to use for authentication\n".
" Database type\n".
" --mysql Run with mysql database (default)\n".
" --maria Run with mariadb database\n".
"\n". "\n".
" Performance and Reporting Options\n". " Performance and Reporting Options\n".
" --skipsize Don't enumerate tables and their types/sizes (default: on)\n". " --skipsize Don't enumerate tables and their types/sizes (default: on)\n".
@ -219,14 +222,14 @@ sub os_setup {
} elsif ($os =~ /Darwin/) { } elsif ($os =~ /Darwin/) {
$physical_memory = `sysctl -n hw.memsize` or memerror; $physical_memory = `sysctl -n hw.memsize` or memerror;
$swap_memory = `sysctl -n vm.swapusage | awk '{print \$3}' | sed 's/\..*\$//'` or memerror; $swap_memory = `sysctl -n vm.swapusage | awk '{print \$3}' | sed 's/\..*\$//'` or memerror;
} elsif ($os =~ /NetBSD|OpenBSD/) { } elsif ($os =~ /NetBSD|OpenBSD|FreeBSD/) {
$physical_memory = `sysctl -n hw.physmem` or memerror; $physical_memory = `sysctl -n hw.physmem` or memerror;
if ($physical_memory < 0) { if ($physical_memory < 0) {
$physical_memory = `sysctl -n hw.physmem64` or memerror; $physical_memory = `sysctl -n hw.physmem64` or memerror;
} }
$swap_memory = `swapctl -l | grep '^/' | awk '{ s+= \$2 } END { print s }'` or memerror; $swap_memory = `swapctl -l | grep '^/' | awk '{ s+= \$2 } END { print s }'` or memerror;
} elsif ($os =~ /BSD/) { } elsif ($os =~ /BSD/) {
$physical_memory = `sysctl -n hw.realmem`; $physical_memory = `sysctl -n hw.realmem` or memerror;
$swap_memory = `swapinfo | grep '^/' | awk '{ s+= \$2 } END { print s }'`; $swap_memory = `swapinfo | grep '^/' | awk '{ s+= \$2 } END { print s }'`;
} elsif ($os =~ /SunOS/) { } elsif ($os =~ /SunOS/) {
$physical_memory = `/usr/sbin/prtconf | grep Memory | cut -f 3 -d ' '` or memerror; $physical_memory = `/usr/sbin/prtconf | grep Memory | cut -f 3 -d ' '` or memerror;
@ -448,6 +451,20 @@ sub check_architecture {
} elsif (`uname` =~ /AIX/ && `bootinfo -K` =~ /64/) { } elsif (`uname` =~ /AIX/ && `bootinfo -K` =~ /64/) {
$arch = 64; $arch = 64;
goodprint "Operating on 64-bit architecture\n"; goodprint "Operating on 64-bit architecture\n";
} elsif (`uname` =~ /NetBSD|OpenBSD/ && `sysctl -b hw.machine` =~ /64/) {
$arch = 64;
goodprint "Operating on 64-bit architecture\n";
} elsif (`uname` =~ /FreeBSD/ && `sysctl -b hw.machine_arch` =~ /64/) {
$arch = 64;
goodprint "Operating on 64-bit architecture\n";
} elsif (`uname` =~ /Darwin/ && `uname -m` =~ /Power Macintosh/) {
# Darwin box.local 9.8.0 Darwin Kernel Version 9.8.0: Wed Jul 15 16:57:01 PDT 2009; root:xnu1228.15.4~1/RELEASE_PPC Power Macintosh
$arch = 64;
goodprint "Operating on 64-bit architecture\n";
} elsif (`uname` =~ /Darwin/ && `uname -m` =~ /x86_64/) {
# Darwin gibas.local 12.3.0 Darwin Kernel Version 12.3.0: Sun Jan 6 22:37:10 PST 2013; root:xnu-2050.22.13~1/RELEASE_X86_64 x86_64
$arch = 64;
goodprint "Operating on 64-bit architecture\n";
} else { } else {
$arch = 32; $arch = 32;
if ($physical_memory > 2147483648) { if ($physical_memory > 2147483648) {