gvl-tracing 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9640e68d58cfbda91dc7c034982b3e43eec6048729d0ca61c8498495ad8f4277
-  data.tar.gz: ab154e734bfb085aff5615837efda1b7836784019fd689051b21db483f86c62b
+  metadata.gz: 4f2845379f02ef9e8cd317a293b0c24c92dbd9aebad15ccb9b378ea1c41cf894
+  data.tar.gz: ce639fb1bffb10262e1dee5f5bf7a80f4425d9db7b690a494b6cefedae507265
 SHA512:
-  metadata.gz: a87a874de0373814d27f9e567c19fa4d36f5c2cdb5db2f3a6d7a7ce3280917dd8ecf0fc85b130f3573aa496cc5633427b92780f48ab00dc9cac8e6649763502a
-  data.tar.gz: c5ef422b98a1cf2835f62d0769c0e0ea2b7d0f6af36888f05617795e4667a0bf4bbcf404e0e860fbdf319ae2be8e41fd84f09c2168282e6a0adfbee92a252840
+  metadata.gz: '01659c02734923610f4c771afcd1a863de369781a7c21cf42c46e5d956f897c65643f0ae6a5a1eebb7fcb81895556271f57f7e164b3ac3581177509d31381db7'
+  data.tar.gz: f0e0894e7d3dcc5c7f00485b8e741be31f832142ef0436524f26e5996da9f901dc17b46080b26f2ecf5bcfc0ca37b6bdaae48b014eaeb00518dfa56b6c892167

data/ext/gvl_tracing_native_extension/gvl_tracing.c

@@ -31,7 +31,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 #include <sys/types.h>
-#include <threads.h>
+#include <pthread.h>
 
 #include "extconf.h"
 
@@ -77,7 +77,7 @@ 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 pthread_mutex_t all_seen_threads_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 static VALUE tracing_init_local_storage(VALUE, VALUE);
 static VALUE tracing_start(VALUE _self, VALUE output_path);
@@ -128,8 +128,6 @@ void Init_gvl_tracing_native_extension(void) {
 
   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);
@@ -148,7 +146,12 @@ static inline void initialize_thread_local_state(thread_local_state *state) {
     uint32_t native_thread_id = 0;
 
     #ifdef HAVE_PTHREAD_THREADID_NP
-      pthread_threadid_np(pthread_self(), &native_thread_id);
+      uint64_t full_native_thread_id;
+      pthread_threadid_np(pthread_self(), &full_native_thread_id);
+      // Note: `pthread_threadid_np` is declared as taking in a `uint64_t` but I don't think macOS uses such really
+      // high thread ids, and anyway perfetto doesn't like full 64-bit ids for threads so let's go with a simplification
+      // for now.
+      native_thread_id = (uint32_t) full_native_thread_id;
     #elif HAVE_GETTID
       native_thread_id = gettid();
     #else
@@ -264,7 +267,9 @@ static void on_thread_event(rb_event_flag_t event_id, const rb_internal_thread_e
   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
@@ -299,6 +304,9 @@ static void on_thread_event(rb_event_flag_t event_id, const rb_internal_thread_e
 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.
@@ -319,6 +327,16 @@ static void thread_local_state_mark(void *data) {
   rb_gc_mark(state->thread); // Marking thread to make sure it stays pinned
 }
 
+static inline void all_seen_threads_mutex_lock(void) {
+  int error = pthread_mutex_lock(&all_seen_threads_mutex);
+  if (error) rb_syserr_fail(error, "Failed to lock GvlTracing mutex");
+}
+
+static inline void all_seen_threads_mutex_unlock(void) {
+  int error = pthread_mutex_unlock(&all_seen_threads_mutex);
+  if (error) rb_syserr_fail(error, "Failed to unlock GvlTracing mutex");
+}
+
 #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);
@@ -333,9 +351,9 @@ static void thread_local_state_mark(void *data) {
       // 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");
+      all_seen_threads_mutex_lock();
       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");
+      all_seen_threads_mutex_unlock();
     }
     return state;
   }
@@ -380,7 +398,7 @@ static VALUE ruby_thread_id_for(UNUSED_ARG VALUE _self, VALUE thread) {
 
 // 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");
+  all_seen_threads_mutex_lock();
 
   VALUE alive_threads = rb_ary_new();
 
@@ -393,6 +411,6 @@ static VALUE trim_all_seen_threads(UNUSED_ARG VALUE _self) {
 
   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");
+  all_seen_threads_mutex_unlock();
   return Qtrue;
 }

data/lib/gvl_tracing/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gvl-tracing
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Ivo Anjo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-29 00:00:00.000000000 Z
+date: 2024-04-06 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: