fiber-profiler 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb42b05548bfd94568a8ed386f637d62fc55a8a86327647c5f397fc57c7cbee7
-  data.tar.gz: 929e61a6392395e02eaedab0c7ed888a0dca4d73139eea138b065807a80a4191
+  metadata.gz: a2bbdd5d629b193bb2c9fe87a9935abda45b21339bc9fa8e9a177a3cb08c6ca4
+  data.tar.gz: c38ff2d79d1dcc2cef0745923da73c0e1bfda612623d1592fffbeb708d6ff97f
 SHA512:
-  metadata.gz: 196980ad2d5d0cc53d159624c461a6cbf01adbc8cb822a79eaf38d58c168b26a88de05be131a57e454be2cf8b1258be548e37e6f3bcb7c0e67ddab73cef71e81
-  data.tar.gz: fa008843a3fe2fc972d3edd1070678889003352e4d57827e4e79e87312376ad4e7bf1e81041c166bed4d6121ca50b0fc3eb7dcb1d81e8f9968a7b4303d52b96e
+  metadata.gz: a23c926af43a1db2f2cf71b269bbb63d0bff602ca17b40ced3da152dd317d084c2f41f47c42ba7194a7be67df6be8d17de54a829808a82173bb3dc83303b14bd
+  data.tar.gz: afd379c5f799fda50fa7229f4512ff01297e9f7f66a32d0eaab575a77c3b66d9b7cc1d13627609193983173b725b8851bf9240ab8096881bc764b66ba83b9a73

data/ext/fiber/profiler/capture.c

@@ -73,12 +73,14 @@ struct Fiber_Profiler_Capture {
 	// Calls that are shorter than this filter threshold will be ignored:
 	double filter_threshold;
 	
+	// Output handling:
 	VALUE output;
 	Fiber_Profiler_Stream_Print print;
 	struct Fiber_Profiler_Stream stream;
 	
 	// Whether or not the profiler is currently running:
 	int running;
+	VALUE thread;
 	
 	// Whether or not to capture call data:
 	int capture;
@@ -133,6 +135,7 @@ void Fiber_Profiler_Capture_Call_free(void *element) {
 static void Fiber_Profiler_Capture_mark(void *ptr) {
 	struct Fiber_Profiler_Capture *profiler = (struct Fiber_Profiler_Capture*)ptr;
 	
+	rb_gc_mark_movable(profiler->thread);
 	rb_gc_mark_movable(profiler->output);
 	
 	// If `klass` is stored as a VALUE in calls, we need to mark them here:
@@ -144,6 +147,7 @@ static void Fiber_Profiler_Capture_mark(void *ptr) {
 static void Fiber_Profiler_Capture_compact(void *ptr) {
 	struct Fiber_Profiler_Capture *profiler = (struct Fiber_Profiler_Capture*)ptr;
 	
+	profiler->thread = rb_gc_location(profiler->thread);
 	profiler->output = rb_gc_location(profiler->output);
 	
 	// If `klass` is stored as a VALUE in calls, we need to update their locations here:
@@ -211,10 +215,12 @@ VALUE Fiber_Profiler_Capture_allocate(VALUE klass) {
 	struct Fiber_Profiler_Capture *profiler = ALLOC(struct Fiber_Profiler_Capture);
 	
 	// Initialize the profiler state:
-	Fiber_Profiler_Capture_output_set(profiler, rb_stderr);	
 	Fiber_Profiler_Stream_initialize(&profiler->stream);
+	profiler->output = Qnil;
 	
 	profiler->running = 0;
+	profiler->thread = Qnil;
+	
 	profiler->capture = 0;
 	profiler->stalls = 0;
 	profiler->nesting = 0;
@@ -258,6 +264,9 @@ VALUE Fiber_Profiler_Capture_initialize(int argc, VALUE *argv, VALUE self) {
 	
 	if (arguments[3] != Qundef) {
 		Fiber_Profiler_Capture_output_set(profiler, arguments[3]);
+	} else {
+		// Initialize the profiler output - we dup `rb_stderr` because the profiler may otherwise run into synchronization issues with other uses of `rb_stderr`:
+		Fiber_Profiler_Capture_output_set(profiler, rb_obj_dup(rb_stderr));
 	}
 	
 	return self;
@@ -324,16 +333,9 @@ static struct Fiber_Profiler_Capture_Call* profiler_event_record_call(struct Fib
 	return call;
 }
 
-void Fiber_Profiler_Capture_fiber_switch(struct Fiber_Profiler_Capture *profiler);
-
 static void Fiber_Profiler_Capture_callback(rb_event_flag_t event_flag, VALUE data, VALUE self, ID id, VALUE klass) {
 	struct Fiber_Profiler_Capture *profiler = Fiber_Profiler_Capture_get(data);
 	
-	if (event_flag & RUBY_EVENT_FIBER_SWITCH) {
-		Fiber_Profiler_Capture_fiber_switch(profiler);
-		return;
-	}
-	
 	// We don't want to capture data if we're not running:
 	if (!profiler->capture) return;
 	
@@ -373,17 +375,24 @@ static void Fiber_Profiler_Capture_callback(rb_event_flag_t event_flag, VALUE da
 	}
 }
 
-VALUE Fiber_Profiler_Capture_start(VALUE self) {
+void Fiber_Profiler_Capture_pause(VALUE self) {
 	struct Fiber_Profiler_Capture *profiler = Fiber_Profiler_Capture_get(self);
 	
-	if (profiler->running) return Qfalse;
+	if (!profiler->capture) return;
 	
-	profiler->running = 1;
+	profiler->capture = 0;
 	
-	Fiber_Profiler_Capture_reset(profiler);
-	Fiber_Profiler_Time_current(&profiler->start_time);
+	rb_thread_remove_event_hook_with_data(profiler->thread, Fiber_Profiler_Capture_callback, self);
+}
+
+void Fiber_Profiler_Capture_resume(VALUE self) {
+	struct Fiber_Profiler_Capture *profiler = Fiber_Profiler_Capture_get(self);
 	
-	rb_event_flag_t event_flags = RUBY_EVENT_FIBER_SWITCH;
+	if (profiler->capture) return;
+	
+	profiler->capture = 1;
+	
+	rb_event_flag_t event_flags = 0;
 	
 	if (profiler->track_calls) {
 		event_flags |= RUBY_EVENT_CALL | RUBY_EVENT_RETURN;
@@ -391,12 +400,29 @@ VALUE Fiber_Profiler_Capture_start(VALUE self) {
 		// event_flags |= RUBY_EVENT_B_CALL | RUBY_EVENT_B_RETURN;
 	}
 	
-	VALUE thread = rb_thread_current();
-	rb_thread_add_event_hook(thread, Fiber_Profiler_Capture_callback, event_flags, self);
+	// CRuby will raise an exception if you try to add "INTERNAL_EVENT" hooks at the same time as other hooks, so we do it in two calls:
+	rb_thread_add_event_hook(profiler->thread, Fiber_Profiler_Capture_callback, event_flags, self);
+	rb_thread_add_event_hook(profiler->thread, Fiber_Profiler_Capture_callback, RUBY_INTERNAL_EVENT_GC_START | RUBY_INTERNAL_EVENT_GC_END_SWEEP, self);
+}
+
+void Fiber_Profiler_Capture_fiber_switch(VALUE self);
+
+void Fiber_Profiler_Capture_fiber_switch_callback(rb_event_flag_t event_flag, VALUE data, VALUE self, ID id, VALUE klass) {
+	Fiber_Profiler_Capture_fiber_switch(data);
+}
+
+VALUE Fiber_Profiler_Capture_start(VALUE self) {
+	struct Fiber_Profiler_Capture *profiler = Fiber_Profiler_Capture_get(self);
+	
+	if (profiler->running) return Qfalse;
+	
+	profiler->running = 1;
+	profiler->thread = rb_thread_current();
+	
+	Fiber_Profiler_Capture_reset(profiler);
+	Fiber_Profiler_Time_current(&profiler->start_time);
 	
-	// if (profiler->track_garbage_collection) {
-		rb_thread_add_event_hook(thread, Fiber_Profiler_Capture_callback, RUBY_INTERNAL_EVENT_GC_START | RUBY_INTERNAL_EVENT_GC_END_SWEEP, self);
-	// }
+	rb_thread_add_event_hook(profiler->thread, Fiber_Profiler_Capture_fiber_switch_callback, RUBY_EVENT_FIBER_SWITCH, self);
 	
 	return self;
 }
@@ -406,11 +432,13 @@ VALUE Fiber_Profiler_Capture_stop(VALUE self) {
 	
 	if (!profiler->running) return Qfalse;
 	
-	profiler->running = 0;
+	Fiber_Profiler_Capture_pause(self);
 	
-	VALUE thread = rb_thread_current();
-	rb_thread_remove_event_hook_with_data(thread, Fiber_Profiler_Capture_callback, self);
+	rb_thread_remove_event_hook_with_data(profiler->thread, Fiber_Profiler_Capture_fiber_switch_callback, self);
 	
+	profiler->running = 0;
+	profiler->thread = Qnil;
+		
 	Fiber_Profiler_Time_current(&profiler->stop_time);
 	Fiber_Profiler_Capture_reset(profiler);
 	
@@ -452,26 +480,29 @@ int Fiber_Profiler_Capture_sample(struct Fiber_Profiler_Capture *profiler) {
 	}
 }
 
-void Fiber_Profiler_Capture_fiber_switch(struct Fiber_Profiler_Capture *profiler)
+void Fiber_Profiler_Capture_fiber_switch(VALUE self)
 {
+	struct Fiber_Profiler_Capture *profiler = Fiber_Profiler_Capture_get(self);
 	float duration = Fiber_Profiler_Capture_duration(profiler);
 	
 	if (profiler->capture) {
+		Fiber_Profiler_Capture_pause(self);
+		
 		Fiber_Profiler_Capture_finish(profiler);
 		
 		if (duration > profiler->stall_threshold) {
 			profiler->stalls += 1;
 			Fiber_Profiler_Capture_print(profiler);
 		}
+		
+		Fiber_Profiler_Capture_reset(profiler);
 	}
 	
-	Fiber_Profiler_Capture_reset(profiler);
-	
 	if (Fiber_Profiler_Capture_sample(profiler)) {
 		// Reset the start time:
 		Fiber_Profiler_Time_current(&profiler->start_time);
 		
-		profiler->capture = 1;
+		Fiber_Profiler_Capture_resume(self);
 	}
 }
 
@@ -560,6 +591,8 @@ void Fiber_Profiler_Capture_print_json(struct Fiber_Profiler_Capture *profiler,
 }
 
 void Fiber_Profiler_Capture_print(struct Fiber_Profiler_Capture *profiler) {
+	if (profiler->output == Qnil) return;
+	
 	FILE *stream = profiler->stream.file;
 	profiler->print(profiler, stream);
 	fflush(stream);

data/lib/fiber/profiler/version.rb

@@ -7,6 +7,6 @@
 class Fiber
 	# @namespace
 	module Profiler
-		VERSION = "0.1.1"
+		VERSION = "0.1.3"
 	end
 end

data/readme.md

@@ -18,6 +18,10 @@ Please see the [project documentation](https://socketry.github.io/fiber-profiler
 
 Please see the [project releases](https://socketry.github.io/fiber-profiler/releases/index) for all releases.
 
+### v0.1.3
+
+  - Improved performance when not profiling (when sampling is enabled).
+
 ### v0.1.0
 
   - Initial implementation extracted from `io-event` gem.

data/releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## v0.1.3
+
+  - Improved performance when not profiling (when sampling is enabled).
+
 ## v0.1.0
 
   - Initial implementation extracted from `io-event` gem.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fiber-profiler
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Samuel Williams
@@ -36,7 +36,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2025-02-13 00:00:00.000000000 Z
+date: 2025-02-14 00:00:00.000000000 Z
 dependencies: []
 executables: []
 extensions: