memory 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37c553347c5941efab19b0f3df37824d10193cbf138582cfc5d24a598ba5a850
-  data.tar.gz: edac25b5c09088fabde46d7af1cc5603897d26d5543b3c8b49adea9a92ef6c68
+  metadata.gz: d560993f9f0c1142d7330fd7f17893d84c46a9d1a265150d5aa6bbc891175479
+  data.tar.gz: bef207c3e7221996f9ac5a1caf9c025fa8da025ea47b8ac222933cc5c08f1947
 SHA512:
-  metadata.gz: 69d25c208346c039acf4c7b190c9b9eece09e7f6fc970db1d4191ed384d2cd74b0650f1c5e69d744e8a1344021c39945d0e21604706887d8495a3f719682bbf9
-  data.tar.gz: 0d5d16c7def274988e920930c181e6abf0d5d32b60489d24d95d35b6fc9faa71e4cf285524246a53c3eb9ec589a6892af7685b52a3d320f933a130c0ca1f1553
+  metadata.gz: 374e9de16464bcdc38453215dc0627d24651bb620f265453d37819e0faf6caef90be86f9ce772f70277a3aba4b4ec990d5587848c8964d17dd385359814081dc
+  data.tar.gz: 4e86fe73db538a6ce6e6b21d8a1bf57f32da62d1c5b7077c6aff8ca1593706ee787c2102bc9a141cce9b4d177415e015f7570e076218ee29b374f32b18a919ad

data/lib/memory/report.rb

@@ -26,7 +26,15 @@ module Memory
 		end
 		
 		attr :total_allocated
+		attr :total_retained
+		attr :aggregates
 		
+		# Add all samples from the given sampler to this report.
+		def add(sampler)
+			self.concat(sampler.allocated)
+		end
+		
+		# Add allocations to this report.
 		def concat(allocations)
 			allocations.each do |allocation|
 				@total_allocated << allocation
@@ -37,7 +45,7 @@ module Memory
 				end
 			end
 		end
-
+		
 		def print(io = $stderr)
 			io.puts "\# Memory Profile", nil
 			

data/lib/memory/sampler.rb

@@ -75,6 +75,9 @@ module Memory
 		
 		def start
 			GC.disable
+			3.times{GC.start}
+			
+			# Ensure any allocations related to the block are freed:
 			GC.start
 			
 			@generation = GC.count
@@ -90,6 +93,9 @@ module Memory
 			GC.enable
 			3.times{GC.start}
 			
+			# See above.
+			GC.start
+			
 			ObjectSpace.each_object do |object|
 				next unless ObjectSpace.allocation_generation(object) == @generation
 				

data/lib/memory/version.rb

@@ -7,5 +7,5 @@
 # Copyright, 2020-2022, by Samuel Williams.
 
 module Memory
-	VERSION = "0.3.0"
+	VERSION = "0.4.0"
 end

data/lib/memory.rb

@@ -13,10 +13,17 @@ require_relative "memory/report"
 require_relative "memory/sampler"
 
 module Memory
-	def self.report(&block)
+	def self.capture(report = nil, &block)
 		sampler = Sampler.new
 		sampler.run(&block)
 		
-		return sampler.report
+		report ||= Report.general
+		report.add(sampler)
+		
+		return report
+	end
+	
+	def self.report(&block)
+		self.capture(&block)
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memory
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Sam Saffron