tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-11-25 23:47:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

parallel: Better CPU detection on OpenIndiana.

Browse source
This commit is contained in:
Ole Tange 2016-04-06 00:35:45 +02:00
parent 4a1abba854
commit b17f41d17f
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/parallel
View file

@ -5307,7 +5307,7 @@ sub no_of_cpus {
} elsif ($^O eq 'darwin') { } elsif ($^O eq 'darwin') {
$no_of_cpus = no_of_cpus_darwin(); $no_of_cpus = no_of_cpus_darwin();
} elsif ($^O eq 'solaris') { } elsif ($^O eq 'solaris') {
$no_of_cpus = no_of_cpus_solaris(); $no_of_cpus = no_of_cpus_solaris() || nproc();
} elsif ($^O eq 'aix') { } elsif ($^O eq 'aix') {
$no_of_cpus = no_of_cpus_aix(); $no_of_cpus = no_of_cpus_aix();
} elsif ($^O eq 'hpux') { } elsif ($^O eq 'hpux') {
@ -5365,7 +5365,7 @@ sub no_of_cores {
} elsif ($^O eq 'darwin') { } elsif ($^O eq 'darwin') {
$no_of_cores = no_of_cores_darwin(); $no_of_cores = no_of_cores_darwin();
} elsif ($^O eq 'solaris') { } elsif ($^O eq 'solaris') {
$no_of_cores = no_of_cores_solaris(); $no_of_cores = no_of_cores_solaris() || nproc();
} elsif ($^O eq 'aix') { } elsif ($^O eq 'aix') {
$no_of_cores = no_of_cores_aix(); $no_of_cores = no_of_cores_aix();
} elsif ($^O eq 'hpux') { } elsif ($^O eq 'hpux') {
@ -5594,6 +5594,12 @@ sub no_of_cpus_solaris {
return $#prtconf +1; return $#prtconf +1;
} }
} }
if(-x "/usr/sbin/prtconf") {
my @prtconf = ::qqx("/usr/sbin/prtconf | grep cpu..instance");
if($#prtconf >= 0) {
return $#prtconf +1;
}
}
return undef; return undef;
} }