linux_stat 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6d3a089c2e214eb53f564d64014d6da9b900467e8b8285be6be6516c92fb366
-  data.tar.gz: 6cc0a5b86b5b9163d2ae1d57b761d8cf6900ff2864987c3b2b39a5072e5d8174
+  metadata.gz: 98045c378f59845c66b01f0e311faed27a4def546bea99354bfd04a4883a5d38
+  data.tar.gz: fe4413395bca5cae357413deba7bd3f1316c845d4652289688fe8c15ee38cc13
 SHA512:
-  metadata.gz: e9d1ce304cec1210fd3cb4f75b36a105b35bc54828106d1d880331b5d8ec6429f120be21200014599a22693950386aa838e03cc20a0fc41c0b819204c6c2da81
-  data.tar.gz: 45ea80ecccb20956945b420bfec45ca0e3f3770233418469fd741f554977c9ab07cb14002f9a887094db0b078f5ae9cc5c1b6a25865e8024a5ade4c278dd7ed8
+  metadata.gz: fef16c595ecac5b2c5ad86851cd6dd8fe27211e7905f315c68ce5cb451e3ee75bf0feff1913ae9b1b66e1fdc4a935d456b4f62b758ee19f592e378c8aa2f78d1
+  data.tar.gz: 84cc82dbd7fe6a080f1ddd1b5c7ea4aa613ea58816893ae681187e859676c111d0cdb988fb26a8f15fd607cd37ec951f30c0492ed722e0b46bfa56449ff69eb8

data/README.md

@@ -674,6 +674,25 @@ irb(main):005:0> LinuxStat::User.gid_by_username('InvalidUser')
 => nil
 ```
 
+Or to get the current user (in docker for example):
+
+```
+$ irb
+irb(main):001:0> require 'linux_stat'
+=> true
+
+irb(main):002:0> LinuxStat::User.get_current_user
+=> "x"
+
+irb(main):003:0> LinuxStat::User.get_user
+=> "x"
+
+irb(main):004:0> LinuxStat::User.get_login
+=> ""
+```
+
+Right, the get_login() can return an empty string. But LinuxStat::User.get_user also aliased as LinuxStat::User.get_current_user shouldn't return an empty string under most circumstances.
+
 ## Note 5: PrettifyBytes
 Often times we need to work with KB, MB GB, TB, or KiB, MiB, GiB, TiB, etc.
 And we need some work to convert bytes to those units.
@@ -683,6 +702,7 @@ To avoid such duplication, it comes with a PrettifyBytes module.
 For example, to convert bytes to decimal suffixes:
 
 ```
+$irb
 irb(main):001:0> require 'linux_stat'
 => true
 
@@ -702,52 +722,70 @@ irb(main):005:0> LinuxStat::PrettifyBytes.convert_decimal(10 ** 13)
 To convert bytes to binary suffixes:
 
 ```
-irb(main):007:0> LinuxStat::PrettifyBytes.convert_binary(1000)
+irb(main):006:0> LinuxStat::PrettifyBytes.convert_binary(1000)
 => "1000.00 bytes"
 
-irb(main):008:0> LinuxStat::PrettifyBytes.convert_binary(10000)
+irb(main):007:0> LinuxStat::PrettifyBytes.convert_binary(10000)
 => "9.77 kibibytes"
 
-irb(main):009:0> LinuxStat::PrettifyBytes.convert_binary(100000)
+irb(main):008:0> LinuxStat::PrettifyBytes.convert_binary(100000)
 => "97.66 kibibytes"
 
-irb(main):010:0> LinuxStat::PrettifyBytes.convert_binary(10 ** 13)
+irb(main):009:0> LinuxStat::PrettifyBytes.convert_binary(10 ** 13)
 => "9.09 tebibytes"
 ```
 
 To convert them to short Metric decimal suffixes:
 
 ```
-irb(main):017:0> LinuxStat::PrettifyBytes.convert_short_decimal(1000)
+irb(main):010:0> LinuxStat::PrettifyBytes.convert_short_decimal(1000)
 => "1.00 kB"
 
-irb(main):018:0> LinuxStat::PrettifyBytes.convert_short_decimal(10000)
+irb(main):011:0> LinuxStat::PrettifyBytes.convert_short_decimal(10000)
 => "10.00 kB"
 
-irb(main):019:0> LinuxStat::PrettifyBytes.convert_short_decimal(100000)
+irb(main):012:0> LinuxStat::PrettifyBytes.convert_short_decimal(100000)
 => "100.00 kB"
 
-irb(main):020:0> LinuxStat::PrettifyBytes.convert_short_decimal(10 ** 13)
+irb(main):013:0> LinuxStat::PrettifyBytes.convert_short_decimal(10 ** 13)
 => "10.00 TB"
 ```
 
 To convert them to short IEC binary suffixes:
 
 ```
-irb(main):013:0> LinuxStat::PrettifyBytes.convert_short_binary(1000)
+irb(main):014:0> LinuxStat::PrettifyBytes.convert_short_binary(1000)
 => "1000 B"
 
-irb(main):014:0> LinuxStat::PrettifyBytes.convert_short_binary(10000)
+irb(main):015:0> LinuxStat::PrettifyBytes.convert_short_binary(10000)
 => "9.77 KiB"
 
-irb(main):015:0> LinuxStat::PrettifyBytes.convert_short_binary(100000)
+irb(main):016:0> LinuxStat::PrettifyBytes.convert_short_binary(100000)
 => "97.66 KiB"
 
-irb(main):016:0> LinuxStat::PrettifyBytes.convert_short_binary(10 ** 13)
+irb(main):017:0> LinuxStat::PrettifyBytes.convert_short_binary(10 ** 13)
 => "9.09 TiB"
 ```
 
-It can support values upto hundreds of yottabytes and yobibytes, or yb and yib.
+It can support values upto hundreds of yottabytes and yobibytes, or yb and yib. You can also do stuff like:
+
+```
+$ irb
+irb(main):001:0> require 'linux_stat'
+=> true
+
+irb(main):002:0> LinuxStat::PrettifyBytes.convert_short_decimal(LinuxStat::Mounts.device_stat('/dev/sdb1')[:total])
+=> "31.47 GB"
+
+irb(main):003:0> LinuxStat::PrettifyBytes.convert_short_binary(LinuxStat::Mounts.device_stat('/dev/sdb1')[:total])
+=> "29.31 GiB"
+
+irb(main):004:0> LinuxStat::PrettifyBytes.convert_short_binary(LinuxStat::Mounts.device_stat('/dev/sdb1')[:used])
+=> "26.80 GiB"
+
+irb(main):005:0> LinuxStat::PrettifyBytes.convert_short_binary(LinuxStat::Mounts.device_stat('/dev/sdb1')[:available])
+=> "2.51 GiB"
+```
 
 Read the ri documentation for more info.
 

data/ext/sysconf/sysconf.c

@@ -25,7 +25,7 @@ static VALUE getOpenMax(VALUE obj) {
 	return INT2FIX(sysconf(_SC_OPEN_MAX)) ;
 }
 
-static VALUE getPageSizeMax(VALUE obj) {
+static VALUE getPageSize(VALUE obj) {
 	return INT2FIX(sysconf(_SC_PAGESIZE)) ;
 }
 
@@ -67,7 +67,7 @@ void Init_sysconf() {
 	rb_define_module_function(_sysconf, "hostname_max", getHostnameMax, 0) ;
 	rb_define_module_function(_sysconf, "login_name_max", getLoginNameMax, 0) ;
 	rb_define_module_function(_sysconf, "open_max", getOpenMax, 0) ;
-	rb_define_module_function(_sysconf, "page_size_max", getPageSizeMax, 0) ;
+	rb_define_module_function(_sysconf, "pagesize", getPageSize, 0) ;
 	rb_define_module_function(_sysconf, "stream_max", getStreamMax, 0) ;
 	rb_define_module_function(_sysconf, "tty_name_max", getTTYNameMax, 0) ;
 	rb_define_module_function(_sysconf, "posix_version", getPosixVersion, 0) ;

data/lib/linux_stat/process_info.rb

@@ -70,10 +70,10 @@ module LinuxStat
 			# By default it is the id of the current process ($$)
 			#
 			# It retuns the memory, virtual memory, and resident memory of the process.
-			# All values are in Kilobytes.
+			# All values are in kilobytes.
 			#
 			# The output is a Hash. For example, a sample output:
-			#    {:memory=>8656, :virtual_memory=>78272, :resident_memory=>14072}
+			#    {:memory=>8515.584, :virtual_memory=>79781.888, :resident_memory=>13955.072}
 			#
 			# Note:
 			# If you need only memory usage of a process, run LinuxStat::ProcessInfo.memory(pid)
@@ -85,34 +85,22 @@ module LinuxStat
 			#
 			# If the info isn't available it will return an empty Hash.
 			def mem_stat(pid = $$)
-				stat_file = "/proc/#{pid}/stat".freeze
-				status_file = "/proc/#{pid}/status".freeze
+				statm = "/proc/#{pid}/statm".freeze
 
-				stat = if File.readable?(stat_file)
-					IO.read(stat_file).split
+				data = if File.readable?(statm)
+					IO.read(statm).split
 				else
-					[]
+					return {}
 				end
 
-				status = if File.readable?(status_file)
-					IO.readlines(status_file)
-				else
-					[]
-				end
-
-				_rss_anon = status.find { |x| x.start_with?('RssAnon') }
-				rss_anon = _rss_anon ? _rss_anon.split[1].to_i : nil
-
-				_virtual_memory = stat[22]
-				vm = _virtual_memory ? _virtual_memory.to_i.fdiv(1024).to_i : nil
-
-				_vm_rss = status.find { |x| x.start_with?('VmRSS') }
-				vm_rss = _vm_rss ? _vm_rss.split[1].to_i : nil
+				_rss_anon = (data[1] && data[2]) ? data[1].to_i.-(data[2].to_i).*(pagesize).fdiv(1000) : nil
+				_virtual_memory = data[0] ? data[0].to_i*(pagesize).fdiv(1000) : nil
+				_resident_memory = data[1] ? data[1].to_i.*(pagesize).fdiv(1000) : nil
 
 				{
-					memory: rss_anon,
-					virtual_memory: vm,
-					resident_memory: vm_rss
+					memory: _rss_anon,
+					virtual_memory: _virtual_memory,
+					resident_memory: _resident_memory
 				}
 			end
 
@@ -121,17 +109,17 @@ module LinuxStat
 			# By default it is the id of the current process ($$)
 			#
 			# It retuns the memory of the process.
-			# The value is in Kilobytes.
+			# The value is in kilobytes.
 			# The output is an Integer. For example, a sample output:
-			#    8664
+			#    8523.776
 			#
 			# If the info isn't available it will return nil.
 			def memory(pid = $$)
-				file = "/proc/#{pid}/status".freeze
+				file = "/proc/#{pid}/statm".freeze
 				return nil unless File.readable?(file)
 
-				_rss_anon = IO.readlines(file).find { |x| x.start_with?('RssAnon') }
-				_rss_anon ? _rss_anon.split[1].to_i : nil
+				data = IO.read(file).split
+				(data[1] && data[2]) ? data[1].to_i.-(data[2].to_i).*(pagesize).fdiv(1000) : nil
 			end
 
 			# virtual_memory(pid = $$)
@@ -139,17 +127,17 @@ module LinuxStat
 			# By default it is the id of the current process ($$)
 			#
 			# It retuns the virtual memory for the process.
-			# The value is in Kilobytes.
+			# The value is in kilobytes.
 			# The output is an Integer. For example, a sample output:
-			#    78376
+			#    79781.888
 			#
 			# If the info isn't available it will return nil.
 			def virtual_memory(pid = $$)
-				file = "/proc/#{pid}/stat".freeze
+				file = "/proc/#{pid}/statm".freeze
 				return nil unless File.readable?(file)
 
-				_virtual_memory = IO.read(file).split[22]
-				_virtual_memory ? _virtual_memory.to_i.fdiv(1024).to_i : nil
+				_virtual_memory = IO.read(file).split[0]
+				_virtual_memory ? _virtual_memory.to_i.*(pagesize).fdiv(1000) : nil
 			end
 
 			# resident_memory(pid = $$)
@@ -157,19 +145,17 @@ module LinuxStat
 			# By default it is the id of the current process ($$)
 			#
 			# It retuns the resident memory for the process.
-			# The value is in Kilobytes.
+			# The value is in kilobytes.
 			# The output is an Integer. For example, a sample output:
-			#    14012
+			#    13996.032
 			#
 			# If the info isn't available it will return nil.
 			def resident_memory(pid = $$)
-				file = "/proc/#{pid}/status".freeze
+				file = "/proc/#{pid}/statm".freeze
 				return nil unless File.readable?(file)
 
-				_vm_rss = IO.readlines(file)
-					.find { |x| x.start_with?('VmRSS') }
-
-				_vm_rss ? _vm_rss.split[1].to_i : nil
+				_vm_rss = IO.read(file).split[1]
+				_vm_rss ? _vm_rss.to_i.*(pagesize).fdiv(1000) : nil
 			end
 
 			# cpu_stat(pid: $$, sleep: 1.0 / LinuxStat::Sysconf.sc_clk_tck)
@@ -292,7 +278,8 @@ module LinuxStat
 				file = "/proc/#{pid}/stat".freeze
 				return nil unless File.readable?(file)
 
-				IO.read(file).split[19].to_i
+				data = IO.read(file).split[19]
+				data ? data.to_i : nil
 			end
 
 			# last_executed_cpu(pid = $$)
@@ -376,6 +363,10 @@ module LinuxStat
 			def ticks_to_ms
 				@@ms ||= 1.0 / get_ticks
 			end
+
+			def pagesize
+				@@pagesize ||= LinuxStat::Sysconf.pagesize
+			end
 		end
 	end
 end

data/lib/linux_stat/version.rb

@@ -1,3 +1,3 @@
 module LinuxStat
-	VERSION = "0.6.1"
+	VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linux_stat
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-08 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies: []
 description: Linux only, efficient linux system utilization reporting and system monitoring
   gem