linux_stat 1.4.0 → 2.1.1

data/lib/linux_stat/process_info.rb

@@ -149,20 +149,7 @@ module LinuxStat
 			#
 			# If the info isn't available it will return an empty Hash.
 			def mem_stat(pid = $$)
-				statm = "/proc/#{pid}/statm".freeze
-				return {} unless File.readable?(statm)
-
-				data = IO.read(statm).split
-
-				_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: _virtual_memory,
-					resident_memory: _resident_memory
-				}
+				LinuxStat::ProcFS.statm(pid)
 			end
 
 			##
@@ -182,11 +169,7 @@ module LinuxStat
 			#
 			# If the info isn't available it will return nil.
 			def memory(pid = $$)
-				file = "/proc/#{pid}/statm".freeze
-				return nil unless File.readable?(file)
-
-				data = IO.read(file).split
-				(data[1] && data[2]) ? data[1].to_i.-(data[2].to_i).*(pagesize).fdiv(1000) : nil
+				LinuxStat::ProcFS.statm_memory(pid) &.fdiv(1000)
 			end
 
 			##
@@ -207,11 +190,7 @@ module LinuxStat
 			#
 			# If the info isn't available it will return nil.
 			def virtual_memory(pid = $$)
-				file = "/proc/#{pid}/statm".freeze
-				return nil unless File.readable?(file)
-
-				_virtual_memory = IO.read(file).split[0]
-				_virtual_memory ? _virtual_memory.to_i.*(pagesize).fdiv(1000) : nil
+				LinuxStat::ProcFS.statm_virtual(pid) &.fdiv(1000)
 			end
 
 			##
@@ -226,17 +205,34 @@ module LinuxStat
 			# The value is in kilobytes.
 			#
 			# The output is an Integer. For example:
-			#    LinuxStat::ProcessInfo.cpu_stat
+			#    LinuxStat::ProcessInfo.resident_memory
 			#
 			#    => 13996.032
 			#
 			# If the info isn't available it will return nil.
 			def resident_memory(pid = $$)
-				file = "/proc/#{pid}/statm".freeze
-				return nil unless File.readable?(file)
+				LinuxStat::ProcFS.statm_resident(pid) &.fdiv(1000)
+			end
 
-				_vm_rss = IO.read(file).split[1]
-				_vm_rss ? _vm_rss.to_i.*(pagesize).fdiv(1000) : nil
+			##
+			# = shared_memory(pid = $$)
+			#
+			# Where pid is the process ID.
+			#
+			# By default it is the id of the current process ($$)
+			#
+			# It retuns the shared memory for the process.
+			#
+			# The value is in kilobytes.
+			#
+			# The output is an Integer. For example:
+			#    LinuxStat::ProcessInfo.shared_memory
+			#
+			#    => 13996.032
+			#
+			# If the info isn't available it will return nil.
+			def shared_memory(pid = $$)
+				LinuxStat::ProcFS.statm_shared(pid) &.fdiv(1000)
 			end
 
 			##
@@ -282,31 +278,25 @@ module LinuxStat
 			#
 			# The :last_executed_cpu also returns an Integer indicating the last executed cpu of the process.
 			def cpu_stat(pid: $$, sleep: ticks_to_ms_t5)
-				file = "/proc/#{pid}/stat"
 				ticks = get_ticks
-
-				return {} unless File.readable?(file)
-
-				stat = IO.read(file).split(/(\(.*\))/)[-1] &.split
-				return {} unless stat
+				stat = LinuxStat::ProcFS.ps_stat(pid)
+				uptime = LS::ProcFS.uptime_f
+				return {} unless uptime && !stat.empty?
 
 				utime, stime, starttime = *stat.values_at(11, 12, 19).map(&:to_f)
-
-				uptime = IO.read('/proc/uptime'.freeze).to_f * ticks
+				uptime *= ticks
 
 				total_time = utime + stime
 				idle1 = uptime - starttime - total_time
 
 				sleep(sleep)
 
-				return {} unless File.readable?(file)
-
-				stat = IO.read(file).split(/(\(.*\))/)[-1] &.split
-				return {} unless stat
+				stat = LinuxStat::ProcFS.ps_stat(pid)
+				uptime = LS::ProcFS.uptime_f
+				return {} unless uptime && !stat.empty?
 
 				utime2, stime2, starttime2 = *stat.values_at(11, 12, 19).map(&:to_f)
-
-				uptime = IO.read('/proc/uptime'.freeze).to_f * ticks
+				uptime *= ticks
 
 				total_time2 = utime2 + stime2
 				idle2 = uptime - starttime2 - total_time2
@@ -348,30 +338,25 @@ module LinuxStat
 			#
 			# This method is more efficient than running LinuxStat::ProcessInfo.cpu_stat()
 			def cpu_usage(pid: $$, sleep: ticks_to_ms_t5)
-				file = "/proc/#{pid}/stat"
 				ticks = get_ticks
+				stat = LinuxStat::ProcFS.ps_stat(pid)
+				uptime = LS::ProcFS.uptime_f
+				return nil unless uptime && !stat.empty?
 
-				return nil unless File.readable?(file)
-
-				stat = IO.read(file).split(/(\(.*\))/)[-1] &.split
-				return nil unless stat
-
-				utime, stime, starttime = *stat.values_at(11, 12, 19).map(&:to_f)
-
-				uptime = IO.read('/proc/uptime'.freeze).to_f * ticks
+				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)
 
-				return nil unless File.readable?(file)
-
-				stat = IO.read(file).split(/(\(.*\))/)[-1] &.split
-				return nil unless stat
+				stat = LinuxStat::ProcFS.ps_stat(pid)
+				uptime = LS::ProcFS.uptime_f
+				return nil unless uptime && !stat.empty?
 
-				utime2, stime2, starttime2 = *stat.values_at(11, 12, 19).map(&:to_f)
-				uptime = IO.read('/proc/uptime'.freeze).to_f * ticks
+				utime2, stime2, starttime2 = *stat.values_at(10, 11, 18).map(&:to_f)
+				uptime *= ticks
 
 				total_time2 = utime2 + stime2
 				idle2 = uptime - starttime2 - total_time2
@@ -405,31 +390,25 @@ module LinuxStat
 			#
 			# But if the info isn't available, it will return nil.
 			def thread_usage(pid: $$, sleep: ticks_to_ms_t5)
-				file = "/proc/#{pid}/stat"
 				ticks = get_ticks
+				stat = LinuxStat::ProcFS.ps_stat(pid)
+				uptime = LS::ProcFS.uptime_f
+				return nil unless uptime && !stat.empty?
 
-				return nil unless File.readable?(file)
-
-				stat = IO.read(file).split(/(\(.*\))/)[-1] &.split
-				return nil unless stat
-
-				utime, stime, starttime = *stat.values_at(11, 12, 19).map(&:to_f)
-
-				uptime = IO.read('/proc/uptime'.freeze).to_f * ticks
+				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)
 
-				return nil unless File.readable?(file)
-
-				stat = IO.read(file).split(/(\(.*\))/)[-1] &.split
-				return nil unless stat
+				stat = LinuxStat::ProcFS.ps_stat(pid)
+				uptime = LS::ProcFS.uptime_f
+				return nil unless uptime && !stat.empty?
 
-				utime2, stime2, starttime2 = *stat.values_at(11, 12, 19).map(&:to_f)
-
-				uptime = IO.read('/proc/uptime'.freeze).to_f * ticks
+				utime2, stime2, starttime2 = *stat.values_at(10, 11, 18).map(&:to_f)
+				uptime *= ticks
 
 				total_time2 = utime2 + stime2
 				idle2 = uptime - starttime2 - total_time2
@@ -460,11 +439,7 @@ module LinuxStat
 			#
 			# This method is way more efficient than running LinuxStat::ProcessInfo.cpu_stat()
 			def threads(pid = $$)
-				file = "/proc/#{pid}/stat".freeze
-				return nil unless File.readable?(file)
-
-				data = IO.read(file).split(/(\(.*\))/)[-1] &.split &.at(17)
-				data ? data.to_i : nil
+				LinuxStat::ProcFS.ps_stat(pid)[16]
 			end
 
 			##
@@ -485,11 +460,7 @@ module LinuxStat
 			#
 			# This method is way more efficient than running LinuxStat::ProcessInfo.cpu_stat()
 			def last_executed_cpu(pid = $$)
-				file = "/proc/#{pid}/stat".freeze
-				return nil unless File.readable?(file)
-
-				data = IO.read(file).split(/(\(.*\))/)[-1] &.split &.at(36)
-				data ? data.to_i : nil
+				LinuxStat::ProcFS.ps_stat(pid)[35]
 			end
 
 			##
@@ -566,21 +537,15 @@ module LinuxStat
 			#
 			# If the info isn't available or the argument passed doesn't exist as a process ID, it will return nil.
 			def start_time_epoch(pid = $$)
-				stat_file = "/proc/#{pid}/stat".freeze
-				uptime = "/proc/uptime".freeze
-
-				@@u_readable ||= File.readable?(uptime)
-				return nil unless @@u_readable && File.readable?(stat_file)
+				uptime = LS::ProcFS.uptime_f
+				stat = LinuxStat::ProcFS.ps_stat(pid)[18]
 
-				stat = IO.read(stat_file).split(/(\(.*\))/)[-1] &.split
-				return nil unless stat
-
-				u = IO.foreach(uptime, ' '.freeze).next.to_f
-				st = stat[19].to_f / get_ticks
+				return nil unless uptime && stat
+				st = stat.to_f / get_ticks
 
 				# Getting two Time objects and dealing with floating point numbers
-				# Just to make sure the time goes monotonically
-				Time.now.-(u - st).to_i
+				# Just to make sure the time goes monotonically unless the clock changes
+				Time.now.-(uptime - st).to_i
 			end
 
 			##
@@ -619,17 +584,10 @@ module LinuxStat
 			#
 			# If the info isn't available or the argument passed doesn't exist as a process ID, it will return nil.
 			def running_time(pid = $$)
-				stat_file = "/proc/#{pid}/stat".freeze
-				uptime = "/proc/uptime".freeze
-
-				@@u_readable ||= File.readable?(uptime)
-				return nil unless @@u_readable && File.readable?(stat_file)
-
-				stat = IO.read(stat_file).split(/(\(.*\))/)[-1] &.split
-				return nil unless stat
-
-				IO.foreach(uptime, ' '.freeze).next.to_f
-					.-(stat[19].to_f / get_ticks).round(2)
+				uptime = LS::ProcFS.uptime_f
+				stat = LinuxStat::ProcFS.ps_stat(pid)[18]
+				return nil unless uptime && stat
+				uptime.-(stat.to_f / get_ticks).round(2)
 			end
 
 			##
@@ -651,13 +609,7 @@ module LinuxStat
 			# If the info isn't available or the argument passed doesn't exist as a process ID,
 			# it will return an empty String.
 			def state(pid = $$)
-				file = "/proc/#{pid}/stat".freeze
-				return ''.freeze unless File.readable?(file)
-
-				stat = IO.read(file).split(/(\(.*\))/)[-1]
-				return '' unless stat
-
-				stat[/\s.+?/].strip
+				LinuxStat::ProcFS.ps_state(pid)
 			end
 
 			##
@@ -670,13 +622,7 @@ module LinuxStat
 			#
 			# If the info isn't available or the argument passed doesn't exist as a process ID, it will return nil.
 			def nice(pid = $$)
-				file = "/proc/#{pid}/stat"
-				return nil unless File.readable?(file)
-
-				stat = IO.read(file).split(/(\(.*\))/)[-1] &.split
-				return nil unless stat
-
-				stat[16].to_i
+				LinuxStat::ProcFS.ps_stat(pid)[15]
 			end
 
 			##
@@ -709,6 +655,41 @@ module LinuxStat
 				LinuxStat::Nproc.count_cpu_for_pid(pid)
 			end
 
+			##
+			# = def cpu_times_i(pid = $$)
+			#
+			# Shows the CPU time used by the process.
+			#
+			# The return value is an Integer.
+			def cpu_time(pid = $$)
+				times = LinuxStat::ProcFS.ps_stat(pid)
+				utime, stime, cutime, cstime = times[10], times[11], times[12], times[13]
+				return nil unless utime && stime && cutime && cstime
+
+				utime.+(stime).+(cutime).+(cstime) / get_ticks
+			end
+
+			##
+			# = def cpu_times(pid = $$)
+			#
+			# Shows the CPU time used by the process.
+			#
+			# The return value is a Hash.
+			def cpu_times(pid = $$)
+				v = cpu_time(pid)
+				return {} unless v
+
+				hour = v / 3600
+				min = v % 3600 / 60
+				sec = v % 60
+
+				{
+					hour: hour,
+					minute: min,
+					second: sec
+				}
+			end
+
 			alias count_cpu nproc
 
 			private

data/lib/linux_stat/swap.rb

@@ -35,7 +35,10 @@ module LinuxStat
 				return {} unless swaps_readable?
 				values_t = read_usage
 
-				total, used = values_t[0].sum, values_t[-1].sum
+				_total, _used = values_t[0], values_t[-1]
+				return {} if _total.empty? || _used.empty?
+
+				total, used = _total.reduce(:+), _used.reduce(:+)
 				available = total - used
 				percent_used = total == 0 ? 0.0 : used.*(100).fdiv(total).round(2)
 				percent_available = total == 0.0 ? 0 : available.*(100).fdiv(total).round(2)
@@ -57,8 +60,19 @@ module LinuxStat
 			#
 			# The return type is a Integer but if the info isn't available, it will return nil.
 			def total
-				return nil unless swaps_readable?
-				read_usage[0].sum
+				v = LinuxStat::Sysinfo.totalswap
+				v ? v.fdiv(1024).to_i : nil
+			end
+
+			##
+			# Shows free swap.
+			#
+			# The value is in kilobytes.
+			#
+			# The return type is a Integer but if the info isn't available, it will return nil.
+			def free
+				v = LinuxStat::Sysinfo.freeswap
+				v ? v.fdiv(1024).to_i : nil
 			end
 
 			##
@@ -70,7 +84,9 @@ module LinuxStat
 			def available
 				return nil unless swaps_readable?
 				values_t = read_usage
-				values_t[0].sum - values_t[1].sum
+				t = values_t[0].reduce(:+)
+				u = values_t[1].reduce(:+)
+				(t && u) ? t - u : nil
 			end
 
 			##
@@ -81,7 +97,7 @@ module LinuxStat
 			# The return type is a Integer but if the info isn't available, it will return nil.
 			def used
 				return nil unless swaps_readable?
-				read_usage[-1].sum
+				read_usage[-1].reduce(:+)
 			end
 
 			##
@@ -92,10 +108,16 @@ module LinuxStat
 				return nil unless swaps_readable?
 				values_t = read_usage
 
-				total = values_t[0].sum
+				_total = values_t[0]
+				_used = values_t[-1]
+				return nil if _total.empty? || _used.empty?
+
+				total = _total.reduce(:+)
+				used = _used.reduce(:+)
+
 				return 0.0 if total == 0
 
-				values_t[-1].sum.*(100).fdiv(total).round(2)
+				used.*(100).fdiv(total).round(2)
 			end
 
 			##
@@ -106,10 +128,15 @@ module LinuxStat
 				return nil unless swaps_readable?
 				values_t = read_usage
 
-				total = values_t[0].sum
+				_total = values_t[0]
+				_used = values_t[-1]
+				return nil if _total.empty? || _used.empty?
+
+				total, used = _total.reduce(:+), _used.reduce(:+)
+
 				return 0.0 if total == 0
 
-				total.-(values_t[-1].sum).*(100).fdiv(total).round(2)
+				total.-(used).*(100).fdiv(total).round(2)
 			end
 
 			private

data/lib/linux_stat/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linux_stat
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies: []
 description: Linux only, efficient linux system utilization reporting and system monitoring
   gem
@@ -19,7 +19,9 @@ executables:
 extensions:
 - ext/fs_stat/extconf.rb
 - ext/nproc/extconf.rb
+- ext/procfs/extconf.rb
 - ext/sysconf/extconf.rb
+- ext/sysinfo/extconf.rb
 - ext/utsname/extconf.rb
 extra_rdoc_files:
 - README.md
@@ -33,8 +35,16 @@ files:
 - ext/fs_stat/fs_stat.c
 - ext/nproc/extconf.rb
 - ext/nproc/nproc.c
+- ext/procfs/extconf.rb
+- ext/procfs/loadavg_pid.h
+- ext/procfs/procfs.c
+- ext/procfs/stat.h
+- ext/procfs/statm.h
+- ext/procfs/uptime.h
 - ext/sysconf/extconf.rb
 - ext/sysconf/sysconf.c
+- ext/sysinfo/extconf.rb
+- ext/sysinfo/sysinfo.c
 - ext/utsname/extconf.rb
 - ext/utsname/utsname.c
 - lib/linux_stat.rb
@@ -68,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="