linux_stat 1.2.2 → 1.5.1

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,14 @@ 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
-
 		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/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

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

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,130 @@
+#include <sys/sysinfo.h>
+#include <inttypes.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) {
+	static struct sysinfo info ;
+	short 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) {
+	short 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) {
+	short 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) {
+	short 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 ;
+	short 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) {
+	short 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) {
+	short 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) {
+	short 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) {
+	short status = sysinfo(&info) ;
+	if (status < 0) return Qnil ;
+
+	uint64_t v = info.uptime ;
+	return ULL2NUM((unsigned long long) v) ;
+}
+
+VALUE loads(VALUE obj) {
+	short 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)
+	) ;
+}
+
+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) ;
+}

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'

data/lib/linux_stat/battery.rb

@@ -1,4 +1,6 @@
 module LinuxStat
+	# Shows various battery related information of the current system.
+
 	module Battery
 		PATH = "/sys/class/power_supply/BAT0".freeze
 

data/lib/linux_stat/bios.rb

@@ -1,4 +1,6 @@
 module LinuxStat
+	# Shows various BIOS related information of the current system.
+
 	module BIOS
 		class << self
 			##

data/lib/linux_stat/cpu.rb

@@ -1,4 +1,6 @@
 module LinuxStat
+	# Shows various CPU related information of the current system.
+
 	module CPU
 		class << self
 			##

data/lib/linux_stat/filesystem.rb

@@ -1,4 +1,6 @@
 module LinuxStat
+	# Shows various Filesystem related information of the current system.
+
 	module Filesystem
 		class << self
 			##

data/lib/linux_stat/kernel.rb

@@ -1,4 +1,6 @@
 module LinuxStat
+	# Shows various Kernel related information of the current system.
+
 	module Kernel
 		class << self
 			##

data/lib/linux_stat/memory.rb

@@ -1,4 +1,6 @@
 module LinuxStat
+	# Shows various Memory related information of the current system.
+
 	module Memory
 		class << self
 			##
@@ -11,7 +13,7 @@ module LinuxStat
 			def stat
 				return {} unless meminfo?
 
-				memory = IO.foreach('/proc/meminfo').first(3)
+				memory = IO.foreach('/proc/meminfo'.freeze).first(3)
 
 				total = memory[0].split[1].to_i
 				available = memory[2].split[1].to_i
@@ -33,13 +35,23 @@ module LinuxStat
 			end
 
 			##
-			# Returns the total memory details reported by /proc/meminfo.
+			# Returns the total memory reported by LS::Sysinfo.totalram()
 			# The value is in Kilobyte.
 			#
 			# It retuns an Integer but if the info is not available, it will return nil.
 			def total
-				return nil unless meminfo?
-				IO.foreach('/proc/meminfo').first.split[1].to_i
+				v = LinuxStat::Sysinfo.totalram
+				v ? v.fdiv(1024).to_i : nil
+			end
+
+			##
+			# Returns the free memory reported by LS::Sysinfo.freeram()
+			# The value is in Kilobyte.
+			#
+			# It retuns an Integer but if the info is not available, it will return nil.
+			def free
+				v = LinuxStat::Sysinfo.freeram
+				v ? v.fdiv(1024).to_i : nil
 			end
 
 			##
@@ -49,7 +61,7 @@ module LinuxStat
 			# It retuns an Integer but if the info is not available, it will return nil
 			def available
 				return nil unless meminfo?
-				IO.foreach('/proc/meminfo').first(3)[-1].split[1].to_i
+				IO.foreach('/proc/meminfo'.freeze).first(3)[-1].split[1].to_i
 			end
 
 			##
@@ -59,7 +71,7 @@ module LinuxStat
 			# It retuns an Integer but if the info is not available, it will return nil.
 			def used
 				return nil unless meminfo?
-				memory = IO.foreach('/proc/meminfo').first(3)
+				memory = IO.foreach('/proc/meminfo'.freeze).first(3)
 				memory[0].split[1].to_i - memory[2].split[1].to_i
 			end
 
@@ -69,7 +81,7 @@ module LinuxStat
 			# It retuns an Integer but if the info is not available, it will return nil
 			def percent_used
 				return nil unless meminfo?
-				memory = IO.foreach('/proc/meminfo').first(3)
+				memory = IO.foreach('/proc/meminfo'.freeze).first(3)
 				total = memory[0].split[1].to_i
 				total.-(memory[2].split[1].to_i).*(100).fdiv(total).round(2)
 			end
@@ -80,13 +92,13 @@ module LinuxStat
 			# It retuns an Integer but if the info is not available,  it will return nil
 			def percent_available
 				return nil unless meminfo?
-				memory = IO.foreach('/proc/meminfo').first(3)
+				memory = IO.foreach('/proc/meminfo'.freeze).first(3)
 				memory[2].split[1].to_i.*(100).fdiv(memory[0].split[1].to_i).round(2)
 			end
 
 			private
 			def meminfo?
-				@@readable ||= File.readable?('/proc/meminfo')
+				@@readable ||= File.readable?('/proc/meminfo'.freeze)
 			end
 		end
 	end