linux_stat 1.2.3 → 1.6.0

data/exe/linuxstat.rb

@@ -113,10 +113,20 @@ execute.sort.each do |c|
 
 	meths.each do |meth|
 		arg = nil
-		params = e.method(meth).parameters
 
-		param = ''
+		arity = e.method(meth).arity
+		if arity > 0 || arity == -2
+			if c == :PrettifyBytes
+				arg = rand(10 ** 15)
+			elsif c == :FS
+				arg = '/'
+			else
+				next
+			end
+		end
 
+		params = e.method(meth).parameters
+		param = ''
 		params.each do |p|
 			case p[0]
 				when :opt
@@ -124,24 +134,15 @@ execute.sort.each do |c|
 				when :key
 					param << "#{p[1]}:, "
 				when :req
-					param << "#{p[1] || 'arg'}, "
+					_arg = arg ? " = #{arg.inspect}" : ''.freeze
+					param << "#{p[1] || 'arg'}#{_arg}, "
 			end
 		end
 
-		param.delete_suffix!(", ")
-
-		if e.method(meth).arity > 0
-			if c == :PrettifyBytes
-				arg = rand(10 ** 15)
-			elsif c == :FS
-				arg = '/'
-			else
-				next
-			end
-		end
+		param.chomp!(", ")
 
 		disp_meth = "#{meth}"
-		disp_meth.concat(arg ? "(#{param} = #{arg.inspect})" : "(#{param})")
+		disp_meth.concat(arg ? "(#{param})" : "(#{param})")
 
 		time = Time.now
 		ret = arg ? e.send(meth, arg) : e.send(meth)

data/ext/fs_stat/fs_stat.c

@@ -18,16 +18,16 @@ static VALUE statfs(VALUE obj, VALUE dir) {
 
 	if(statvfs(d, &buf) < 0) return hash ;
 
-	rb_hash_aset(hash, ID2SYM(rb_intern("block_size")), INT2FIX(buf.f_bsize)) ;
-	rb_hash_aset(hash, ID2SYM(rb_intern("fragment_size")), INT2FIX(buf.f_frsize)) ;
-	rb_hash_aset(hash, ID2SYM(rb_intern("blocks")), INT2FIX(buf.f_blocks)) ;
-	rb_hash_aset(hash, ID2SYM(rb_intern("block_free")), INT2FIX(buf.f_bfree)) ;
-	rb_hash_aset(hash, ID2SYM(rb_intern("block_avail_unpriv")), INT2FIX(buf.f_bavail)) ;
-	rb_hash_aset(hash, ID2SYM(rb_intern("inodes")), INT2FIX(buf.f_files)) ;
-	rb_hash_aset(hash, ID2SYM(rb_intern("free_inodes")), INT2FIX(buf.f_ffree)) ;
-	rb_hash_aset(hash, ID2SYM(rb_intern("filesystem_id")), INT2FIX(buf.f_fsid)) ;
-	rb_hash_aset(hash, ID2SYM(rb_intern("mount_flags")), INT2FIX(buf.f_flag)) ;
-	rb_hash_aset(hash, ID2SYM(rb_intern("max_filename_length")), INT2FIX(buf.f_namemax)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("block_size")), INT2FIX((unsigned int)buf.f_bsize)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("fragment_size")), ULL2NUM((unsigned long long)buf.f_frsize)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("blocks")), ULL2NUM((unsigned long long)buf.f_blocks)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("block_free")), ULL2NUM((unsigned long long)buf.f_bfree)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("block_avail_unpriv")), ULL2NUM((unsigned long long)buf.f_bavail)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("inodes")), ULL2NUM((unsigned long long)buf.f_files)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("free_inodes")), ULL2NUM((unsigned long long)buf.f_ffree)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("filesystem_id")), ULL2NUM((unsigned long long)buf.f_fsid)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("mount_flags")), ULL2NUM((unsigned long long)buf.f_flag)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("max_filename_length")), ULL2NUM((unsigned long long)buf.f_namemax)) ;
 
 	return hash ;
 }

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/extconf.rb

@@ -4,7 +4,7 @@ unless have_const('linux') || RbConfig::CONFIG['arch'].to_s[/linux/]
 	abort('Platform is not linux')
 end
 
-unless have_header('sys/unistd.h') && have_header('ruby.h')
+unless have_header('unistd.h') && have_header('ruby.h')
 	abort('Missing header')
 end
 

data/ext/sysconf/sysconf.c

@@ -12,7 +12,7 @@
 #endif
 
 static VALUE getTick(VALUE obj) {
-	short int val = sysconf(_SC_CLK_TCK) ;
+	int val = sysconf(_SC_CLK_TCK) ;
 	if (val < 0) return Qnil ;
 
 	return INT2FIX(val) ;
@@ -22,84 +22,84 @@ static VALUE getChildMax(VALUE obj) {
 	long long int val = sysconf(_SC_CHILD_MAX) ;
 	if (val < 0) return Qnil ;
 
-	return INT2FIX(val) ;
+	return LL2NUM(val) ;
 }
 
 static VALUE getHostnameMax(VALUE obj) {
-	int val = sysconf(_SC_HOST_NAME_MAX) ;
+	long long val = sysconf(_SC_HOST_NAME_MAX) ;
 	if (val < 0) return Qnil ;
 
-	return INT2FIX(val) ;
+	return LL2NUM(val) ;
 }
 
 static VALUE getLoginNameMax(VALUE obj) {
-	int val = sysconf(_SC_LOGIN_NAME_MAX) ;
+	long long val = sysconf(_SC_LOGIN_NAME_MAX) ;
 	if (val < 0) return Qnil ;
 
-	return INT2FIX(val) ;
+	return LL2NUM(val) ;
 }
 
 static VALUE getOpenMax(VALUE obj) {
-	int val = sysconf(_SC_OPEN_MAX) ;
+	long long val = sysconf(_SC_OPEN_MAX) ;
 	if (val < 0) return Qnil ;
 
-	return INT2FIX(val) ;
+	return LL2NUM(val) ;
 }
 
 static VALUE getPageSize(VALUE obj) {
-	short int val = sysconf(_SC_PAGESIZE) ;
+	int val = sysconf(_SC_PAGESIZE) ;
 	if (val < 0) return Qnil ;
 
 	return INT2FIX(val) ;
 }
 
 static VALUE getStreamMax(VALUE obj) {
-	int val = sysconf(_SC_STREAM_MAX) ;
+	long long val = sysconf(_SC_STREAM_MAX) ;
 	if (val < 0) return Qnil ;
 
-	return INT2FIX(val) ;
+	return LL2NUM(val) ;
 }
 
 static VALUE getTTYNameMax(VALUE obj) {
-	int val = sysconf(_SC_TTY_NAME_MAX) ;
+	long long val = sysconf(_SC_TTY_NAME_MAX) ;
 	if (val < 0) return Qnil ;
 
-	return INT2FIX(val) ;
+	return LL2NUM(val) ;
 }
 
 static VALUE getPosixVersion(VALUE obj) {
-	int val = sysconf(_SC_VERSION) ;
+	long long val = sysconf(_SC_VERSION) ;
 	if (val < 0) return Qnil ;
 
-	return INT2FIX(val) ;
+	return LL2NUM(val) ;
 }
 
 static VALUE getLineMax(VALUE obj) {
-	int val = sysconf(_SC_LINE_MAX) ;
+	long long val = sysconf(_SC_LINE_MAX) ;
 	if (val < 0) return Qnil ;
 
-	return INT2FIX(val) ;
+	return LL2NUM(val) ;
 }
 
 static VALUE getExprNestMax(VALUE obj) {
-	int val = sysconf(_SC_EXPR_NEST_MAX) ;
+	long long val = sysconf(_SC_EXPR_NEST_MAX) ;
 	if (val < 0) return Qnil ;
 
-	return INT2FIX(val) ;
+	return LL2NUM(val) ;
 }
 
 static VALUE getProcessorConfigured(VALUE obj) {
-	short int val = sysconf(_SC_NPROCESSORS_CONF) ;
+	long val = sysconf(_SC_NPROCESSORS_CONF) ;
 	if (val < 0) return Qnil ;
 
-	return INT2FIX(val) ;
+	return LONG2NUM(val) ;
 }
 
 static VALUE getProcessorOnline(VALUE obj) {
-	short int val = sysconf(_SC_NPROCESSORS_ONLN) ;
+	long val = sysconf(_SC_NPROCESSORS_ONLN) ;
 	if (val < 0) return Qnil ;
 
-	return INT2FIX(val) ;
+	return LONG2NUM(val) ;
 }
 
 static VALUE getUser(VALUE obj) {
@@ -108,22 +108,22 @@ static VALUE getUser(VALUE obj) {
 }
 
 static VALUE getUID(VALUE obj) {
-	return INT2FIX(getuid()) ;
+	return UINT2NUM((unsigned int) getuid()) ;
 }
 
 static VALUE getGID(VALUE obj) {
-	return INT2FIX(getgid()) ;
+	return UINT2NUM((unsigned int) getgid()) ;
 }
 
 static VALUE getEUID(VALUE obj) {
-	return INT2FIX(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/extconf.rb

@@ -0,0 +1,11 @@
+require 'mkmf'
+
+unless have_const('linux') || RbConfig::CONFIG['arch'].to_s[/linux/]
+	abort('Platform is not linux')
+end
+
+unless have_header('sys/sysinfo.h') && have_header('ruby.h')
+	abort('Missing header')
+end
+
+create_makefile 'linux_stat/sysinfo'

data/ext/sysinfo/sysinfo.c

@@ -0,0 +1,177 @@
+#include <sys/sysinfo.h>
+#include "ruby.h"
+
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
+	#pragma GCC optimize ("O3")
+	#pragma GCC diagnostic warning "-Wall"
+#elif defined(__clang__)
+	#pragma clang optimize on
+	#pragma clang diagnostic warning "-Wall"
+#elif defined(__INTEL_COMPILER)
+	#pragma intel optimization_level 3
+#endif
+
+static struct sysinfo info ;
+
+VALUE totalram(VALUE obj) {
+	char status = sysinfo(&info) ;
+	if (status < 0) return Qnil ;
+
+	VALUE _rb_v = ULL2NUM((unsigned long long) info.totalram) ;
+	VALUE _rb_mem_unit = ULL2NUM((unsigned long long) info.mem_unit) ;
+	return rb_funcallv_public(_rb_v, rb_intern("*"), 1, &_rb_mem_unit) ;
+}
+
+VALUE freeram(VALUE obj) {
+	char status = sysinfo(&info) ;
+	if (status < 0) return Qnil ;
+
+	VALUE _rb_v = ULL2NUM((unsigned long long) info.freeram) ;
+	VALUE _rb_mem_unit = ULL2NUM((unsigned long long) info.mem_unit) ;
+	return rb_funcallv_public(_rb_v, rb_intern("*"), 1, &_rb_mem_unit) ;
+}
+
+VALUE sharedram(VALUE obj) {
+	char status = sysinfo(&info) ;
+	if (status < 0) return Qnil ;
+
+	VALUE _rb_v = ULL2NUM((unsigned long long) info.sharedram) ;
+	VALUE _rb_mem_unit = ULL2NUM((unsigned long long) info.mem_unit) ;
+	return rb_funcallv_public(_rb_v, rb_intern("*"), 1, &_rb_mem_unit) ;
+}
+
+VALUE bufferram(VALUE obj) {
+	char status = sysinfo(&info) ;
+	if (status < 0) return Qnil ;
+
+	VALUE _rb_v = ULL2NUM((unsigned long long) info.bufferram) ;
+	VALUE _rb_mem_unit = ULL2NUM((unsigned long long) info.mem_unit) ;
+	return rb_funcallv_public(_rb_v, rb_intern("*"), 1, &_rb_mem_unit) ;
+}
+
+VALUE totalswap(VALUE obj) {
+	static struct sysinfo info ;
+	char status = sysinfo(&info) ;
+	if (status < 0) return Qnil ;
+
+	VALUE _rb_v = ULL2NUM((unsigned long long) info.totalswap) ;
+	VALUE _rb_mem_unit = ULL2NUM((unsigned long long) info.mem_unit) ;
+	return rb_funcallv_public(_rb_v, rb_intern("*"), 1, &_rb_mem_unit) ;
+}
+
+VALUE freeswap(VALUE obj) {
+	char status = sysinfo(&info) ;
+	if (status < 0) return Qnil ;
+
+	VALUE _rb_v = ULL2NUM((unsigned long long) info.freeswap) ;
+	VALUE _rb_mem_unit = ULL2NUM((unsigned long long) info.mem_unit) ;
+	return rb_funcallv_public(_rb_v, rb_intern("*"), 1, &_rb_mem_unit) ;
+}
+
+VALUE totalhigh(VALUE obj) {
+	char status = sysinfo(&info) ;
+	if (status < 0) return Qnil ;
+
+	VALUE _rb_v = ULL2NUM((unsigned long long) info.totalhigh) ;
+	VALUE _rb_mem_unit = ULL2NUM((unsigned long long) info.mem_unit) ;
+	return rb_funcallv_public(_rb_v, rb_intern("*"), 1, &_rb_mem_unit) ;
+}
+
+VALUE freehigh(VALUE obj) {
+	char status = sysinfo(&info) ;
+	if (status < 0) return Qnil ;
+
+	VALUE _rb_v = ULL2NUM((unsigned long long) info.freehigh) ;
+	VALUE _rb_mem_unit = ULL2NUM((unsigned long long) info.mem_unit) ;
+	return rb_funcallv_public(_rb_v, rb_intern("*"), 1, &_rb_mem_unit) ;
+}
+
+VALUE uptime(VALUE obj) {
+	char status = sysinfo(&info) ;
+	if (status < 0) return Qnil ;
+
+	unsigned long long v = info.uptime ;
+	return ULL2NUM((unsigned long long) v) ;
+}
+
+VALUE loads(VALUE obj) {
+	char status = sysinfo(&info) ;
+	if(status < 0) return rb_ary_new() ;
+
+	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 ;
+
+	return rb_ary_new_from_args(3,
+		rb_float_new(l_1),
+		rb_float_new(l_5),
+		rb_float_new(l_15)
+	) ;
+}
+
+// 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") ;
+
+	rb_define_module_function(_sysinfo, "totalram", totalram, 0) ;
+	rb_define_module_function(_sysinfo, "freeram", freeram, 0) ;
+	rb_define_module_function(_sysinfo, "sharedram", sharedram, 0) ;
+	rb_define_module_function(_sysinfo, "bufferram", bufferram, 0) ;
+	rb_define_module_function(_sysinfo, "totalswap", totalswap, 0) ;
+	rb_define_module_function(_sysinfo, "freeswap", freeswap, 0) ;
+	rb_define_module_function(_sysinfo, "totalhigh", totalhigh, 0) ;
+	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.rb

@@ -23,19 +23,23 @@ require "linux_stat/version"
 # But might be required by other module functions in "Dependent Modules" section
 require "linux_stat/battery"
 require "linux_stat/bios"
-require "linux_stat/memory"
 require "linux_stat/net"
 require "linux_stat/pci"
 require "linux_stat/process"
-require "linux_stat/swap"
+require "linux_stat/thermal"
 require "linux_stat/usb"
 
 # Dependent Modules
 # Modules that can have reverse dependency
 
+# LinuxStat::CPU.sysinfo dependent modules
+require "linux_stat/sysinfo"
+require "linux_stat/swap"
+require "linux_stat/memory"
+
 # LinuxStat::CPU.nproc dependent modules
-require "linux_stat/cpu"
 require "linux_stat/nproc"
+require "linux_stat/cpu"
 
 # LinuxStat::Uname dependent modules
 require 'linux_stat/utsname'