linux_stat 1.4.0 → 2.1.1

data/bin/console

@@ -1,4 +1,10 @@
 #!/usr/bin/env ruby
 $-v = true
-%w(linux_stat irb).each(&method(:require))
+
+begin
+	%w(linux_stat irb).each(&method(:require))
+rescue LoadError
+	abort "LinuxStat and IRB shoud be installed before you can run LinuxStat console"
+end
+
 IRB.start(__FILE__)

data/exe/linuxstat.rb

@@ -7,6 +7,12 @@ rescue LoadError
 	abort "The Gem needs to be installed before this test can be run!"
 end
 
+Integer.class_exec do
+	define_method(:clamp) { |min, max|
+		self < min ? min : self > max ? max : self
+	}
+end unless 1.respond_to?(:clamp)
+
 # Gradient colour to strings
 class String
 	def colourize(colour = 1, flip: false)
@@ -138,7 +144,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/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/procfs/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('unistd.h') && have_header('ruby.h')
+	abort('Missing header')
+end
+
+create_makefile 'linux_stat/procfs'

data/ext/procfs/loadavg_pid.h

@@ -0,0 +1,11 @@
+VALUE last_pid(VALUE obj) {
+	FILE *f = fopen("/proc/loadavg", "r") ;
+	if (!f) return Qnil ;
+
+	unsigned long long _last_pid ;
+	char status = fscanf(f, "%*f %*f %*f %*s %llu", &_last_pid) ;
+	fclose(f) ;
+	if (status != 1) return Qnil ;
+
+	return ULL2NUM(_last_pid) ;
+}

data/ext/procfs/procfs.c

@@ -0,0 +1,42 @@
+// ProcFS doesn't include all the /proc/ files.
+// It includes some of them that can add potential
+// performance boost to the LinuxStat modules.
+//
+// Some LinuxStat modules reads /proc/ files
+// that are not present here. That is because
+// Ruby can handle them well with little wastage.
+// Adding C may be a potential risk in such places.
+//
+// In this ProcFS module, we will define the methods
+// that really gets the benefit.
+
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include "ruby.h"
+#include "uptime.h"
+#include "statm.h"
+#include "stat.h"
+#include "loadavg_pid.h"
+
+int Init_procfs() {
+	VALUE _linux_stat = rb_define_module("LinuxStat") ;
+	VALUE _procfs = rb_define_module_under(_linux_stat, "ProcFS") ;
+
+	// uptime
+	rb_define_module_function(_procfs, "uptime_f", uptime_f, 0) ;
+
+	// statm
+	rb_define_module_function(_procfs, "statm_memory", statm_memory, 1) ;
+	rb_define_module_function(_procfs, "statm", statm, 1) ;
+	rb_define_module_function(_procfs, "statm_virtual", statm_virtual, 1) ;
+	rb_define_module_function(_procfs, "statm_resident", statm_resident, 1) ;
+	rb_define_module_function(_procfs, "statm_shared", statm_shared, 1) ;
+
+	// loadavg last PID
+	rb_define_module_function(_procfs, "last_pid", last_pid, 0) ;
+
+	// stat
+	rb_define_module_function(_procfs, "ps_state", ps_state, 1) ;
+	rb_define_module_function(_procfs, "ps_stat", ps_stat, 1) ;
+}

data/ext/procfs/stat.h

@@ -0,0 +1,98 @@
+VALUE ps_state(VALUE obj, VALUE pid) {
+	int _pid = FIX2INT(pid) ;
+	if (_pid < 0) return rb_str_new_cstr("") ;
+
+	char _path[22] ;
+	sprintf(_path, "/proc/%d/stat", _pid) ;
+
+	FILE *f = fopen(_path, "r") ;
+	if (!f) return rb_str_new_cstr("") ;
+
+	char _s[1] ;
+
+	char status = fscanf(f, "%*llu (%*[^)]%*[)] %s", _s) ;
+	fclose(f) ;
+
+	if (status != 1) return rb_str_new_cstr("") ;
+	return rb_str_new_cstr(_s) ;
+}
+
+VALUE ps_stat(VALUE obj, VALUE pid) {
+	int _pid = FIX2INT(pid) ;
+	if (_pid < 0) return rb_str_new_cstr("") ;
+
+	char _path[22] ;
+	sprintf(_path, "/proc/%d/stat", _pid) ;
+
+	FILE *f = fopen(_path, "r") ;
+
+	if (!f)
+		return rb_ary_new() ;
+
+	// ?? JEEZ !!
+	// We need to do this because the datatypes are different
+	// Can't make an array like Ruby out of String
+	// This is hard to write and check, but tested, and works.
+	//
+	// For this struct,
+	// follow https://man7.org/linux/man-pages/man5/proc.5.html
+	int ppid, pgrp, session, tty_nr, tpgid ;
+	unsigned flags ;
+	long unsigned minflt, cminflt, majflt, cmajflt, utime, stime ;
+	long cutime, cstime, priority, nice, num_threads, itrealvalue ;
+	long long unsigned starttime ;
+	long unsigned vsize ;
+	long rss ;
+	long unsigned rsslim, startcode, endcode, startstack, kstkesp, kstkeip ;
+	long unsigned signal, blocked, sigignore, sigcatch, wchan, nswap, cnswap ;
+	int exit_signal, processor ;
+	unsigned rt_priority, policy ;
+	long long unsigned delayacct_blkio_ticks ;
+	long unsigned guest_time ;
+	long cguest_time ;
+	long unsigned start_data, end_data, start_brk, arg_start, arg_end ;
+	long unsigned env_start, env_end ;
+	int exit_code ;
+
+	char status = fscanf(
+		f, "%*llu (%*[^)]%*[)] %*c "
+		"%d %d %d %d %d %u "
+		"%lu %lu %lu %lu %lu %lu "
+		"%ld %ld %ld %ld %ld %ld "
+		"%llu %lu %ld %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu "
+		"%d %d %u %u %llu %lu %ld %lu %lu %lu %lu %lu %lu %lu %d", &ppid, &pgrp,
+		&session, &tty_nr, &tpgid, &flags, &minflt, &cminflt, &majflt, &cmajflt, &utime, &stime, &cutime,
+		&cstime, &priority, &nice, &num_threads, &itrealvalue, &starttime, &vsize, &rss, &rsslim,
+		&startcode, &endcode, &startstack, &kstkesp, &kstkeip, &signal, &blocked, &sigignore,
+		&sigcatch, &wchan, &nswap, &cnswap, &exit_signal, &processor, &rt_priority, &policy,
+		&delayacct_blkio_ticks, &guest_time, &cguest_time, &start_data, &end_data,
+		&start_brk, &arg_start, &arg_end, &env_start, &env_end, &exit_code
+	) ;
+
+	fclose(f) ;
+
+	if (status != 49)
+		return rb_ary_new() ;
+
+	return rb_ary_new_from_args(49,
+	INT2NUM(ppid), INT2NUM(pgrp), INT2NUM(session), INT2NUM(tty_nr), INT2NUM(tpgid),
+	UINT2NUM(flags),
+	ULONG2NUM(minflt), ULONG2NUM(cminflt), ULONG2NUM(majflt), ULONG2NUM(cmajflt),
+	ULONG2NUM(utime), ULONG2NUM(stime),
+	LONG2NUM(cutime), LONG2NUM(cstime), LONG2NUM(priority),
+	LONG2NUM(nice), LONG2NUM(num_threads), LONG2NUM(itrealvalue),
+	ULL2NUM(starttime),
+	ULONG2NUM(vsize),
+	LONG2NUM(rss),
+	ULONG2NUM(rsslim), ULONG2NUM(startcode), ULONG2NUM(endcode),
+	ULONG2NUM(startstack), ULONG2NUM(kstkesp), ULONG2NUM(kstkeip),
+	ULONG2NUM(signal), ULONG2NUM(blocked), ULONG2NUM(sigignore), ULONG2NUM(sigcatch),
+	ULONG2NUM(wchan), ULONG2NUM(nswap), ULONG2NUM(cnswap),
+	INT2NUM(exit_signal), INT2NUM(processor),
+	UINT2NUM(rt_priority), UINT2NUM(policy),
+	ULL2NUM(delayacct_blkio_ticks), ULONG2NUM(guest_time), LONG2NUM(cguest_time), ULONG2NUM(start_data),
+	ULONG2NUM(end_data), ULONG2NUM(start_brk), ULONG2NUM(arg_start), ULONG2NUM(arg_end),
+	ULONG2NUM(env_start), ULONG2NUM(env_end),
+	INT2NUM(exit_code)
+	) ;
+}

data/ext/procfs/statm.h

@@ -0,0 +1,109 @@
+#define PAGESIZE sysconf(_SC_PAGESIZE)
+
+VALUE statm(VALUE obj, VALUE pid) {
+	VALUE hash = rb_hash_new() ;
+
+	int _pid = FIX2INT(pid) ;
+	if (_pid < 0) return hash ;
+
+	char _path[22] ;
+	sprintf(_path, "/proc/%d/statm", _pid) ;
+
+	FILE *f = fopen(_path, "r") ;
+	if (!f) return hash ;
+
+	unsigned int _virtual, resident, shared ;
+	char status = fscanf(f, "%u %u %u", &_virtual, &resident, &shared) ;
+	fclose(f) ;
+
+	if (status != 3) return hash ;
+
+	int pagesize = PAGESIZE ;
+
+	_virtual *= pagesize ;
+	resident *= pagesize ;
+	shared *= pagesize ;
+
+	unsigned int v = resident - shared ;
+
+	rb_hash_aset(hash, ID2SYM(rb_intern("memory")), UINT2NUM(v)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("virtual_memory")), UINT2NUM(_virtual)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("resident_memory")), UINT2NUM(resident)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("shared_memory")), UINT2NUM(shared)) ;
+
+	return hash ;
+}
+
+VALUE statm_virtual(VALUE obj, VALUE pid) {
+	int _pid = FIX2INT(pid) ;
+	if (_pid < 0) return Qnil ;
+
+	char _path[22] ;
+	sprintf(_path, "/proc/%d/statm", _pid) ;
+
+	FILE *f = fopen(_path, "r") ;
+	if (!f) return Qnil ;
+
+	unsigned int _virtual ;
+	char status = fscanf(f, "%u", &_virtual) ;
+	fclose(f) ;
+
+	if (status != 1) return Qnil ;
+	return UINT2NUM(_virtual * PAGESIZE) ;
+}
+
+VALUE statm_resident(VALUE obj, VALUE pid) {
+	int _pid = FIX2INT(pid) ;
+	if (_pid < 0) return Qnil ;
+
+	char _path[22] ;
+	sprintf(_path, "/proc/%d/statm", _pid) ;
+
+	FILE *f = fopen(_path, "r") ;
+	if (!f) return Qnil ;
+
+	unsigned int resident ;
+	char status = fscanf(f, "%*u %u", &resident) ;
+	fclose(f) ;
+
+	if (status != 1) return Qnil ;
+	return UINT2NUM(resident * PAGESIZE) ;
+}
+
+VALUE statm_shared(VALUE obj, VALUE pid) {
+	int _pid = FIX2INT(pid) ;
+	if (_pid < 0) return Qnil ;
+
+	char _path[22] ;
+	sprintf(_path, "/proc/%d/statm", _pid) ;
+
+	FILE *f = fopen(_path, "r") ;
+	if (!f) return Qnil ;
+
+	unsigned int shared ;
+	char status = fscanf(f, "%*u %*u %u", &shared) ;
+	fclose(f) ;
+
+	if (status != 1) return Qnil ;
+	return UINT2NUM(shared * PAGESIZE) ;
+}
+
+VALUE statm_memory(VALUE obj, VALUE pid) {
+	int _pid = FIX2INT(pid) ;
+	if (_pid < 0) return Qnil ;
+
+	char _path[22] ;
+	sprintf(_path, "/proc/%d/statm", _pid) ;
+
+	FILE *f = fopen(_path, "r") ;
+	if (!f) return Qnil ;
+
+	unsigned int resident, shared ;
+	char status = fscanf(f, "%*u %u %u", &resident, &shared) ;
+	fclose(f) ;
+
+	if (status != 2) return Qnil ;
+
+	unsigned int v = (resident - shared) * PAGESIZE ;
+	return UINT2NUM(v) ;
+}

data/ext/procfs/uptime.h

@@ -0,0 +1,12 @@
+VALUE uptime_f(VALUE obj) {
+	FILE *f = fopen("/proc/uptime", "r") ;
+	if (!f) return Qnil ;
+
+	double up_f ;
+	char status = fscanf(f, "%lf", &up_f) ;
+	fclose(f) ;
+
+	if (status != 1) return Qnil ;
+
+	return DBL2NUM(up_f) ;
+}

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) ;
 }