blink_tm 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01d7b36b52fa20a719ef69531323fb73ee3563a0ae9ec1ca50caac1df0aa3f2b
-  data.tar.gz: 86f49cb52e5411dd5ca8e24694603945a6c57cf7060833ea530667ed4f8d3535
+  metadata.gz: aee9807ee73b58a75f7c4c0d09fcda705f6d8087d51e3c5178ab0472ebd2faae
+  data.tar.gz: d9156630e58cc9d4a41b26b7f0666f2abe565de91e8d1636bb8733920a9dfac0
 SHA512:
-  metadata.gz: d0ac33e5458a8d21c0d7a397f8708798744da67608c74dd79e250af40b40ada164caa36a2992466e3393a5f0e2e660758923d973c6af16b36dc28de12ca65f92
-  data.tar.gz: d7cffa14891bf6c766b56870ce3df1bd0ca224694ea33448d9ae259cc4c871ee0178c45f668d24c6308a64818f5c9d71db01bfa99357a43b28a83cf87789862e
+  metadata.gz: 204d49f580218bce9aed96a58a27a1f6fae07996e8d9a911749fec17a621b8c4cfcf2f081e71447e0d61788b22032713239c287d0b1194d6c4e6b048fdcd24a1
+  data.tar.gz: 4c269cca6fb02329354483e4495a88da1270c6426a2756315eb8bc88ef0577466165d0f2239181a140bcf04042c04c4ae4b53c0ec53044034bd930954f98f606

data/lib/blink_tm.rb

@@ -1,8 +1,9 @@
 # Frozen_String_Literal: true
 require 'blink_tm/baudrate'
-require 'blink_tm/diskstats'
 require 'linux_stat'
 
+$-v = true
+
 module BlinkTM
 	# Important Constants
 	BAUDRATE = BlinkTM::B57600
@@ -37,7 +38,7 @@ module BlinkTM
 	ROOT_DEV = ::LinuxStat::Mounts.root
 	ROOT = File.split(ROOT_DEV)[-1]
 
-	SECTORS = get_sector_size(ROOT_DEV)
+	SECTORS = ::LS::Filesystem.sectors(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

data/lib/blink_tm/blink_tm.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -w
+#!/usr/bin/env ruby
 # Frozen_String_Literal: true
 
 module BlinkTM
@@ -93,9 +93,9 @@ module BlinkTM
 
 		Thread.new {
 			while true
-				io_stat1 = BlinkTM.diskstats(ROOT)
+				io_stat1 = LS::FS.total_io(ROOT)
 				sleep POLLING
-				io_stat2 = BlinkTM.diskstats(ROOT)
+				io_stat2 = LS::FS.total_io(ROOT)
 
 				io_r = io_stat2[0].-(io_stat1[0]).*(SECTORS).fdiv(POLLING)
 				io_w = io_stat2[1].-(io_stat1[1]).*(SECTORS).fdiv(POLLING)

data/lib/blink_tm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blink_tm
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-29 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linux_stat
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0
 description: A controller for Arduino OLED System Monitor, Blink Task Manager
 email:
 - souravgoswami@protonmail.com
@@ -31,15 +31,11 @@ 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
@@ -62,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.18
 signing_key:
 specification_version: 4
 summary: A controller for Arduino OLED System Monitor, Blink Task Manager

data/ext/diskstats/diskstats.c

@@ -1,41 +0,0 @@
-#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

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

data/ext/diskstats/sectors.h

@@ -1,15 +0,0 @@
-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) ;
-}