Merge pull request #550 from kubabrecka/memtotal_macos

implement MemInfo.mem_total on Mac OS X
This commit is contained in:
Neil Lalonde 2013-03-25 07:11:16 -07:00
commit 4fec7d26fa

View File

@ -1,15 +1,21 @@
class MemInfo class MemInfo
# Total memory in kb. Only works on systems with /proc/meminfo. # Total memory in kb. On Mac OS uses "sysctl", elsewhere expects the system has /proc/meminfo.
# Returns nil if it cannot be determined. # Returns nil if it cannot be determined.
def mem_total def mem_total
@mem_total ||= begin @mem_total ||=
if s = `grep MemTotal /proc/meminfo` begin
/(\d+)/.match(s)[0].try(:to_i) system = `uname`.strip
else if system == "Darwin"
s = `sysctl -n hw.memsize`.strip
s.to_i / 1024
else
s = `grep MemTotal /proc/meminfo`
/(\d+)/.match(s)[0].try(:to_i)
end
rescue
nil nil
end end
end
end end
end end