gvl-tracing 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5ec59682543834d531647bea2601457de0d8f8d57fe039181375891ef29ae60
-  data.tar.gz: ebfa80876458868eb9780bdf655c75ff7c3b649f0661799533e6dcd12f5b06ea
+  metadata.gz: d4945e5419655b2e69f310845e6214ff0bd6eb66ae820383f9cbe97855f15cdb
+  data.tar.gz: dd95a9431c53c3904b054227a305da7433a789d8828b0340abc2b48864361735
 SHA512:
-  metadata.gz: 259ae5c91f2d750ed61ec938a3eb3f92fc813391393420648288626d824408f1678a534de2185c73a6ea8fc2a695aa46135f5529a8fa9bd32e00c0f878b5a538
-  data.tar.gz: ead5ce15933a39684675705a60983dbcd5fc8afb7752822103799261d05d5e3b3f6da8562ca496b9929f7bebf9ed203c31ccc5b778be59bf2c724f7bab9c4d49
+  metadata.gz: eca1b710f5918e887f06c44dfa970100e77c99bbc63318321a72e76dfffc4b44022b055dae4de05992494fc40910a467f4aa3ed045ab891018303a15fe8169e1
+  data.tar.gz: 59deb53b041211513979526345af62c3e94495e73deae38d1f1e7272a11469695ae5c2435331bcf811f1c943c18f9602c4e3199c97fef9963cb3e3e4cd25f5cd

data/ext/gvl_tracing_native_extension/gvl_tracing.c

@@ -56,11 +56,14 @@ static void set_native_thread_id(void);
 static void render_event(const char *event_name);
 static void on_thread_event(rb_event_flag_t event, const rb_internal_thread_event_data_t *_unused1, void *_unused2);
 static void on_gc_event(VALUE tpval, void *_unused1);
+static VALUE mark_sleeping(VALUE _self);
 
 // Thread-local state
 static _Thread_local bool current_thread_seen = false;
 static _Thread_local unsigned int current_thread_serial = 0;
 static _Thread_local uint64_t thread_id = 0;
+static _Thread_local rb_event_flag_t previous_state = 0; // Used to coalesce similar events
+static _Thread_local bool sleeping = false; // Used to track when a thread is sleeping
 
 // Global mutable state
 static rb_atomic_t thread_serial = 0;
@@ -77,6 +80,7 @@ void Init_gvl_tracing_native_extension(void) {
 
   rb_define_singleton_method(gvl_tracing_module, "_start", tracing_start, 1);
   rb_define_singleton_method(gvl_tracing_module, "_stop", tracing_stop, 0);
+  rb_define_singleton_method(gvl_tracing_module, "mark_sleeping", mark_sleeping, 0);
 }
 
 static inline void initialize_thread_id(void) {
@@ -204,6 +208,23 @@ static void render_event(const char *event_name) {
 }
 
 static void on_thread_event(rb_event_flag_t event_id, UNUSED_ARG const rb_internal_thread_event_data_t *_unused1, UNUSED_ARG void *_unused2) {
+  // In some cases, Ruby seems to even multiple suspended events for the same thread in a row (e.g. when multiple threads)
+  // are waiting on a Thread::ConditionVariable.new that gets signaled. We coalesce these events to make the resulting
+  // timeline easier to see.
+  //
+  // I haven't observed other situations where we'd want to coalesce events, but we may apply this to all events in the
+  // future. One annoying thing to remember when generalizing this is how to reset the `previous_state` across multiple
+  // start/stop calls to GvlTracing.
+  if (event_id == RUBY_INTERNAL_THREAD_EVENT_SUSPENDED && event_id == previous_state) return;
+  previous_state = event_id;
+
+  if (event_id == RUBY_INTERNAL_THREAD_EVENT_SUSPENDED && sleeping) {
+    render_event("sleeping");
+    return;
+  } else {
+    sleeping = false;
+  }
+
   const char* event_name = "bug_unknown_event";
   switch (event_id) {
     case RUBY_INTERNAL_THREAD_EVENT_READY:     event_name = "wants_gvl"; break;
@@ -224,3 +245,8 @@ static void on_gc_event(VALUE tpval, UNUSED_ARG void *_unused1) {
   }
   render_event(event_name);
 }
+
+static VALUE mark_sleeping(VALUE _self) {
+  sleeping = true;
+  return Qnil;
+}

data/lib/gvl_tracing/sleep_tracking.rb

@@ -0,0 +1,12 @@
+# Experimental: This monkey patch when loaded introduces a new state -- "sleeping" -- which is more specific than the
+# regular "waiting". This can be useful to distinguish when waiting is happening based on time, vs for some event to
+# happen.
+
+module GvlTracing::SleepTracking
+  def sleep(...)
+    GvlTracing.mark_sleeping
+    super(...)
+  end
+end
+
+include GvlTracing::SleepTracking

data/lib/gvl_tracing/version.rb

@@ -26,5 +26,5 @@
 # frozen_string_literal: true
 
 module GvlTracing
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gvl-tracing
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Ivo Anjo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-01 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -30,6 +30,7 @@ files:
 - gems.rb
 - gvl-tracing.gemspec
 - lib/gvl-tracing.rb
+- lib/gvl_tracing/sleep_tracking.rb
 - lib/gvl_tracing/version.rb
 - preview.png
 homepage: https://github.com/ivoanjo/gvl-tracing