gvl-tracing 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af27ef999bd0dba6070d9faf4e4465f77ae7dc440d77d99999be6ac0c1be07ec
-  data.tar.gz: 2a0978b7135b22a9827e7f040f04ba7e261bd3ebb9f576218e19473d84560053
+  metadata.gz: 2bf28c6665bf4afa02c13299947bb65d7c62c3af783858afdc3a5383e334fa47
+  data.tar.gz: b1999e7e17d56e76ba732962708c14979e2690cd78204946d2f05e7146b05725
 SHA512:
-  metadata.gz: fc9bb3ac74a50d3103c0acc538ec7ef171324427f78ef62eadcc1afc5a2def15f3ef7063f3f74150aad20f3e93a406d2c3f2a0ca19aa63cff824d1e684637e19
-  data.tar.gz: cca0048ff2181b6346e0628dcb9710ee83937d2b7a1014c0133b0b7747b2b5328e73d29d4164daedeaddde9cb6e879a52a73646e62ca95e0c8845c2dc044d3d0
+  metadata.gz: feb5fb173e07343af18c929608b20b2463fc0b676565b926242585f3fed31991e34ab5f549d7cbfe0e26c883d4a1e6eebf1d8da9e1586f0fa63d0890cdd3b108
+  data.tar.gz: 615226e345e230b989d7738754f02a058935d67679b4ca16c610cbbb6fe34f82aff6de3299d9548af579a30d55bccaedf25cd52d4f631023cff93a683fe3c8bb

data/ext/gvl_tracing_native_extension/gvl_tracing.c

@@ -83,6 +83,7 @@ static VALUE gc_tracepoint = Qnil;
 static int thread_storage_key = 0;
 static VALUE all_seen_threads = Qnil;
 static pthread_mutex_t all_seen_threads_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t output_mutex = PTHREAD_MUTEX_INITIALIZER;
 static bool os_threads_view_enabled;
 
 static VALUE tracing_init_local_storage(VALUE, VALUE);
@@ -95,6 +96,8 @@ 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 void output_mutex_lock(void);
+static inline void output_mutex_unlock(void);
 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);
@@ -259,6 +262,7 @@ static double render_event(thread_local_state *state, const char *event_name) {
   // Important note: We've observed some rendering issues in perfetto if the tid or pid are numbers that are "too big",
   // see https://github.com/ivoanjo/gvl-tracing/pull/4#issuecomment-1196463364 for an example.
 
+  output_mutex_lock();
   fprintf(output_file,
     // Finish previous duration
     "  {\"ph\": \"E\", \"pid\": %"PRId64", \"tid\": %d, \"ts\": %f},\n" \
@@ -269,6 +273,7 @@ static double render_event(thread_local_state *state, const char *event_name) {
     // Args for second line
     process_id, thread_id_for(state), now_microseconds, event_name
   );
+  output_mutex_unlock();
 
   return now_microseconds;
 }
@@ -355,6 +360,18 @@ static inline void all_seen_threads_mutex_unlock(void) {
   if (error) rb_syserr_fail(error, "Failed to unlock GvlTracing mutex");
 }
 
+static inline void output_mutex_lock(void) {
+  int error = pthread_mutex_lock(&output_mutex);
+  // Can't raise exceptions on error since it gets used from outside the GVL
+  if (error) fprintf(stderr, "Failed to lock the GvlTracing output_mutex");
+}
+
+static inline void output_mutex_unlock(void) {
+  int error = pthread_mutex_unlock(&output_mutex);
+  // Can't raise exceptions on error since it gets used from outside the GVL
+  if (error) fprintf(stderr, "Failed to unlock the GvlTracing output_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);
@@ -444,17 +461,21 @@ static void render_os_thread_event(thread_local_state *state, double now_microse
   // chars, so here we append a different letter to each thread to cause the color hashing to differ.
   char color_suffix_hack = ('a' + (thread_id_for(state) % 26));
 
+  output_mutex_lock();
   fprintf(output_file,
     "  {\"ph\": \"B\", \"pid\": %"PRId64", \"tid\": %u, \"ts\": %f, \"name\": \"Thread %d (%c)\"},\n",
     OS_THREADS_VIEW_PID, current_native_thread_id(), now_microseconds, thread_id_for(state), color_suffix_hack
   );
+  output_mutex_unlock();
 }
 
 static void finish_previous_os_thread_event(double now_microseconds) {
+  output_mutex_lock();
   fprintf(output_file,
     "  {\"ph\": \"E\", \"pid\": %"PRId64", \"tid\": %u, \"ts\": %f},\n",
     OS_THREADS_VIEW_PID, current_native_thread_id(), now_microseconds
   );
+  output_mutex_unlock();
 }
 
 static inline uint32_t current_native_thread_id(void) {

data/gvl-tracing.gemspec

@@ -42,7 +42,8 @@ Gem::Specification.new do |spec|
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features|examples)/|\.(?:git|travis|circleci)|appveyor)})
+      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features|examples)/|\.(?:git|travis|circleci)|appveyor)}) ||
+        [".editorconfig", ".ruby-version", ".standard.yml", "gems.rb", "Rakefile"].include?(f)
     end
   end
   spec.require_paths = ["lib", "ext"]

data/lib/gvl_tracing/version.rb

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

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: gvl-tracing
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Ivo Anjo
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-30 00:00:00.000000000 Z
+date: 2024-12-08 00:00:00.000000000 Z
 dependencies: []
-description:
+description: 
 email:
 - ivo@ivoanjo.me
 executables: []
@@ -18,16 +18,11 @@ extensions:
 - ext/gvl_tracing_native_extension/extconf.rb
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".ruby-version"
-- ".standard.yml"
 - CODE_OF_CONDUCT.adoc
 - LICENSE
 - README.adoc
-- Rakefile
 - ext/gvl_tracing_native_extension/extconf.rb
 - ext/gvl_tracing_native_extension/gvl_tracing.c
-- gems.rb
 - gvl-tracing.gemspec
 - lib/gvl-tracing.rb
 - lib/gvl_tracing/sleep_tracking.rb
@@ -37,7 +32,7 @@ homepage: https://github.com/ivoanjo/gvl-tracing
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -53,8 +48,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.4.1
+signing_key: 
 specification_version: 4
 summary: Get a timeline view of Global VM Lock usage in your Ruby app
 test_files: []

data/.editorconfig

@@ -1,22 +0,0 @@
-# EditorConfig is awesome: https://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.h]
-indent_style = space
-indent_size = 2
-
-[*.c]
-indent_style = space
-indent_size = 2
-
-[*.yml]
-indent_style = space
-indent_size = 2

data/.ruby-version

@@ -1 +0,0 @@
-ruby-3.2.2

data/.standard.yml

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

data/Rakefile

@@ -1,36 +0,0 @@
-# gvl-tracing: Ruby gem for getting a timelinew view of GVL usage
-# Copyright (c) 2022 Ivo Anjo <ivo@ivoanjo.me>
-#
-# This file is part of gvl-tracing.
-#
-# MIT License
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# frozen_string_literal: true
-
-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", :spec]

data/gems.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-gemspec
-
-gem "rake", "~> 13.0"
-gem "rake-compiler", "~> 1.2"
-gem "pry"
-gem "pry-byebug"
-gem "rspec"
-gem "standard", "~> 1.41"
-gem "concurrent-ruby"
-gem "benchmark-ips", "~> 2.13"
-gem "rubocop", ">= 1.66.0"