linux_stat 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56eb9d01b537db6e6dab3a6ee86a391a1076f63cc612ff961e33f7ab8c703129
-  data.tar.gz: 30a3f6df0c51dfb14c28fcbdd7d2298d4f13fa48e15ef9ef63ab13e0fd980e68
+  metadata.gz: 938eb126f7b43a731ec3d8de134f606411ff2245011eca7416782daaddd4220d
+  data.tar.gz: 8c171887831dcbd04b24f6301ba9a8450bc9510708c3c931aac6c256444b2477
 SHA512:
-  metadata.gz: 1f24a5a7fb1d8f32a2c35c7cbc5a7b9bb380efb33a2df23e269ea4ebac565f866b6a399a0361a3f4f325bad13be1b545d59726efccabb4d8d6f8045ed03c3fc6
-  data.tar.gz: 81c1c316b49aaab37f4e300eb597db3a3bcb538549fc6192d9661e7ca5022bd5b6942a257ced51760e2065d7aca82ae465f55e79202ba7a5f8c9e917f53f505c
+  metadata.gz: 362dfab83cc06f4b84eee112fd0e5ca405b75ad91c94639eed76c3961514ea56d75e6f263624140a08f64298b2a080753d247f2ee3ce7d3be3a9c0023e3d4d53
+  data.tar.gz: 14c6912aba0cf41e85fb6e79ba0c71496512b5b740db8457fe8af4f68588e06601170823a00ecab5fcef88e6c28feb8fcb98ee27c3c42bcff2ee11ac61a5194d

data/exe/linuxstat.rb

@@ -11,7 +11,7 @@ end
 T_FMT = '%d'.freeze
 
 # Check the number of iterations
-iterations = (ARGV.find { |x| x.to_i.to_s == x } || 1).to_i
+iterations = (ARGV.find { |x| LinuxStat::Misc.integer?(x) } || 1).to_i
 
 Integer.class_exec do
 	define_method(:clamp) { |min, max|
@@ -73,14 +73,14 @@ conflicting.each do |x, y, z|
 		rev = ARGV.reverse
 
 		if rev.index { |_x| _x[y] } < rev.index { |_x| _x[z] }
-			hash.merge!(o1 => true)
+			hash.store(o1, true)
 		else
-			hash.merge!(o2 => true)
+			hash.store(o2, true)
 		end
 	elsif m1
-		hash.merge!(o1 => true)
+		hash.store(o1, true)
 	elsif m2
-		hash.merge!(o2 => true)
+		hash.store(o2, true)
 	end
 end
 

data/ext/misc/integer/extconf.rb

@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile 'linux_stat/misc/integer'

data/ext/misc/integer/integer?.c

@@ -0,0 +1,63 @@
+/*
+	Validates if a String is integer or not.
+
+	Conditions:
+		- The String can start with - (negative)
+		- If the Argument is a BigInt or Integer, or anything else, return false
+		- The String cannot have anything other than 0 to 9
+		- The String can have leading zeroes and negative sign:
+			Example 1: "-00999" which translates to Ruby's -999 (decimal)
+			Example 2: "000999" translates to 999
+		- If it fails to determine, it returns nil instead of false
+		- It doesn't raise any error. Handing nil is enough to indicate that it failed.
+*/
+
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
+	#pragma GCC optimize ("O3")
+	#pragma GCC diagnostic warning "-Wall"
+#elif defined(__clang__)
+	#pragma clang optimize on
+	#pragma clang diagnostic warning "-Wall"
+#elif defined(__INTEL_COMPILER)
+	#pragma intel optimization_level 3
+#endif
+
+#include <limits.h>
+#include "ruby.h"
+
+VALUE isNumber(volatile VALUE obj, volatile VALUE val) {
+	// But we don't expect anything other than String though as Argument.
+	// Note that raising ArgumentError or any kind of Error shouldn't be done here
+	// Otherwise Integer(n) is the best method in Ruby.
+	if (!RB_TYPE_P(val, T_STRING))
+		return Qnil ;
+
+	char *str = StringValuePtr(val) ;
+	char ch = str[0] ;
+
+	// If the string is empty, return false
+	if (!ch) return Qfalse ;
+
+	unsigned char i = ch == '-' ? 1 : 0 ;
+	if (!str[i]) return Qfalse ;
+
+	unsigned char max = UCHAR_MAX ;
+
+	# pragma GCC unroll 4
+	while((ch = str[i++])) {
+		if (ch < 48 || ch > 57)
+			return Qfalse ;
+
+		if (i == max)
+			return Qnil ;
+	}
+
+	return Qtrue ;
+}
+
+void Init_integer() {
+	VALUE linuxStat = rb_define_module("LinuxStat") ;
+	VALUE misc = rb_define_module_under(linuxStat, "Misc") ;
+
+	rb_define_module_function(misc, "integer?", isNumber, 1) ;
+}

data/lib/linux_stat/battery.rb

@@ -308,7 +308,7 @@ module LinuxStat
 					ret[:charge_full_wh] = c_f_wh if c_f_wh
 					ret[:charge_percentage] = charge_percentage if charge_percentage
 
-					h.merge!(File.split(x)[-1].to_sym => ret)
+					h.store(File.split(x)[-1].to_sym, ret)
 				end
 				h
 			end

data/lib/linux_stat/cpu.rb

@@ -46,7 +46,8 @@ module LinuxStat
 					res = totald.-(idle_now - idle_then).fdiv(totald).abs.*(100)
 					res = res.nan? ? 0.0 : res > 100 ? 100.0 : res.round(2)
 
-					h.merge!( x => res )
+					h.store(x, res)
+					h
 				end
 			end
 
@@ -203,7 +204,7 @@ module LinuxStat
 
 				h = {}
 				@@cur_f.each { |id, file|
-					h.merge!(id => IO.read(file).to_i) if File.readable?(file)
+					h.store(id, IO.read(file).to_i) if File.readable?(file)
 				}
 
 				h
@@ -229,7 +230,7 @@ module LinuxStat
 
 				h = {}
 				@@min_f.each { |id, file|
-					h.merge!(id => IO.read(file).to_i) if File.readable?(file)
+					h.store(id, IO.read(file).to_i) if File.readable?(file)
 				}
 
 				h
@@ -251,7 +252,7 @@ module LinuxStat
 
 				h = {}
 				@@min_f.each { |id, file|
-					h.merge!(id => IO.read(file).to_i) if File.readable?(file)
+					h.store(id, IO.read(file).to_i) if File.readable?(file)
 				}
 
 				h
@@ -275,7 +276,7 @@ module LinuxStat
 
 				h = {}
 				@@scaling_g.each { |id, file|
-					h.merge!(id => IO.read(file).tap(&:strip!)) if File.readable?(file)
+					h.store(id, IO.read(file).tap(&:strip!)) if File.readable?(file)
 				}
 
 				h
@@ -297,14 +298,89 @@ module LinuxStat
 
 				h = {}
 				@@scaling_av_g.each { |id, file|
-					h.merge!(id => IO.read(file).split.each(&:strip!)) if File.readable?(file)
+					h.store(id, IO.read(file).split.each(&:strip!)) if File.readable?(file)
 				}
 
 				h
 			end
 
+			##
+			# Returns the number of physical cores on the system.
+			#
+			# The return value is an Array of Integers. Each number denoting the physical processor number.
+			# You can later use this to schedule tasks or something else (not provided by LinuxStat).
+			#
+			# However, if the information isn't available on /sys/devices/system/cpu[0-9]*/topology/thread_siblings_list, it will return an empty Array.
+			def physical_core_list
+				physical_cores = []
+				hyperthreaded = {}
+
+				entries = Dir.entries('/sys/devices/system/cpu/'.freeze)
+				entries.delete(?..freeze)
+				entries.delete('..'.freeze)
+
+				entries.each do |x|
+					if x[0..2] == 'cpu'.freeze && LinuxStat::Misc.integer?(x[3..-1])
+						file = "/sys/devices/system/cpu/#{x}/topology/thread_siblings_list"
+						next unless File.readable?(file)
+
+						data = IO.read(file)
+						data.strip!
+
+						val = data.split(?,.freeze).map(&:to_i)
+						val.shift
+
+						# Add items has for fast lookup.
+						# This hash includes all hyper threaded cores that doesn't map to anything.
+						# But this hash has the purpose to look up for items and not include in the list of physical_cores
+						# This is just an array, but can look for keys in O(1), so it's faster than ary.find() { ... }.
+						val.each { |x| hyperthreaded.store(x, nil) }
+
+						key = x[3..-1].to_i
+						physical_cores << key unless hyperthreaded.key?(key)
+					end
+				end
+
+				physical_cores
+			end
+
+			##
+			# Returns the number of physical cores on the system.
+			#
+			# The return value is an Array of Integers. Each number denoting the hyperthreaded processor number.
+			# You can later use this to schedule tasks or something else (not provided by LinuxStat).
+			#
+			# However, if the information isn't available on /sys/devices/system/cpu[0-9]*/topology/thread_siblings_list, it will return an empty Array.
+			def hyperthreaded_core_list
+				hyperthreaded = {}
+
+				entries = Dir.entries('/sys/devices/system/cpu/'.freeze)
+				entries.delete(?..freeze)
+				entries.delete('..'.freeze)
+
+				entries.each do |x|
+					if x[0..2] == 'cpu'.freeze && LinuxStat::Misc.integer?(x[3..-1])
+						file = "/sys/devices/system/cpu/#{x}/topology/thread_siblings_list"
+						next unless File.readable?(file)
+
+						data = IO.read(file)
+						data.strip!
+
+						val = data.split(?,.freeze).map(&:to_i)
+						val.shift
+
+						# Add items has for fast lookup to get rid of duplicate items.
+						val.each { |x| hyperthreaded.store(x, nil) unless hyperthreaded.key?(x) }
+					end
+				end
+
+				hyperthreaded.keys
+			end
+
 			alias usages stat
 			alias usage total_usage
+			alias physical_cores physical_core_list
+			alias hyperthreaded_cores hyperthreaded_core_list
 
 			private
 			def cpuinfo

data/lib/linux_stat/mounts.rb

@@ -58,7 +58,7 @@ module LinuxStat
 			def tmpfs
 				ret = {}
 				mounts.each { |x|
-					ret.merge!({x.split[1] => x}) if x.start_with?('tmpfs '.freeze)
+					ret.store(x.split[1], x) if x.start_with?('tmpfs '.freeze)
 				}
 				ret
 			end
@@ -115,7 +115,7 @@ module LinuxStat
 
 					unless x.empty?
 						_x = x.split
-						m.merge!(_x[0] => _x[1])
+						m.store(_x[0], _x[1])
 					end
 				end
 				m
@@ -146,7 +146,7 @@ module LinuxStat
 						_x = x.split
 						total, free, available, used = fs_info(_x[1])
 
-						m.merge!(_x[0] => {
+						m.store(_x[0], {
 							mountpoint: _x[1],
 
 							total: total,

data/lib/linux_stat/net.rb

@@ -120,8 +120,8 @@ module LinuxStat
 
 					r.each_with_index { |x, i|
 						downcased = x.downcase
-						h.merge!(:r => i) if downcased.start_with?('receive'.freeze)
-						h.merge!(:t => i) if downcased.start_with?('transmit'.freeze)
+						h.store(:r, i) if downcased.start_with?('receive'.freeze)
+						h.store(:t, i) if downcased.start_with?('transmit'.freeze)
 					}
 
 					data_0 = data.next.gsub(?|.freeze, ' %'.freeze)

data/lib/linux_stat/os.rb

@@ -234,7 +234,8 @@ module LinuxStat
 					value[0] = ''.freeze if value[0] == ?".freeze
 					value[-1] = ''.freeze if value[-1] == ?".freeze
 
-					h.merge!( key.to_sym => value )
+					h.store(key.to_sym, value)
+					h
 				}
 			end
 		end

data/lib/linux_stat/pci.rb

@@ -76,7 +76,7 @@ module LinuxStat
 						kernel_driver: kernel_driver
 					}
 
-					ret.merge!(hwdata: query) unless query.empty?
+					ret.store(:hwdata, query) unless query.empty?
 
 					ret
 				}
@@ -186,14 +186,14 @@ module LinuxStat
 							vendor: vendor, device: device
 						}
 
-						ret.merge!(sub_vendor: sub_vendor) if sub_vendor
-						ret.merge!(sub_device: sub_device) if sub_device
+						ret.store(:sub_vendor, sub_vendor) if sub_vendor
+						ret.store(:sub_device, sub_device) if sub_device
 
-						ret.merge!(kernel_driver: kernel_driver) if kernel_driver
-						ret.merge!(revision: revision) unless revision.empty?
-						ret.merge!(irq: irq) if irq
-						ret.merge!(enable: enable) unless enable.nil?
-						ret.merge!(hwdata: query) unless query.empty?
+						ret.store(:kernel_driver, kernel_driver) if kernel_driver
+						ret.store(:revision, revision) unless revision.empty?
+						ret.store(:irq, irq) if irq
+						ret.store(:enable, enable) unless enable.nil?
+						ret.store(:hwdata, query) unless query.empty?
 
 						ret
 					rescue StandardError
@@ -355,7 +355,7 @@ module LinuxStat
 
 					if sub_vendor_id && sub_device_id
 						sub_product = vendor.dig(1, product_id, 1, sub_vendor_id, sub_device_id)
-						ret.merge!(sub_system: sub_product) if sub_product
+						ret.store(:sub_system, sub_product) if sub_product
 					end
 
 					ret

data/lib/linux_stat/process.rb

@@ -33,7 +33,7 @@ module LinuxStat
 					x = l[i]
 
 					begin
-						h.merge!( x => IO.read("/proc/#{x}/comm").strip)
+						h.store(x, IO.read("/proc/#{x}/comm").strip)
 					rescue StandardError
 					end
 				end
@@ -56,7 +56,7 @@ module LinuxStat
 					begin
 						cmdlines = IO.read("/proc/#{x}/cmdline").strip
 						cmdlines.gsub!(?\u0000.freeze, ?\s.freeze)
-						h.merge!(x => cmdlines)
+						h.store(x, cmdlines)
 					rescue StandardError
 					end
 				end
@@ -75,7 +75,7 @@ module LinuxStat
 					x = l[i]
 
 					begin
-						h.merge!(x =>
+						h.store(x,
 							case LinuxStat::ProcFS.ps_state(x)
 								when ?S.freeze then :sleeping
 								when ?I.freeze then :idle

data/lib/linux_stat/process_info.rb

@@ -36,7 +36,7 @@ module LinuxStat
 
 					if x[/^(read|write)_bytes:\s*\d*$/]
 						splitted = x.split
-						out.merge!(splitted[0].split(?:)[0].to_sym => splitted[-1].to_i)
+						out.store(splitted[0].split(?:)[0].to_sym, splitted[-1].to_i)
 					end
 				}
 

data/lib/linux_stat/swap.rb

@@ -13,7 +13,8 @@ module LinuxStat
 				file = IO.readlines('/proc/swaps'.freeze).drop(1)
 				file.reduce({}) do |h, x|
 					name, *stats = x.strip.split
-					h.merge!(name => stats.map! { |v| v.to_i.to_s == v ? v.to_i : v.to_sym })
+					h.store(name, stats.map! { |v| LinuxStat::Misc.integer?(v) ? v.to_i : v.to_sym })
+					h
 				end
 			end
 

data/lib/linux_stat/thermal.rb

@@ -107,10 +107,10 @@ module LinuxStat
 
 					h = {path: path, name: name}
 
-					h.merge!(label: label) if label
-					h.merge!(key => value)
-					h.merge!(temp_crit: temp_crit) if temp_crit
-					h.merge!(temp_crit: temp_max) if temp_max
+					h.store(:label, label) if label
+					h.store(key, value)
+					h.store(:temp_crit, temp_crit) if temp_crit
+					h.store(:temp_crit, temp_max) if temp_max
 
 					ret.push(h)
 				end

data/lib/linux_stat/usb.rb

@@ -102,20 +102,20 @@ module LinuxStat
 							vendor_id: id_vendor, product_id: id_product
 						}
 
-						ret.merge!(bus_num: bus_num.to_i) unless bus_num.empty?
-						ret.merge!(dev_num: dev_num.to_i) unless dev_num.empty?
+						ret.store(:bus_num, bus_num.to_i) unless bus_num.empty?
+						ret.store(:dev_num, dev_num.to_i) unless dev_num.empty?
 
-						ret.merge!(serial: serial) unless serial.empty?
+						ret.store(:serial, serial) unless serial.empty?
 
-						ret.merge!(hwdata: query) unless query.empty?
-						ret.merge!(product: product) unless product.empty?
-						ret.merge!(manufacturer: manufacturer) unless manufacturer.empty?
+						ret.store(:hwdata, query) unless query.empty?
+						ret.store(:product, product) unless product.empty?
+						ret.store(:manufacturer, manufacturer) unless manufacturer.empty?
 
-						ret.merge!(removable: is_removable) unless is_removable.nil?
-						ret.merge!(authorized: authorized == 1)
+						ret.store(:removable, is_removable) unless is_removable.nil?
+						ret.store(:authorized, authorized == 1)
 
-						ret.merge!(b_max_power: b_max_power) unless b_max_power.empty?
-						ret.merge!(b_max_packet_size0: b_max_packet_size0) if b_max_packet_size0
+						ret.store(:b_max_power, b_max_power) unless b_max_power.empty?
+						ret.store(:b_max_packet_size0, b_max_packet_size0) if b_max_packet_size0
 
 						ret
 					rescue StandardError

data/lib/linux_stat/user.rb

@@ -25,9 +25,11 @@ module LinuxStat
 			def ids
 				return {} unless passwd_readable?
 				passwd_splitted.reduce({}) { |h, x|
-					h.merge!(x[0].to_sym => {
+					h.store(x[0].to_sym, {
 						uid: x[2].to_i, gid: x[3].to_i
 					})
+
+					h
 				}
 			end
 
@@ -42,8 +44,10 @@ module LinuxStat
 			def uids
 				return {} unless passwd_readable?
 				passwd_splitted.reduce({}) { |h, x|
-					h.merge!(x[0].to_sym => x[2].to_i)
+					h.store(x[0].to_sym, x[2].to_i)
+					h
 				}
+
 			end
 
 			##
@@ -59,7 +63,8 @@ module LinuxStat
 				return {} unless passwd_readable?
 
 				passwd_splitted.reduce({}) { |h, x|
-					h.merge!(x[0].to_sym => x[3].to_i)
+					h.store(x[0].to_sym, x[3].to_i)
+					h
 				}
 			end
 
@@ -76,7 +81,8 @@ module LinuxStat
 				return {} unless passwd_readable?
 				passwd.reduce({}) { |h, x|
 					splitted = x.split(?:)
-					h.merge!(splitted[0].to_sym => splitted[5])
+					h.store(splitted[0].to_sym, splitted[5])
+					h
 				}
 			end
 

data/lib/linux_stat/version.rb

@@ -1,3 +1,3 @@
 module LinuxStat
-	VERSION = "2.4.0"
+	VERSION = "2.5.0"
 end

data/lib/linux_stat.rb

@@ -15,6 +15,7 @@
 
 # Miscellaneous Modules
 # Independed and LinuxStat's miscellaneous modules
+require 'linux_stat/misc/integer'
 require 'linux_stat/prettify_bytes'
 require "linux_stat/version"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linux_stat
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
+date: 2021-10-23 00:00:00.000000000 Z
 dependencies: []
 description: Linux only, efficient linux system utilization reporting and system monitoring
   gem
@@ -18,6 +18,7 @@ executables:
 - linuxstat.rb
 extensions:
 - ext/fs_stat/extconf.rb
+- ext/misc/integer/extconf.rb
 - ext/nproc/extconf.rb
 - ext/procfs/extconf.rb
 - ext/sysconf/extconf.rb
@@ -35,6 +36,8 @@ files:
 - ext/fs_stat/extconf.rb
 - ext/fs_stat/fs_stat.c
 - ext/fs_stat/sector_size.h
+- ext/misc/integer/extconf.rb
+- ext/misc/integer/integer?.c
 - ext/nproc/extconf.rb
 - ext/nproc/nproc.c
 - ext/procfs/extconf.rb
@@ -87,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.21
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Efficient linux system reporting gem