@@ -86,27 +86,25 @@ def compute_processor_count
86
86
"select NumberOfLogicalProcessors from Win32_Processor" )
87
87
result . to_enum . collect ( &:NumberOfLogicalProcessors ) . reduce ( :+ )
88
88
elsif File . executable? ( "/usr/bin/nproc" )
89
- IO . popen ( "/usr/bin/nproc --all" ) . read . to_i
89
+ IO . popen ( "/usr/bin/nproc --all" , & : read) . to_i
90
90
elsif File . readable? ( "/proc/cpuinfo" )
91
91
IO . read ( "/proc/cpuinfo" ) . scan ( /^processor/ ) . size
92
92
elsif File . executable? ( "/usr/bin/hwprefs" )
93
- IO . popen ( "/usr/bin/hwprefs thread_count" ) . read . to_i
93
+ IO . popen ( "/usr/bin/hwprefs thread_count" , & : read) . to_i
94
94
elsif File . executable? ( "/usr/sbin/psrinfo" )
95
- IO . popen ( "/usr/sbin/psrinfo" ) . read . scan ( /^.*on-*line/ ) . size
95
+ IO . popen ( "/usr/sbin/psrinfo" , & : read) . scan ( /^.*on-*line/ ) . size
96
96
elsif File . executable? ( "/usr/sbin/ioscan" )
97
- IO . popen ( "/usr/sbin/ioscan -kC processor" ) do |out |
98
- out . read . scan ( /^.*processor/ ) . size
99
- end
97
+ IO . popen ( "/usr/sbin/ioscan -kC processor" , &:read ) . scan ( /^.*processor/ ) . size
100
98
elsif File . executable? ( "/usr/sbin/pmcycles" )
101
- IO . popen ( "/usr/sbin/pmcycles -m" ) . read . count ( "\n " )
99
+ IO . popen ( "/usr/sbin/pmcycles -m" , & : read) . count ( "\n " )
102
100
elsif File . executable? ( "/usr/sbin/lsdev" )
103
- IO . popen ( "/usr/sbin/lsdev -Cc processor -S 1" ) . read . count ( "\n " )
101
+ IO . popen ( "/usr/sbin/lsdev -Cc processor -S 1" , & : read) . count ( "\n " )
104
102
elsif File . executable? ( "/usr/sbin/sysconf" ) and os_name =~ /irix/i
105
- IO . popen ( "/usr/sbin/sysconf NPROC_ONLN" ) . read . to_i
103
+ IO . popen ( "/usr/sbin/sysconf NPROC_ONLN" , & : read) . to_i
106
104
elsif File . executable? ( "/usr/sbin/sysctl" )
107
- IO . popen ( "/usr/sbin/sysctl -n hw.ncpu" ) . read . to_i
105
+ IO . popen ( "/usr/sbin/sysctl -n hw.ncpu" , & : read) . to_i
108
106
elsif File . executable? ( "/sbin/sysctl" )
109
- IO . popen ( "/sbin/sysctl -n hw.ncpu" ) . read . to_i
107
+ IO . popen ( "/sbin/sysctl -n hw.ncpu" , & : read) . to_i
110
108
else
111
109
1
112
110
end
@@ -118,7 +116,7 @@ def compute_processor_count
118
116
def compute_physical_processor_count
119
117
ppc = case RbConfig ::CONFIG [ "target_os" ]
120
118
when /darwin1/
121
- IO . popen ( "/usr/sbin/sysctl -n hw.physicalcpu" ) . read . to_i
119
+ IO . popen ( "/usr/sbin/sysctl -n hw.physicalcpu" , & : read) . to_i
122
120
when /linux/
123
121
cores = { } # unique physical ID / core ID combinations
124
122
phy = 0
0 commit comments