linux_stat 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5da13d97b132a58afb5d56337e40f5a234cf129612a14886e931b5d01d2232d3
-  data.tar.gz: dee75b59d2a8e2ab3f55e19c7e117869149d2c318fbc12e6e8a39c3d9433d418
+  metadata.gz: 2204620ae409ee97e9a3fb737bb2442ce2f60e2f8b1fe4473c31c441a3ae19ac
+  data.tar.gz: f04b438fc002122865f56597bb39acdfc52fd19f25bf628a4db3a3f4afb09830
 SHA512:
-  metadata.gz: 1885696170e580ac960730d82dce2e73ca8b924211b3ee1d74c3cdde362fdaebf6fcc08a7fd49b444729186e65c68b0c15767c9baca050d0853b0460ae1ca989
-  data.tar.gz: 8ec56355b4774c830282ca5ecb23dc3318ccc8fabd748a20af4bb0535bec6e3f0da9a3d0232ce09f58e1bf43cb9cc5917e970633dc19cc7c4b0cc9ed786df492
+  metadata.gz: 3fec213db7635a5763bd6082da8cbe429b0c3bb2f227e242e9cf33da59bb381dc5f008edd1bf63da576c8ad4b39fe8f56f97efb9f4ff3a4ce9f8760253afc97f
+  data.tar.gz: 6de48af0e03a1a91166d4cc5f438f38cc0662a9d4cbc948d663591abfcf078ddd751f5f9064362448ef76252d38eb85258a4abaa20ac88c07a6dbf28b23b762b

data/exe/linuxstat.rb

@@ -138,7 +138,8 @@ execute.sort.each do |c|
 					param << "#{p[1] || 'arg'}#{_arg}, "
 			end
 		end
-		param.delete_suffix!(", ")
+
+		param.chomp!(", ")
 
 		disp_meth = "#{meth}"
 		disp_meth.concat(arg ? "(#{param})" : "(#{param})")

data/ext/nproc/nproc.c

@@ -18,9 +18,9 @@
 static VALUE count_cpu_for_pid(VALUE obj, VALUE pid) {
 	cpu_set_t set ;
 	CPU_ZERO(&set) ;
-	short int stat = sched_getaffinity(FIX2INT(pid), sizeof(set), &set) ;
+	char status = sched_getaffinity(FIX2INT(pid), sizeof(set), &set) ;
 
-	if (stat < 0) return Qnil ;
+	if (status < 0) return Qnil ;
 	return INT2FIX(CPU_COUNT(&set)) ;
 }
 

data/ext/sysconf/sysconf.c

@@ -1,5 +1,4 @@
 #include <unistd.h>
-#include <inttypes.h>
 #include "ruby.h"
 
 #if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
@@ -13,94 +12,94 @@
 #endif
 
 static VALUE getTick(VALUE obj) {
-	int16_t val = sysconf(_SC_CLK_TCK) ;
+	int val = sysconf(_SC_CLK_TCK) ;
 	if (val < 0) return Qnil ;
 
 	return INT2FIX(val) ;
 }
 
 static VALUE getChildMax(VALUE obj) {
-	int64_t val = sysconf(_SC_CHILD_MAX) ;
+	long long int val = sysconf(_SC_CHILD_MAX) ;
 	if (val < 0) return Qnil ;
 
-	return INT2NUM(val) ;
+	return LL2NUM(val) ;
 }
 
 static VALUE getHostnameMax(VALUE obj) {
-	int32_t val = sysconf(_SC_HOST_NAME_MAX) ;
+	long long val = sysconf(_SC_HOST_NAME_MAX) ;
 	if (val < 0) return Qnil ;
 
-	return INT2NUM(val) ;
+	return LL2NUM(val) ;
 }
 
 static VALUE getLoginNameMax(VALUE obj) {
-	int32_t val = sysconf(_SC_LOGIN_NAME_MAX) ;
+	long long val = sysconf(_SC_LOGIN_NAME_MAX) ;
 	if (val < 0) return Qnil ;
 
-	return INT2NUM(val) ;
+	return LL2NUM(val) ;
 }
 
 static VALUE getOpenMax(VALUE obj) {
-	int64_t val = sysconf(_SC_OPEN_MAX) ;
+	long long val = sysconf(_SC_OPEN_MAX) ;
 	if (val < 0) return Qnil ;
 
-	return INT2NUM(val) ;
+	return LL2NUM(val) ;
 }
 
 static VALUE getPageSize(VALUE obj) {
-	int32_t val = sysconf(_SC_PAGESIZE) ;
+	int val = sysconf(_SC_PAGESIZE) ;
 	if (val < 0) return Qnil ;
 
-	return INT2NUM(val) ;
+	return INT2FIX(val) ;
 }
 
 static VALUE getStreamMax(VALUE obj) {
-	int64_t val = sysconf(_SC_STREAM_MAX) ;
+	long long val = sysconf(_SC_STREAM_MAX) ;
 	if (val < 0) return Qnil ;
 
-	return INT2NUM(val) ;
+	return LL2NUM(val) ;
 }
 
 static VALUE getTTYNameMax(VALUE obj) {
-	int32_t val = sysconf(_SC_TTY_NAME_MAX) ;
+	long long val = sysconf(_SC_TTY_NAME_MAX) ;
 	if (val < 0) return Qnil ;
 
-	return INT2NUM(val) ;
+	return LL2NUM(val) ;
 }
 
 static VALUE getPosixVersion(VALUE obj) {
-	int32_t val = sysconf(_SC_VERSION) ;
+	long long val = sysconf(_SC_VERSION) ;
 	if (val < 0) return Qnil ;
 
-	return INT2NUM(val) ;
+	return LL2NUM(val) ;
 }
 
 static VALUE getLineMax(VALUE obj) {
-	int32_t val = sysconf(_SC_LINE_MAX) ;
+	long long val = sysconf(_SC_LINE_MAX) ;
 	if (val < 0) return Qnil ;
 
-	return INT2NUM(val) ;
+	return LL2NUM(val) ;
 }
 
 static VALUE getExprNestMax(VALUE obj) {
-	int32_t val = sysconf(_SC_EXPR_NEST_MAX) ;
+	long long val = sysconf(_SC_EXPR_NEST_MAX) ;
 	if (val < 0) return Qnil ;
 
-	return INT2NUM(val) ;
+	return LL2NUM(val) ;
 }
 
 static VALUE getProcessorConfigured(VALUE obj) {
-	int32_t val = sysconf(_SC_NPROCESSORS_CONF) ;
+	long val = sysconf(_SC_NPROCESSORS_CONF) ;
 	if (val < 0) return Qnil ;
 
-	return INT2NUM(val) ;
+	return LONG2NUM(val) ;
 }
 
 static VALUE getProcessorOnline(VALUE obj) {
-	int32_t val = sysconf(_SC_NPROCESSORS_ONLN) ;
+	long val = sysconf(_SC_NPROCESSORS_ONLN) ;
 	if (val < 0) return Qnil ;
 
-	return INT2NUM(val) ;
+	return LONG2NUM(val) ;
 }
 
 static VALUE getUser(VALUE obj) {
@@ -109,22 +108,22 @@ static VALUE getUser(VALUE obj) {
 }
 
 static VALUE getUID(VALUE obj) {
-	return INT2NUM(getuid()) ;
+	return UINT2NUM((unsigned int) getuid()) ;
 }
 
 static VALUE getGID(VALUE obj) {
-	return INT2NUM(getgid()) ;
+	return UINT2NUM((unsigned int) getgid()) ;
 }
 
 static VALUE getEUID(VALUE obj) {
-	return INT2NUM(geteuid()) ;
+	return UINT2NUM((unsigned int) geteuid()) ;
 }
 
 static VALUE getHostname(VALUE obj) {
 	int h_max = sysconf(_SC_HOST_NAME_MAX) + 1 ;
 	char hostname[h_max] ;
 
-	short int status = gethostname(hostname, h_max) ;
+	char status = gethostname(hostname, h_max) ;
 
 	return (status < 0) ? rb_str_new_cstr("") : rb_str_new_cstr(hostname) ;
 }

data/ext/sysinfo/sysinfo.c

@@ -1,5 +1,4 @@
 #include <sys/sysinfo.h>
-#include <inttypes.h>
 #include "ruby.h"
 
 #if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
@@ -15,8 +14,7 @@
 static struct sysinfo info ;
 
 VALUE totalram(VALUE obj) {
-	static struct sysinfo info ;
-	short status = sysinfo(&info) ;
+	char status = sysinfo(&info) ;
 	if (status < 0) return Qnil ;
 
 	VALUE _rb_v = ULL2NUM((unsigned long long) info.totalram) ;
@@ -25,7 +23,7 @@ VALUE totalram(VALUE obj) {
 }
 
 VALUE freeram(VALUE obj) {
-	short status = sysinfo(&info) ;
+	char status = sysinfo(&info) ;
 	if (status < 0) return Qnil ;
 
 	VALUE _rb_v = ULL2NUM((unsigned long long) info.freeram) ;
@@ -34,7 +32,7 @@ VALUE freeram(VALUE obj) {
 }
 
 VALUE sharedram(VALUE obj) {
-	short status = sysinfo(&info) ;
+	char status = sysinfo(&info) ;
 	if (status < 0) return Qnil ;
 
 	VALUE _rb_v = ULL2NUM((unsigned long long) info.sharedram) ;
@@ -43,7 +41,7 @@ VALUE sharedram(VALUE obj) {
 }
 
 VALUE bufferram(VALUE obj) {
-	short status = sysinfo(&info) ;
+	char status = sysinfo(&info) ;
 	if (status < 0) return Qnil ;
 
 	VALUE _rb_v = ULL2NUM((unsigned long long) info.bufferram) ;
@@ -53,7 +51,7 @@ VALUE bufferram(VALUE obj) {
 
 VALUE totalswap(VALUE obj) {
 	static struct sysinfo info ;
-	short status = sysinfo(&info) ;
+	char status = sysinfo(&info) ;
 	if (status < 0) return Qnil ;
 
 	VALUE _rb_v = ULL2NUM((unsigned long long) info.totalswap) ;
@@ -62,7 +60,7 @@ VALUE totalswap(VALUE obj) {
 }
 
 VALUE freeswap(VALUE obj) {
-	short status = sysinfo(&info) ;
+	char status = sysinfo(&info) ;
 	if (status < 0) return Qnil ;
 
 	VALUE _rb_v = ULL2NUM((unsigned long long) info.freeswap) ;
@@ -71,7 +69,7 @@ VALUE freeswap(VALUE obj) {
 }
 
 VALUE totalhigh(VALUE obj) {
-	short status = sysinfo(&info) ;
+	char status = sysinfo(&info) ;
 	if (status < 0) return Qnil ;
 
 	VALUE _rb_v = ULL2NUM((unsigned long long) info.totalhigh) ;
@@ -80,7 +78,7 @@ VALUE totalhigh(VALUE obj) {
 }
 
 VALUE freehigh(VALUE obj) {
-	short status = sysinfo(&info) ;
+	char status = sysinfo(&info) ;
 	if (status < 0) return Qnil ;
 
 	VALUE _rb_v = ULL2NUM((unsigned long long) info.freehigh) ;
@@ -89,15 +87,15 @@ VALUE freehigh(VALUE obj) {
 }
 
 VALUE uptime(VALUE obj) {
-	short status = sysinfo(&info) ;
+	char status = sysinfo(&info) ;
 	if (status < 0) return Qnil ;
 
-	uint64_t v = info.uptime ;
+	unsigned long long v = info.uptime ;
 	return ULL2NUM((unsigned long long) v) ;
 }
 
 VALUE loads(VALUE obj) {
-	short status = sysinfo(&info) ;
+	char status = sysinfo(&info) ;
 	if(status < 0) return rb_ary_new() ;
 
 	long double load = 1.f / (1 << SI_LOAD_SHIFT) ;
@@ -113,6 +111,54 @@ VALUE loads(VALUE obj) {
 	) ;
 }
 
+// Some people may need this function, just keep it to not make unnecessary calls
+VALUE sysinfoStat(VALUE obj) {
+	char status = sysinfo(&info) ;
+	VALUE hash = rb_hash_new() ;
+	if (status < 0) return hash ;
+
+	unsigned long long mem_unit = info.mem_unit ;
+	VALUE _rb_mem_unit = ULL2NUM(mem_unit) ;
+
+	unsigned long long _totalram = info.totalram ;
+	unsigned long long _freeram = info.freeram ;
+	unsigned long long _sharedram = info.sharedram ;
+	unsigned long long _bufferram = info.bufferram ;
+	unsigned long long _totalswap = info.totalswap ;
+	unsigned long long _freeswap = info.freeswap ;
+	unsigned long long _totalhigh = info.totalhigh ;
+	unsigned long long _freehigh = info.freehigh ;
+	unsigned long long _uptime = info.uptime ;
+
+	long double load = 1.f / (1 << SI_LOAD_SHIFT) ;
+
+	float l_1 = info.loads[0] * load ;
+	float l_5 = info.loads[1] * load ;
+	float l_15 = info.loads[2] * load ;
+
+	VALUE loads = rb_ary_new_from_args(3,
+		rb_float_new(l_1),
+		rb_float_new(l_5),
+		rb_float_new(l_15)
+	) ;
+
+	VALUE mul = rb_intern("*") ;
+
+	rb_hash_aset(hash, ID2SYM(rb_intern("totalram")), rb_funcallv_public(ULL2NUM(_totalram), mul, 1, &_rb_mem_unit)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("freeram")), rb_funcallv_public(ULL2NUM(_freeram), mul, 1, &_rb_mem_unit)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("sharedram")), rb_funcallv_public(ULL2NUM(_sharedram), mul, 1, &_rb_mem_unit)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("bufferram")), rb_funcallv_public(ULL2NUM(_bufferram), mul, 1, &_rb_mem_unit)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("totalswap")), rb_funcallv_public(ULL2NUM(_totalswap), mul, 1, &_rb_mem_unit)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("freeswap")), rb_funcallv_public(ULL2NUM(_freeswap), mul, 1, &_rb_mem_unit)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("totalhigh")), rb_funcallv_public(ULL2NUM(_totalhigh), mul, 1, &_rb_mem_unit)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("freehigh")), rb_funcallv_public(ULL2NUM(_freehigh), mul, 1, &_rb_mem_unit)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("uptime")), rb_funcallv_public(ULL2NUM(_uptime), mul, 1, &_rb_mem_unit)) ;
+
+	rb_hash_aset(hash, ID2SYM(rb_intern("loads")), loads) ;
+
+	return hash ;
+}
+
 void Init_sysinfo() {
 	VALUE _linux_stat = rb_define_module("LinuxStat") ;
 	VALUE _sysinfo = rb_define_module_under(_linux_stat, "Sysinfo") ;
@@ -127,4 +173,5 @@ void Init_sysinfo() {
 	rb_define_module_function(_sysinfo, "freehigh", freehigh, 0) ;
 	rb_define_module_function(_sysinfo, "uptime", uptime, 0) ;
 	rb_define_module_function(_sysinfo, "loads", loads, 0) ;
+	rb_define_module_function(_sysinfo, "stat", sysinfoStat, 0) ;
 }

data/ext/utsname/utsname.c

@@ -17,7 +17,7 @@ static char *sysname = "", *nodename = "" ;
 static char *release = "", *version = "", *machine = "" ;
 
 void init_buf() {
-	short status = uname(&buf) ;
+	char status = uname(&buf) ;
 
 	if (status > -1) {
 		sysname = buf.sysname ;

data/lib/linux_stat/os.rb

@@ -140,6 +140,8 @@ module LinuxStat
 			#
 			#    => {:hour=>10, :minute=>34, :second=>12.59}
 			#
+			# Using uptime is 10x slower than using uptime_i
+			#
 			# If the stat isn't available, an empty hash is returned.
 			def uptime
 				return {} unless uptime_readable?
@@ -158,11 +160,27 @@ module LinuxStat
 				}.freeze
 			end
 
+			##
+			# Returns Float uptime of the system reported by /proc/uptime
+			#    LinuxStat::OS.uptime_f
+			#
+			#    => 28956.34
+			#
+			# The value is generally rounded to 2 decimal places.
+			#
+			# Using uptime_f is 10x slower than using uptime_i
+			#
+			# If the stat isn't available, nil is returned.
+			def uptime_f
+				return nil unless uptime_readable?
+				IO.foreach('/proc/uptime'.freeze, ' ').next.to_f
+			end
+
 			##
 			# Returns uptime of the system reported by LinuxStat::Sysinfo.uptime()
 			#    LinuxStat::OS.uptime_i
 			#
-			#    28956
+			#    => 28956
 			#
 			# If the stat isn't available, nil is returned.
 			def uptime_i

data/lib/linux_stat/version.rb

@@ -1,3 +1,3 @@
 module LinuxStat
-	VERSION ||= "1.5.1"
+	VERSION ||= "1.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linux_stat
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies: []
 description: Linux only, efficient linux system utilization reporting and system monitoring
   gem
@@ -71,7 +71,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="