compute_unit 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95a51bd70b85087d18049b7fdcab55801859e1a6f240b58b3b26262431160b3d
-  data.tar.gz: 6c6da1daca1a6f46b3e9f651d0ca6c1ea9063cd78dc8ca0311cb68b99c6a6bb8
+  metadata.gz: e7454de36f403e2803ee5b87ee989781de8b663d32cfe290b3c22ab0c18f598d
+  data.tar.gz: 6b6afa144e05011bec545ddbda688ae663650dce4d09070be9a3922f84bc9606
 SHA512:
-  metadata.gz: 7d7b0e432a47d65cae85ae48d86412702e037202404ece13c333495f805ed9eb75c4982e3d297d9f185ae24252b0bc559edb44a4b4168ceb5c70fbfb0c15ae3e
-  data.tar.gz: 4349a92b6b913d7e777ede290028bffcd6496392b2c8a7f63b36c9cec7e0d19dd7824013481a5d792d963e9138721b7ff9bec4ecf72a7f5efc4dab1bbe745c29
+  metadata.gz: 3821595267038d8424a7ae3558437339f87b871ce4e294ffe80cce1c928924a9ae1ebd7fa9b293c08a2b40217a71f7a4358e8a943456dd0c978cf7e4bfbb5a0a
+  data.tar.gz: 4fa97e267f9fd8c60999d8af1dd96e15e9e77435c98ece688e53386147e0e7470b1f9a7e149f702fbcb237fbf6c41085f051db9ad441e1388dbde6ce9d2469a5

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Compute Unit Changelog
 
-## Unrleased
+## 0.5.0
+Released 10/5/2020
+
+* Add more method docs
+* Allow overriding of cpu power
+* Update cpu name using model
+* Add new search methods
+* Add voltage and other cpu metrics
 ## 0.4.0
 * Adds ability to list attached processes to compute_unit sorted by field
 * Adds ability to list top_x attached processes sorted by field

data/lib/compute_unit.rb

@@ -20,16 +20,36 @@ module ComputeUnit
     require 'compute_unit/cpu'
     require 'compute_unit/asic'
 
-    copy_default_database unless File.exist?(PCI_DATABASE_PATH)
+    # if this file doesn't exist we need to fetch it or copy it
+    refresh_pci_database unless File.exist?(PCI_DATABASE_PATH)
 
-    ComputeUnit::Gpu.find_all(use_opencl) +
-      ComputeUnit::Cpu.find_all +
-      ComputeUnit::Asic.find_all
+    Gpu.find_all(use_opencl) + Cpu.find_all + Asic.find_all
+  end
+
+  # @param pid [Integer] the pid to search with
+  # @param field [Symbol] - the field to sort by
+  # @return [Array] - a array of device paths
+  # @example usage
+  #   device_paths_by_process(3748) => ["/sys/bus/pci/devices/0000:00:00.0"]
+  def self.device_paths_by_process(pid)
+    # processes = ComputeUnit::Cpu.attached_processes(field).last(1) + ComputeUnit::Gpu.attached_processes(field)
+    # processes.find_all { |process| process.pid == pid }
+    # We can get the utilized devices but it appears cubersome to convert to a device path
+    # This method uses more resources
+    find_by_process(pid).map(&:device_path)
+  end
+
+  # @param pid [Integer] the pid to search with
+  # @param use_opencl [Boolean] use opencl on gpu devices
+  def self.find_by_process(pid, use_opencl = false)
+    find_all(use_opencl).find_all do |unit|
+      unit.top_processes.first.pid.to_i == pid.to_i
+    end
   end
 
   # copies the default pci database from linux filesystem over to the gem path
   def self.copy_default_database
-    FileUtils.cp(DEFAULT_PCIDB_PATH, PCI_DATABASE_PATH)
+    FileUtils.cp(DEFAULT_PCIDB_PATH, PCI_DATABASE_PATH) if File.exist?(DEFAULT_PCIDB_PATH)
   end
 
   # get a fresh copy of the database and then use find_all

data/lib/compute_unit/compute_base.rb

@@ -30,10 +30,13 @@ module ComputeUnit
     end
 
     # @summary Finds all cpu attached processes and sorts by pctcpu
+    # param filter [Regex] - if supplied filter out devices from fd list
     # @param field [Symbol] - the field to sort by
     # @return [Array] - an array of attached processes
-    def attached_processes(_field = :pctcpu)
-      raise NotImplementedError
+    def attached_processes(field = :pctcpu, filter = nil)
+      raise NotImplementedError unless self.class.respond_to?(:attached_processes)
+
+      self.class.attached_processes(field, filter)
     end
 
     # @summary Find the processes consuming the most cpu

data/lib/compute_unit/cpu.rb

@@ -6,8 +6,8 @@ module ComputeUnit
   class Cpu < ComputeBase
     DEVICE_CLASS = '060000'
     DEVICE_CLASS_NAME = 'CPU'
+    VOLTAGE_MSR = 0x198
     # @return [Array] - returns a list of device paths of all devices considered for display
-    alias name model
 
     def self.devices
       ComputeUnit::ComputeBase.devices.find_all do |device|
@@ -15,45 +15,83 @@ module ComputeUnit
       end
     end
 
+    def utilization
+      1 # until we can calculate this.  Is loadavg a good metric? or load / cpus
+    end
+
     # @summary Finds all cpu attached processes and sorts by pctcpu
     # @param field [Symbol] - the field to sort by
+    # @param filter [Regex] - if supplied filter out devices from fd list
     # @return [Array] - an array of attached processes
-    def attached_processes(field = :pctcpu)
+    def self.attached_processes(field = :pctcpu, _filter = nil)
       Sys::ProcTable.ps(smaps: false).sort_by(&field)
     end
 
+    # @summary [Float] - returns the voltage of the cpu
+    # @param processor_id [Integer] - the id of the cpu
+    def voltage(processor_id = 0)
+      file = "/dev/cpu/#{processor_id}/msr"
+      return 0 unless File.exist?(file)
+
+      # read 8 bytes, then unpack it by turning it into an integer
+      # make it a binary string, pluck out some specific bits, then
+      # convert it back to an integer
+      # divide by 8192 to give the voltage
+      # lowbit = 32
+      # highbit = 47
+      # bits = 47 - 32 + 1 # we want to read bits 32-47
+      msr = IO.new IO.sysopen(file, 'rb')
+      msr.sysseek(VOLTAGE_MSR)
+      data, = msr.sysread(8).unpack('q')
+      format('%.2f', ((data >> 32) / 8192.to_f))
+    end
+
+    # @return [String] - the model / name of the cpu
     def model
       raw_cpu_data[:model_name]
     end
 
+    # @return [String] - the model / name of the cpu
+    def name
+      model
+    end
+
+    # @return [String] - the maker of the cpu
     def make
       raw_cpu_data[:vendor_id]
     end
 
+    # @return [Integer] - the number of cores
     def num_cores
       raw_cpu_data[:cores_per_socket].to_i
     end
 
+    # @return [Integer] - the number of threads
     def num_threads
       raw_cpu_data[:threads_per_core].to_i
     end
 
+    # @return [Integer] - the number of cpus
     def nproc
       raw_cpu_data[:cpus].to_i
     end
 
+    # @return [Float] - current mhz of cpu
     def current_freq_mhz
       raw_cpu_data[:cpu_mhz].to_f.round(0)
     end
 
+    # @return [Float] - max mhz of cpu
     def max_freq_mhz
       raw_cpu_data[:cpu_max_mhz].to_f.round(0)
     end
 
+    # @return [Float] - current min of cpu
     def min_freq_mhz
       raw_cpu_data[:cpu_min_mhz].to_f.round(0)
     end
 
+    # @return [String] the path of the hwmon path for monitoring temps
     def base_hwmon_path
       File.join(ComputeUnit::SYSFS_PATH, 'devices/platform/coretemp.0/hwmon')
     end
@@ -75,6 +113,40 @@ module ComputeUnit
       read_hwmon_data('temp1_input', 0).to_f.round(0) / 1000
     end
 
+    def status
+      0
+    end
+
+    def power
+      ENV.fetch('CPU_POWER', 60) # until we can calculate power we will just use 60
+    end
+
+    def fan
+      2500 # until we can calculate fan speed
+    end
+
+    def mem_temp
+      0 # until we can get the mem temp
+    end
+
+    def pci_loc
+      device_path
+    end
+
+    def status_info
+      { index: "CPU#{index}",
+        name: model,
+        bios: 'N/A',
+        core_clock: current_freq_mhz,
+        memory_clock: 'N/A',
+        power: power,
+        fan: fan,
+        core_volt: voltage,
+        temp: temp,
+        mem_temp: mem_temp,
+        status: status }
+    end
+
     def metrics
       {
         temp: temp,
@@ -94,6 +166,14 @@ module ComputeUnit
       super.merge(metrics)
     end
 
+    def initialize(_device_path, opts)
+      super
+      @type = :CPU
+      @pci_loc = device_path,
+                 @index = opts[:index].to_i
+      @power_offset = 0
+    end
+
     def self.create_from_path(device_path, index)
       opts = {
         device_class_id: device_class(device_path),
@@ -106,7 +186,7 @@ module ComputeUnit
       new(device_path, opts)
     end
 
-    def self.find_all
+    def self.find_all(_use_opencl = false)
       devices.sort.map.with_index do |device_path, index|
         create_from_path(device_path, index)
       end

data/lib/compute_unit/gpu.rb

@@ -14,12 +14,14 @@ module ComputeUnit
     end
 
     # @summary Finds all cpu attached processes and sorts by pctcpu
+    # @param filter [Regex] - if supplied filter out devices from fd list
     # @param field [Symbol] - the field to sort by
     # @return [Array] - an array of attached processes
-    def attached_processes(field = :pctcpu)
+    def self.attached_processes(field = :pctcpu, filter = %r{/dev/dri|nvidia\d+})
+      filter ||= %r{/dev/dri|nvidia\d+}
       # looks for any fd device with dri or nvidia in the name
       p = Sys::ProcTable.ps(smaps: false).find_all do |p|
-        p.fd.values.find { |f| f =~ %r{/dev/dri|nvidia\d+} }
+        p.fd.values.find { |f| f =~ filter }
       end
       p.sort_by(&field)
     end

data/lib/compute_unit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ComputeUnit
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compute_unit
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-29 00:00:00.000000000 Z
+date: 2020-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable
@@ -133,7 +133,6 @@ files:
 - lib/compute_unit/monkey_patches.rb
 - lib/compute_unit/utils.rb
 - lib/compute_unit/version.rb
-- miner@192.168.0.119
 homepage: https://gitlab.com/blockops/compute_unit
 licenses:
 - MIT