linux_stat 2.1.2 → 2.3.0

data/exe/linuxstat.rb

@@ -7,6 +7,12 @@ rescue LoadError
 	abort "The Gem needs to be installed before this test can be run!"
 end
 
+# Time reporting format
+T_FMT = '%d'.freeze
+
+# Check the number of iterations
+iterations = (ARGV.find { |x| x.to_i.to_s == x } || 1).to_i
+
 Integer.class_exec do
 	define_method(:clamp) { |min, max|
 		self < min ? min : self > max ? max : self
@@ -100,122 +106,166 @@ execute = constants.map(&:downcase).map.with_index { |x, i|
 execute.replace(constants) if execute.empty?
 HEXAGONS = %W(\u2b22 \u2b23 \u2B53 \u2B1F)
 
-execute.sort.each do |c|
-	e = eval("LinuxStat::#{c}")
+puts " #{HEXAGONS.rotate![0]} LinuxStat: #{LinuxStat::VERSION}"
+puts " #{HEXAGONS.rotate![0]} Test Modules: #{execute.size}"
+puts " #{HEXAGONS.rotate![0]} Iterations: #{iterations}"
 
-	next if e.class != Module && e.class != Class
+puts " #{HEXAGONS.rotate![0]} Format: Markdown" if MARKDOWN
+puts " #{HEXAGONS.rotate![0]} Format: HTML" if HTML
 
-	meths = e.methods(false).sort
+sleep 2
+puts
 
-	if meths.length > 0
-		if MARKDOWN
-			puts "### LinuxStat::#{c}\n```"
-		elsif HTML
-			puts "<h3>LinuxStat::#{c}</h3>\n<pre>"
-		else
-			puts "\e[1;4;38;2;255;240;0mLinuxStat::#{c}\e[0m"
-		end
+def get_colour(n)
+	if n > 10_000
+		"\e[1;38;2;255;50;50m"
+	elsif n > 5_000
+		"\e[1;38;2;255;170;0m"
+	else
+		"\e[1;38;2;0;170;0m"
 	end
+end
+
+total_real_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+total_cpu_time = Process.times
+
+iterations.times do
+	execute.sort.each do |c|
+		e = eval("LinuxStat::#{c}")
+
+		next if e.class != Module && e.class != Class
 
-	meths.each do |meth|
-		arg = nil
+		meths = e.methods(false).sort
 
-		arity = e.method(meth).arity
-		if arity > 0 || arity == -2
-			if c == :PrettifyBytes
-				arg = rand(10 ** 15)
-			elsif c == :FS
-				arg = '/'
+		if meths.length > 0
+			if MARKDOWN
+				puts "### LinuxStat::#{c}\n```"
+			elsif HTML
+				puts "<h3>LinuxStat::#{c}</h3>\n<pre>"
 			else
-				next
+				puts "\e[1;4;38;2;255;240;0mLinuxStat::#{c}\e[0m"
 			end
 		end
 
-		params = e.method(meth).parameters
-		param = ''
-		params.each do |p|
-			case p[0]
-				when :opt
-					param << "#{p[1]}, "
-				when :key
-					param << "#{p[1]}:, "
-				when :req
-					_arg = arg ? " = #{arg.inspect}" : ''.freeze
-					param << "#{p[1] || 'arg'}#{_arg}, "
+		meths.each do |meth|
+			arg = nil
+
+			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
-		end
 
-		param.chomp!(", ")
-
-		disp_meth = "#{meth}"
-		disp_meth.concat(arg ? "(#{param})" : "(#{param})")
-
-		time = Time.now
-		ret = arg ? e.send(meth, arg) : e.send(meth)
-		time2 = Time.now
-		time = time2.-(time).*(1_000_000).round(3)
-
-		v = ret.inspect
-		dis = v.length > 253 ? v[0..250].strip + '...'.freeze : v
-
-		source = e.singleton_method(meth).source_location.to_a
-		src, src_meth, src_ret = '', '', ''
-
-		unless source.empty?
-			src << " File:\t\t#{File.split(source[0])[-1]} | Line: #{source[1]}\n"
-			src_meth << " Definition:\t#{IO.foreach(source[0]).first(source[1])[-1].strip}\n"
-
-			src_ret << " Returns:\t" << case ret
-				when Array then 'Array | Empty Array'
-				when Complex then 'Complex | nil'
-				when Float then 'Float | nil'
-				when Hash then 'Hash | Empty Hash'
-				when Integer then 'Integer | nil'
-				when Rational then 'Rational | nil'
-				when String then "String | (Frozen) Empty String"
-				when Time then 'Time | nil'
-				when true, false then 'True or False | nil'
-				when nil then 'nil'
-				else ''
-			end << ?\n.freeze if PRINT_TYPE
-
-			if MARKDOWN || HTML
-				src.prepend('#'.freeze)
-				src_meth.prepend('#'.freeze)
-				src_ret.prepend(?#.freeze) if PRINT_TYPE
-			else
-				src.prepend(HEXAGONS.rotate![0].freeze)
-				src_meth.prepend(HEXAGONS.rotate![0].freeze)
-				src_ret.prepend(HEXAGONS.rotate![0].freeze) if PRINT_TYPE
+			params = e.method(meth).parameters
+			param = ''
+			params.each do |p|
+				case p[0]
+					when :opt
+						param << "#{p[1]}, "
+					when :key
+						param << "#{p[1]}:, "
+					when :req
+						_arg = arg ? " = #{arg.inspect}" : ''.freeze
+						param << "#{p[1] || 'arg'}#{_arg}, "
+				end
 			end
-		end
 
-		if MARKDOWN
-			puts "#{src}#{src_meth}#{src_ret}#{e}.#{disp_meth}\n=> #{dis}"
-		elsif HTML
-			puts "#{src}#{src_meth}#{src_ret}#{e}.#{disp_meth}\n=> #{dis}"
-		else
-			puts "\e[1m#{src.colourize}\e[1m#{src_meth.colourize(6)}\e[1m#{src_ret.colourize(1)}\e[0m\e[1;38;2;80;80;255m#{e}.#{disp_meth}\e[0m\n=> #{dis}"
-		end
+			param.chomp!(", ")
+
+			disp_meth = "#{meth}"
+			disp_meth.concat(arg ? "(#{param})" : "(#{param})")
+
+			time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+			cputime = Process.times
+
+			ret = arg ? e.send(meth, arg) : e.send(meth)
+
+			time2 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+			cputime2 = Process.times
+
+			time = time2.-(time).*(1_000_000)
+			cputime = cputime2.stime.+(cputime2.utime).-(cputime.stime + cputime.utime).*(1_000_000)
+
+			v = ret.inspect
+			dis = v.length > 253 ? v[0..250].strip + '...'.freeze : v
+
+			source = e.singleton_method(meth).source_location.to_a
+			src, src_meth, src_ret = '', '', ''
+
+			unless source.empty?
+				src << " File:\t\t#{File.split(source[0])[-1]} | Line: #{source[1]}\n"
+				src_meth << " Definition:\t#{IO.foreach(source[0]).first(source[1])[-1].strip}\n"
+
+				src_ret << " Returns:\t" << case ret
+					when Array then 'Array | Empty Array'
+					when Complex then 'Complex | nil'
+					when Float then 'Float | nil'
+					when Hash then 'Hash | Empty Hash'
+					when Integer then 'Integer | nil'
+					when Rational then 'Rational | nil'
+					when String then "String | (Frozen) Empty String"
+					when Time then 'Time | nil'
+					when true, false then 'True or False | nil'
+					when nil then 'nil'
+					else ''
+				end << ?\n.freeze if PRINT_TYPE
+
+				if MARKDOWN || HTML
+					src.prepend('#'.freeze)
+					src_meth.prepend('#'.freeze)
+					src_ret.prepend(?#.freeze) if PRINT_TYPE
+				else
+					src.prepend(HEXAGONS.rotate![0].freeze)
+					src_meth.prepend(HEXAGONS.rotate![0].freeze)
+					src_ret.prepend(HEXAGONS.rotate![0].freeze) if PRINT_TYPE
+				end
+			end
 
-		puts( "(" +
-			if time > 10_000
-				"\e[1;38;2;255;50;50m"
-			elsif time > 5_000
-				"\e[1;38;2;255;170;0m"
+			if MARKDOWN
+				puts "#{src}#{src_meth}#{src_ret}#{e}.#{disp_meth}\n=> #{dis}"
+			elsif HTML
+				puts "#{src}#{src_meth}#{src_ret}#{e}.#{disp_meth}\n=> #{dis}"
 			else
-				"\e[1;38;2;0;170;0m"
-			end + "Time taken: #{time}\u03BCs\e[0m)"
-		) if PRINT_TIME
+				puts "\e[1m#{src.colourize}\e[1m#{src_meth.colourize(6)}\e[1m#{src_ret.colourize(1)}\e[0m\e[1;38;2;80;80;255m#{e}.#{disp_meth}\e[0m\n=> #{dis}"
+			end
 
-		puts
-	end
+			if PRINT_TIME
+				time_colour = get_colour(time)
+				cputime_colour = get_colour(cputime)
+
+				puts "[Real Time: #{time_colour}#{T_FMT % time}\u03BCs\e[0m, "\
+				"CPU Time: #{cputime_colour}#{T_FMT % cputime}\u03BCs\e[0m]"
+			end
+
+			puts
+		end
 
-	if meths.length > 0
-		if MARKDOWN
-			puts "```\n\n"
-		elsif HTML
-			puts "</pre>"
+		if meths.length > 0
+			if MARKDOWN
+				puts "```\n\n"
+			elsif HTML
+				puts "</pre>"
+			end
 		end
 	end
 end
+
+if PRINT_TIME
+	total_real_time2 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+	total_cpu_time2 = Process.times
+
+	total_real_t = total_real_time2.-(total_real_time).*(1_000_000)
+
+	total_cpu_t = total_cpu_time2.stime.+(total_cpu_time2.utime).-(
+		total_cpu_time.stime + total_cpu_time.utime
+	).*(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"
+end

data/ext/fs_stat/disk_stat.h

@@ -0,0 +1,25 @@
+static VALUE getDiskStats (volatile VALUE obj, volatile VALUE path) {
+	FILE *file = fopen("/proc/diskstats", "r") ;
+	if(!file) return rb_ary_new() ;
+
+	char lines[120] ;
+	unsigned long long read, write ;
+	char *p = StringValuePtr(path) ;
+
+	while(fgets(lines, 119, file)) {
+		sscanf(lines, "%*s %*s %s %*s %*s %llu %*s %*s %*s %llu", lines, &read, &write) ;
+
+		if(strcmp(lines, p) == 0) {
+			fclose(file) ;
+
+			return rb_ary_new_from_args(
+				2,
+				ULL2NUM(read),
+				ULL2NUM(write)
+			) ;
+		}
+	}
+
+	fclose(file) ;
+	return rb_ary_new() ;
+}

data/ext/fs_stat/extconf.rb

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

data/ext/fs_stat/fs_stat.c

@@ -1,5 +1,12 @@
 #include <sys/statvfs.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <linux/fs.h>
+#include <unistd.h>
+
 #include "ruby.h"
+#include "sector_size.h"
+#include "disk_stat.h"
 
 #if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
 	#pragma GCC optimize ("O3")
@@ -11,7 +18,7 @@
 	#pragma intel optimization_level 3
 #endif
 
-static VALUE statfs(VALUE obj, VALUE dir) {
+static VALUE statfs(volatile VALUE obj, volatile VALUE dir) {
 	struct statvfs buf ;
 	char *d = StringValuePtr(dir) ;
 	VALUE hash = rb_hash_new() ;
@@ -36,4 +43,6 @@ void Init_fs_stat() {
 	VALUE _linux_stat = rb_define_module("LinuxStat") ;
 	VALUE fs = rb_define_module_under(_linux_stat, "FS") ;
 	rb_define_module_function(fs, "stat", statfs, 1) ;
+	rb_define_module_function(fs, "sectors", getSectorSize, 1) ;
+	rb_define_module_function(fs, "total_io", getDiskStats, 1) ;
 }

data/ext/fs_stat/sector_size.h

@@ -0,0 +1,13 @@
+static VALUE getSectorSize(volatile VALUE obj, volatile VALUE path) {
+	char *dev = StringValuePtr(path) ;
+
+	unsigned int fd = open(dev, O_RDONLY | O_NONBLOCK) ;
+	if(fd < 0) return Qnil ;
+
+	unsigned int sSize = 0 ;
+	short status = ioctl(fd, BLKSSZGET, &sSize) ;
+	close(fd) ;
+	if(status < 0)  return Qnil ;
+
+	return UINT2NUM(sSize) ;
+}

data/ext/nproc/nproc.c

@@ -15,7 +15,7 @@
 	#pragma intel optimization_level 3
 #endif
 
-static VALUE count_cpu_for_pid(VALUE obj, VALUE pid) {
+static VALUE count_cpu_for_pid(volatile VALUE obj, volatile VALUE pid) {
 	cpu_set_t set ;
 	CPU_ZERO(&set) ;
 	char status = sched_getaffinity(FIX2INT(pid), sizeof(set), &set) ;

data/ext/procfs/loadavg_pid.h

@@ -1,4 +1,4 @@
-VALUE last_pid(VALUE obj) {
+static VALUE last_pid(volatile VALUE obj) {
 	FILE *f = fopen("/proc/loadavg", "r") ;
 	if (!f) return Qnil ;
 

data/ext/procfs/procfs.c

@@ -38,5 +38,6 @@ int Init_procfs() {
 
 	// stat
 	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) ;
 }

data/ext/procfs/stat.h

@@ -1,4 +1,4 @@
-VALUE ps_state(VALUE obj, VALUE pid) {
+static VALUE ps_state(volatile VALUE obj, volatile VALUE pid) {
 	int _pid = FIX2INT(pid) ;
 	if (_pid < 0) return rb_str_new_cstr("") ;
 
@@ -17,7 +17,28 @@ VALUE ps_state(VALUE obj, VALUE pid) {
 	return rb_str_new_cstr(_s) ;
 }
 
-VALUE ps_stat(VALUE obj, VALUE pid) {
+static VALUE ps_times(volatile VALUE obj, volatile VALUE pid) {
+	int _pid = FIX2INT(pid) ;
+	if (_pid < 0) return Qnil ;
+
+	char _path[22] ;
+	sprintf(_path, "/proc/%d/stat", _pid) ;
+
+	FILE *f = fopen(_path, "r") ;
+	if (!f) return Qnil ;
+
+	unsigned long utime, stime ;
+
+	char status = fscanf(f, "%*llu (%*[^)]%*[)] %*c %*d %*d %*d %*d %*d %*u %*lu %*lu %*lu %*lu %lu %lu", &utime, &stime) ;
+	fclose(f) ;
+
+	if (status != 2) return Qnil ;
+	double total_time = (utime + stime) / (float)sysconf(_SC_CLK_TCK);
+
+	return DBL2NUM(total_time) ;
+}
+
+static VALUE ps_stat(volatile VALUE obj, volatile VALUE pid) {
 	int _pid = FIX2INT(pid) ;
 	if (_pid < 0) return rb_str_new_cstr("") ;
 

data/ext/procfs/statm.h

@@ -1,6 +1,6 @@
 #define PAGESIZE sysconf(_SC_PAGESIZE)
 
-VALUE statm(VALUE obj, VALUE pid) {
+static VALUE statm(volatile VALUE obj, volatile VALUE pid) {
 	VALUE hash = rb_hash_new() ;
 
 	int _pid = FIX2INT(pid) ;
@@ -34,7 +34,7 @@ VALUE statm(VALUE obj, VALUE pid) {
 	return hash ;
 }
 
-VALUE statm_virtual(VALUE obj, VALUE pid) {
+static VALUE statm_virtual(volatile VALUE obj, volatile VALUE pid) {
 	int _pid = FIX2INT(pid) ;
 	if (_pid < 0) return Qnil ;
 
@@ -52,7 +52,7 @@ VALUE statm_virtual(VALUE obj, VALUE pid) {
 	return UINT2NUM(_virtual * PAGESIZE) ;
 }
 
-VALUE statm_resident(VALUE obj, VALUE pid) {
+static VALUE statm_resident(volatile VALUE obj, volatile VALUE pid) {
 	int _pid = FIX2INT(pid) ;
 	if (_pid < 0) return Qnil ;
 
@@ -70,7 +70,7 @@ VALUE statm_resident(VALUE obj, VALUE pid) {
 	return UINT2NUM(resident * PAGESIZE) ;
 }
 
-VALUE statm_shared(VALUE obj, VALUE pid) {
+static VALUE statm_shared(volatile VALUE obj, volatile VALUE pid) {
 	int _pid = FIX2INT(pid) ;
 	if (_pid < 0) return Qnil ;
 
@@ -88,7 +88,7 @@ VALUE statm_shared(VALUE obj, VALUE pid) {
 	return UINT2NUM(shared * PAGESIZE) ;
 }
 
-VALUE statm_memory(VALUE obj, VALUE pid) {
+static VALUE statm_memory(volatile VALUE obj, volatile VALUE pid) {
 	int _pid = FIX2INT(pid) ;
 	if (_pid < 0) return Qnil ;