amdgpu_fan 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a499ce52639612b25843b04c3497c7c36f23f3a960d0946b7dc2e249e9a18874
-  data.tar.gz: fa87ca342988d97a91773b1272829a3b825b88dbd65420d6abd26fed8d97ac92
+  metadata.gz: 1fb09354467c6ffeb603c4cbc72b131c626e83d4403148ebeb5fac342222ac29
+  data.tar.gz: b62420cbf660f704682f34565128c749216bb5605b3d57b843f4bc85671aa09c
 SHA512:
-  metadata.gz: 06b3bd73191b39da57ac9c14e7ada8fa2cf1a069e8401f45af10eab6ede0bf79a5ebd2f80ba5c464e60f960e24d11783cf20d698c640a38e36c80846b305772e
-  data.tar.gz: 794e28fd6ae71a898b1e897a0fd612add4585e901ece8bc3928e62de9d8245107767848352fe7203d4aa5b6ec60c4e78b28523cc0c893d4d0bcb2f67fdd52044
+  metadata.gz: f9a94891e8024c9e2c58c46feb4b7654e69978a9215278d9588065db177e8df447670cad9be726f608f16bd77f4a26e2a05fe16c536ce42bce0c9242489d2b43
+  data.tar.gz: 8046858789272ed17ce75304f53ee3915973193bc81bd301335448456c99bd8d4d774962668b2b98388a24301e158d4cffb18a65a28d27c7fd45c130c639740d

data/config/environment.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'async'
 require 'thor'
 
 require_relative '../lib/amdgpu_fan'

data/lib/amdgpu_fan/cli.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/AbcSize, Metrics/ClassLength, Metrics/MethodLength
+
 require 'yaml'
 
 module AmdgpuFan
@@ -56,18 +58,19 @@ module AmdgpuFan
     desc 'status [--logo]', 'View device info, current fan speed, and temperature.'
     def status(option = nil)
       puts radeon_logo if option == '--logo'
-      puts ICONS[:gpu] + ' GPU:'.ljust(9) + amdgpu_service.name,
-           ICONS[:vbios] + ' vBIOS:'.ljust(9) + amdgpu_service.vbios_version,
-           ICONS[:display] + ' Displays:' + amdgpu_service.display_names.join(', '),
-           ICONS[:clock] + ' Clocks:'.ljust(9) + clock_status,
-           ICONS[:memory] + ' Memory:'.ljust(9) + mem_total_mibibyes,
-           ICONS[:fan] + ' Fan:'.ljust(9) + fan_status,
-           ICONS[:temp] + ' Temp:'.ljust(9) + "#{amdgpu_service.temperature}°C",
-           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}%)",
-           ICONS[:load] + ' 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.'
@@ -76,7 +79,7 @@ module AmdgpuFan
     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)
 
@@ -120,21 +123,21 @@ module AmdgpuFan
         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.to_s,
-             ICONS[:memory] + ' Memory clk  ' + watcher.mem_clock.to_s,
-             ICONS[:fan] +    ' Fan speed   ' + watcher.fan_speed.to_s,
-             ICONS[:power] +  ' Power usage ' + watcher.power.to_s,
-             ICONS[:temp] +   ' Temperature ' + watcher.temp.to_s
+        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
@@ -142,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
@@ -165,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
@@ -177,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
@@ -201,3 +210,5 @@ module AmdgpuFan
     end
   end
 end
+
+# rubocop:enable Metrics/AbcSize, Metrics/ClassLength, Metrics/MethodLength

data/lib/amdgpu_fan/connector.rb

@@ -18,9 +18,9 @@ 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]+/)
         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

@@ -36,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/pci.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+
 require 'net/http'
 
 module AmdgpuFan
@@ -44,8 +46,8 @@ module AmdgpuFan
           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)
+          # 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 }
@@ -60,3 +62,5 @@ module AmdgpuFan
     end
   end
 end
+
+# rubocop:enable Metrics/AbcSize, Metrics/MethodLength

data/lib/amdgpu_fan/service.rb

@@ -31,7 +31,7 @@ module AmdgpuFan
     end
 
     def connectors
-      @connectors ||= Connector.where card_num: card_num
+      @connectors ||= Connector.where card_num:
     end
 
     def core_clock
@@ -78,7 +78,7 @@ module AmdgpuFan
     # 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
 
     ##
@@ -159,7 +159,7 @@ module AmdgpuFan
     end
 
     def clock_from_pp_file(file)
-      File.read(file).slice(/\w+(?= \*)/)
+      File.read(file).slice(/\w+(?= \*)/).to_i
     end
 
     def device_id

data/lib/amdgpu_fan/stat_set.rb

@@ -7,6 +7,7 @@ module AmdgpuFan
     attr_reader :unit
 
     def initialize(unit)
+      super
       @unit = unit
     end
 

data/lib/amdgpu_fan/version.rb

@@ -2,5 +2,5 @@
 
 module AmdgpuFan
   # Current version of RSpec Core, in semantic versioning format.
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/lib/amdgpu_fan/watcher.rb

@@ -1,21 +1,24 @@
 # 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, :num_measurements, :mem_clock, :power, :temp
+    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'
-      @mem_clock = StatSet.new 'MHz'
-      @fan_speed = StatSet.new 'RPM'
-      @power = StatSet.new 'W'
-      @temp = StatSet.new '°C'
+      @memory_clock = StatSet.new 'MHz'
+      @fan_speed_rpm = StatSet.new 'RPM'
+      @power_draw = StatSet.new 'W'
+      @temperature = StatSet.new '°C'
     end
 
     ##
@@ -24,19 +27,20 @@ module AmdgpuFan
     def measure
       @num_measurements += 1
 
-      @core_clock.now = @amdgpu_service.core_clock.to_i
-      @mem_clock.now = @amdgpu_service.memory_clock.to_i
-      @fan_speed.now = @amdgpu_service.fan_speed_rpm.to_i
-      @power.now = @amdgpu_service.power_draw.to_f
-      @temp.now = @amdgpu_service.temperature.to_i
-
-      [@core_clock, @mem_clock, @fan_speed, @power, @temp].each do |stat_set|
-        calculate_stats(stat_set)
+      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
@@ -47,7 +51,7 @@ module AmdgpuFan
 
       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)
+        ((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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: amdgpu_fan
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Kevin McCormack
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+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
@@ -52,6 +66,34 @@ dependencies:
     - - ">="
       - !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:
@@ -77,7 +119,8 @@ files:
 homepage: https://github.com/HarlemSquirrel/amdgpu-fan-rb
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -86,14 +129,14 @@ 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
+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