linux_stat 2.2.3 → 2.5.1

data/ext/procfs/statm.h

@@ -1,6 +1,6 @@
 #define PAGESIZE sysconf(_SC_PAGESIZE)
 
-VALUE statm(VALUE obj, VALUE pid) {
+static VALUE statm(volatile VALUE obj, volatile VALUE pid) {
 	VALUE hash = rb_hash_new() ;
 
 	int _pid = FIX2INT(pid) ;
@@ -34,7 +34,7 @@ VALUE statm(VALUE obj, VALUE pid) {
 	return hash ;
 }
 
-VALUE statm_virtual(VALUE obj, VALUE pid) {
+static VALUE statm_virtual(volatile VALUE obj, volatile VALUE pid) {
 	int _pid = FIX2INT(pid) ;
 	if (_pid < 0) return Qnil ;
 
@@ -52,7 +52,7 @@ VALUE statm_virtual(VALUE obj, VALUE pid) {
 	return UINT2NUM(_virtual * PAGESIZE) ;
 }
 
-VALUE statm_resident(VALUE obj, VALUE pid) {
+static VALUE statm_resident(volatile VALUE obj, volatile VALUE pid) {
 	int _pid = FIX2INT(pid) ;
 	if (_pid < 0) return Qnil ;
 
@@ -70,7 +70,7 @@ VALUE statm_resident(VALUE obj, VALUE pid) {
 	return UINT2NUM(resident * PAGESIZE) ;
 }
 
-VALUE statm_shared(VALUE obj, VALUE pid) {
+static VALUE statm_shared(volatile VALUE obj, volatile VALUE pid) {
 	int _pid = FIX2INT(pid) ;
 	if (_pid < 0) return Qnil ;
 
@@ -88,7 +88,7 @@ VALUE statm_shared(VALUE obj, VALUE pid) {
 	return UINT2NUM(shared * PAGESIZE) ;
 }
 
-VALUE statm_memory(VALUE obj, VALUE pid) {
+static VALUE statm_memory(volatile VALUE obj, volatile VALUE pid) {
 	int _pid = FIX2INT(pid) ;
 	if (_pid < 0) return Qnil ;
 

data/ext/procfs/uptime.h

@@ -1,4 +1,4 @@
-VALUE uptime_f(VALUE obj) {
+static VALUE uptime_f(volatile VALUE obj) {
 	FILE *f = fopen("/proc/uptime", "r") ;
 	if (!f) return Qnil ;
 

data/ext/sysconf/sysconf.c

@@ -11,103 +11,103 @@
 	#pragma intel optimization_level 3
 #endif
 
-static VALUE getTick(VALUE obj) {
+static VALUE getTick(volatile VALUE obj) {
 	int val = sysconf(_SC_CLK_TCK) ;
 	if (val < 0) return Qnil ;
 
 	return INT2FIX(val) ;
 }
 
-static VALUE getChildMax(VALUE obj) {
+static VALUE getChildMax(volatile VALUE obj) {
 	long long int val = sysconf(_SC_CHILD_MAX) ;
 	if (val < 0) return Qnil ;
 
 	return LL2NUM(val) ;
 }
 
-static VALUE getHostnameMax(VALUE obj) {
+static VALUE getHostnameMax(volatile VALUE obj) {
 	long long val = sysconf(_SC_HOST_NAME_MAX) ;
 	if (val < 0) return Qnil ;
 
 	return LL2NUM(val) ;
 }
 
-static VALUE getLoginNameMax(VALUE obj) {
+static VALUE getLoginNameMax(volatile VALUE obj) {
 	long long val = sysconf(_SC_LOGIN_NAME_MAX) ;
 	if (val < 0) return Qnil ;
 
 	return LL2NUM(val) ;
 }
 
-static VALUE getOpenMax(VALUE obj) {
+static VALUE getOpenMax(volatile VALUE obj) {
 	long long val = sysconf(_SC_OPEN_MAX) ;
 	if (val < 0) return Qnil ;
 
 	return LL2NUM(val) ;
 }
 
-static VALUE getPageSize(VALUE obj) {
+static VALUE getPageSize(volatile VALUE obj) {
 	int val = sysconf(_SC_PAGESIZE) ;
 	if (val < 0) return Qnil ;
 
 	return INT2FIX(val) ;
 }
 
-static VALUE getStreamMax(VALUE obj) {
+static VALUE getStreamMax(volatile VALUE obj) {
 	long long val = sysconf(_SC_STREAM_MAX) ;
 	if (val < 0) return Qnil ;
 
 	return LL2NUM(val) ;
 }
 
-static VALUE getTTYNameMax(VALUE obj) {
+static VALUE getTTYNameMax(volatile VALUE obj) {
 	long long val = sysconf(_SC_TTY_NAME_MAX) ;
 	if (val < 0) return Qnil ;
 
 	return LL2NUM(val) ;
 }
 
-static VALUE getPosixVersion(VALUE obj) {
+static VALUE getPosixVersion(volatile VALUE obj) {
 	long long val = sysconf(_SC_VERSION) ;
 	if (val < 0) return Qnil ;
 
 	return LL2NUM(val) ;
 }
 
-static VALUE getLineMax(VALUE obj) {
+static VALUE getLineMax(volatile VALUE obj) {
 	long long val = sysconf(_SC_LINE_MAX) ;
 	if (val < 0) return Qnil ;
 
 	return LL2NUM(val) ;
 }
 
-static VALUE getExprNestMax(VALUE obj) {
+static VALUE getExprNestMax(volatile VALUE obj) {
 	long long val = sysconf(_SC_EXPR_NEST_MAX) ;
 	if (val < 0) return Qnil ;
 
 	return LL2NUM(val) ;
 }
 
-static VALUE getProcessorConfigured(VALUE obj) {
+static VALUE getProcessorConfigured(volatile VALUE obj) {
 	long val = sysconf(_SC_NPROCESSORS_CONF) ;
 	if (val < 0) return Qnil ;
 
 	return LONG2NUM(val) ;
 }
 
-static VALUE getProcessorOnline(VALUE obj) {
+static VALUE getProcessorOnline(volatile VALUE obj) {
 	long val = sysconf(_SC_NPROCESSORS_ONLN) ;
 	if (val < 0) return Qnil ;
 
 	return LONG2NUM(val) ;
 }
 
-static VALUE getUser(VALUE obj) {
+static VALUE getUser(volatile VALUE obj) {
 	char *name = getlogin() ;
 	return name ? rb_str_new_cstr(name) : rb_str_new_cstr("") ;
 }
 
-static VALUE getUID(VALUE obj) {
+static VALUE getUID(volatile VALUE obj) {
 	return UINT2NUM((unsigned int) getuid()) ;
 }
 
@@ -115,11 +115,11 @@ static VALUE getGID(VALUE obj) {
 	return UINT2NUM((unsigned int) getgid()) ;
 }
 
-static VALUE getEUID(VALUE obj) {
+static VALUE getEUID(volatile VALUE obj) {
 	return UINT2NUM((unsigned int) geteuid()) ;
 }
 
-static VALUE getHostname(VALUE obj) {
+static VALUE getHostname(volatile VALUE obj) {
 	int h_max = sysconf(_SC_HOST_NAME_MAX) + 1 ;
 	char hostname[h_max] ;
 

data/ext/sysinfo/sysinfo.c

@@ -13,7 +13,7 @@
 
 static struct sysinfo info ;
 
-VALUE totalram(VALUE obj) {
+static VALUE totalram(volatile VALUE obj) {
 	char status = sysinfo(&info) ;
 	if (status < 0) return Qnil ;
 
@@ -22,7 +22,7 @@ VALUE totalram(VALUE obj) {
 	return rb_funcallv_public(_rb_v, rb_intern("*"), 1, &_rb_mem_unit) ;
 }
 
-VALUE freeram(VALUE obj) {
+static VALUE freeram(volatile VALUE obj) {
 	char status = sysinfo(&info) ;
 	if (status < 0) return Qnil ;
 
@@ -31,7 +31,7 @@ VALUE freeram(VALUE obj) {
 	return rb_funcallv_public(_rb_v, rb_intern("*"), 1, &_rb_mem_unit) ;
 }
 
-VALUE sharedram(VALUE obj) {
+static VALUE sharedram(volatile VALUE obj) {
 	char status = sysinfo(&info) ;
 	if (status < 0) return Qnil ;
 
@@ -40,7 +40,7 @@ VALUE sharedram(VALUE obj) {
 	return rb_funcallv_public(_rb_v, rb_intern("*"), 1, &_rb_mem_unit) ;
 }
 
-VALUE bufferram(VALUE obj) {
+static VALUE bufferram(volatile VALUE obj) {
 	char status = sysinfo(&info) ;
 	if (status < 0) return Qnil ;
 
@@ -49,7 +49,7 @@ VALUE bufferram(VALUE obj) {
 	return rb_funcallv_public(_rb_v, rb_intern("*"), 1, &_rb_mem_unit) ;
 }
 
-VALUE totalswap(VALUE obj) {
+static VALUE totalswap(volatile VALUE obj) {
 	static struct sysinfo info ;
 	char status = sysinfo(&info) ;
 	if (status < 0) return Qnil ;
@@ -59,7 +59,7 @@ VALUE totalswap(VALUE obj) {
 	return rb_funcallv_public(_rb_v, rb_intern("*"), 1, &_rb_mem_unit) ;
 }
 
-VALUE freeswap(VALUE obj) {
+static VALUE freeswap(volatile VALUE obj) {
 	char status = sysinfo(&info) ;
 	if (status < 0) return Qnil ;
 
@@ -68,7 +68,7 @@ VALUE freeswap(VALUE obj) {
 	return rb_funcallv_public(_rb_v, rb_intern("*"), 1, &_rb_mem_unit) ;
 }
 
-VALUE totalhigh(VALUE obj) {
+static VALUE totalhigh(volatile VALUE obj) {
 	char status = sysinfo(&info) ;
 	if (status < 0) return Qnil ;
 
@@ -77,7 +77,7 @@ VALUE totalhigh(VALUE obj) {
 	return rb_funcallv_public(_rb_v, rb_intern("*"), 1, &_rb_mem_unit) ;
 }
 
-VALUE freehigh(VALUE obj) {
+static VALUE freehigh(volatile VALUE obj) {
 	char status = sysinfo(&info) ;
 	if (status < 0) return Qnil ;
 
@@ -86,7 +86,7 @@ VALUE freehigh(VALUE obj) {
 	return rb_funcallv_public(_rb_v, rb_intern("*"), 1, &_rb_mem_unit) ;
 }
 
-VALUE uptime(VALUE obj) {
+static VALUE uptime(volatile VALUE obj) {
 	char status = sysinfo(&info) ;
 	if (status < 0) return Qnil ;
 
@@ -94,7 +94,7 @@ VALUE uptime(VALUE obj) {
 	return ULL2NUM((unsigned long long) v) ;
 }
 
-VALUE loads(VALUE obj) {
+static VALUE loads(volatile VALUE obj) {
 	char status = sysinfo(&info) ;
 	if(status < 0) return rb_ary_new() ;
 
@@ -112,7 +112,7 @@ VALUE loads(VALUE obj) {
 }
 
 // Some people may need this function, just keep it to not make unnecessary calls
-VALUE sysinfoStat(VALUE obj) {
+static VALUE sysinfoStat(volatile VALUE obj) {
 	char status = sysinfo(&info) ;
 	VALUE hash = rb_hash_new() ;
 	if (status < 0) return hash ;

data/ext/utsname/utsname.c

@@ -28,23 +28,23 @@ void init_buf() {
 	}
 }
 
-static VALUE getSysname(VALUE obj) {
+static VALUE getSysname(volatile VALUE obj) {
 	return rb_str_new_cstr(sysname) ;
 }
 
-static VALUE getNodename(VALUE obj) {
+static VALUE getNodename(volatile VALUE obj) {
 	return rb_str_new_cstr(nodename) ;
 }
 
-static VALUE getRelease(VALUE obj) {
+static VALUE getRelease(volatile VALUE obj) {
 	return rb_str_new_cstr(release) ;
 }
 
-static VALUE getVersion(VALUE obj) {
+static VALUE getVersion(volatile VALUE obj) {
 	return rb_str_new_cstr(version) ;
 }
 
-static VALUE getMachine(VALUE obj) {
+static VALUE getMachine(volatile VALUE obj) {
 	return rb_str_new_cstr(machine) ;
 }
 

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

@@ -21,24 +21,53 @@ module LinuxStat
 			#
 			#    => {0=>84.38, 1=>100.0, 2=>50.0, 3=>87.5, 4=>87.5}
 			#
+			# It discards any offline CPU or disabled CPU.
+			# For example, if your system CPU has 4 cores, and you disabled core 3, the output will be:
+			#    LinuxStat::CPU.stat
+			#
+			#    => {0=>26.67, 1=>0.0, 2=>20.0, 4=>20.0}
+			#
 			# If the information is not available, it will return an empty Hash
 			def stat(sleep = ticks_to_ms_t5)
 				return {} unless stat?
 
-				data = IO.readlines('/proc/stat'.freeze).select { |x| x[/^cpu\d*/] }.map! { |x| x.split.map!(&:to_f) }
+				data = IO.readlines('/proc/stat'.freeze).select { |x| x[/^cpu\d*/] }
+				cpu_names1 = []
+				data.map! { |x|
+					splitted = x.split
+					name = splitted.shift[/\d*$/]
+					cpu_names1.push(name.empty? ? 0 : name.to_i + 1)
+					splitted.map!(&:to_f)
+				}
+
 				sleep(sleep)
-				data2 = IO.readlines('/proc/stat'.freeze).select { |x| x[/^cpu\d*/] }.map! { |x| x.split.map!(&:to_f) }
+				data2 = IO.readlines('/proc/stat'.freeze).select { |x| x[/^cpu\d*/] }
+
+				cpu_names2 = []
+				data2.map! { |x|
+					splitted = x.split
+					name = splitted.shift[/\d*$/]
+					cpu_names2.push(name.empty? ? 0 : name.to_i + 1)
+					splitted.map!(&:to_f)
+				}
 
 				# On devices like android, the core count can change anytime (hotplugging).
 				# I had crashes on Termux.
 				# So better just count the min number of CPU and iterate over that
 				# If data.length is smaller than data2.length, we don't have enough data to compare.
-				dl, d2l = data.length, data2.length
-				min = dl > d2l ? d2l : dl
+				dl, d2l = cpu_names1.length, cpu_names2.length
+				if dl > d2l
+					min = d2l
+					cpu_cores = cpu_names2
+				else
+					min = dl
+					cpu_cores = cpu_names1
+				end
 
 				min.times.reduce({}) do |h, x|
-					user, nice, sys, idle, iowait, irq, softirq, steal = *data[x].drop(1)
-					user2, nice2, sys2, idle2, iowait2, irq2, softirq2, steal2 = *data2[x].drop(1)
+					cpu_core = cpu_cores[x]
+					user, nice, sys, idle, iowait, irq, softirq, steal = *data[x]
+					user2, nice2, sys2, idle2, iowait2, irq2, softirq2, steal2 = *data2[x]
 
 					idle_then, idle_now  = idle + iowait, idle2 + iowait2
 					totald = idle_now.+(user2 + nice2 + sys2 + irq2 + softirq2 + steal2) - idle_then.+(user + nice + sys + irq + softirq + steal)
@@ -46,7 +75,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(cpu_core, res)
+					h
 				end
 			end
 
@@ -203,12 +233,16 @@ 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
 			end
 
+			def times
+				LinuxStat::ProcFS.cpu_times
+			end
+
 			##
 			# Returns a Hash with max core frequencies corresponding to the CPUs.
 			#
@@ -225,7 +259,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
@@ -247,7 +281,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
@@ -271,7 +305,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
@@ -293,14 +327,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/filesystem.rb

@@ -110,6 +110,51 @@ module LinuxStat
 			def stat_raw(fs = ?..freeze)
 				LinuxStat::FS.stat(fs)
 			end
+
+			def sector_size(path = LinuxStat::Mounts.root)
+				LinuxStat::FS.sectors(path)
+			end
+
+			def io_total(path = LinuxStat::Mounts.root)
+				p = File.split(path)[-1]
+				_io_total = LinuxStat::FS.total_io(p)
+
+				return {} if _io_total.empty?
+
+				sector_size = LinuxStat::FS.sectors(path)
+				return {} unless sector_size
+
+				{
+					read: _io_total[0] &.*(sector_size),
+					write: _io_total[1] &.*(sector_size),
+				}
+			end
+
+			def io_usage(path = LinuxStat::Mounts.root, interval = 0.1)
+				p = File.split(path)[-1]
+
+				measure1 = LinuxStat::FS.total_io(p)
+				sleep(interval)
+				measure2 = LinuxStat::FS.total_io(p)
+
+				return {} if measure1.empty? || measure2.empty?
+
+				sector_size = LinuxStat::FS.sectors(path)
+				return {} unless sector_size
+
+				m1r = measure1[0]
+				m1w = measure1[1]
+
+				m2r = measure2[0]
+				m2w = measure2[1]
+
+				{
+					read: m2r.-(m1r).*(sector_size).fdiv(interval),
+					write: m2w.-(m1w).*(sector_size).fdiv(interval)
+				}
+			end
+
+			alias sectors sector_size
 		end
 	end
 end

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