Fix incorrect option handling for ps.

Author: ioquatix

lib/memory/leak/cluster.rb

@@ -85,8 +85,12 @@ def apply_limit!(total_size_limit = @total_size_limit)
 
 			# Sample the memory usage of all processes in the cluster.
 			def sample!
-				System.memory_usages(@processes.keys).each do |process_id, memory_usage|
-					@processes[process_id].current_size = memory_usage
+				System.memory_usages(@processes.keys) do |process_id, memory_usage|
+					if monitor = @processes[process_id]
+						monitor.current_size = memory_usage
+					else
+						Console.warn(self, "Unknown process ID.", process_id: process_id)
+					end
 				end
 			end
 

lib/memory/leak/system.rb

@@ -36,8 +36,12 @@ def self.total_memory_size
 			# @parameter process_ids [Array(Integer)] The process IDs to monitor.
 			# @returns [Array(Tuple(Integer, Integer))] The memory usage of the given process IDs.
 			def self.memory_usages(process_ids)
-				IO.popen(["ps", "-o", "pid=,rss=", *process_ids.map(&:to_s)]) do |io|
-					io.each_line.map(&:split).map{|process_id, size| [process_id.to_i, size.to_i * 1024]}
+				return to_enum(__method__, process_ids) unless block_given?
+				
+				IO.popen(["ps", "-o", "pid=,rss=", "-p", process_ids.join(",")]) do |io|
+					io.each_line.map(&:split).each do |process_id, size|
+						yield process_id.to_i, size.to_i * 1024
+					end
 				end
 			end
 
@@ -46,7 +50,7 @@ def self.memory_usages(process_ids)
 			# @parameter process_ids [Array(Integer)] The process IDs to monitor.
 			# @returns [Array(Tuple(Integer, Integer))] The memory usage of the given process IDs.
 			def self.memory_usage(process_id)
-				IO.popen(["ps", "-o", "rss=", process_id.to_s]) do |io|
+				IO.popen(["ps", "-o", "rss=", "-p", process_id.to_s]) do |io|
 					return io.read.to_i * 1024
 				end
 			end

test/memory/leak/system.rb

@@ -24,18 +24,24 @@
 
 	with ".memory_usages" do
 		it "can determine the memory usages" do
-			result = subject.memory_usages([Process.pid])
-			expect(result).to be_a(Array)
+			pids = 3.times.map{Process.spawn("sleep 1")}
+			
+			result = subject.memory_usages(pids)
 
 			result.each do |process_id, size|
+				expect(pids).to be(:include?, process_id)
 				expect(process_id).to be_a(Integer)
 				expect(size).to be_a(Integer)
 			end
+		ensure
+			pids.each do |pid|
+				Process.kill(:TERM, pid)
+				Process.wait(pid)
+			end
 		end
 
 		it "ignores invalid process IDs" do
 			result = subject.memory_usages([Process.pid, 0])
-			expect(result).to be_a(Array)
 
 			result.each do |process_id, size|
 				expect(process_id).to be_a(Integer)