amdgpu_fan 0.5.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 822ba3e84cdd6cb64680ace91e696351c3ac8f61fe7344554304be517c1ee141
-  data.tar.gz: b74858f3916aec38afb02134694011f59f4c672d276dd4905e9da6accee69333
+  metadata.gz: 1fb09354467c6ffeb603c4cbc72b131c626e83d4403148ebeb5fac342222ac29
+  data.tar.gz: b62420cbf660f704682f34565128c749216bb5605b3d57b843f4bc85671aa09c
 SHA512:
-  metadata.gz: 1798fa2cb6a578717c75d898501833e75e27fc8efd14881954c8a7cdf53e71a0dc1dfb0cba6b51b8b96572943761d6d9f23be33f26f8bc6ee3c42e38f017ab7c
-  data.tar.gz: 95df0c6e478a1cbe580695c9be8cf123e555ec76ef767eb5a91b24d174693667cf33b0dabcc6a3ddd45cdfd54a7efd070317e6a74fc63395f2b96d207b77e0eb
+  metadata.gz: f9a94891e8024c9e2c58c46feb4b7654e69978a9215278d9588065db177e8df447670cad9be726f608f16bd77f4a26e2a05fe16c536ce42bce0c9242489d2b43
+  data.tar.gz: 8046858789272ed17ce75304f53ee3915973193bc81bd301335448456c99bd8d4d774962668b2b98388a24301e158d4cffb18a65a28d27c7fd45c130c639740d

data/README.md

@@ -1,5 +1,6 @@
 # amdgpu_fan
 
+[![Gem Version](https://badge.fury.io/rb/amdgpu_fan.svg)](https://badge.fury.io/rb/amdgpu_fan)
 [![Build Status](https://travis-ci.org/HarlemSquirrel/amdgpu-fan-rb.svg?branch=master)](https://travis-ci.org/HarlemSquirrel/amdgpu-fan-rb) [![Maintainability](https://api.codeclimate.com/v1/badges/27233cee17ef6a2c14fd/maintainability)](https://codeclimate.com/github/HarlemSquirrel/amdgpu-fan-rb/maintainability)
 
 A Ruby CLI to read and set fan speed, power profiles, and more for AMD Radeon graphics cards running on the AMDGPU Linux driver.
@@ -74,8 +75,30 @@ Watching Advanced Micro Devices, Inc. [AMD/ATI] Radeon R9 FURY X / NANO every 3
 And now the watch is ended.
 ```
 
+```
+➤  bin/amdgpu_fan watch_avg
+Watching Sapphire Technology Limited Vega 10 XL/XT [Radeon RX Vega 56/64] min, max and averges since
+2020-06-02 23:05:20 -0400...
+  <Press Ctrl-C to exit>
+⏰ Core clock  min:    852 MHz avg:  887.0 MHz max:   1200 MHz now:    852 MHz
+💾 Memory clk  min:    167 MHz avg:  227.1 MHz max:    945 MHz now:    167 MHz
+🌀 Fan speed   min:   1231 RPM avg: 1231.0 RPM max:   1231 RPM now:   1231 RPM
+⚡ Power usage min:    6.0 W   avg:   21.8 W   max:  141.0 W   now:    6.0 W
+🌡  Temperature min:     30 °C  avg:   31.3 °C  max:     35 °C  now:     32 °C
+^C
+And now the watch is ended.
+```
+
 ## Dependencies
 
 - [Ruby](https://www.ruby-lang.org) with [Bundler](https://bundler.io)
 - [Thor](http://whatisthor.com/) (installed with `bundle install`)
-- [`lspci`](https://linux.die.net/man/8/lspci) (included with most Linux distributions)
+- Internet connection - Device info is retrieved from https://pci-ids.ucw.cz/
+
+## Building a binary
+
+[Ruby Packer](https://github.com/pmq20/ruby-packer) provides a convenient way to compile this into a single executable. For the best results, compile Ruby Packer from source from the lastest master branch.
+
+```sh
+rubyc amdgpu_fan --output amdgpu_fan
+```

data/config/environment.rb

@@ -1,11 +1,16 @@
 # frozen_string_literal: true
 
+require 'async'
 require 'thor'
 
 require_relative '../lib/amdgpu_fan'
+require_relative '../lib/amdgpu_fan/version'
 
 require_relative '../lib/amdgpu_fan/mixin/cli_output_format'
 require_relative '../lib/amdgpu_fan/mixin/sys_write'
 
 require_relative '../lib/amdgpu_fan/service'
 require_relative '../lib/amdgpu_fan/cli'
+require_relative '../lib/amdgpu_fan/pci'
+require_relative '../lib/amdgpu_fan/stat_set'
+require_relative '../lib/amdgpu_fan/watcher'

data/config/icons.yml

@@ -0,0 +1,10 @@
+---
+clock: ⏰
+display: 📺
+fan: 🌀
+gpu: 👾
+load: "⚖ "
+memory: 💾
+power: ⚡
+temp: "🌡 "
+vbios: 📄

data/lib/amdgpu_fan/cli.rb

@@ -1,10 +1,16 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/AbcSize, Metrics/ClassLength, Metrics/MethodLength
+
+require 'yaml'
+
 module AmdgpuFan
   # The command-line interface class
   class Cli < Thor
     include CliOutputFormat
 
+    ICONS = YAML.safe_load(File.read(File.join(__dir__, '../../config/icons.yml')))
+                .transform_keys(&:to_sym).freeze
     WATCH_FIELD_SEPARATOR = ' | '
 
     desc 'connectors', 'View the status of the display connectors.'
@@ -52,22 +58,28 @@ module AmdgpuFan
     desc 'status [--logo]', 'View device info, current fan speed, and temperature.'
     def status(option = nil)
       puts radeon_logo if option == '--logo'
-      puts "👾 #{'GPU:'.ljust(9)} #{amdgpu_service.name}",
-           "📄 #{'vBIOS:'.ljust(9)} #{amdgpu_service.vbios_version}",
-           "📺 Displays: #{amdgpu_service.connectors.map(&:display_name).compact.join(',')}",
-           "⏰ #{'Clocks:'.ljust(9)} #{clock_status}",
-           "💾 #{'Memory:'.ljust(9)} #{mem_total_mibibyes}",
-           "🌀 #{'Fan:'.ljust(9)} #{fan_status}",
-           "🌞 #{'Temp:'.ljust(9)} #{amdgpu_service.temperature}°C",
-           "⚡ #{'Power:'.ljust(9)} #{amdgpu_service.profile_mode} profile in " \
-            "#{amdgpu_service.power_dpm_state} mode using " \
-            "#{amdgpu_service.power_draw} / #{amdgpu_service.power_max} Watts "\
-            "(#{amdgpu_service.power_draw_percent}%)",
-           "⚖  #{'Load:'.ljust(9)} #{percent_meter amdgpu_service.busy_percent, 20}"
+      puts ICONS[:gpu] + ' GPU:'.ljust(9) + amdgpu_service.name
+      puts ICONS[:vbios] + ' vBIOS:'.ljust(9) + amdgpu_service.vbios_version
+      puts "#{ICONS[:display]} Displays:#{amdgpu_service.display_names.join(', ')}"
+      puts ICONS[:clock] + ' Clocks:'.ljust(9) + clock_status
+      puts ICONS[:memory] + ' Memory:'.ljust(9) + mem_total_mibibyes
+      puts ICONS[:fan] + ' Fan:'.ljust(9) + fan_status
+      puts ICONS[:temp] + ' Temp:'.ljust(9) + "#{amdgpu_service.temperature}°C"
+      puts ICONS[:power] + ' Power:'.ljust(9) +
+           "#{amdgpu_service.profile_mode} profile in " \
+           "#{amdgpu_service.power_dpm_state} mode using " \
+           "#{amdgpu_service.power_draw} / #{amdgpu_service.power_max} Watts "\
+           "(#{amdgpu_service.power_draw_percent}%)"
+      puts ICONS[:load] + ' Load:'.ljust(9) + percent_meter(amdgpu_service.busy_percent)
+    end
+
+    desc 'version', 'Print the application version.'
+    def version
+      puts AmdgpuFan::VERSION
     end
 
     desc 'watch [SECONDS]', 'Watch fan speed, load, power, and temperature ' \
-         'refreshed every n seconds.'
+                            'refreshed every n seconds.'
     def watch(seconds = 1)
       return puts 'Seconds must be from 1 to 600' unless (1..600).cover?(seconds.to_i)
 
@@ -91,12 +103,41 @@ module AmdgpuFan
       end
     end
 
+    desc 'watch_avg',
+         <<~DOC
+           Watch min, max, average, and current stats.
+         DOC
+    def watch_avg
+      puts "Watching #{amdgpu_service.name} min, max and averges since #{Time.now}...",
+           '  <Press Ctrl-C to exit>',
+           "\n\n\n\n\n"
+
+      trap 'SIGINT' do
+        puts "\nAnd now the watch is ended."
+        exit 0
+      end
+
+      watcher = Watcher.new amdgpu_service
+
+      loop do
+        watcher.measure
+        5.times { print "\033[K\033[A" } # move up a line and clear to end of line
+
+        puts "#{ICONS[:clock]} Core clock  #{watcher.core_clock}",
+             "#{ICONS[:memory]} Memory clk  #{watcher.memory_clock}",
+             "#{ICONS[:fan]} Fan speed   #{watcher.fan_speed_rpm}",
+             "#{ICONS[:power]} Power usage #{watcher.power_draw}",
+             "#{ICONS[:temp]} Temperature #{watcher.temperature}"
+        sleep 1
+      end
+    end
+
     desc 'watch_csv [SECONDS]', 'Watch stats in CSV format ' \
-         'refreshed every n seconds defaulting to 1 second.'
+                                'refreshed every n seconds defaulting to 1 second.'
     def watch_csv(seconds = 1)
       return puts 'Seconds must be from 1 to 600' unless (1..600).cover?(seconds.to_i)
 
-      puts 'Timestamp, Core Clock (Mhz),Memory Clock (Mhz),Fan speed (rpm), '\
+      puts 'Timestamp,Core Clock (Mhz),Memory Clock (Mhz),Fan speed (rpm),'\
            'Load (%),Power (Watts),Temp (°C)'
 
       trap 'SIGINT' do
@@ -104,13 +145,19 @@ module AmdgpuFan
       end
 
       loop do
-        puts [Time.now.strftime('%F %T'),
-              amdgpu_service.core_clock,
-              amdgpu_service.memory_clock,
-              amdgpu_service.fan_speed_rpm,
-              amdgpu_service.busy_percent,
-              amdgpu_service.power_draw,
-              amdgpu_service.temperature].join(',')
+        list = []
+        threads = [
+          Thread.new { list[0] = amdgpu_service.core_clock },
+          Thread.new { list[1] = amdgpu_service.memory_clock },
+          Thread.new { list[2] = amdgpu_service.fan_speed_rpm },
+          Thread.new { list[3] = amdgpu_service.busy_percent },
+          Thread.new { list[4] = amdgpu_service.power_draw },
+          Thread.new { list[5] = amdgpu_service.temperature }
+        ]
+        threads.each(&:join)
+
+        puts [Time.now.strftime('%F %T'), *list].join(',')
+
         sleep seconds.to_i
       end
     end
@@ -127,7 +174,7 @@ module AmdgpuFan
 
     def fan_status
       "#{amdgpu_service.fan_mode} mode running at " \
-       "#{amdgpu_service.fan_speed_rpm} rpm (#{amdgpu_service.fan_speed_percent}%)"
+        "#{amdgpu_service.fan_speed_rpm} rpm (#{amdgpu_service.fan_speed_percent}%)"
     end
 
     def mem_total_mibibyes
@@ -139,8 +186,8 @@ module AmdgpuFan
     end
 
     def summary_clock
-      "Core: #{amdgpu_service.core_clock.rjust(7)}#{WATCH_FIELD_SEPARATOR}"\
-        "Memory: #{amdgpu_service.memory_clock.rjust(7)}"
+      "Core: #{amdgpu_service.core_clock.to_s.rjust(7)}#{WATCH_FIELD_SEPARATOR}"\
+        "Memory: #{amdgpu_service.memory_clock.to_s.rjust(7)}"
     end
 
     def summary_fan
@@ -163,3 +210,5 @@ module AmdgpuFan
     end
   end
 end
+
+# rubocop:enable Metrics/AbcSize, Metrics/ClassLength, Metrics/MethodLength

data/lib/amdgpu_fan/connector.rb

@@ -6,11 +6,11 @@ module AmdgpuFan
   # A model class for a GPU connector
   class Connector
     EDID_DESCRIPTORS_CONF = {
-      display_descriptor_leading_bytes: String.new('\x00\xFC\x00', encoding: 'ascii-8bit'),
+      display_name_leading_bytes: String.new('\x00\xFC\x00', encoding: 'ascii-8bit'),
+      unspecified_text_leading_bytes: String.new('\x00\xFE\x00', encoding: 'ascii-8bit'),
       index_range: (54..125)
     }.freeze
 
-
     attr_reader :card_num, :dir_path, :index, :type
 
     class << self
@@ -18,11 +18,11 @@ module AmdgpuFan
       # Return an array of connector objects for the provided card number.
       # The files are sorted to improve how they are displayed to the user.
       def where(card_num:)
-        Dir["/sys/class/drm/card#{card_num}/card#{card_num}-*"].sort.map do |dir_path|
-          Connector.new card_num: card_num,
-                        dir_path: dir_path,
+        Dir["/sys/class/drm/card#{card_num}/card#{card_num}-*"].map do |dir_path|
+          Connector.new card_num:,
+                        dir_path:,
                         index: dir_path[-1],
-                        type: dir_path.slice(/(?<=card#{card_num}-)[A-Z]+/)
+                        type: dir_path.slice(/(?<=card#{card_num}-)[A-z]+/)
         end
       end
     end
@@ -41,10 +41,7 @@ module AmdgpuFan
     def display_name
       return if edid.to_s.empty?
 
-      edid.slice(EDID_DESCRIPTORS_CONF[:index_range])
-          .scan(/(?<=#{EDID_DESCRIPTORS_CONF[:display_descriptor_leading_bytes]}).{1,13}/)
-          .first
-          .strip
+      (display_name_text + unspecified_text).join(' ').strip
     end
 
     def status
@@ -53,8 +50,22 @@ module AmdgpuFan
 
     private
 
+    def display_descriptors_raw
+      edid.slice EDID_DESCRIPTORS_CONF[:index_range]
+    end
+
+    def display_name_text
+      display_descriptors_raw
+        .scan(/(?<=#{EDID_DESCRIPTORS_CONF[:display_name_leading_bytes]}).{1,13}/)
+    end
+
     def edid
       File.read("#{dir_path}/edid", encoding: 'ascii-8bit')
     end
+
+    def unspecified_text
+      display_descriptors_raw
+        .scan(/(?<=#{EDID_DESCRIPTORS_CONF[:unspecified_text_leading_bytes]}).{1,13}/)
+    end
   end
 end

data/lib/amdgpu_fan/mixin/cli_output_format.rb

@@ -3,19 +3,35 @@
 module AmdgpuFan
   # A mixin to help with CLI output formatting
   module CliOutputFormat
-    METER_CHAR = '*'
+    METER_CHARS = [' ', *("\u2588".."\u258F").to_a.reverse].freeze
     TIME_FORMAT = '%F %T'
 
-    private
-
     def current_time
       Time.now.strftime(TIME_FORMAT)
     end
 
-    def percent_meter(percent, length = 10)
-      progress_bar_count = (length * percent.to_f / 100).round
-      percent_string = "#{format '%<num>0.2i', num: percent}%".ljust(3)
-      "[#{METER_CHAR * progress_bar_count}#{' ' * (length - progress_bar_count)}]#{percent_string}"
+    ##
+    # Return a string with meter and percentage for +percent+
+    #
+    def percent_meter(percent, width = 3)
+      meter_char_indexes = []
+      percent_portion_size = 100.0 / width
+      width.times do |i|
+        current_portion = percent.to_i - (percent_portion_size * i)
+
+        current_portion_percent = if current_portion >= percent_portion_size
+                                    1
+                                  elsif current_portion <= 0
+                                    0
+                                  else
+                                    current_portion / percent_portion_size
+                                  end
+
+        meter_char_indexes << ((METER_CHARS.length - 1) * current_portion_percent.to_f).round
+      end
+
+      percent_string = "#{format '%<num>0.2i', num: percent}%".ljust(4)
+      "#{percent_string}[#{meter_char_indexes.map { |i| METER_CHARS[i] }.join}]"
     end
 
     def radeon_logo

data/lib/amdgpu_fan/mixin/fan.rb

@@ -4,7 +4,6 @@ module AmdgpuFan
   ##
   # A mixin to read fan details and validate input
   module Fan
-
     private
 
     def fan_file(type)
@@ -37,7 +36,7 @@ module AmdgpuFan
     end
 
     def valid_fan_percent_speed?(percent)
-      (1..100.to_i).cover?(percent.to_i)
+      (1..(100.to_i)).cover?(percent.to_i)
     end
   end
 end

data/lib/amdgpu_fan/mixin/sys_write.rb

@@ -3,11 +3,10 @@
 module AmdgpuFan
   # A mixin to help with writing to system files
   module SysWrite
-
     private
 
     ##
-    # Write to a system file with elevated priviledges. 
+    # Write to a system file with elevated priviledges.
     def sudo_write(file_path, value)
       `echo "#{value}" | sudo tee #{file_path}`
     end

data/lib/amdgpu_fan/pci.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+# rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+
+require 'net/http'
+
+module AmdgpuFan
+  ## PCI
+  #
+  # Retrieve device information from PCI IDs.
+  # https://pci-ids.ucw.cz/
+  #
+  class PCI
+    TMP_FILE = '/tmp/pci.ids.txt'
+    URL = 'https://pci-ids.ucw.cz/v2.2/pci.ids'
+
+    ##
+    # Return the device name if available
+    #
+    def self.device_name(vendor_id, device_id, subdevice_id)
+      device = info.dig vendor_id, :devices, device_id
+
+      device.dig(subdevice_id, :name) || device[:name]
+    end
+
+    def self.vendor_name(vendor_id)
+      info.dig vendor_id, :name
+    end
+
+    def self.info
+      current_vendor_id = nil
+      current_device_id = nil
+
+      @info = raw.each_line.with_object({}) do |line, hash|
+        next if line.empty? || line.start_with?('#')
+
+        if line[0] =~ /(\d|[a-z])/
+          # Vendor line
+          current_vendor_id = line.split('  ').first.to_i(16)
+          vendor_name = line.split('  ').last.strip
+          hash[current_vendor_id] = { name: vendor_name, devices: {} }
+        elsif line[0..1] =~ /\t\w/
+          # Device line
+          current_device_id = line.split('  ').first.to_i(16)
+          device_name = line.split('  ').last.strip
+          hash[current_vendor_id][:devices][current_device_id] = { name: device_name }
+        elsif line[0..2] =~ /\t\t\w/
+          # Subvendor line
+          # subvendor_id = line.split(' ').first.to_i(16)
+          subdevice_id = line.split[1].to_i(16)
+          subdevice_name = line.split('  ')[1].strip
+          hash[current_vendor_id][:devices][current_device_id][subdevice_id] =
+            { name: subdevice_name }
+        end
+      end
+    end
+
+    def self.raw
+      File.write(TMP_FILE, Net::HTTP.get(URI(URL))) unless File.exist?(TMP_FILE)
+
+      @raw ||= File.read(TMP_FILE)
+    end
+  end
+end
+
+# rubocop:enable Metrics/AbcSize, Metrics/MethodLength

data/lib/amdgpu_fan/service.rb

@@ -4,6 +4,7 @@ require_relative 'mixin/fan'
 require_relative 'mixin/sys_write'
 
 require_relative 'connector'
+require_relative 'pci'
 
 module AmdgpuFan
   ## AmdgpuService
@@ -30,21 +31,31 @@ module AmdgpuFan
     end
 
     def connectors
-      @connectors ||= Connector.where card_num: card_num
+      @connectors ||= Connector.where card_num:
     end
 
     def core_clock
       clock_from_pp_file "#{base_card_dir}/pp_dpm_sclk"
     end
 
+    def display_names
+      connectors.map(&:display_name).compact
+    end
+
     def fan_mode
       FAN_MODES[File.read(fan_mode_file).strip] || 'unknown'
     end
 
+    ##
+    # Set the fan mode to auto or manual.
+    #
     def fan_mode=(mode)
       sudo_write fan_mode_file, FAN_MODES.key(mode.to_s)
     end
 
+    ##
+    # Set the fan speed to a percentage if <= 100 or a raw value
+    #
     def fan_speed=(value)
       if valid_fan_percent_speed?(value)
         new_raw = (value.to_f / 100 * fan_raw_speeds(:max).to_i).round
@@ -63,20 +74,37 @@ module AmdgpuFan
       (fan_speed_raw.to_f / fan_raw_speeds(:max).to_i * 100).round
     end
 
+    ##
+    # Return the fan speed in revolutions per minute
+    #
     def fan_speed_rpm
-      File.read(fan_file(:input)).strip
+      File.read(fan_file(:input)).strip.to_i
     end
 
+    ##
+    # Return the current memory clock speed.
+    #
     def memory_clock
       clock_from_pp_file "#{base_card_dir}/pp_dpm_mclk"
     end
 
+    ##
+    # Return the total memory on the card in bytes
+    #
     def memory_total
       File.read("#{base_card_dir}/mem_info_vram_total").to_i
     end
 
+    def model_id
+      @model_id ||= File.read(File.join(base_card_dir, '/subsystem_device')).gsub(/\A0x/, '').upcase
+    end
+
     def name
-      lspci_subsystem.split(': ')[1].strip
+      return 'Unknown' unless PCI.vendor_name(vendor_id)
+
+      [PCI.vendor_name(vendor_id),
+       PCI.device_name(vendor_id, device_id, subdevice_id) || 'unknown']
+        .join(' ')
     end
 
     def power_dpm_state
@@ -131,15 +159,11 @@ module AmdgpuFan
     end
 
     def clock_from_pp_file(file)
-      File.read(file).slice(/\w+(?= \*)/)
+      File.read(file).slice(/\w+(?= \*)/).to_i
     end
 
-    def gpu_pci_id
-      @gpu_pci_id ||= `lspci -v | grep VGA`.split(' ').first
-    end
-
-    def lspci_subsystem
-      @lspci_subsystem ||= `lspci -v -s #{gpu_pci_id} | grep "Subsystem:"`
+    def device_id
+      @device_id ||= File.read(File.join(base_card_dir, 'device')).to_i(16)
     end
 
     def power_avg_file
@@ -150,8 +174,16 @@ module AmdgpuFan
       (raw_string.strip.to_f / 1_000_000).round(2)
     end
 
+    def subdevice_id
+      @subdevice_id ||= File.read(File.join(base_card_dir, 'subsystem_device')).to_i(16)
+    end
+
     def temperature_file
       @temperature_file ||= Dir.glob("#{base_card_dir}/**/temp1_input").first
     end
+
+    def vendor_id
+      @vendor_id ||= File.read(File.join(base_card_dir, 'vendor')).to_i(16)
+    end
   end
 end

data/lib/amdgpu_fan/stat_set.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module AmdgpuFan
+  # A set of stats
+  class StatSet < Hash
+    attr_accessor :avg, :max, :min, :now
+    attr_reader :unit
+
+    def initialize(unit)
+      super
+      @unit = unit
+    end
+
+    def stats
+      { min: min, avg: avg, max: max, now: now }
+    end
+
+    ##
+    # Return a string containing all the stats with units.
+    #
+    def to_s
+      stats.map { |k, v| "#{k}: #{v.to_s.rjust(6)} #{unit.ljust(3)} " }.join
+    end
+  end
+end

data/lib/amdgpu_fan/version.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module AmdgpuFan
+  # Current version of RSpec Core, in semantic versioning format.
+  VERSION = '0.8.0'
+end

data/lib/amdgpu_fan/watcher.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'async'
+
+require_relative 'stat_set'
+
+module AmdgpuFan
+  # Keep track of stats over time.
+  class Watcher
+    attr_reader :core_clock, :fan_speed_rpm, :num_measurements, :memory_clock, :power_draw,
+                :temperature
+
+    def initialize(amdgpu_service)
+      @amdgpu_service = amdgpu_service
+      @num_measurements = 0
+
+      @core_clock = StatSet.new 'MHz'
+      @memory_clock = StatSet.new 'MHz'
+      @fan_speed_rpm = StatSet.new 'RPM'
+      @power_draw = StatSet.new 'W'
+      @temperature = StatSet.new '°C'
+    end
+
+    ##
+    # Take a new set of measurements and adjust the stats.
+    #
+    def measure
+      @num_measurements += 1
+
+      Async do |task|
+        %i[core_clock fan_speed_rpm memory_clock power_draw temperature].each do |stat|
+          task.async do
+            send(stat).now = amdgpu_service.send(stat)
+            calculate_stats(send(stat))
+          end
+        end
+      end
+    end
+
+    private
+
+    attr_reader :amdgpu_service
+
+    def calculate_stats(stat_set)
+      if num_measurements == 1
+        stat_set.min = stat_set.now
+        stat_set.avg = stat_set.now.to_f
+        stat_set.max = stat_set.now
+        return
+      end
+
+      stat_set.min = stat_set.now if stat_set.now < stat_set.min
+      stat_set.avg =
+        ((stat_set.now + (stat_set.avg * (num_measurements - 1))) / num_measurements.to_f)
+        .round(1)
+      stat_set.max = stat_set.now if stat_set.now > stat_set.max
+    end
+  end
+end

metadata

@@ -1,15 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: amdgpu_fan
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Kevin McCormack
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-15 00:00:00.000000000 Z
-dependencies: []
+date: 2022-01-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: async
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: A CLI for interacting with the amdgpu Linux driver
 email: harlemsquirrel@gmail.com
 executables:
@@ -20,18 +104,24 @@ files:
 - README.md
 - bin/amdgpu_fan
 - config/environment.rb
+- config/icons.yml
 - lib/amdgpu_fan.rb
 - lib/amdgpu_fan/cli.rb
 - lib/amdgpu_fan/connector.rb
 - lib/amdgpu_fan/mixin/cli_output_format.rb
 - lib/amdgpu_fan/mixin/fan.rb
 - lib/amdgpu_fan/mixin/sys_write.rb
+- lib/amdgpu_fan/pci.rb
 - lib/amdgpu_fan/service.rb
+- lib/amdgpu_fan/stat_set.rb
+- lib/amdgpu_fan/version.rb
+- lib/amdgpu_fan/watcher.rb
 homepage: https://github.com/HarlemSquirrel/amdgpu-fan-rb
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -39,15 +129,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: A CLI to view and set fan speeds for AMD graphics cards running on the open
   source amdgpu Linux driver