memory-profiler 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1f0d854f80d796037192a81dfe2912291e0653510755e06d0a7e85e8b84a4ea
-  data.tar.gz: 11e5bbe54085baa3cc2c085c947b2ef9c74f3e85a44a59249ea2c5e41bc4a2bd
+  metadata.gz: 8a65991a6612d28ede2c4ab5652bcf410e7edf92a0f98e8bdeebd921b64232d6
+  data.tar.gz: 230a10b0d5ed42f74d19007534dbae1ee49df3c67d0507fcf42a0fc67b1cf5e3
 SHA512:
-  metadata.gz: '05866071c2c1a20e868d8ca0c11f9951595bac35b86e051863ecde8c11e581d7c92780826c4816c087764f9cdc078859402e6d718e272f6a337dc59ab69d2b63'
-  data.tar.gz: e070faca1aa563faff377a56cb7287e1dbf369b65dc534c623425ad33c83e7d938925a25f470821e2134848ed2db7adce94408736e0fead52bba6cbc07ec5a9d
+  metadata.gz: 7b64a8a6b0a500f84c52689aa5affad466d19e3ddc723db2014af3ef784fe35b7d6704aa2bf363f27c23d8fe75e27bdef5c7e969736a2bedcfc925467dd3e16a
+  data.tar.gz: da48ff77a1915aaa978ce162b6c44d310b6b4a77af59b6df18c3e6fc92b19aa40df99473bb461dafd0a160ded3c5721681cce3e22dece393d484c0b2c51e67b4

data/ext/memory/profiler/capture.c

@@ -28,6 +28,9 @@ struct Memory_Profiler_Capture {
 	// Should we queue callbacks? (temporarily disabled during queue processing).
 	int paused;
 
+	// Should we automatically track all classes? (if false, only explicitly tracked classes are tracked).
+	int track_all;
+
 	// Tracked classes: class => VALUE (wrapped Memory_Profiler_Capture_Allocations).
 	st_table *tracked;
 	
@@ -163,21 +166,18 @@ static void Memory_Profiler_Capture_process_newobj(VALUE self, VALUE klass, VALU
 	// Pause the capture to prevent infinite loop:
 	capture->paused += 1;
 	
-	// Increment global new count:
-	capture->new_count++;
-	
-	// Look up or create allocations record for this class:
+	// Look up allocations record for this class:
 	st_data_t allocations_data;
 	VALUE allocations;
 	struct Memory_Profiler_Capture_Allocations *record;
 	
 	if (st_lookup(capture->tracked, (st_data_t)klass, &allocations_data)) {
-		// Existing record
+		// Existing record - class is explicitly tracked
 		allocations = (VALUE)allocations_data;
 		record = Memory_Profiler_Allocations_get(allocations);
 		record->new_count++;
-	} else {
-		// First time seeing this class, create record automatically
+	} else if (capture->track_all) {
+		// First time seeing this class, create record automatically (if track_all is enabled)
 		record = ALLOC(struct Memory_Profiler_Capture_Allocations);
 		record->callback = Qnil;
 		record->new_count = 1;
@@ -187,8 +187,15 @@ static void Memory_Profiler_Capture_process_newobj(VALUE self, VALUE klass, VALU
 		st_insert(capture->tracked, (st_data_t)klass, (st_data_t)allocations);
 		RB_OBJ_WRITTEN(self, Qnil, klass);
 		RB_OBJ_WRITTEN(self, Qnil, allocations);
+	} else {
+		// track_all disabled and class not explicitly tracked - skip this allocation entirely
+		capture->paused -= 1;
+		return;
 	}
 	
+	// Increment global new count (only if we're tracking this class):
+	capture->new_count++;
+	
 	VALUE data = Qnil;
 	if (!NIL_P(record->callback)) {
 		data = rb_funcall(record->callback, rb_intern("call"), 3, klass, sym_newobj, Qnil);
@@ -367,9 +374,10 @@ static VALUE Memory_Profiler_Capture_alloc(VALUE klass) {
 	capture->new_count = 0;
 	capture->free_count = 0;
 	
-	// Initialize state flags - not running, callbacks disabled
+	// Initialize state flags - not running, callbacks disabled, track_all disabled by default
 	capture->running = 0;
 	capture->paused = 0;
+	capture->track_all = 0;
 	
 	// Global event queue system will auto-initialize on first use (lazy initialization)
 	
@@ -381,6 +389,24 @@ static VALUE Memory_Profiler_Capture_initialize(VALUE self) {
 	return self;
 }
 
+// Get track_all setting
+static VALUE Memory_Profiler_Capture_track_all_get(VALUE self) {
+	struct Memory_Profiler_Capture *capture;
+	TypedData_Get_Struct(self, struct Memory_Profiler_Capture, &Memory_Profiler_Capture_type, capture);
+	
+	return capture->track_all ? Qtrue : Qfalse;
+}
+
+// Set track_all setting
+static VALUE Memory_Profiler_Capture_track_all_set(VALUE self, VALUE value) {
+	struct Memory_Profiler_Capture *capture;
+	TypedData_Get_Struct(self, struct Memory_Profiler_Capture, &Memory_Profiler_Capture_type, capture);
+	
+	capture->track_all = RTEST(value) ? 1 : 0;
+	
+	return value;
+}
+
 // Start capturing allocations
 static VALUE Memory_Profiler_Capture_start(VALUE self) {
 	struct Memory_Profiler_Capture *capture;
@@ -572,14 +598,10 @@ struct Memory_Profiler_Each_Object_Arguments {
 	VALUE allocations;
 };
 
-// Cleanup function to ensure table is made weak again
+// Cleanup function to re-enable GC
 static VALUE Memory_Profiler_Capture_each_object_ensure(VALUE arg) {
-	struct Memory_Profiler_Each_Object_Arguments *arguments = (struct Memory_Profiler_Each_Object_Arguments *)arg;
-	struct Memory_Profiler_Capture *capture;
-	TypedData_Get_Struct(arguments->self, struct Memory_Profiler_Capture, &Memory_Profiler_Capture_type, capture);
-	
-	// Make table weak again
-	Memory_Profiler_Object_Table_decrement_strong(capture->states);
+	// Re-enable GC (rb_gc_enable returns previous state, but we don't need it)
+	rb_gc_enable();
 	
 	return Qnil;
 }
@@ -639,10 +661,11 @@ static VALUE Memory_Profiler_Capture_each_object(int argc, VALUE *argv, VALUE se
 	
 	RETURN_ENUMERATOR(self, argc, argv);
 	
-	// Make table strong so objects won't be collected during iteration
-	Memory_Profiler_Object_Table_increment_strong(capture->states);
+	// Disable GC to prevent objects from being collected during iteration
+	rb_gc_disable();
 	
-	// Process all pending events and run GC to clean up stale objects:
+	// Process all pending events to clean up stale entries
+	// At this point, all remaining objects in the table should be valid
 	Memory_Profiler_Events_process_all();
 	
 	// If class provided, look up its allocations wrapper
@@ -653,7 +676,8 @@ static VALUE Memory_Profiler_Capture_each_object(int argc, VALUE *argv, VALUE se
 			allocations = (VALUE)allocations_data;
 		} else {
 			// Class not tracked - nothing to iterate
-			Memory_Profiler_Object_Table_decrement_strong(capture->states);
+			// Re-enable GC before returning
+			rb_gc_enable();
 			return self;
 		}
 	}
@@ -746,6 +770,8 @@ void Init_Memory_Profiler_Capture(VALUE Memory_Profiler)
 	rb_define_alloc_func(Memory_Profiler_Capture, Memory_Profiler_Capture_alloc);
 	
 	rb_define_method(Memory_Profiler_Capture, "initialize", Memory_Profiler_Capture_initialize, 0);
+	rb_define_method(Memory_Profiler_Capture, "track_all", Memory_Profiler_Capture_track_all_get, 0);
+	rb_define_method(Memory_Profiler_Capture, "track_all=", Memory_Profiler_Capture_track_all_set, 1);
 	rb_define_method(Memory_Profiler_Capture, "start", Memory_Profiler_Capture_start, 0);
 	rb_define_method(Memory_Profiler_Capture, "stop", Memory_Profiler_Capture_stop, 0);
 	rb_define_method(Memory_Profiler_Capture, "track", Memory_Profiler_Capture_track, -1);  // -1 to accept block

data/ext/memory/profiler/table.c

@@ -37,7 +37,6 @@ struct Memory_Profiler_Object_Table* Memory_Profiler_Object_Table_new(size_t ini
 	table->capacity = initial_capacity > 0 ? initial_capacity : INITIAL_CAPACITY;
 	table->count = 0;
 	table->tombstones = 0;
-	table->strong = 0;  // Start as weak table (strong == 0 means weak)
 	
 	// Use calloc to zero out entries (0 = empty slot)
 	table->entries = calloc(table->capacity, sizeof(struct Memory_Profiler_Object_Table_Entry));
@@ -303,12 +302,7 @@ void Memory_Profiler_Object_Table_mark(struct Memory_Profiler_Object_Table *tabl
 		struct Memory_Profiler_Object_Table_Entry *entry = &table->entries[i];
 		// Skip empty slots and tombstones
 		if (entry->object != 0 && entry->object != TOMBSTONE) {
-			// Mark object key if table is strong (strong > 0)
-			// When weak (strong == 0), object keys can be GC'd (that's how we detect frees)
-			if (table->strong > 0) {
-				rb_gc_mark_movable(entry->object);
-			}
-			
+			// Don't mark object keys - table is weak (object keys can be GC'd, that's how we detect frees)
 			// Always mark the other fields (klass, data) - we own these
 			if (entry->klass) rb_gc_mark_movable(entry->klass);
 			if (entry->data) rb_gc_mark_movable(entry->data);
@@ -413,17 +407,3 @@ size_t Memory_Profiler_Object_Table_size(struct Memory_Profiler_Object_Table *ta
 	return table->count;
 }
 
-// Increment strong reference count (makes table strong when > 0)
-void Memory_Profiler_Object_Table_increment_strong(struct Memory_Profiler_Object_Table *table) {
-	if (table) {
-		table->strong++;
-	}
-}
-
-// Decrement strong reference count (makes table weak when == 0)
-void Memory_Profiler_Object_Table_decrement_strong(struct Memory_Profiler_Object_Table *table) {
-	if (table && table->strong > 0) {
-		table->strong--;
-	}
-}
-

data/ext/memory/profiler/table.h

@@ -19,10 +19,8 @@ struct Memory_Profiler_Object_Table_Entry {
 // Custom object table for tracking allocations during GC.
 // Uses system malloc/free (not ruby_xmalloc) to be safe during GC compaction.
 // Keys are object addresses (updated during compaction).
+// Table is always weak - object keys are not marked, allowing GC to collect them.
 struct Memory_Profiler_Object_Table {
-	// Strong reference count: 0 = weak (don't mark keys), >0 = strong (mark keys)
-	int strong;
-
 	size_t capacity;    // Total slots
 	size_t count;       // Used slots (occupied entries)
 	size_t tombstones;  // Deleted slots (tombstone markers)
@@ -62,11 +60,3 @@ void Memory_Profiler_Object_Table_compact(struct Memory_Profiler_Object_Table *t
 // Get current size
 size_t Memory_Profiler_Object_Table_size(struct Memory_Profiler_Object_Table *table);
 
-// Increment strong reference count
-// When strong > 0, table is strong and will mark object keys during GC
-void Memory_Profiler_Object_Table_increment_strong(struct Memory_Profiler_Object_Table *table);
-
-// Decrement strong reference count
-// When strong == 0, table is weak and will not mark object keys during GC
-void Memory_Profiler_Object_Table_decrement_strong(struct Memory_Profiler_Object_Table *table);
-

data/lib/memory/profiler/sampler.rb

@@ -104,6 +104,7 @@ module Memory
 				@gc = gc
 				
 				@capture = Capture.new
+				@capture.track_all = true
 				@call_trees = {}
 				@samples = {}
 			end

data/lib/memory/profiler/version.rb

@@ -7,7 +7,7 @@
 module Memory
 	# @namespace
 	module Profiler
-		VERSION = "1.5.1"
+		VERSION = "1.6.0"
 	end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memory-profiler
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Samuel Williams