linux_stat 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7af04643c6d2b3886048d2f8e454b6aaea3646a7aca28e46af44bb67e8ecb3f
-  data.tar.gz: fba61371d7ab4169e6c187a81bba56c8016d848afea9b2c6d5a8b2ffd30fb9bb
+  metadata.gz: da63a14786b35b2eb286dfe55a0466d58f287b34e22d8b87213fe0e0549e7142
+  data.tar.gz: d184a4fb326d78d8cc375cd651b2a490963121bd3c260d3979c774744e7f35b1
 SHA512:
-  metadata.gz: 33272ae30466df860dd3330cdbac62031a9f1022f6854577c83330705cb2ec5c3b2864cac88d1e5823c2d756e1866496fef01e3ef77f26e8e82dd71d14a7ad1a
-  data.tar.gz: 1004e9136ce2b252a7c4ce2f408dcaa4558dd1d4219edc61a049ead3456ab571a7b17058663462136858372659855b894c578c15f0099d84ae2a99ed8d30824e
+  metadata.gz: fbeaa968b47d24698e6d21a141a07ab014673b1d6a34798ed2e1a1b3ab2d9152860b8ee53b057409345592c13ac725648448fb4fe540d3225ac67a832ef6ee09
+  data.tar.gz: 84a7153078308c22bcad3681c15b5fbb7e9fee9ae873379e190cae23287fd4adea5bc319c31395ae87e6e8d155fae5c66826c6db6736c9838071c5156e2b56d9

data/lib/linux_stat/process_info.rb

@@ -283,7 +283,7 @@ module LinuxStat
 				uptime = LS::ProcFS.uptime_f
 				return {} unless uptime && !stat.empty?
 
-				utime, stime, starttime = *stat.values_at(11, 12, 19).map(&:to_f)
+				utime, stime, starttime = *stat.values_at(10, 11, 18).map(&:to_f)
 				uptime *= ticks
 
 				total_time = utime + stime
@@ -295,14 +295,14 @@ module LinuxStat
 				uptime = LS::ProcFS.uptime_f
 				return {} unless uptime && !stat.empty?
 
-				utime2, stime2, starttime2 = *stat.values_at(11, 12, 19).map(&:to_f)
+				utime2, stime2, starttime2 = *stat.values_at(10, 11, 18).map(&:to_f)
 				uptime *= ticks
 
 				total_time2 = utime2 + stime2
 				idle2 = uptime - starttime2 - total_time2
 
 				totald = idle2.+(total_time2).-(idle1 + total_time)
-				cpu_u = totald.-(idle2 - idle1).fdiv(totald).abs.*(100)./(cpu_count)
+				cpu_u = totald.-(idle2 - idle1).fdiv(totald).abs.*(100)./(LinuxStat::CPU.count)
 
 				{
 					cpu_usage: cpu_u > 100 ? 100.0 : cpu_u.round(2),
@@ -338,32 +338,10 @@ module LinuxStat
 			#
 			# This method is more efficient than running LinuxStat::ProcessInfo.cpu_stat()
 			def cpu_usage(pid: $$, sleep: ticks_to_ms_t5)
-				ticks = get_ticks
-				stat = LinuxStat::ProcFS.ps_stat(pid)
-				uptime = LS::ProcFS.uptime_f
-				return nil unless uptime && !stat.empty?
-
-				utime, stime, starttime = *stat.values_at(10, 11, 18).map(&:to_f)
-				uptime *= ticks
-
-				total_time = utime + stime
-				idle1 = uptime - starttime - total_time
-
-				sleep(sleep)
-
-				stat = LinuxStat::ProcFS.ps_stat(pid)
-				uptime = LS::ProcFS.uptime_f
-				return nil unless uptime && !stat.empty?
-
-				utime2, stime2, starttime2 = *stat.values_at(10, 11, 18).map(&:to_f)
-				uptime *= ticks
-
-				total_time2 = utime2 + stime2
-				idle2 = uptime - starttime2 - total_time2
+				u = cpu_usage_thread(pid, sleep)
+				return nil unless u
 
-				totald = idle2.+(total_time2).-(idle1 + total_time)
-
-				u = totald.-(idle2 - idle1).fdiv(totald).abs.*(100)./(cpu_count)
+				u /= LinuxStat::CPU.count
 				u > 100 ? 100.0 : u.round(2)
 			end
 
@@ -390,34 +368,10 @@ module LinuxStat
 			#
 			# But if the info isn't available, it will return nil.
 			def thread_usage(pid: $$, sleep: ticks_to_ms_t5)
-				ticks = get_ticks
-				stat = LinuxStat::ProcFS.ps_stat(pid)
-				uptime = LS::ProcFS.uptime_f
-				return nil unless uptime && !stat.empty?
-
-				utime, stime, starttime = *stat.values_at(10, 11, 18).map(&:to_f)
-				uptime *= ticks
-
-				total_time = utime + stime
-				idle1 = uptime - starttime - total_time
-
-				sleep(sleep)
+				u = cpu_usage_thread(pid, sleep)
+				return nil unless u
 
-				stat = LinuxStat::ProcFS.ps_stat(pid)
-				uptime = LS::ProcFS.uptime_f
-				return nil unless uptime && !stat.empty?
-
-				utime2, stime2, starttime2 = *stat.values_at(10, 11, 18).map(&:to_f)
-				uptime *= ticks
-
-				total_time2 = utime2 + stime2
-				idle2 = uptime - starttime2 - total_time2
-
-				totald = idle2.+(total_time2).-(idle1 + total_time)
-
-				u = totald.-(idle2 - idle1).fdiv(totald).abs.*(100)
-
-				cpu_count_t100 = cpu_count * 100
+				cpu_count_t100 = LinuxStat::CPU.count * 100
 				u > cpu_count_t100 ? cpu_count_t100 : u.round(2)
 			end
 
@@ -709,8 +663,33 @@ module LinuxStat
 				@@pagesize ||= LinuxStat::Sysconf.pagesize.to_i
 			end
 
-			def cpu_count
-				@@nprocessors_conf ||= LinuxStat::CPU.count
+			def cpu_usage_thread(pid, delay)
+				ticks = get_ticks
+				stat = LinuxStat::ProcFS.ps_stat(pid)
+				uptime = LS::ProcFS.uptime_f
+				return nil unless uptime && !stat.empty?
+
+				utime, stime, starttime = *stat.values_at(10, 11, 18).map(&:to_f)
+				uptime *= ticks
+
+				total_time = utime + stime
+				idle1 = uptime - starttime - total_time
+
+				sleep(delay)
+
+				stat = LinuxStat::ProcFS.ps_stat(pid)
+				uptime = LS::ProcFS.uptime_f
+				return nil unless uptime && !stat.empty?
+
+				utime2, stime2, starttime2 = *stat.values_at(10, 11, 18).map(&:to_f)
+				uptime *= ticks
+
+				total_time2 = utime2 + stime2
+				idle2 = uptime - starttime2 - total_time2
+
+				totald = idle2.+(total_time2).-(idle1 + total_time)
+
+				totald.-(idle2 - idle1).fdiv(totald).abs.*(100)
 			end
 		end
 	end

data/lib/linux_stat/version.rb

@@ -1,3 +1,3 @@
 module LinuxStat
-	VERSION ||= "2.1.1"
+	VERSION ||= "2.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linux_stat
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2021-02-06 00:00:00.000000000 Z
 dependencies: []
 description: Linux only, efficient linux system utilization reporting and system monitoring
   gem
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.7
 signing_key:
 specification_version: 4
 summary: Efficient linux system reporting gem