linux_stat 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aaa7608b7663765621d718c95aaeedad578364aa83f09fcd678399bb7ebd783
-  data.tar.gz: 98695af9e725d99fda2fc0209082b796247dd9fb1a72fa316b6edd1d121124c3
+  metadata.gz: 11d9c04524805452a0662ea750b21a137a69912f4f699f7582076c5fa46ad639
+  data.tar.gz: 6428b4caee5b475349b34c667c5d7157b6fb5d64b9a0a90dbdb160a8b3182042
 SHA512:
-  metadata.gz: f34856c25125b173e87df17a127b872ebf8abb3c4d0f432cf6dbcc564c3c9a5bb1ab873c9d0695156255cc1ffc994e891b84958702192fe8f2f8925b2e17dd2c
-  data.tar.gz: b639f0c37d74d8edac8315180a196001ad387f5fefdee48e9335aa95c0dce593c63ffd00f0e100dc1222dd0c8212b7a73a93e6627c1ad8b00ee47327a1df1989
+  metadata.gz: 9cb66d951d9f1b7beb0115e3c0e040c377930efeeb323aa38c2cfd4af29988c6aa99041efdfbcb00c8e29383256254997c4d5297777c5cac7503834f279fa922
+  data.tar.gz: bc42532fabf55a172b9688c56e66e695e3caa45f4b94d2006601021cbec6569b8aea5a15dfcb50b82646350707e915fb5b76198c6ff37bf4cf79207d91542509

data/README.md

@@ -435,23 +435,23 @@ LinuxStat::OS.uptime()
 ```
 # File: prettify_bytes.rb | Line: 42
 # Definition: def convert_binary(n)
-LinuxStat::PrettifyBytes.convert_binary( = 139259240343413)
-=> "126.66 tebibytes"
+LinuxStat::PrettifyBytes.convert_binary(n = 948100170920596)
+=> "862.29 tebibytes"
 
 # File: prettify_bytes.rb | Line: 19
 # Definition: def convert_decimal(n)
-LinuxStat::PrettifyBytes.convert_decimal( = 9064429892244)
-=> "9.06 terabytes"
+LinuxStat::PrettifyBytes.convert_decimal(n = 778254889812055)
+=> "778.25 terabytes"
 
 # File: prettify_bytes.rb | Line: 90
 # Definition: def convert_short_binary(n)
-LinuxStat::PrettifyBytes.convert_short_binary( = 768519163615746)
-=> "698.96 TiB"
+LinuxStat::PrettifyBytes.convert_short_binary(n = 924133737100164)
+=> "840.49 TiB"
 
 # File: prettify_bytes.rb | Line: 65
 # Definition: def convert_short_decimal(n)
-LinuxStat::PrettifyBytes.convert_short_decimal( = 125226567793596)
-=> "125.23 TB"
+LinuxStat::PrettifyBytes.convert_short_decimal(n = 723831850276707)
+=> "723.83 TB"
 
 ```
 

data/lib/linux_stat/cpu.rb

@@ -2,7 +2,7 @@ module LinuxStat
 	module CPU
 		class << self
 			##
-			# = stat(sleep = 1.0 / LinuxStat::Sysconf.sc_clk_tck)
+			# = stat(sleep = 1.0 / LinuxStat::Sysconf.sc_clk_tck * 5)
 			#
 			# Where sleep is the delay to gather the data.
 			#
@@ -18,7 +18,7 @@ module LinuxStat
 			#    {0=>84.38, 1=>100.0, 2=>50.0, 3=>87.5, 4=>87.5}
 			#
 			# If the information is not available, it will return an empty Hash
-			def stat(sleep = ticks_to_ms)
+			def stat(sleep = ticks_to_ms_t5)
 				return {} unless stat?
 
 				data = IO.readlines('/proc/stat').select! { |x| x[/^cpu\d*/] }.map! { |x| x.split.map!(&:to_f) }
@@ -60,7 +60,7 @@ module LinuxStat
 			# It's like running LinuxStat::CPU.stat[0] but it's much more efficient and calculates just the aggregated usage which is available at the top of the /proc/stat file.
 			#
 			# If the information is not available, it will return nil.
-			def total_usage(sleep = ticks_to_ms)
+			def total_usage(sleep = ticks_to_ms_t5)
 				return nil unless stat?
 
 				data = IO.foreach('/proc/stat').first.split.tap(&:shift).map!(&:to_f)
@@ -136,8 +136,11 @@ module LinuxStat
 				@@stat_readable ||= File.readable?('/proc/stat')
 			end
 
-			def ticks_to_ms
-				@@ms ||= 1.0 / LinuxStat::Sysconf.sc_clk_tck
+			# Just to avoid duplicate calculations
+			# ticks to ms times 5
+			# If the ticks is 100, it will return 0.05
+			def ticks_to_ms_t5
+				@@ms_t5 ||= 1.0 / LinuxStat::Sysconf.sc_clk_tck * 5
 			end
 		end
 	end

data/lib/linux_stat/prettify_bytes.rb

@@ -100,10 +100,7 @@ module LinuxStat
 
 			private
 			def pad_left(n, mantissa_length = 2)
-				n = n.round(mantissa_length)
-				exp, mant = n.to_s.split(?..freeze)
-				m = mant.length < mantissa_length ? mant + ?0.freeze * (mantissa_length - mant.length) : mant
-				exp + ?..freeze + m
+				sprintf("%.#{mantissa_length}f".freeze, n)
 			end
 		end
 	end

data/lib/linux_stat/process_info.rb

@@ -203,13 +203,13 @@ module LinuxStat
 			end
 
 			##
-			# = cpu_stat(pid: $$, sleep: 1.0 / LinuxStat::Sysconf.sc_clk_tck)
+			# = cpu_stat(pid: $$, sleep: 1.0 / LinuxStat::Sysconf.sc_clk_tck * 5)
 			#
 			# Where pid is the process ID and sleep time is the interval between measurements.
 			#
 			# By default it is the id of the current process ($$), and sleep is LinuxStat::Sysconf.sc_clk_tck
 			#
-			# The smallest amount of available sleep time is 1.0 / LinuxStat::Sysconf.sc_clk_tck.
+			# The smallest amount of available sleep time is 1.0 / LinuxStat::Sysconf.sc_clk_tck * 5.
 			#
 			# * Note 1:
 			# 1. Do note that the sleep time can slow down your application.
@@ -244,7 +244,7 @@ module LinuxStat
 			# Only use this method if you need all of the data at once, in such case, it's more efficient to use this method.
 			#
 			# The :last_executed_cpu also returns an Integer indicating the last executed cpu of the process.
-			def cpu_stat(pid: $$, sleep: ticks_to_ms)
+			def cpu_stat(pid: $$, sleep: ticks_to_ms_t5)
 				file = "/proc/#{pid}/stat"
 				return {} unless File.readable?(file)
 
@@ -277,15 +277,15 @@ module LinuxStat
 			end
 
 			##
-			# = cpu_usage(pid: $$, sleep: 1.0 / LinuxStat::Sysconf.sc_clk_tck)
+			# = cpu_usage(pid: $$, sleep: 1.0 / LinuxStat::Sysconf.sc_clk_tck * 5)
 			#
 			# Where pid is the process ID and sleep time is the interval between measurements.
 			#
-			# By default it is the id of the current process ($$), and sleep is 1.0 / LinuxStat::Sysconf.sc_clk_tck
+			# By default it is the id of the current process ($$), and sleep is 1.0 / LinuxStat::Sysconf.sc_clk_tck * 5
 			#
 			# The smallest amount of available sleep time is LinuxStat::Sysconf.sc_clk_tck.
 			#
-			# It retuns the CPU usage in Float.
+			# It retuns the CPU usage as Float.
 			#
 			# For example:
 			#
@@ -298,7 +298,7 @@ module LinuxStat
 			# But if the info isn't available, it will return nil.
 			#
 			# This method is more efficient than running LinuxStat::ProcessInfo.cpu_stat()
-			def cpu_usage(pid: $$, sleep: ticks_to_ms)
+			def cpu_usage(pid: $$, sleep: ticks_to_ms_t5)
 				file = "/proc/#{pid}/stat"
 				return nil unless File.readable?(file)
 
@@ -324,6 +324,54 @@ module LinuxStat
 				totald.-(idle2 - idle1).fdiv(totald).*(100).round(2).abs./(LinuxStat::CPU.count)
 			end
 
+			##
+			# = thread_usage(pid: $$, sleep: 1.0 / LinuxStat::Sysconf.sc_clk_tck * 5)
+			#
+			# Where pid is the process ID and sleep time is the interval between measurements.
+			#
+			# By default it is the id of the current process ($$), and sleep is 1.0 / LinuxStat::Sysconf.sc_clk_tck * 5
+			#
+			# The smallest amount of available sleep time is LinuxStat::Sysconf.sc_clk_tck.
+			#
+			# It retuns the per core CPU usage as Float.
+			#
+			# For example:
+			#
+			#    LinuxStat::ProcessInfo.core_usage
+			#
+			#    => 200.0
+			#
+			# A value of 100.0 indicates it is using 100% processing power of a core.
+			#
+			# The value could be 0 to (100 * the number of CPU threads (including hyperthreading) in the system)
+			#
+			# But if the info isn't available, it will return nil.
+			def thread_usage(pid: $$, sleep: ticks_to_ms_t5)
+				file = "/proc/#{pid}/stat"
+				return nil unless File.readable?(file)
+
+				ticks = get_ticks
+
+				utime, stime, starttime = IO.read(file)
+					.split.values_at(13, 14, 21).map(&:to_f)
+				uptime = IO.read('/proc/uptime'.freeze).to_f * ticks
+
+				total_time = utime + stime
+				idle1 = uptime - starttime - total_time
+
+				sleep(sleep)
+
+				utime2, stime2, starttime2 = IO.read(file)
+					.split.values_at(13, 14, 21).map(&:to_f)
+				uptime = IO.read('/proc/uptime'.freeze).to_f * ticks
+
+				total_time2 = utime2 + stime2
+				idle2 = uptime - starttime2 - total_time2
+
+				totald = idle2.+(total_time2).-(idle1 + total_time)
+				totald.-(idle2 - idle1).fdiv(totald).*(100).round(2).abs
+			end
+
 			##
 			# = threads(pid = $$)
 			#
@@ -550,8 +598,10 @@ module LinuxStat
 			end
 
 			# Just to avoid multiple calculations!...
-			def ticks_to_ms
-				@@ms ||= 1.0 / get_ticks
+			# ticks to ms * 5
+			# If ticks is 100, it will return 0.05
+			def ticks_to_ms_t5
+				@@ms_t5 ||= 1.0 / get_ticks * 5
 			end
 
 			def pagesize

data/lib/linux_stat/version.rb

@@ -1,3 +1,3 @@
 module LinuxStat
-	VERSION ||= "0.7.4"
+	VERSION ||= "0.7.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_stat
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Sourav Goswami