gvl-tracing 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4945e5419655b2e69f310845e6214ff0bd6eb66ae820383f9cbe97855f15cdb
-  data.tar.gz: dd95a9431c53c3904b054227a305da7433a789d8828b0340abc2b48864361735
+  metadata.gz: 47df73ea238560430f56d7b1ee2f0484e9e57b8f0784e065209cd5cfbe7b1084
+  data.tar.gz: 1517522202fd357b31db4a087f769991ccf9f0a0c56b38191f64976827b3e752
 SHA512:
-  metadata.gz: eca1b710f5918e887f06c44dfa970100e77c99bbc63318321a72e76dfffc4b44022b055dae4de05992494fc40910a467f4aa3ed045ab891018303a15fe8169e1
-  data.tar.gz: 59deb53b041211513979526345af62c3e94495e73deae38d1f1e7272a11469695ae5c2435331bcf811f1c943c18f9602c4e3199c97fef9963cb3e3e4cd25f5cd
+  metadata.gz: ed938fa078cb982b23efe5da8a1a0fcb6d367534e7eeb342b2ce4853bf82cb7f0bb7998fd1a0bfa3bc3fd61a9f5d049717e245235dcf3df5a072be0b54eb9c2b
+  data.tar.gz: c1f2db9dbde2a28321deee3b4186c08eb06f3da1f231f652d1822692e67e479e7be3a7b22daada77bc8130e9d6e016027b8470f9c84eceb827f4e06a17ac6d12

data/.ruby-version

@@ -1 +1 @@
-ruby-3.2.0
+ruby-3.2.2

data/.standard.yml

@@ -3,3 +3,7 @@ ruby_version: 3.2
 ignore:
   - 'examples/example1.rb':
     - Style/InfiniteLoop
+  - 'examples/example5.rb':
+    - Style/InfiniteLoop
+  - 'lib/gvl_tracing/sleep_tracking.rb':
+    - Style/MixinUsage

data/README.adoc

@@ -8,9 +8,9 @@ A Ruby gem for getting a timeline view of Global VM Lock usage in your Ruby app
 
 image::preview.png[]
 
-See my blog post https://ivoanjo.me/blog/2022/07/17/tracing-ruby-global-vm-lock/[tracing ruby's (global) vm lock] for more details!
+For instructions and examples on how to use it, see my https://ivoanjo.me/blog/2023/07/23/understanding-the-ruby-global-vm-lock-by-observing-it/[RubyKaigi 2023 talk on "Understanding the Ruby Global VM Lock by observing it"].
 
-NOTE: This gem only works on Ruby 3.2 and above because it depends on the https://github.com/ruby/ruby/pull/5500[GVL Instrumentation API].
+NOTE: This gem only works on Ruby 3.2 and above because it depends on the https://github.com/ruby/ruby/pull/5500[GVL Instrumentation API]. Furthermore, the GVL Instrumentation API does not (as of Ruby 3.2 and 3.3) currently work on Microsoft Windows.
 
 == Quickest start
 
@@ -76,7 +76,9 @@ This way you can actually link from your dashboards and similar pages directly t
 
 == Development
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to https://rubygems.org[rubygems.org].
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to https://rubygems.org[rubygems.org]. To run specs, run `bundle exec rake spec`.
+
+To run all actions (build the extension, check linting, and run specs), run `bundle exec rake`.
 
 == Contributing
 

data/Rakefile

@@ -28,7 +28,9 @@
 require "bundler/gem_tasks"
 require "standard/rake"
 require "rake/extensiontask"
+require "rspec/core/rake_task"
 
 Rake::ExtensionTask.new("gvl_tracing_native_extension")
+RSpec::Core::RakeTask.new(:spec)
 
-task default: [:compile, :"standard:fix"]
+task default: [:compile, :"standard:fix", :spec]

data/ext/gvl_tracing_native_extension/extconf.rb

@@ -30,18 +30,27 @@ if ["jruby", "truffleruby"].include?(RUBY_ENGINE)
     "Perhaps a #{RUBY_ENGINE} equivalent could be created -- help is welcome! :)\n#{"-" * 80}"
 end
 
+if Gem.win_platform?
+  raise \
+    "\n#{"-" * 80}\nSorry! This gem is currently unsupported on Microsoft Windows. That's because Ruby's GVL " \
+    "instrumentation API, which it relies on, also doesn't work on Windows.\n" \
+    "Hint: This gem does work on WSL."
+end
+
 require "mkmf"
 
 have_func("gettid", "unistd.h")
 have_header("pthread.h")
 have_func("pthread_getname_np", "pthread.h")
 have_func("pthread_threadid_np", "pthread.h")
+have_func("rb_internal_thread_specific_get", "ruby/thread.h") # 3.3+
+
 append_cflags("-Werror-implicit-function-declaration")
 append_cflags("-Wunused-parameter")
 append_cflags("-Wold-style-definition")
 append_cflags("-Wall")
 append_cflags("-Wextra")
-append_cflags("-Werror") if ENV['ENABLE_WERROR'] == 'true'
+append_cflags("-Werror") if ENV["ENABLE_WERROR"] == "true"
 
 create_header
 create_makefile "gvl_tracing_native_extension"

data/ext/gvl_tracing_native_extension/gvl_tracing.c

@@ -31,6 +31,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 #include <sys/types.h>
+#include <threads.h>
 
 #include "extconf.h"
 
@@ -49,21 +50,22 @@
   #define UNUSED_ARG
 #endif
 
-static VALUE tracing_start(VALUE _self, VALUE output_path);
-static VALUE tracing_stop(VALUE _self);
-static double timestamp_microseconds(void);
-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);
+#ifdef HAVE_RB_INTERNAL_THREAD_SPECIFIC_GET
+  #define RUBY_3_3_PLUS
+#else
+  #define RUBY_3_2
+#endif
 
-// 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
+typedef struct {
+  bool initialized;
+  int32_t current_thread_serial;
+  #ifdef RUBY_3_2
+    int32_t native_thread_id;
+  #endif
+  VALUE thread;
+  rb_event_flag_t previous_state; // Used to coalesce similar events
+  bool sleeping; // Used to track when a thread is sleeping
+} thread_local_state;
 
 // Global mutable state
 static rb_atomic_t thread_serial = 0;
@@ -72,47 +74,119 @@ static rb_internal_thread_event_hook_t *current_hook = NULL;
 static double started_tracing_at_microseconds = 0;
 static int64_t process_id = 0;
 static VALUE gc_tracepoint = Qnil;
+#pragma GCC diagnostic ignored "-Wunused-variable"
+static int thread_storage_key = 0;
+static VALUE all_seen_threads = Qnil;
+static mtx_t all_seen_threads_mutex;
+
+static VALUE tracing_init_local_storage(VALUE, VALUE);
+static VALUE tracing_start(VALUE _self, VALUE output_path);
+static VALUE tracing_stop(VALUE _self);
+static double timestamp_microseconds(void);
+static void render_event(thread_local_state *, 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);
+static size_t thread_local_state_memsize(UNUSED_ARG const void *_unused);
+static void thread_local_state_mark(void *data);
+static inline int32_t thread_id_for(thread_local_state *state);
+static VALUE ruby_thread_id_for(UNUSED_ARG VALUE _self, VALUE thread);
+static VALUE trim_all_seen_threads(UNUSED_ARG VALUE _self);
+
+#pragma GCC diagnostic ignored "-Wunused-const-variable"
+static const rb_data_type_t thread_local_state_type = {
+  .wrap_struct_name = "GvlTracing::__threadLocal",
+  .function = {
+    .dmark = thread_local_state_mark,
+    .dfree = RUBY_DEFAULT_FREE,
+    .dsize = thread_local_state_memsize,
+  },
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+};
+
+#ifdef RUBY_3_3_PLUS
+  static inline thread_local_state *GT_LOCAL_STATE(VALUE thread, bool allocate);
+  #define GT_EVENT_LOCAL_STATE(event_data, allocate) GT_LOCAL_STATE(event_data->thread, allocate)
+  // Must only be called from a thread holding the GVL
+  #define GT_CURRENT_THREAD_LOCAL_STATE() GT_LOCAL_STATE(rb_thread_current(), true)
+#else
+  // Thread-local state
+  static _Thread_local thread_local_state __thread_local_state = { 0 };
+
+  static inline thread_local_state *GT_CURRENT_THREAD_LOCAL_STATE(void);
+  #define GT_LOCAL_STATE(thread, allocate) GT_CURRENT_THREAD_LOCAL_STATE()
+  #define GT_EVENT_LOCAL_STATE(event_data, allocate) GT_CURRENT_THREAD_LOCAL_STATE()
+#endif
 
 void Init_gvl_tracing_native_extension(void) {
+  #ifdef RUBY_3_3_PLUS
+    thread_storage_key = rb_internal_thread_specific_key_create();
+  #endif
+
   rb_global_variable(&gc_tracepoint);
+  rb_global_variable(&all_seen_threads);
+
+  all_seen_threads = rb_ary_new();
+
+  if (mtx_init(&all_seen_threads_mutex, mtx_plain) != thrd_success) rb_raise(rb_eRuntimeError, "Failed to initialize GvlTracing mutex");
 
   VALUE gvl_tracing_module = rb_define_module("GvlTracing");
 
+  rb_define_singleton_method(gvl_tracing_module, "_init_local_storage", tracing_init_local_storage, 1);
   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);
+  rb_define_singleton_method(gvl_tracing_module, "_thread_id_for", ruby_thread_id_for, 1);
+  rb_define_singleton_method(gvl_tracing_module, "trim_all_seen_threads", trim_all_seen_threads, 0);
 }
 
-static inline void initialize_thread_id(void) {
-  current_thread_seen = true;
-  current_thread_serial = RUBY_ATOMIC_FETCH_ADD(thread_serial, 1);
-  set_native_thread_id();
-}
+static inline void initialize_thread_local_state(thread_local_state *state) {
+  state->initialized = true;
+  state->current_thread_serial = RUBY_ATOMIC_FETCH_ADD(thread_serial, 1);
+
+  #ifdef RUBY_3_2
+    uint32_t native_thread_id = 0;
 
-static inline void render_thread_metadata(void) {
-  char native_thread_name_buffer[64] = "(unnamed)";
+    #ifdef HAVE_PTHREAD_THREADID_NP
+      pthread_threadid_np(pthread_self(), &native_thread_id);
+    #elif HAVE_GETTID
+      native_thread_id = gettid();
+    #else
+      // Note: We could use the current_thread_serial as a crappy fallback, but this would make getting thread names
+      // not work very well
+      #error No native thread id available?
+    #endif
 
-  #ifdef HAVE_PTHREAD_GETNAME_NP
-    pthread_getname_np(pthread_self(), native_thread_name_buffer, sizeof(native_thread_name_buffer));
+    state->native_thread_id = native_thread_id;
   #endif
+}
 
-  fprintf(output_file,
-    "  {\"ph\": \"M\", \"pid\": %"PRId64", \"tid\": %"PRIu64", \"name\": \"thread_name\", \"args\": {\"name\": \"%s\"}},\n",
-    process_id, thread_id, native_thread_name_buffer);
+static VALUE tracing_init_local_storage(UNUSED_ARG VALUE _self, VALUE threads) {
+  #ifdef RUBY_3_3_PLUS
+    for (long i = 0, len = RARRAY_LEN(threads); i < len; i++) {
+        VALUE thread = RARRAY_AREF(threads, i);
+        GT_LOCAL_STATE(thread, true);
+    }
+  #endif
+  return Qtrue;
 }
 
 static VALUE tracing_start(UNUSED_ARG VALUE _self, VALUE output_path) {
   Check_Type(output_path, T_STRING);
 
+  trim_all_seen_threads(Qnil);
+
   if (output_file != NULL) rb_raise(rb_eRuntimeError, "Already started");
   output_file = fopen(StringValuePtr(output_path), "w");
   if (output_file == NULL) rb_syserr_fail(errno, "Failed to open GvlTracing output file");
 
+  fprintf(output_file, "[\n");
+
+  thread_local_state *state = GT_CURRENT_THREAD_LOCAL_STATE();
   started_tracing_at_microseconds = timestamp_microseconds();
   process_id = getpid();
 
-  fprintf(output_file, "[\n");
-  render_event("started_tracing");
+  render_event(state, "started_tracing");
 
   current_hook = rb_internal_thread_add_event_hook(
     on_thread_event,
@@ -126,15 +200,8 @@ static VALUE tracing_start(UNUSED_ARG VALUE _self, VALUE output_path) {
     NULL
   );
 
-  gc_tracepoint = rb_tracepoint_new(
-    0,
-    (
-      RUBY_INTERNAL_EVENT_GC_ENTER |
-      RUBY_INTERNAL_EVENT_GC_EXIT
-    ),
-    on_gc_event,
-    (void *) NULL
-  );
+  gc_tracepoint = rb_tracepoint_new(0, (RUBY_INTERNAL_EVENT_GC_ENTER | RUBY_INTERNAL_EVENT_GC_EXIT), on_gc_event, NULL);
+
   rb_tracepoint_enable(gc_tracepoint);
 
   return Qtrue;
@@ -143,18 +210,23 @@ static VALUE tracing_start(UNUSED_ARG VALUE _self, VALUE output_path) {
 static VALUE tracing_stop(UNUSED_ARG VALUE _self) {
   if (output_file == NULL) rb_raise(rb_eRuntimeError, "Tracing not running");
 
+  thread_local_state *state = GT_CURRENT_THREAD_LOCAL_STATE();
   rb_internal_thread_remove_event_hook(current_hook);
   rb_tracepoint_disable(gc_tracepoint);
   gc_tracepoint = Qnil;
 
-  render_event("stopped_tracing");
+  render_event(state, "stopped_tracing");
   // closing the json syntax in the output file is handled in GvlTracing.stop code
 
   if (fclose(output_file) != 0) rb_syserr_fail(errno, "Failed to close GvlTracing output file");
 
   output_file = NULL;
 
-  return Qtrue;
+  #ifdef RUBY_3_3_PLUS
+    return all_seen_threads;
+  #else
+    return rb_funcall(rb_cThread, rb_intern("list"), 0);
+  #endif
 }
 
 static double timestamp_microseconds(void) {
@@ -163,31 +235,12 @@ static double timestamp_microseconds(void) {
   return (current_monotonic.tv_nsec / 1000.0) + (current_monotonic.tv_sec * 1000.0 * 1000.0);
 }
 
-static void set_native_thread_id(void) {
-  uint64_t native_thread_id = 0;
-
-  #ifdef HAVE_PTHREAD_THREADID_NP
-    pthread_threadid_np(pthread_self(), &native_thread_id);
-  #elif HAVE_GETTID
-    native_thread_id = gettid();
-  #else
-    native_thread_id = current_thread_serial; // TODO: Better fallback for Windows?
-  #endif
-
-  thread_id = native_thread_id;
-}
-
 // Render output using trace event format for perfetto:
 // https://chromium.googlesource.com/catapult/+/refs/heads/main/docs/trace-event-format.md
-static void render_event(const char *event_name) {
+static void render_event(thread_local_state *state, const char *event_name) {
   // Event data
   double now_microseconds = timestamp_microseconds() - started_tracing_at_microseconds;
 
-  if (!current_thread_seen) {
-    initialize_thread_id();
-    render_thread_metadata();
-  }
-
   // Each event is converted into two events in the output: one that signals the end of the previous event
   // (whatever it was), and one that signals the start of the actual event we're processing.
   // Yes, this seems to be slightly bending the intention of the output format, but it seemed easier to do this way.
@@ -197,32 +250,41 @@ static void render_event(const char *event_name) {
 
   fprintf(output_file,
     // Finish previous duration
-    "  {\"ph\": \"E\", \"pid\": %"PRId64", \"tid\": %"PRIu64", \"ts\": %f},\n" \
+    "  {\"ph\": \"E\", \"pid\": %"PRId64", \"tid\": %d, \"ts\": %f},\n" \
     // Current event
-    "  {\"ph\": \"B\", \"pid\": %"PRId64", \"tid\": %"PRIu64", \"ts\": %f, \"name\": \"%s\"},\n",
+    "  {\"ph\": \"B\", \"pid\": %"PRId64", \"tid\": %d, \"ts\": %f, \"name\": \"%s\"},\n",
     // Args for first line
-    process_id, thread_id, now_microseconds,
+    process_id, thread_id_for(state), now_microseconds,
     // Args for second line
-    process_id, thread_id, now_microseconds, event_name
+    process_id, thread_id_for(state), now_microseconds, 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)
+static void on_thread_event(rb_event_flag_t event_id, const rb_internal_thread_event_data_t *event_data, UNUSED_ARG void *_unused2) {
+  thread_local_state *state = GT_EVENT_LOCAL_STATE(event_data,
+    // These events are guaranteed to hold the GVL, so they can allocate
+    event_id & (RUBY_INTERNAL_THREAD_EVENT_STARTED | RUBY_INTERNAL_THREAD_EVENT_RESUMED));
+
+  if (!state) return;
+
+  #ifdef RUBY_3_3_PLUS
+    if (!state->thread) state->thread = event_data->thread;
+  #endif
+  // In some cases, Ruby seems to emit 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 && event_id == state->previous_state) return;
+  state->previous_state = event_id;
 
-  if (event_id == RUBY_INTERNAL_THREAD_EVENT_SUSPENDED && sleeping) {
-    render_event("sleeping");
+  if (event_id == RUBY_INTERNAL_THREAD_EVENT_SUSPENDED && state->sleeping) {
+    render_event(state, "sleeping");
     return;
   } else {
-    sleeping = false;
+    state->sleeping = false;
   }
 
   const char* event_name = "bug_unknown_event";
@@ -233,20 +295,109 @@ static void on_thread_event(rb_event_flag_t event_id, UNUSED_ARG const rb_intern
     case RUBY_INTERNAL_THREAD_EVENT_STARTED:   event_name = "started";   break;
     case RUBY_INTERNAL_THREAD_EVENT_EXITED:    event_name = "died";      break;
   };
-  render_event(event_name);
+  render_event(state, event_name);
 }
 
 static void on_gc_event(VALUE tpval, UNUSED_ARG void *_unused1) {
   const char* event_name = "bug_unknown_event";
+  thread_local_state *state = GT_LOCAL_STATE(rb_thread_current(), false); // no alloc during GC
+
+  if (!state) return;
+
   switch (rb_tracearg_event_flag(rb_tracearg_from_tracepoint(tpval))) {
     case RUBY_INTERNAL_EVENT_GC_ENTER: event_name = "gc"; break;
     // TODO: is it possible the thread wasn't running? Might need to save the last state.
     case RUBY_INTERNAL_EVENT_GC_EXIT: event_name = "running"; break;
   }
-  render_event(event_name);
+  render_event(state, event_name);
 }
 
-static VALUE mark_sleeping(VALUE _self) {
-  sleeping = true;
+static VALUE mark_sleeping(UNUSED_ARG VALUE _self) {
+  GT_CURRENT_THREAD_LOCAL_STATE()->sleeping = true;
   return Qnil;
 }
+
+static size_t thread_local_state_memsize(UNUSED_ARG const void *_unused) { return sizeof(thread_local_state); }
+
+static void thread_local_state_mark(void *data) {
+  thread_local_state *state = (thread_local_state *)data;
+  rb_gc_mark(state->thread); // Marking thread to make sure it stays pinned
+}
+
+#ifdef RUBY_3_3_PLUS
+  static inline thread_local_state *GT_LOCAL_STATE(VALUE thread, bool allocate) {
+    thread_local_state *state = rb_internal_thread_specific_get(thread, thread_storage_key);
+    if (!state && allocate) {
+      VALUE wrapper = TypedData_Make_Struct(rb_cObject, thread_local_state, &thread_local_state_type, state);
+      state->thread = thread;
+      rb_thread_local_aset(thread, rb_intern("__gvl_tracing_local_state"), wrapper);
+      rb_internal_thread_specific_set(thread, thread_storage_key, state);
+      RB_GC_GUARD(wrapper);
+      initialize_thread_local_state(state);
+
+      // Keep thread around, to be able to extract names at the end
+      // We grab a lock here since thread creation can happen in multiple Ractors, and we want to make sure only one
+      // of them is mutating the array at a time. @ivoanjo: I think this is enough to make this safe....?
+      if (mtx_lock(&all_seen_threads_mutex) != thrd_success) rb_raise(rb_eRuntimeError, "Failed to lock GvlTracing mutex");
+      rb_ary_push(all_seen_threads, thread);
+      if (mtx_unlock(&all_seen_threads_mutex) != thrd_success) rb_raise(rb_eRuntimeError, "Failed to unlock GvlTracing mutex");
+    }
+    return state;
+  }
+#endif
+
+#ifdef RUBY_3_2
+  static inline thread_local_state *GT_CURRENT_THREAD_LOCAL_STATE(void) {
+    thread_local_state *state = &__thread_local_state;
+    if (!state->initialized) {
+      initialize_thread_local_state(state);
+    }
+    return state;
+  }
+#endif
+
+static inline int32_t thread_id_for(thread_local_state *state) {
+  // We use different strategies for 3.2 vs 3.3+ to identify threads. This is because:
+  //
+  // 1. On 3.2 we have no way of associating the actual thread VALUE object with the state/serial, so instead we identify
+  //    threads by their native ids. This is not entirely correct, since Ruby can reuse native threads (e.g. if a thread
+  //    dies and another immediately gets created) but it's good enough for our purposes. (Associating the thread VALUE
+  //    object is useful to, e.g. get thread names later.)
+  //
+  // 2. On 3.3 we can associate the state/serial with the thread VALUE object AND additionally with the MN scheduler
+  //    the same thread VALUE can end up executing on different native threads so using the native thread id as an
+  //    identifier would be wrong.
+  #ifdef RUBY_3_3_PLUS
+    return state->current_thread_serial;
+  #else
+    return state->native_thread_id;
+  #endif
+}
+
+static VALUE ruby_thread_id_for(UNUSED_ARG VALUE _self, VALUE thread) {
+  #ifdef RUBY_3_2
+    rb_raise(rb_eRuntimeError, "On Ruby 3.2 we should use the native thread id directly");
+  #endif
+
+  thread_local_state *state = GT_LOCAL_STATE(thread, true);
+  return INT2FIX(thread_id_for(state));
+}
+
+// Can only be called while GvlTracing is not active + while holding the GVL
+static VALUE trim_all_seen_threads(UNUSED_ARG VALUE _self) {
+  if (mtx_lock(&all_seen_threads_mutex) != thrd_success) rb_raise(rb_eRuntimeError, "Failed to lock GvlTracing mutex");
+
+  VALUE alive_threads = rb_ary_new();
+
+  for (long i = 0, len = RARRAY_LEN(all_seen_threads); i < len; i++) {
+    VALUE thread = RARRAY_AREF(all_seen_threads, i);
+    if (rb_funcall(thread, rb_intern("alive?"), 0) == Qtrue) {
+      rb_ary_push(alive_threads, thread);
+    }
+  }
+
+  rb_ary_replace(all_seen_threads, alive_threads);
+
+  if (mtx_unlock(&all_seen_threads_mutex) != thrd_success) rb_raise(rb_eRuntimeError, "Failed to unlock GvlTracing mutex");
+  return Qtrue;
+}

data/gems.rb

@@ -7,5 +7,8 @@ gemspec
 gem "rake", "~> 13.0"
 gem "rake-compiler", "~> 1.2"
 gem "pry"
-gem "standard", "~> 1.12"
+gem "pry-byebug"
+gem "rspec"
+gem "standard", "~> 1.33"
 gem "concurrent-ruby"
+gem "benchmark-ips", "~> 2.13"

data/lib/gvl-tracing.rb

@@ -36,6 +36,7 @@ module GvlTracing
 
     def start(file)
       _start(file)
+      _init_local_storage(Thread.list)
       @path = file
 
       return unless block_given?
@@ -43,24 +44,24 @@ module GvlTracing
       begin
         yield
       ensure
-        _stop
+        stop
       end
     end
 
     def stop
-      thread_list = Thread.list
-
-      _stop
+      thread_list = _stop
 
       append_thread_names(thread_list)
+
+      trim_all_seen_threads
     end
 
     private
 
     def append_thread_names(list)
-      threads_name = aggreate_thread_list(list).join(",\n")
-      File.open(@path, 'a') do |f|
-        f.puts(threads_name)
+      thread_names = aggreate_thread_list(list).join(",\n")
+      File.open(@path, "a") do |f|
+        f.puts(thread_names)
         f.puts("]")
       end
     end
@@ -69,14 +70,14 @@ module GvlTracing
       list.each_with_object([]) do |t, acc|
         next unless t.name || t == Thread.main
 
-        acc << "  {\"ph\": \"M\", \"pid\": #{Process.pid}, \"tid\": #{t.native_thread_id}, \"name\": \"thread_name\", \"args\": {\"name\": \"#{thread_label(t)}\"}}"
+        acc << "  {\"ph\": \"M\", \"pid\": #{Process.pid}, \"tid\": #{thread_id_for(t)}, \"name\": \"thread_name\", \"args\": {\"name\": \"#{thread_label(t)}\"}}"
       end
     end
 
     REGEX = /lib(?!.*lib)\/([a-zA-Z-]+)/
     def thread_label(thread)
       if thread == Thread.main
-        return thread.name ? thread.name : "Main Thread"
+        return thread.name || "Main Thread"
       end
 
       lib_name = thread.to_s.match(REGEX)
@@ -85,5 +86,12 @@ module GvlTracing
 
       "#{thread.name} from #{lib_name[1]}"
     end
+
+    def thread_id_for(t)
+      RUBY_VERSION.start_with?("3.2.") ? t.native_thread_id : _thread_id_for(t)
+    end
   end
 end
+
+# Eagerly initialize context for main thread
+GvlTracing.send(:thread_id_for, Thread.main)

data/lib/gvl_tracing/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gvl-tracing
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ivo Anjo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-05 00:00:00.000000000 Z
+date: 2024-03-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Get a timeline view of Global VM Lock usage in your Ruby app