Skip to content

Fix interpreter guard clauses for signal handling #15892

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

Merged
straight-shoota merged 2 commits into from
Jun 16, 2025
Merged

Fix interpreter guard clauses for signal handling #15892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39e8674
Fix interpreter guard clauses for signal handling
straight-shoota Jun 10, 2025
a5b1964
fixup
straight-shoota Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spec/std/signal_spec.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
require "./spec_helper"
require "signal"

{% skip_file if flag?(:interpreted) && !Crystal::Interpreter.has_method?(:signal) %}
{% skip_file if flag?(:interpreted) && !Crystal::Interpreter.class.has_method?(:signal) %}

describe "Signal" do
typeof(Signal::ABRT.reset)
Expand Down
8 changes: 4 additions & 4 deletions src/crystal/system/unix/signal.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module Crystal::System::Signal
@@mutex.synchronize do
unless @@handlers[signal]?
@@sigset << signal
{% if flag?(:interpreted) && Crystal::Interpreter.has_method?(:signal) %}
{% if flag?(:interpreted) && Crystal::Interpreter.class.has_method?(:signal) %}
Crystal::Interpreter.signal(signal.value, 2)
{% else %}
action = LibC::Sigaction.new
Expand Down Expand Up @@ -66,7 +66,7 @@ module Crystal::System::Signal
else
@@mutex.synchronize do
@@handlers.delete(signal)
{% if flag?(:interpreted) && Crystal::Interpreter.has_method?(:signal) %}
{% if flag?(:interpreted) && Crystal::Interpreter.class.has_method?(:signal) %}
h = case handler
when LibC::SIG_DFL then 0
when LibC::SIG_IGN then 1
Expand Down Expand Up @@ -134,7 +134,7 @@ module Crystal::System::Signal
::Signal.each do |signal|
next unless @@sigset.includes?(signal)

{% if flag?(:interpreted) && Crystal::Interpreter.has_method?(:signal) %}
{% if flag?(:interpreted) && Crystal::Interpreter.class.has_method?(:signal) %}
Crystal::Interpreter.signal(signal.value, 0)
{% else %}
LibC.signal(signal, LibC::SIG_DFL)
Expand Down Expand Up @@ -206,7 +206,7 @@ module Crystal::System::Signal
@@sigset.clear
start_loop

{% if flag?(:interpreted) && Interpreter.has_method?(:signal_descriptor) %}
{% if flag?(:interpreted) && Interpreter.class.has_method?(:signal_descriptor) %}
# replace the interpreter's writer pipe with the interpreted, so signals
# will be received by the interpreter, but handled by the interpreted
# signal loop
Expand Down
2 changes: 1 addition & 1 deletion src/kernel.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,6 @@ end
{% end %}
{% end %}

{% if flag?(:interpreted) && flag?(:unix) && Crystal::Interpreter.has_method?(:signal_descriptor) %}
{% if flag?(:interpreted) && flag?(:unix) && Crystal::Interpreter.class.has_method?(:signal_descriptor) %}
Crystal::System::Signal.setup_default_handlers
{% end %}