sunburst 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ecfac43448912f08b86571fecabeb676b11902524428b542973b83f535eeb71
-  data.tar.gz: 85668f8a6cb4a40f48e9e6f24c43dae60cf07b68a9ab1b6d4f5559b2eb8f0d71
+  metadata.gz: 327a6ef07e1800b7edc89af0dc6ad0696ff2aef5656c9b908b0bb274c344638b
+  data.tar.gz: fe11501674b83a4dc0372585ad9f0e3dcf2ab834c781ea30d81936d958f026fb
 SHA512:
-  metadata.gz: '09483bbbc6011547a6cbc1a691363545d5c7002dbfca9c593fde20bb4083df5995e449e02d319bd65054967b164417a2cc2662cca41541c647ab745f67e776fe'
-  data.tar.gz: 42c5ce9d7ba09046ddb22c27cb8de6ac64c64a488b0a52a3cb52357aa2d1fc3f4029e8772fa3543c6725ac5ada1258c4876564c0fb7ddd07ab2593d84d2e0463
+  metadata.gz: 12a106e06a0f15348d9c71db9ffcc6dd56a71541bf316a1de6e8d3bdf842966b12a437d21777705e3e7f707dba6397f54b86ca3d79a3ca81b76f4570d091d2f0
+  data.tar.gz: 4b840b941a94bb1be01d351e7e61e1130a1e8c59c377fad3475740a9229541ca8dd149c6b970a8aeefe53dbd96cfd1b781cb634b85cc05debf108a71cf68ff9e

data/exe/sunburst

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # Frozen_String_Literal: true
 
-$-v = nil
+$-v = true
 STDOUT.sync = STDIN.sync = true
 require 'sunburst'
 
@@ -82,22 +82,24 @@ begin
 
 	data = if progress
 		if human_readable
-			Sunburst.measure(command: command, time: time, sleep_time: 0.0001) { |exec_t, cpu_t, mem, threads, state|
-				print "\e[2K:: "\
+			Sunburst.measure(command: command, time: time, sleep_time: 0.0001) { |exec_t, cpu_t, mem, threads, state, cpu_u|
+				print "\e[2K\r:: "\
 				"Exec T: #{"%05.2f" % exec_t}s | "\
 				"CPU T: #{"%05.2f" % cpu_t}s | "\
 				"Mem: #{convert_bytes(mem)} | "\
 				"Threads: #{threads} | "\
-				"State: #{state}\r"
+				"State: #{state} | "\
+				"CPU U: #{cpu_u}\e[s\r\e[u"
 			}
 		else
-			Sunburst.measure(command: command, time: time, sleep_time: 0.0001) { |exec_t, cpu_t, mem, threads, state|
-				print "\e[2K:: "\
+			Sunburst.measure(command: command, time: time, sleep_time: 0.0001) { |exec_t, cpu_t, mem, threads, state, cpu_u|
+				print "\e[2K\r:: "\
 				"Exec T: #{"%05.2f" % exec_t} | "\
 				"CPU T: #{"%05.2f" % cpu_t} | "\
 				"Mem: #{"%2d" % mem} | "\
 				"Threads: #{threads} | "\
-				"State: #{state}\r"
+				"State: #{state} | "\
+				"CPU U: #{cpu_u}\e[s\r\e[u"
 			}
 		end
 	else
@@ -152,6 +154,13 @@ begin
 		puts ":: The memory Usage Can't be Logged."
 	end
 
+	avg_mem = data[:avg_mem]
+	if avg_mem
+		puts ":: Avg. Memory Usage: #{style}#{convert_bytes(avg_mem)}\e[0m (#{percent_mem.round(3)}% system mem)"
+	else
+		puts ":: The Average Memory Usage can't be Logged."
+	end
+
 	max_mem = data[:max_memory]
 	if max_mem
 		percent_mem = max_mem.*(100).fdiv(Sunburst.total_ram)
@@ -178,6 +187,20 @@ begin
 		puts ":: The max memory Usage can't be logged."
 	end
 
+	avg_cpu_usage = data[:avg_cpu_usage]
+	if avg_cpu_usage
+		puts ":: Avg. CPU Usage: #{style}#{avg_cpu_usage}\e[0m"
+	else
+		puts ":: The Avg. CPU Usage Can't be Logged"
+	end
+
+	max_cpu_usage = data[:max_cpu_usage]
+	if max_cpu_usage
+		puts ":: Max CPU Usage: #{style}#{max_cpu_usage}\e[0m"
+	else
+		puts ":: The Max CPU Usage Can't be Logged"
+	end
+
 	max_threads = data[:max_threads]
 	style = +"\e[1;"
 	style << if max_threads > 16
@@ -195,6 +218,8 @@ begin
 rescue Errno::ENOENT
 	puts "sunburst: #{command}: command not found"
 	puts ?\n, ?- * Sunburst.win_width
+rescue Interrupt
+	puts "\n\e[2KInterrupt Received"
 rescue StandardError
 	puts $!.full_message
 end

data/ext/stats/stats.c

@@ -44,28 +44,35 @@ VALUE ps_stat(volatile VALUE obj, volatile VALUE pid) {
 	int ppid, processor ;
 	long unsigned utime, stime ;
 	long num_threads ;
+	long long unsigned starttime ;
 
 	char status = fscanf(
 		f, "%*llu (%*[^)]%*[)] %1s "
 		"%d %*d %*d %*d %*d %*u "
 		"%*lu %*lu %*lu %*lu %lu %lu "
-		"%*ld %*ld %*ld %*ld %ld",
-		&state, &ppid, &utime, &stime, &num_threads
+		"%*ld %*ld %*ld %*ld %ld %*ld %ld",
+		&state, &ppid, &utime, &stime, &num_threads, &starttime
 	) ;
 
 	fclose(f) ;
 
-	if (status != 5) return rb_ary_new() ;
+	if (status != 6) return rb_ary_new() ;
 
-	return rb_ary_new_from_args(5,
+	return rb_ary_new_from_args(6,
 		INT2NUM(ppid),
 		ULONG2NUM(utime),
 		ULONG2NUM(stime),
 		LONG2NUM(num_threads),
-		rb_str_new(state, 1)
+		rb_str_new(state, 1),
+		ULL2NUM(starttime)
 	) ;
 }
 
+VALUE nProcessors(volatile VALUE obj) {
+	int coreCount = sysconf(_SC_NPROCESSORS_CONF) ;
+	return (coreCount == -1) ? Qnil : INT2NUM(coreCount) ;
+}
+
 VALUE clock_monotonic(volatile VALUE obj) {
 	struct timespec tv ;
 	clock_gettime(CLOCK_MONOTONIC, &tv) ;
@@ -109,4 +116,5 @@ void Init_stats() {
 	rb_define_module_function(sunburst, "ps_stat", ps_stat, 1) ;
 
 	rb_define_module_function(sunburst, "total_ram", totalRAM, 0) ;
+	rb_define_module_function(sunburst, "nprocessors", nProcessors, 0) ;
 }

data/lib/sunburst/sunburst.rb

@@ -10,13 +10,55 @@ module Sunburst
 		stats
 	end
 
+	def self.calculate_cpu_usage(pid, sleep_time)
+		uptime_file = '/proc/uptime'.freeze
+
+		unless File.readable?(uptime_file)
+			sleep(sleep_time)
+			return nil
+		end
+
+		ticks = Sunburst::TICKS
+		stat = Sunburst.ps_stat(pid)
+		uptime = IO.read('/proc/uptime').to_f
+
+		if stat.empty?
+			sleep(sleep_time)
+			return nil
+		end
+
+		utime, stime, starttime = *stat.values_at(1, 2, 5).map(&:to_f)
+		uptime *= ticks
+
+		total_time = utime + stime
+		idle1 = uptime - starttime - total_time
+
+		sleep(sleep_time)
+
+		stat = Sunburst.ps_stat(pid)
+		uptime = IO.read('/proc/uptime').to_f
+		return nil if stat.empty?
+
+		utime2, stime2, starttime2 = *stat.values_at(1, 2, 5).map(&:to_f)
+		uptime *= ticks
+
+		total_time2 = utime2 + stime2
+		idle2 = uptime - starttime2 - total_time2
+
+		totald = idle2.+(total_time2).-(idle1 + total_time)
+		cpu_u = totald.-(idle2 - idle1).fdiv(totald).abs.*(100)./(Sunburst.nprocessors)
+
+		cpu_u > 100 ? 100.0 : cpu_u
+	end
+
 	def self.measure(command:, time: nil, sleep_time: 0.001)
 		progress = block_given?
 
 		r = {
 			execution_time: nil, cpu_time: nil,
 			memory: nil, max_threads: nil,
-			max_memory: nil, state: nil, last_state: nil
+			avg_mem: nil, max_memory: nil, state: nil, last_state: nil,
+			avg_cpu_usage: nil, max_cpu_usage: nil
 		}
 
 		IO.popen(command) { |x|
@@ -29,11 +71,36 @@ module Sunburst
 				Thread.new { print x.readpartial(4096) until x.eof? }
 			end
 
+			cpu_usage = 0
+			max_cpu_usage = 0
+			cpu_usage_sum = 0
+			cpu_usage_measure_count = 0
+
+			Thread.new {
+				while true
+					_cpu_usage = calculate_cpu_usage(pid, 0.25)
+
+					if _cpu_usage
+						cpu_usage = "%05.2f%%".freeze % _cpu_usage
+						cpu_usage_sum += _cpu_usage
+						cpu_usage_measure_count += 1
+
+						max_cpu_usage = _cpu_usage if _cpu_usage > max_cpu_usage
+					else
+						cpu_usage = ?X.freeze
+					end
+
+				end
+			}
+
 			last_mem = 0
 			max_threads = 0
 			max_mem = 0
 			last_state = nil
 
+			avg_mem = 0
+			mem_measure_count = 0
+
 			while true
 				_last_mem = Sunburst.get_mem(pid)
 
@@ -41,6 +108,9 @@ module Sunburst
 				last_mem = _last_mem
 				max_mem = last_mem if max_mem < _last_mem
 
+				avg_mem += _last_mem
+				mem_measure_count += 1
+
 				# Get stats
 				stats = get_stats(pid)
 				_threads = stats[3]
@@ -55,7 +125,8 @@ module Sunburst
 						stats[1].+(stats[2]).fdiv(Sunburst::TICKS),
 						_last_mem * Sunburst::PAGESIZE,
 						_threads,
-						last_state
+						last_state,
+						cpu_usage
 					)
 				end
 
@@ -84,10 +155,14 @@ module Sunburst
 			r[:max_threads] = max_threads unless max_threads == 0
 			r[:memory] = last_mem * Sunburst::PAGESIZE if last_mem > 0
 			r[:max_memory] = max_mem * Sunburst::PAGESIZE if last_mem > 0
+			r[:avg_mem] =  (avg_mem * Sunburst::PAGESIZE) / mem_measure_count if mem_measure_count > 0
 
 			r[:execution_time] = time2.-(time1).truncate(5)
 			r[:state] = state
 			r[:last_state] = last_state
+
+			r[:avg_cpu_usage] = sprintf("%05.2f%%", cpu_usage_sum / cpu_usage_measure_count) if cpu_usage_measure_count > 0
+			r[:max_cpu_usage] = sprintf("%05.2f%%", max_cpu_usage) if max_cpu_usage > 0
 		}
 
 		r

data/lib/sunburst/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunburst
 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-11 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies: []
 description: Run a process for a given time, kill it with SIGKILL, report CPU time
   and memory usage
@@ -47,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.13
+rubygems_version: 3.2.21
 signing_key:
 specification_version: 4
 summary: Run a process for a given time, kill it with SIGKILL, report CPU time and