memory-profiler 1.1.13 → 1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cc3a03e3b76e232615954217c88c54d2077da267793f79c9b5dc5d8463398f6
-  data.tar.gz: 29466a48c28857d7093156c80072dc3cba66420275b307cb2fea64102ece2624
+  metadata.gz: cce184966c5eb2b104059f419fb7f220b2bea168b5359adacc90923079332241
+  data.tar.gz: 436690f9e75f5ba72546604fd58d71efccb56d4dc8b8880feaa3b4ecab03c918
 SHA512:
-  metadata.gz: 9171990674d31df2af4daa7ed082b696ce1a093cb8f83ba6bab1d82ed1ef2704bb3cb4aef48758db7ba6b815e8729483d8b2124f3f687a77f3029400e1e3bb7b
-  data.tar.gz: 4f4845133c13fe67caa4641df912280983d05f4c6e0fca324b0827f0ffbbd040710670e9d3cd1ef6e6ab7d61bbbe22334f89ffbf4286652f4d4e361891f2dfb5
+  metadata.gz: 54d4d1e2f8d19da788e53ffa0c5e69dcaf5db708d5d1de0336bccc79c6311330a56b0c8cb605b7bb7dbc116b91b91a752cacf317d4403e5188517ddcdded12a2
+  data.tar.gz: 4994f81f0b6dd2b0c46bc3aa3e415dbc16ffb633d9fefdeafd67d10df522aaccc5003dd632a664b8eb69e476053bac5f51d0979c69c4daa97965356b1bb2ca9c

data/ext/memory/profiler/capture.c

@@ -138,9 +138,9 @@ const char *event_flag_name(rb_event_flag_t event_flag) {
 }
 
 // Process a NEWOBJ event. All allocation tracking logic is here.
-static void Memory_Profiler_Capture_process_newobj(VALUE capture_value, VALUE klass, VALUE object) {
+static void Memory_Profiler_Capture_process_newobj(VALUE self, VALUE klass, VALUE object) {
 	struct Memory_Profiler_Capture *capture;
-	TypedData_Get_Struct(capture_value, struct Memory_Profiler_Capture, &Memory_Profiler_Capture_type, capture);
+	TypedData_Get_Struct(self, struct Memory_Profiler_Capture, &Memory_Profiler_Capture_type, capture);
 	
 	// Pause the capture to prevent infinite loop:
 	capture->paused += 1;
@@ -168,8 +168,8 @@ static void Memory_Profiler_Capture_process_newobj(VALUE capture_value, VALUE kl
 		
 		allocations = Memory_Profiler_Allocations_wrap(record);
 		st_insert(capture->tracked_classes, (st_data_t)klass, (st_data_t)allocations);
-		RB_OBJ_WRITTEN(capture_value, Qnil, klass);
-		RB_OBJ_WRITTEN(capture_value, Qnil, allocations);
+		RB_OBJ_WRITTEN(self, Qnil, klass);
+		RB_OBJ_WRITTEN(self, Qnil, allocations);
 	}
 	
 	// Only store state if there's a callback
@@ -298,10 +298,19 @@ static void Memory_Profiler_Capture_event_callback(VALUE data, void *ptr) {
 	VALUE klass = rb_class_of(object);
 	if (!klass) return;
 	
+	if (DEBUG) {
+		const char *klass_name = "(ignored)";
+		if (event_flag == RUBY_INTERNAL_EVENT_NEWOBJ) {
+			klass_name = rb_class2name(klass);
+		}
+		fprintf(stderr, "Memory_Profiler_Capture_event_callback: object=%p, event_flag=%s, klass=%s\n", (void*)object, event_flag_name(event_flag), klass_name);
+	}
+
 	if (event_flag == RUBY_INTERNAL_EVENT_NEWOBJ) {
 		// Skip NEWOBJ if disabled (during callback) to prevent infinite recursion
 		if (capture->paused) return;
 		
+		// Check if class is already freed (T_NONE). This can happen when:
 		// It's safe to unconditionally call here:
 		object = rb_obj_id(object);
 
@@ -309,6 +318,10 @@ static void Memory_Profiler_Capture_event_callback(VALUE data, void *ptr) {
 	} else if (event_flag == RUBY_INTERNAL_EVENT_FREEOBJ) {
 		// We only care about objects that have been seen before (i.e. have an object ID):
 		if (RB_FL_TEST(object, FL_SEEN_OBJ_ID)) {
+			// For freeobj, we only care about klasses that we are tracking.
+			// This prevents us from enqueuing klass objects that might be freed.
+			if (!st_lookup(capture->tracked_classes, (st_data_t)klass, NULL)) return;
+			
 			// It's only safe to call here if the object already has an object ID.
 			object = rb_obj_id(object);
 			
@@ -417,7 +430,7 @@ static VALUE Memory_Profiler_Capture_track(int argc, VALUE *argv, VALUE self) {
 		RB_OBJ_WRITE(self, &record->callback, callback);
 	} else {
 		struct Memory_Profiler_Capture_Allocations *record = ALLOC(struct Memory_Profiler_Capture_Allocations);
-		record->callback = callback;  // Initial assignment, no write barrier needed
+		RB_OBJ_WRITE(self, &record->callback, callback);
 		record->new_count = 0;
 		record->free_count = 0;
 		record->states = st_init_numtable();
@@ -426,14 +439,8 @@ static VALUE Memory_Profiler_Capture_track(int argc, VALUE *argv, VALUE self) {
 		allocations = Memory_Profiler_Allocations_wrap(record);
 		
 		st_insert(capture->tracked_classes, (st_data_t)klass, (st_data_t)allocations);
-		// Notify GC about the class VALUE stored as key in the table
 		RB_OBJ_WRITTEN(self, Qnil, klass);
-		// Notify GC about the allocations VALUE stored as value in the table
 		RB_OBJ_WRITTEN(self, Qnil, allocations);
-		// Now inform GC about the callback reference
-		if (!NIL_P(callback)) {
-			RB_OBJ_WRITTEN(self, Qnil, callback);
-		}
 	}
 	
 	return allocations;

data/ext/memory/profiler/events.c

@@ -31,6 +31,7 @@ static void Memory_Profiler_Events_mark(void *ptr);
 static void Memory_Profiler_Events_compact(void *ptr);
 static void Memory_Profiler_Events_free(void *ptr);
 static size_t Memory_Profiler_Events_memsize(const void *ptr);
+static const char *Memory_Profiler_Event_Type_name(enum Memory_Profiler_Event_Type type);
 
 // TypedData definition for Events.
 static const rb_data_type_t Memory_Profiler_Events_type = {
@@ -102,15 +103,9 @@ static void Memory_Profiler_Events_mark_queue(struct Memory_Profiler_Queue *queu
 		// Skip already-processed events if requested:
 		if (skip_none && event->type == MEMORY_PROFILER_EVENT_TYPE_NONE) continue;
 		
-		// Mark the Capture instance and class:
 		rb_gc_mark_movable(event->capture);
 		rb_gc_mark_movable(event->klass);
-		
-		// For NEWOBJ: mark the object to keep it alive until processor runs
-		// For FREEOBJ: DON'T mark (object is being freed)
-		if (event->type == MEMORY_PROFILER_EVENT_TYPE_NEWOBJ) {
-			rb_gc_mark_movable(event->object);
-		}
+		rb_gc_mark_movable(event->object);
 	}
 }
 
@@ -133,7 +128,6 @@ static void Memory_Profiler_Events_compact_queue(struct Memory_Profiler_Queue *q
 		// Skip already-processed events if requested:
 		if (skip_none && event->type == MEMORY_PROFILER_EVENT_TYPE_NONE) continue;
 		
-		// Update all VALUEs if they moved during compaction:
 		event->capture = rb_gc_location(event->capture);
 		event->klass = rb_gc_location(event->klass);
 		event->object = rb_gc_location(event->object);

data/lib/memory/profiler/version.rb

@@ -7,7 +7,7 @@
 module Memory
 	# @namespace
 	module Profiler
-		VERSION = "1.1.13"
+		VERSION = "1.1.15"
 	end
 end
 

data/readme.md

@@ -22,6 +22,14 @@ Please see the [project documentation](https://socketry.github.io/memory-profile
 
 Please see the [project releases](https://socketry.github.io/memory-profiler/releases/index) for all releases.
 
+### v1.1.15
+
+  - Ignore `freeobj` for classes that are not being tracked.
+
+### v1.1.14
+
+  - Ignore `freeobj` events for objects with anonymous classes that are not tracked (and thus become `T_NONE`).
+
 ### v1.1.13
 
   - Fix sampler loop interval handling.
@@ -62,14 +70,6 @@ Please see the [project releases](https://socketry.github.io/memory-profiler/rel
   - Better state handling and object increment/decrement counting.
   - Better call tree handling - including support for `prune!`.
 
-### v1.1.5
-
-  - Use queue for `newobj` too to avoid invoking user code during object allocation.
-
-### v1.1.2
-
-  - Fix handling of GC compaction (I hope).
-
 ## Contributing
 
 We welcome contributions to this project.

data/releases.md

@@ -1,5 +1,13 @@
 # Releases
 
+## v1.1.15
+
+  - Ignore `freeobj` for classes that are not being tracked.
+
+## v1.1.14
+
+  - Ignore `freeobj` events for objects with anonymous classes that are not tracked (and thus become `T_NONE`).
+
 ## v1.1.13
 
   - Fix sampler loop interval handling.

metadata

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