blink_tm 0.1.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a36bc60afc808cd46592945eebb5522b017af21743da1cdc71eeb381a7367dd
-  data.tar.gz: 8a5d4c012fdad495381e8fe4caafa39e9b3aafa8490f52dc83460cecc8826296
+  metadata.gz: '080b57c4c4dac231dbb6353428aaaf7be86bd47e4da2379308c23d9ca5315aaa'
+  data.tar.gz: e13ccff20189b8e1e944230b0c27ce87272677a9d50ee2c289098800f1860fe9
 SHA512:
-  metadata.gz: ac2ac55e696cb64a0260057029633e1132255d1956f9a484c841515fb3b9dac92d21ec6b4f7287186396c0c4bd3b54f301b69be88126616ee2ef4c9ffdd1a84c
-  data.tar.gz: 59454494c4df79ed7918e925c7e9cacf8db35b1e2b698e2192ba1c953829db023fb28d876075d736e9128f1940adc78d20892f3b3e75ec9201c961fad565f114
+  metadata.gz: 1ae79bb6028b57c8046e1cf68ccd62fcac30ae38a75579d6402855e9dce94d012877cd358bd0b4a99dc6ddd1376ba3548a3ac88aa59867ea54d9c7bdd7e5f16c
+  data.tar.gz: 4cc14d89f98e59675fa2071005cda0b44a4c41f421c5ea0ba850193363b33c922c623187c939f9ed48bd152277732ceb7022e3ccedc88cc13ba710c2d52157f4

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/baudrate/baudrate.c

@@ -7,7 +7,7 @@ VALUE setBaudRate(volatile VALUE obj, volatile VALUE dev, volatile VALUE speed)
 	char *device = StringValuePtr(dev) ;
 	unsigned int spd = NUM2UINT(speed) ;
 
-	int serial_port = open(device, O_RDWR) ;
+	int serial_port = open(device, O_RDWR | O_NOCTTY) ;
 	struct termios tty ;
 
 	char status = tcgetattr(serial_port, &tty) ;
@@ -22,7 +22,10 @@ VALUE setBaudRate(volatile VALUE obj, volatile VALUE dev, volatile VALUE speed)
 		-isig -icanon -iexten -echo -echoe -echok -echoctl -echoke
 	*/
 
-	if(status != 0) return Qnil ;
+	if(status != 0) {
+		close(serial_port) ;
+		return Qnil ;
+	}
 
 	tty.c_cflag &= ~CSIZE ;
 	tty.c_cflag |= CS8 ;
@@ -46,18 +49,20 @@ VALUE setBaudRate(volatile VALUE obj, volatile VALUE dev, volatile VALUE speed)
 	cfsetospeed(&tty, spd) ;
 	status = tcsetattr(serial_port, TCSANOW, &tty) ;
 
-	if (status == 0) return Qtrue ;
+	close(serial_port) ;
 
+	if (status == 0) return Qtrue ;
 	return Qfalse ;
 }
 
 VALUE getBaudRate(volatile VALUE obj, volatile VALUE dev) {
 	char *device = StringValuePtr(dev) ;
 
-	int serial_port = open(device, O_RDWR) ;
+	int serial_port = open(device, O_RDWR | O_NOCTTY | O_NONBLOCK) ;
 	struct termios tty ;
 
 	char status = tcgetattr(serial_port, &tty) ;
+	close(serial_port) ;
 
 	if(status == 0) {
 		unsigned int in = cfgetispeed(&tty) ;

data/ext/crc32/crc32.c

@@ -0,0 +1,33 @@
+/*
+	Source:
+	https://commandlinefanatic.com/cgi-bin/showarticle.cgi?article=art008
+
+	Note that this obeys the standard and matches with Ruby's Zlib.crc32(...)
+*/
+
+#define CRC32_DIVISOR 0xEDB88320
+#include "ruby.h"
+
+static VALUE getCRC(volatile VALUE obj, volatile VALUE str) {
+	char *input = StringValuePtr(str) ;
+	unsigned char len = strlen(input) ;
+	unsigned long crc = 0xFFFFFFFF ;
+
+	for (unsigned char i = 0 ; i < len ; ++i) {
+		crc ^= input[i] ;
+
+		for (unsigned char k = 8 ; k ; --k) {
+			crc = crc & 1 ? (crc >> 1) ^ CRC32_DIVISOR : crc >> 1 ;
+		}
+	}
+
+	char buffer[11] ;
+	sprintf(buffer, "%lu", crc ^ 0xFFFFFFFF) ;
+
+	return rb_str_new_cstr(buffer) ;
+}
+
+void Init_crc32() {
+	VALUE blinktm = rb_define_module("BlinkTM") ;
+	rb_define_module_function(blinktm, "crc32", getCRC, 1) ;
+}

data/ext/crc32/extconf.rb

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

data/lib/blink_tm.rb

@@ -1,20 +1,24 @@
 # Frozen_String_Literal: true
 require 'blink_tm/baudrate'
+require 'linux_stat'
+
+$-v = true
 
 module BlinkTM
 	# Important Constants
-	BAUDRATE = BlinkTM::B57600
+	BAUDRATE = BlinkTM::B38400
 	SCANID = 'BTM'
 
 	# POLLING time, how often should CPU, Net, IO usages should be updated.
 	# Should always be a float.
-	POLLING = 0.375
+	POLLING = 0.250
 
 	# Refresh time, how often the main loop should run
 	REFRESH = 0.5
 
 	# Errors
 	NoDeviceError = Class.new(StandardError)
+	SyncError = Class.new(StandardError)
 	DeviceNotReady = Class.new(StandardError)
 
 	# Units
@@ -30,9 +34,18 @@ 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 'linux_stat'
 require 'blink_tm/blink_tm'
+require 'blink_tm/crc32'

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
@@ -77,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 {
@@ -90,27 +93,34 @@ 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 = 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
 		}
 
+		prev_crc32 = ''
+
 		begin
 			raise NoDeviceError unless device
 
 			in_sync = false
-			fd = IO.sysopen(device, Fcntl::O_RDWR | Fcntl::O_EXCL)
+
+			fd = IO.sysopen(
+				device,
+				Fcntl::O_RDWR | Fcntl::O_NOCTTY | Fcntl::O_NONBLOCK | Fcntl::O_TRUNC
+			)
+
 			file = IO.open(fd)
 
 			until in_sync
 				# Clear out any extra zombie bits
-				file.syswrite(?~)
+				file.syswrite(?~.freeze)
 				# Start the device
-				file.syswrite(?#)
+				file.syswrite(?#.freeze)
 				file.flush
 
 				sleep 0.125
@@ -124,12 +134,12 @@ module BlinkTM
 					sleep 0.05
 					retry
 				end
-
-				sleep 0.05
 			end
 
+			sync_error_count = 0
+
 			puts "#{BlinkTM::BOLD}#{BlinkTM::GREEN}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Device ready!#{BlinkTM::RESET}"
-			refresh = 0
+			file.read
 
 			while true
 				# cpu(01234) memUsed(999993) swapUsed(999992) io_active(0)
@@ -154,16 +164,23 @@ module BlinkTM
 				# "#{convert_bytes(net_u)} #{convert_bytes(net_d)} "\
 				# "#{convert_bytes(io_r)} #{convert_bytes(io_w)}"
 
-				refresh ^= 1
-
 				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)}#{refresh}~"
+				"#{convert_bytes(io_r)}#{convert_bytes(io_w)}1~"
 
 				# Rescuing from suspend
 				file.syswrite(str)
 				file.flush
+				crc32 = file.read.scrub![/\d+/]
 
+				unless crc32 == prev_crc32 || prev_crc32.empty?
+					raise SyncError if sync_error_count > 1
+					sync_error_count += 1
+				else
+					sync_error_count = 0 unless sync_error_count == 0
+				end
+
+				prev_crc32 = BlinkTM.crc32(str[2..-2])
 				sleep REFRESH
 			end
 		rescue Interrupt, SystemExit, SignalException
@@ -178,6 +195,10 @@ module BlinkTM
 				sleep 0.1
 			end
 
+			retry
+		rescue BlinkTM::SyncError
+			file &.close
+			sleep 0.005
 			retry
 		rescue BlinkTM::DeviceNotReady
 			file &.close
@@ -191,31 +212,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 = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blink_tm
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-07-15 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,11 +31,14 @@ executables:
 - blink-tm
 extensions:
 - ext/baudrate/extconf.rb
+- ext/crc32/extconf.rb
 extra_rdoc_files: []
 files:
 - exe/blink-tm
 - ext/baudrate/baudrate.c
 - ext/baudrate/extconf.rb
+- ext/crc32/crc32.c
+- ext/crc32/extconf.rb
 - lib/blink_tm.rb
 - lib/blink_tm/blink_tm.rb
 - lib/blink_tm/version.rb
@@ -58,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.21
 signing_key:
 specification_version: 4
 summary: A controller for Arduino OLED System Monitor, Blink Task Manager