blink_tm 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a36bc60afc808cd46592945eebb5522b017af21743da1cdc71eeb381a7367dd
-  data.tar.gz: 8a5d4c012fdad495381e8fe4caafa39e9b3aafa8490f52dc83460cecc8826296
+  metadata.gz: db910772825de89e18bf29aa17905561b275accef99af4ce513f7bdee177b531
+  data.tar.gz: d67946a495717d5fb69c0c8a82b0c3af779a59a1afd1384d2a9e2bc172fd2a34
 SHA512:
-  metadata.gz: ac2ac55e696cb64a0260057029633e1132255d1956f9a484c841515fb3b9dac92d21ec6b4f7287186396c0c4bd3b54f301b69be88126616ee2ef4c9ffdd1a84c
-  data.tar.gz: 59454494c4df79ed7918e925c7e9cacf8db35b1e2b698e2192ba1c953829db023fb28d876075d736e9128f1940adc78d20892f3b3e75ec9201c961fad565f114
+  metadata.gz: 13d05ea503502ffacdaec63e656dc23bfb11d4f4190a1be9925989d2278d6444547bd659297d8b1f281b421fd8f67ac8ec7ad2a3e80f10ddd5a551838643adbf
+  data.tar.gz: 4966f3fe0180f4b7b366dadf621a29a8d3712ee2e8a5b60e6219be5df5b2902b857d8562920f674d136fb60ecadaeeec992ebe1fffc4d24e715c5e399d733973

data/exe/blink-tm

@@ -9,9 +9,9 @@ while(!dev)
 	dev = BlinkTM.find_device
 
 	if dev
-		puts "#{BlinkTM::BOLD}#{BlinkTM::GREEN}:: Device discovered successfully. Path: #{dev}#{BlinkTM::RESET}"
+		puts "#{BlinkTM::BOLD}#{BlinkTM::GREEN}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Device discovered successfully. Path: #{dev}#{BlinkTM::RESET}"
 	else
-		puts "#{BlinkTM::BOLD}#{BlinkTM::RED}:: No device found. Retrying #{retry_count += 1}#{BlinkTM::RESET}"
+		puts "#{BlinkTM::BOLD}#{BlinkTM::RED}:: #{Time.now.strftime('%H:%M:%S.%2N')}: No device found. Retrying #{retry_count += 1}#{BlinkTM::RESET}"
 		sleep 0.5
 	end
 end

data/ext/diskstats/diskstats.c

@@ -0,0 +1,41 @@
+#include <stdio.h>
+#include <string.h>
+
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <linux/fs.h>
+
+#include "ruby.h"
+#include "sectors.h"
+
+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() ;
+}
+
+void Init_diskstats() {
+	VALUE blink_tm = rb_define_module("BlinkTM") ;
+	rb_define_module_function(blink_tm, "diskstats", getDiskstats, 1) ;
+	rb_define_module_function(blink_tm, "get_sector_size", getSectorSize, 1) ;
+}

data/ext/diskstats/extconf.rb

@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile 'blink_tm/diskstats'

data/ext/diskstats/sectors.h

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

data/lib/blink_tm.rb

@@ -1,5 +1,7 @@
 # Frozen_String_Literal: true
 require 'blink_tm/baudrate'
+require 'blink_tm/diskstats'
+require 'linux_stat'
 
 module BlinkTM
 	# Important Constants
@@ -30,9 +32,17 @@ module BlinkTM
 	ORANGE = "\e[38;2;245;155;20m"
 	BOLD = "\e[1m"
 	RESET = "\e[0m"
+
+	# Other constants
+	ROOT_DEV = ::LinuxStat::Mounts.root
+	ROOT = File.split(ROOT_DEV)[-1]
+
+	SECTORS = get_sector_size(ROOT_DEV)
+
+	abort "#{BOLD}#{RED}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Can't get root partition#{RESET}" unless ROOT
+	abort "#{BOLD}#{RED}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Can't get sector size#{RESET}" unless SECTORS
 end
 
 require 'blink_tm/version'
 require 'fcntl'
-require 'linux_stat'
 require 'blink_tm/blink_tm'

data/lib/blink_tm/blink_tm.rb

@@ -90,12 +90,12 @@ module BlinkTM
 
 		Thread.new {
 			while true
-				io_stat1 = iostat()
+				io_stat1 = BlinkTM.diskstats(ROOT)
 				sleep POLLING
-				io_stat2 = iostat()
+				io_stat2 = BlinkTM.diskstats(ROOT)
 
-				io_r = io_stat2[0].-(io_stat1[0]).fdiv(POLLING)
-				io_w = io_stat2[1].-(io_stat1[1]).fdiv(POLLING)
+				io_r = io_stat2[0].-(io_stat1[0]).*(SECTORS).fdiv(POLLING)
+				io_w = io_stat2[1].-(io_stat1[1]).*(SECTORS).fdiv(POLLING)
 			end
 		}
 
@@ -103,7 +103,7 @@ module BlinkTM
 			raise NoDeviceError unless device
 
 			in_sync = false
-			fd = IO.sysopen(device, Fcntl::O_RDWR | Fcntl::O_EXCL)
+			fd = IO.sysopen(device, Fcntl::O_RDWR)
 			file = IO.open(fd)
 
 			until in_sync
@@ -156,7 +156,7 @@ module BlinkTM
 
 				refresh ^= 1
 
-				str = "!##{"%03d" % cpu_u}#{"%03d" % mem_u}#{"%03d" % swap_u}"\
+				str = "!##{cpu_u.nan? ? '000' : "%03d" % cpu_u}#{"%03d" % mem_u}#{"%03d" % swap_u}"\
 				"#{convert_bytes(net_u)}#{convert_bytes(net_d)}"\
 				"#{convert_bytes(io_r)}#{convert_bytes(io_w)}#{refresh}~"
 
@@ -191,31 +191,5 @@ module BlinkTM
 		end
 	end
 
-	def iostat
-		@@root_partition ||= IO.foreach('/proc/mounts').detect {
-			|x| x.split[1] == ?/
-		}.to_s.split[0].to_s.split(?/).to_a[-1]
-
-		@@sector_size ||= LS::FS.stat(?/)[:block_size]
-
-		io = []
-
-		IO.foreach('/proc/diskstats') { |x|
-			splitted = x.split
-
-			if splitted[2] == @@root_partition
-				# IO read / write
-				io.replace([
-					splitted[5].to_i * @@sector_size,
-					splitted[9].to_i * @@sector_size
-				])
-
-				break
-			end
-		}
-
-		io
-	end
-
 	extend(self)
 end

data/lib/blink_tm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BlinkTM
-	VERSION = "0.1.3"
+	VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blink_tm
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linux_stat
@@ -31,11 +31,15 @@ executables:
 - blink-tm
 extensions:
 - ext/baudrate/extconf.rb
+- ext/diskstats/extconf.rb
 extra_rdoc_files: []
 files:
 - exe/blink-tm
 - ext/baudrate/baudrate.c
 - ext/baudrate/extconf.rb
+- ext/diskstats/diskstats.c
+- ext/diskstats/extconf.rb
+- ext/diskstats/sectors.h
 - lib/blink_tm.rb
 - lib/blink_tm/blink_tm.rb
 - lib/blink_tm/version.rb