linux_stat 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2caab049f35d0dcad515eff80928136273b729219cc70a7c07f6823282f0a39c
-  data.tar.gz: eb8a5a546f795116e825bd704da6380a81b197b61ffd4125d0dc2c267e6ea808
+  metadata.gz: 56eb9d01b537db6e6dab3a6ee86a391a1076f63cc612ff961e33f7ab8c703129
+  data.tar.gz: 30a3f6df0c51dfb14c28fcbdd7d2298d4f13fa48e15ef9ef63ab13e0fd980e68
 SHA512:
-  metadata.gz: cd77811626f97fe248885dc2686447e584801d607fb2147200852ff3debc36e0fe37fe8a139a71fe67398ac3fde074c821b68428ccbb6a9cf4126385bcfa23df
-  data.tar.gz: 89a2646c48f68d48e02bc5593bb4f616090c5e1c30045a05eb39a3d0b1c41412853ee09c600b11d4f1e59544bf49e5409fb1d2906d666290989683a707142358
+  metadata.gz: 1f24a5a7fb1d8f32a2c35c7cbc5a7b9bb380efb33a2df23e269ea4ebac565f866b6a399a0361a3f4f325bad13be1b545d59726efccabb4d8d6f8045ed03c3fc6
+  data.tar.gz: 81c1c316b49aaab37f4e300eb597db3a3bcb538549fc6192d9661e7ca5022bd5b6942a257ced51760e2065d7aca82ae465f55e79202ba7a5f8c9e917f53f505c

data/README.md

@@ -38,18 +38,36 @@ It only works on Linux, and detecting the OS is upto the user of this gem.
 2. Ruby: Ruby 2.3.0 and above.
 
 ## Build Dependencies:
-+ You need to have the C compiler installed to be able to compile the C extensions.
-On Arch Linux:
+#### You need to have the C compiler installed to be able to compile the C extensions.
+
++ On Arch Linux / Manjaro / Archlabs / Other Arch Based Distributions
+```
+# pacman -S gcc make ruby
+```
+
++ On Debian / Ubuntu / Linux Mint / Pop!_OS / Raspberry Pi OS / Other Debian Based Distributions
+```
+# apt install gcc build-essential ruby ruby-dev build-essential
+```
+
++ Gentoo / Gentoo Based Distributions
+```
+# emerge --ask dev-lang/ruby
+```
+
++ Fedora / AmazonLinux* / CentOS* / Other RedHat Based Distributions
 ```
-# pacman -S gcc make
+# yum install gcc ruby-devel ruby make
 ```
 
-On Debian based systems:
+You can run linux_stat on *AmazonLinux and *CentOS if you have Ruby 2.3.0+.
+
++ OpenSUSE
 ```
-# apt install gcc build-essential ruby-dev
+# zypper install gcc ruby ruby-devel make
 ```
 
-+ You can remove the packages once the program is installed.
++ You can remove the above packages once the gem is installed.
 
 ---
 
@@ -62,13 +80,28 @@ You can install hwdata simply.
 + Arch:
 
 ```
-sudo pacman -S hwids
+# pacman -S hwids
 ```
 
 + Debian based systems:
 
 ```
-sudo apt install hwdata
+# apt install hwdata
+```
+
++ Gentoo / Gentoo Based Distributions
+```
+# emerge --ask sys-apps/hwids
+```
+
++ Fedora / Amazon Linux / CentOS
+```
+# yum install hwdata
+```
+
++ OpenSUSE
+```
+zypper install hwdata
 ```
 
 But without hwdata, it won't show such information.

data/exe/linuxstat.rb

@@ -266,6 +266,6 @@ if PRINT_TIME
 	).*(1_000_000)
 
 	puts "\e[38;2;255;255;0m:: Warning total time also depends on your terminal speed!\e[0m"
-	puts "Total Real Time: #{T_FMT % total_real_t}ms"
-	puts "Total CPU Time: #{T_FMT % total_cpu_t}ms"
+	puts "Total Real Time: #{T_FMT % total_real_t}\u03BCs"
+	puts "Total CPU Time: #{T_FMT % total_cpu_t}\u03BCs"
 end

data/ext/procfs/procfs.c

@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
+#include <glob.h>
 #include "ruby.h"
 #include "uptime.h"
 #include "statm.h"
@@ -22,6 +23,8 @@
 int Init_procfs() {
 	VALUE _linux_stat = rb_define_module("LinuxStat") ;
 	VALUE _procfs = rb_define_module_under(_linux_stat, "ProcFS") ;
+	VALUE _cpu = rb_define_module_under(_linux_stat, "CPU") ;
+	VALUE _process = rb_define_module_under(_linux_stat, "Process") ;
 
 	// uptime
 	rb_define_module_function(_procfs, "uptime_f", uptime_f, 0) ;
@@ -40,4 +43,7 @@ int Init_procfs() {
 	rb_define_module_function(_procfs, "ps_state", ps_state, 1) ;
 	rb_define_module_function(_procfs, "ps_times", ps_times, 1) ;
 	rb_define_module_function(_procfs, "ps_stat", ps_stat, 1) ;
+	rb_define_module_function(_procfs, "cpu_times", cpuTimes, 0) ;
+	rb_define_module_function(_procfs, "list_process", listProcess, 0) ;
+
 }

data/ext/procfs/stat.h

@@ -17,6 +17,29 @@ static VALUE ps_state(volatile VALUE obj, volatile VALUE pid) {
 	return rb_str_new_cstr(_s) ;
 }
 
+static VALUE listProcess(volatile VALUE obj) {
+	VALUE ary = rb_ary_new() ;
+
+	glob_t globlist ;
+	int status = glob("/proc/[0-9]*/", GLOB_NOSORT, NULL, &globlist) ;
+
+	if (status == GLOB_NOSPACE || status == GLOB_ABORTED || status == GLOB_NOMATCH) {
+		globfree(&globlist) ;
+		return ary ;
+	}
+
+	char *v, *token ;
+	unsigned int i = 0 ;
+	unsigned int num ;
+
+	while(v = globlist.gl_pathv[i++]) {
+		if (sscanf(v, "/proc/%u", &num) == 1) rb_ary_push(ary, UINT2NUM(num)) ;
+	}
+
+	globfree(&globlist) ;
+	return ary ;
+}
+
 static VALUE ps_times(volatile VALUE obj, volatile VALUE pid) {
 	int _pid = FIX2INT(pid) ;
 	if (_pid < 0) return Qnil ;
@@ -117,3 +140,46 @@ static VALUE ps_stat(volatile VALUE obj, volatile VALUE pid) {
 	INT2NUM(exit_code)
 	) ;
 }
+
+static VALUE cpuTimes(volatile VALUE obj) {
+	VALUE ary = rb_ary_new() ;
+	FILE *f = fopen("/proc/stat", "r") ;
+
+	if (!f) return ary ;
+
+	unsigned long user, nice, system, idle, iowait, irq, softirq, steal, guest, guest_nice ;
+	char line[1024] ;
+	char cpuCode[7] ;
+	float ticks = sysconf(_SC_CLK_TCK) ;
+	char scanStatus ;
+
+	while(fgets(line, 1023, f)) {
+		if (!(line[0] == 'c' && line[1] == 'p' && line[2] == 'u')) break ;
+
+		scanStatus = sscanf(line,
+			"%7[cpu0-9] %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu",
+			cpuCode, &user, &nice, &system, &idle, &iowait, &irq, &softirq, &steal, &guest, &guest_nice
+		) ;
+
+		if (scanStatus != 11) break ;
+
+		VALUE innerHash = rb_hash_new() ;
+		rb_hash_aset(innerHash, ID2SYM(rb_intern("cpu")), rb_str_new_cstr(cpuCode)) ;
+		rb_hash_aset(innerHash, ID2SYM(rb_intern("user")), rb_float_new(user / ticks)) ;
+		rb_hash_aset(innerHash, ID2SYM(rb_intern("nice")), rb_float_new(nice / ticks)) ;
+		rb_hash_aset(innerHash, ID2SYM(rb_intern("system")), rb_float_new(system / ticks)) ;
+		rb_hash_aset(innerHash, ID2SYM(rb_intern("idle")), rb_float_new(idle / ticks)) ;
+		rb_hash_aset(innerHash, ID2SYM(rb_intern("iowait")), rb_float_new(iowait / ticks)) ;
+		rb_hash_aset(innerHash, ID2SYM(rb_intern("irq")), rb_float_new(irq / ticks)) ;
+		rb_hash_aset(innerHash, ID2SYM(rb_intern("softirq")), rb_float_new(softirq / ticks)) ;
+		rb_hash_aset(innerHash, ID2SYM(rb_intern("steal")), rb_float_new(steal / ticks)) ;
+		rb_hash_aset(innerHash, ID2SYM(rb_intern("guest")), rb_float_new(guest / ticks)) ;
+		rb_hash_aset(innerHash, ID2SYM(rb_intern("guest_nice")), rb_float_new(guest_nice / ticks)) ;
+
+		rb_ary_push(ary, innerHash) ;
+	}
+
+	fclose(f) ;
+
+	return ary ;
+}

data/lib/linux_stat/cpu.rb

@@ -209,6 +209,10 @@ module LinuxStat
 				h
 			end
 
+			def times
+				LinuxStat::ProcFS.cpu_times
+			end
+
 			##
 			# Returns a Hash with max core frequencies corresponding to the CPUs.
 			#

data/lib/linux_stat/process.rb

@@ -1,25 +1,15 @@
 module LinuxStat
 	# Shows various information about a process that is either
 	# running, sleeping, idle or a zombie.
-
 	module Process
 		class << self
 			##
 			# Returns the list of processes from /proc/.
+			# The output doesn't guarantee a sorted list, in fact it's shuffled most of the time.
 			#
 			# The return type is an Array of Integers.
 			def list
-				d = Dir['/proc/*'.freeze]
-				ret, i = [], -1
-				count = d.length
-
-				while(i += 1) < count
-					pid = File.split(d[i])[1]
-					pid_i = pid.to_i
-					ret << pid_i if pid_i.to_s == pid
-				end
-
-				ret
+				LinuxStat::ProcFS.list_process
 			end
 
 			##
@@ -27,7 +17,7 @@ module LinuxStat
 			#
 			# The return type is Integer.
 			def count
-				list.length
+				LinuxStat::ProcFS.list_process.length
 			end
 
 			##
@@ -36,7 +26,7 @@ module LinuxStat
 			def names
 				h, i = {}, -1
 
-				l = list
+				l = LinuxStat::ProcFS.list_process
 				count = l.length
 
 				while(i += 1) < count
@@ -57,7 +47,7 @@ module LinuxStat
 			def cmdlines
 				h, i = {}, -1
 
-				l = list
+				l = LinuxStat::ProcFS.list_process
 				count = l.length
 
 				while(i += 1) < count
@@ -66,7 +56,7 @@ module LinuxStat
 					begin
 						cmdlines = IO.read("/proc/#{x}/cmdline").strip
 						cmdlines.gsub!(?\u0000.freeze, ?\s.freeze)
-						h.merge!( x => cmdlines)
+						h.merge!(x => cmdlines)
 					rescue StandardError
 					end
 				end
@@ -78,7 +68,7 @@ module LinuxStat
 			def types
 				h, i = {}, -1
 
-				l = list
+				l = LinuxStat::ProcFS.list_process
 				count = l.length
 
 				while(i += 1) < count
@@ -109,7 +99,7 @@ module LinuxStat
 			# Returns all the id of processes that are sleeping.
 			# The return type is an Array of Integers.
 			def sleeping
-				list.select { |x|
+				LinuxStat::ProcFS.list_process.select { |x|
 					LinuxStat::ProcFS.ps_state(x) == ?S.freeze
 				}
 			end
@@ -118,7 +108,7 @@ module LinuxStat
 			# Returns all the id of processes that are idle.
 			# The return type is an Array of Integers.
 			def idle
-				list.select { |x|
+				LinuxStat::ProcFS.list_process.select { |x|
 					LinuxStat::ProcFS.ps_state(x) == ?I.freeze
 				}
 			end
@@ -127,7 +117,7 @@ module LinuxStat
 			# Returns all the id of processes that are zombies.
 			# The return type is an Array of Integers.
 			def zombie
-				list.select { |x|
+				LinuxStat::ProcFS.list_process.select { |x|
 					LinuxStat::ProcFS.ps_state(x) == ?Z.freeze
 				}
 			end
@@ -136,7 +126,7 @@ module LinuxStat
 			# Returns all the id of processes that are running.
 			# The return type is an Array of Integers.
 			def running
-				list.select { |x|
+				LinuxStat::ProcFS.list_process.select { |x|
 					LinuxStat::ProcFS.ps_state(x) == ?R.freeze
 				}
 			end
@@ -145,7 +135,7 @@ module LinuxStat
 			# Returns all the id of processes that are stopped.
 			# The return type is an Array of Integers.
 			def stopped
-				list.select { |x|
+				LinuxStat::ProcFS.list_process.select { |x|
 					v = LinuxStat::ProcFS.ps_state(x)
 					v == ?T.freeze || v == ?t.freeze
 				}

data/lib/linux_stat/version.rb

@@ -1,3 +1,3 @@
 module LinuxStat
-	VERSION = "2.3.0"
+	VERSION = "2.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linux_stat
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies: []
 description: Linux only, efficient linux system utilization reporting and system monitoring
   gem
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.18
+rubygems_version: 3.2.21
 signing_key:
 specification_version: 4
 summary: Efficient linux system reporting gem