Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Collect stack frames immediately in Ruby 3.0 #150

Merged
merged 3 commits into from Apr 29, 2021
Merged

Collect stack frames immediately in Ruby 3.0 #150

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
415ee28
Remove reentrancy detection from postponed job
jhawthorn Apr 22, 2021
cf67aff
Use a mutex to avoid reentering signal handler
jhawthorn Apr 28, 2021
6c3f4d7
Collect stack frames immediately on interrupt
jhawthorn Apr 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 20 additions & 8 deletions ext/stackprof/stackprof.c
View file
Open in desktop
Expand Up @@ -22,6 +22,14 @@
#define FAKE_FRAME_MARK INT2FIX(1)
#define FAKE_FRAME_SWEEP INT2FIX(2)

/*
* As of Ruby 3.0, it should be safe to read stack frames at any time
* See https://github.com/ruby/ruby/commit/0e276dc458f94d9d79a0f7c7669bde84abe80f21
*/
#if RUBY_API_VERSION_MAJOR < 3
#define USE_POSTPONED_JOB
#endif

static const char *fake_frame_cstrs[] = {
"(garbage collection)",
"(marking)",
Expand Down Expand Up @@ -596,31 +604,30 @@ stackprof_record_gc_samples()
static void
stackprof_gc_job_handler(void *data)
{
static int in_signal_handler = 0;
if (in_signal_handler) return;
if (!_stackprof.running) return;

in_signal_handler++;
stackprof_record_gc_samples();
in_signal_handler--;
}

static void
stackprof_job_handler(void *data)
{
static int in_signal_handler = 0;
if (in_signal_handler) return;
if (!_stackprof.running) return;

in_signal_handler++;
stackprof_record_sample();
in_signal_handler--;
}

static void
stackprof_signal_handler(int sig, siginfo_t *sinfo, void *ucontext)
{
static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;

_stackprof.overall_signals++;

if (!_stackprof.running) return;
if (!ruby_native_thread_p()) return;
if (pthread_mutex_trylock(&lock)) return;

if (!_stackprof.ignore_gc && rb_during_gc()) {
VALUE mode = rb_gc_latest_gc_info(sym_state);
if (mode == sym_marking) {
Expand All @@ -631,8 +638,13 @@ stackprof_signal_handler(int sig, siginfo_t *sinfo, void *ucontext)
_stackprof.unrecorded_gc_samples++;
rb_postponed_job_register_one(0, stackprof_gc_job_handler, (void*)0);
} else {
#ifdef USE_POSTPONED_JOB
rb_postponed_job_register_one(0, stackprof_job_handler, (void*)0);
#else
stackprof_job_handler(0);
#endif
}
pthread_mutex_unlock(&lock);
}

static void
Expand Down