blink_tm 0.1.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4e90e73c0c9d495bf37a16e6020498d5880ef79dd2ad36aaa054fd344580e5c
-  data.tar.gz: 02a83b060adb7e15c3e06cc6fe266aa699740b494d0a4f87296aa329741aa12a
+  metadata.gz: aee9807ee73b58a75f7c4c0d09fcda705f6d8087d51e3c5178ab0472ebd2faae
+  data.tar.gz: d9156630e58cc9d4a41b26b7f0666f2abe565de91e8d1636bb8733920a9dfac0
 SHA512:
-  metadata.gz: 40d53fe4c787ad0995525d6531688ef5d83f9049107fca15936826ebde78515cf29c15bd567ad9c19a8bebc6acca9ce38419a874349063e76c93349739c62ea4
-  data.tar.gz: f6483431ae948c6eda5a59ca449e086b7a3fb4c8fee9766039bbb1d8c200ddd62994cb00387a78229e32726dbe90881ea57912e01bd31af8534b575541aba4dc
+  metadata.gz: 204d49f580218bce9aed96a58a27a1f6fae07996e8d9a911749fec17a621b8c4cfcf2f081e71447e0d61788b22032713239c287d0b1194d6c4e6b048fdcd24a1
+  data.tar.gz: 4c269cca6fb02329354483e4495a88da1270c6426a2756315eb8bc88ef0577466165d0f2239181a140bcf04042c04c4ae4b53c0ec53044034bd930954f98f606

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/lib/blink_tm.rb

@@ -1,14 +1,20 @@
 # Frozen_String_Literal: true
 require 'blink_tm/baudrate'
+require 'linux_stat'
+
+$-v = true
 
 module BlinkTM
 	# Important Constants
 	BAUDRATE = BlinkTM::B57600
 	SCANID = 'BTM'
+
+	# POLLING time, how often should CPU, Net, IO usages should be updated.
+	# Should always be a float.
 	POLLING = 0.375
 
-	# Refresh should always get subtracted with 0.05
-	REFRESH = 0.5 - 0.05
+	# Refresh time, how often the main loop should run
+	REFRESH = 0.5
 
 	# Errors
 	NoDeviceError = Class.new(StandardError)
@@ -27,7 +33,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 = ::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
 end
 
 require 'blink_tm/version'
+require 'fcntl'
 require 'blink_tm/blink_tm'

data/lib/blink_tm/blink_tm.rb

@@ -1,10 +1,6 @@
-
-#!/usr/bin/ruby -w
+#!/usr/bin/env ruby
 # Frozen_String_Literal: true
 
-require 'fcntl'
-require 'linux_stat'
-
 module BlinkTM
 	# Detect device
 	def find_device
@@ -81,7 +77,10 @@ module BlinkTM
 		io_r = io_w = 0
 
 		Thread.new {
-			cpu_u = LS::CPU.total_usage(POLLING).to_f while true
+			while true
+				_cpu_u = LS::CPU.total_usage(POLLING).to_f
+				cpu_u = _cpu_u.nan? ? 0 : _cpu_u.to_i
+			end
 		}
 
 		Thread.new {
@@ -94,12 +93,12 @@ module BlinkTM
 
 		Thread.new {
 			while true
-				io_stat1 = iostat()
+				io_stat1 = LS::FS.total_io(ROOT)
 				sleep POLLING
-				io_stat2 = iostat()
+				io_stat2 = LS::FS.total_io(ROOT)
 
-				io_r = POLLING * io_stat2[0].-(io_stat1[0])
-				io_w = POLLING * io_stat2[1].-(io_stat1[1])
+				io_r = io_stat2[0].-(io_stat1[0]).*(SECTORS).fdiv(POLLING)
+				io_w = io_stat2[1].-(io_stat1[1]).*(SECTORS).fdiv(POLLING)
 			end
 		}
 
@@ -107,7 +106,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
@@ -128,8 +127,6 @@ module BlinkTM
 					sleep 0.05
 					retry
 				end
-
-				sleep 0.05
 			end
 
 			puts "#{BlinkTM::BOLD}#{BlinkTM::GREEN}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Device ready!#{BlinkTM::RESET}"
@@ -157,23 +154,13 @@ module BlinkTM
 				# "#{convert_bytes(net_u)} #{convert_bytes(net_d)} "\
 				# "#{convert_bytes(io_r)} #{convert_bytes(io_w)}"
 
-				str = "#{"%03d" % cpu_u}#{"%03d" % mem_u}#{"%03d" % swap_u}"\
+				str = "!##{"%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)}"
+				"#{convert_bytes(io_r)}#{convert_bytes(io_w)}1~"
 
 				# Rescuing from suspend
-				file.syswrite('#')
-
-				file.syswrite('!')
-				file.flush
-				sleep 0.025
-
 				file.syswrite(str)
 				file.flush
-				sleep 0.025
-
-				file.syswrite('~')
-				file.flush
 
 				sleep REFRESH
 			end
@@ -202,22 +189,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_stat = IO.foreach('/proc/diskstats'.freeze).find { |x|
-			x.split[2] == @@root_partition
-		} &.split.to_a
-
-		_io_r = io_stat[5].to_f.*(@@sector_size).round
-		_io_w = io_stat[9].to_f.*(@@sector_size).round
-
-		[_io_r, _io_w]
-	end
-
 	extend(self)
 end

data/lib/blink_tm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blink_tm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-25 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
@@ -58,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