sys-cpu 1.0.2 → 1.0.5

data/lib/sys/unix/sys/cpu.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 require 'ffi'
 require 'rbconfig'
 
+# The Sys module is a name space only.
 module Sys
+  # The CPU class encapsulates information about the physical CPU's on your system.
   class CPU
     extend FFI::Library
     ffi_lib FFI::Library::LIBC
@@ -43,7 +47,7 @@ module Sys
     begin
       attach_function(
         :sysctl,
-        [:pointer, :uint, :pointer, :pointer, :pointer, :size_t],
+        %i[pointer uint pointer pointer pointer size_t],
         :int
       )
       private_class_method :sysctl
@@ -54,7 +58,7 @@ module Sys
     begin
       attach_function(
         :sysctlbyname,
-        [:string, :pointer, :pointer, :pointer, :size_t],
+        %i[string pointer pointer pointer size_t],
         :int
       )
       private_class_method :sysctlbyname
@@ -64,10 +68,10 @@ module Sys
 
     # Solaris
     begin
-      attach_function :getloadavg, [:pointer, :int], :int
-      attach_function :processor_info, [:int, :pointer], :int
+      attach_function :getloadavg, %i[pointer int], :int
+      attach_function :processor_info, %i[int pointer], :int
       attach_function :sysconf, [:int], :long
-      attach_function :sysinfo, [:int, :pointer, :long], :int
+      attach_function :sysinfo, %i[int pointer long], :int
 
       private_class_method :getloadavg
       private_class_method :processor_info
@@ -105,13 +109,7 @@ module Sys
 
         size.write_int(optr.size)
 
-        if RbConfig::CONFIG['host_os'] =~ /darwin/i
-          name = 'hw.machine'
-        else
-          name = 'hw.machine_arch'
-        end
-
-        if sysctlbyname(name, optr, size, nil, 0) < 0
+        if sysctlbyname('hw.machine_arch', optr, size, nil, 0) < 0
           raise Error, 'sysctlbyname function failed'
         end
 
@@ -168,7 +166,7 @@ module Sys
           raise Error, 'sysctl function failed'
         end
 
-        buf.strip.unpack('C').first
+        buf.strip.unpack1('C')
       end
     end
 
@@ -188,68 +186,42 @@ module Sys
         if sysctl(mib, 2, buf, size, nil, 0) < 0
           raise Error, 'sysctl function failed'
         end
-
-        buf.strip
       else
         buf = 0.chr * 257
 
         if sysinfo(SI_MACHINE, buf, buf.size) < 0
           raise Error, 'sysinfo function failed'
         end
-
-        buf.strip
       end
+
+      buf.strip
     end
 
     # Returns a string indicating the cpu model.
     #
     def self.model
-      if RbConfig::CONFIG['host_os'] =~ /darwin/i
-        ptr  = FFI::MemoryPointer.new(:long)
-        size = FFI::MemoryPointer.new(:size_t)
+      if respond_to?(:sysctl, true)
+        buf  = 0.chr * 64
+        mib  = FFI::MemoryPointer.new(:int, 2)
+        size = FFI::MemoryPointer.new(:long, 1)
 
-        size.write_long(ptr.size)
+        mib.write_array_of_int([CTL_HW, HW_MODEL])
+        size.write_int(buf.size)
 
-        if sysctlbyname('hw.cputype', ptr, size, nil, 0) < 0
-          raise 'sysctlbyname function failed'
+        if sysctl(mib, 2, buf, size, nil, 0) < 0
+          raise Error, 'sysctl function failed'
         end
 
-        case ptr.read_long
-          when  CPU_TYPE_X86, CPU_TYPE_X86_64
-            'Intel'
-          when CPU_TYPE_SPARC
-            'Sparc'
-          when CPU_TYPE_POWERPC, CPU_TYPE_POWERPC64
-            'PowerPC'
-          else
-            'Unknown'
-        end
+        buf.strip
       else
-        if respond_to?(:sysctl, true)
-          buf  = 0.chr * 64
-          mib  = FFI::MemoryPointer.new(:int, 2)
-          size = FFI::MemoryPointer.new(:long, 1)
-
-          mib.write_array_of_int([CTL_HW, HW_MODEL])
-          size.write_int(buf.size)
-
-          if sysctl(mib, 2, buf, size, nil, 0) < 0
-            raise Error, 'sysctl function failed'
-          end
-
-          buf.strip
-        else
-          pinfo = ProcInfo.new
-
-          # Some systems start at 0, some at 1
-          if processor_info(0, pinfo) < 0
-            if processor_info(1, pinfo) < 0
-              raise Error, 'process_info function failed'
-            end
-          end
+        pinfo = ProcInfo.new
 
-          pinfo[:pi_processor_type].to_s
+        # Some systems start at 0, some at 1
+        if processor_info(0, pinfo) < 0 && processor_info(1, pinfo) < 0
+          raise Error, 'processor_info function failed'
         end
+
+        pinfo[:pi_processor_type].to_s
       end
     end
 
@@ -272,11 +244,7 @@ module Sys
           raise Error, 'sysctlbyname failed'
         end
 
-        if RbConfig::CONFIG['host_os'] =~ /darwin/i
-          optr.read_long / 1000000
-        else
-          optr.read_long
-        end
+        optr.read_long
       elsif respond_to?(:sysctl, true)
         buf  = 0.chr * 16
         mib  = FFI::MemoryPointer.new(:int, 2)
@@ -289,15 +257,13 @@ module Sys
           raise Error, 'sysctl function failed'
         end
 
-        buf.unpack('I*').first / 1000000
+        buf.unpack1('I*') / 1_000_000
       else
         pinfo = ProcInfo.new
 
         # Some systems start at 0, some at 1
-        if processor_info(0, pinfo) < 0
-          if processor_info(1, pinfo) < 0
-            raise Error, 'process_info function failed'
-          end
+        if processor_info(0, pinfo) < 0 && processor_info(1, pinfo) < 0
+          raise Error, 'processor_info function failed'
         end
 
         pinfo[:pi_clock].to_i
@@ -308,15 +274,10 @@ module Sys
     # average.
     #
     def self.load_avg
-      if respond_to?(:getloadavg, true)
-        loadavg = FFI::MemoryPointer.new(:double, 3)
-
-        if getloadavg(loadavg, loadavg.size) < 0
-          raise Error, 'getloadavg function failed'
-        end
-
-        loadavg.get_array_of_double(0, 3)
-      end
+      return unless respond_to?(:getloadavg, true)
+      loadavg = FFI::MemoryPointer.new(:double, 3)
+      raise Error, 'getloadavg function failed' if getloadavg(loadavg, loadavg.size) < 0
+      loadavg.get_array_of_double(0, 3)
     end
 
     # Returns the floating point processor type.
@@ -328,10 +289,9 @@ module Sys
 
       pinfo = ProcInfo.new
 
-      if processor_info(0, pinfo) < 0
-        if processor_info(1, pinfo) < 0
-          raise Error, 'process_info function failed'
-        end
+      # Some start at 0, some start at 1
+      if processor_info(0, pinfo) < 0 && processor_info(1, pinfo) < 0
+        raise Error, 'processor_info function failed'
       end
 
       pinfo[:pi_fputypes].to_s
@@ -348,7 +308,7 @@ module Sys
       pinfo = ProcInfo.new
 
       if processor_info(num, pinfo) < 0
-        raise Error, 'process_info function failed'
+        raise Error, 'processor_info function failed'
       end
 
       case pinfo[:pi_state].to_i