process-metrics 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21b2cec0ce445dbf8e7401a91b2ef3698c2b2d0dc1faa497e6c5e18cbb80efbe
-  data.tar.gz: 0d7004039c130aa4c13aafcf3bbe867fbded7a9968bb5cf1f1f64e8e153c518c
+  metadata.gz: 43c70d72392b299b8219b1bb1d5762de8d4ee116568ebd4ada928ba946d3ae96
+  data.tar.gz: d0c5a4ab4a3fd2935e95667fff758c20c87f14165776dec5b908f544cc24a590
 SHA512:
-  metadata.gz: a368497ef8239069aadbbbdf507892f516d7109325f5e5363b6c666abf4df2fac788b4406e2f596af2151d67f3cb433a937ca9a55c63ba1289874427a3bb5763
-  data.tar.gz: 1022c8a322daf3b779324d8a8ec04daf2014336c80e9feb3f4686eefd0ff918d08b24f1fd4d626fa7df69732fdae93199a320c4769654ac75dbece2ad12c0225
+  metadata.gz: 91961040cacd7a310a28ab42b76ff4f73386bdbd77a36138b7e5e4a3704fed2e6184ad493629ad501e45473c0013bbe675a4c159d74efc723a1cdb138b1a1df7
+  data.tar.gz: 9de09390fbc96a7dc208914fd18aeed8d0380f49fb3bc4ab8bf33ec1e15dba671d48921eb71460a33aba779d409cd4180c7f811f42ff736ddd4bf48d2971958e

data/lib/process/metrics/memory/darwin.rb

@@ -51,18 +51,18 @@ module Process
 			
 			# Capture memory usage for the given process IDs.
 			def self.capture(pid, count: 1, **options)
-				usage = Memory.zero
-				
 				IO.popen(["vmmap", pid.to_s], "r") do |io|
+					usage = Memory.zero
+					
 					io.each_line do |line|
 						if match = LINE.match(line)
+							usage.map_count += 1
+							
 							virtual_size = parse_size(match[:virtual_size])
 							resident_size = parse_size(match[:resident_size])
 							dirty_size = parse_size(match[:dirty_size])
 							swap_size = parse_size(match[:swap_size])
 							
-							# Update counts
-							usage.map_count += 1
 							usage.resident_size += resident_size
 							usage.swap_size += swap_size
 							
@@ -84,13 +84,21 @@ module Process
 							end
 						end
 					end
+					
+					if usage.map_count.zero?
+						# vmap might not fail, but also might not return any data.
+						return nil
+					end
+					
+					# Darwin does not expose proportional memory usage, so we guess based on the number of processes. Yes, this is a terrible hack, but it's the most reasonable thing to do given the constraints:
+					usage.proportional_size = usage.resident_size / count
+					usage.proportional_swap_size = usage.swap_size / count
+					
+					return usage
 				end
-				
-				# Darwin does not expose proportional memory usage, so we guess based on the number of processes. Yes, this is a terrible hack, but it's the most reasonable thing to do given the constraints:
-				usage.proportional_size = usage.resident_size / count
-				usage.proportional_swap_size = usage.swap_size / count
-				
-				return usage
+			rescue Errno::ESRCH
+				# Process doesn't exist.
+				return nil
 			end
 		end
 		

data/lib/process/metrics/memory/linux.rb

@@ -20,7 +20,7 @@ module Process
 				usage.minor_faults = fields[10-3].to_i
 				usage.major_faults = fields[12-3].to_i
 			rescue
-				# Be robust to unexpected formats; ignore errors silently.
+				# Ignore.
 			end
 			
 			# @returns [Numeric] Total memory size in kilobytes.
@@ -54,10 +54,10 @@ module Process
 				
 				# Capture memory usage for the given process IDs.
 				def self.capture(pid, **options)
-					usage = Memory.zero
-					
-					begin
-						File.foreach("/proc/#{pid}/smaps_rollup") do |line|
+					File.open("/proc/#{pid}/smaps_rollup") do |file|
+						usage = Memory.zero
+						
+						file.each_line do |line|
 							if /(?<name>.*?):\s+(?<value>\d+) kB/ =~ line
 								if key = SMAP[name]
 									usage[key] += value.to_i
@@ -68,11 +68,12 @@ module Process
 						usage.map_count += File.readlines("/proc/#{pid}/maps").size
 						# Also capture fault counters:
 						self.capture_faults(pid, usage)
-					rescue Errno::ENOENT, Errno::ESRCH
-						# Ignore, process may have ended.
+						
+						return usage
 					end
-					
-					return usage
+				rescue Errno::ENOENT, Errno::ESRCH
+					# Process doesn't exist.
+					return nil
 				end
 			elsif File.readable?("/proc/self/smaps")
 				# Whether the memory usage can be captured on this system.
@@ -82,10 +83,10 @@ module Process
 				
 				# Capture memory usage for the given process IDs.
 				def self.capture(pid, **options)
-					usage = Memory.zero
-					
-					begin
-						File.foreach("/proc/#{pid}/smaps") do |line|
+					File.open("/proc/#{pid}/smaps") do |file|
+						usage = Memory.zero
+						
+						file.each_line do |line|
 							# The format of this is fixed according to:
 							# https://github.com/torvalds/linux/blob/351c8a09b00b5c51c8f58b016fffe51f87e2d820/fs/proc/task_mmu.c#L804-L814
 							if /(?<name>.*?):\s+(?<value>\d+) kB/ =~ line
@@ -98,13 +99,15 @@ module Process
 								usage.map_count += 1
 							end
 						end
+						
 						# Also capture fault counters:
 						self.capture_faults(pid, usage)
-					rescue Errno::ENOENT, Errno::ESRCH
-						# Ignore, process may have ended.
+						
+						return usage
 					end
-					
-					return usage
+				rescue Errno::ENOENT, Errno::ESRCH
+					# Process doesn't exist.
+					return nil
 				end
 			else
 				def self.supported?

data/lib/process/metrics/version.rb

@@ -7,6 +7,6 @@
 module Process
 	# @namespace
 	module Metrics
-		VERSION = "0.6.1"
+		VERSION = "0.7.0"
 	end
 end

data/readme.md

@@ -16,6 +16,10 @@ Please see the [project documentation](https://socketry.github.io/process-metric
 
 Please see the [project releases](https://socketry.github.io/process-metrics/releases/index) for all releases.
 
+### v0.7.0
+
+  - Be more proactive about returning nil if memory capture failed.
+
 ### v0.6.1
 
   - Handle `Errno::ESRCH: No such process @ io_fillbuf - fd:xxx /proc/xxx/smaps_rollup` by ignoring it.
@@ -69,14 +73,6 @@ Please see the [project releases](https://socketry.github.io/process-metrics/rel
   - Fixed process metrics to exclude the `ps` command itself from measurements.
   - Fixed documentation formatting issues.
 
-### v0.1.0
-
-  - Initial release with support for process and memory metrics on Linux and Darwin (macOS).
-  - Support for selecting processes based on PID or PPID (process group).
-  - Implementation of memory statistics collection using `/proc` filesystem on Linux.
-  - Better handling of process hierarchies.
-  - Support for older Ruby versions.
-
 ## Contributing
 
 We welcome contributions to this project.

data/releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## v0.7.0
+
+  - Be more proactive about returning nil if memory capture failed.
+
 ## v0.6.1
 
   - Handle `Errno::ESRCH: No such process @ io_fillbuf - fd:xxx /proc/xxx/smaps_rollup` by ignoring it.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: process-metrics
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Samuel Williams