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.

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

Add Process::Status#exit_signal? #15284

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions spec/std/process/status_spec.cr
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,13 @@ describe Process::Status do
err1.hash.should eq(err2.hash)
end

it "#exit_signal?" do
Process::Status.new(exit_status(0)).exit_signal?.should be_nil
Process::Status.new(exit_status(1)).exit_signal?.should be_nil

status_for(:interrupted).exit_signal?.should eq({% if flag?(:unix) %}Signal::INT{% else %}nil{% end %})
end

{% if flag?(:unix) && !flag?(:wasi) %}
it "#exit_signal" do
Process::Status.new(Signal::HUP.value).exit_signal.should eq Signal::HUP
Expand All @@ -110,6 +117,16 @@ describe Process::Status do
Process::Status.new(unknown_signal.value).exit_signal.should eq unknown_signal
end

it "#exit_signal?" do
Process::Status.new(Signal::HUP.value).exit_signal?.should eq Signal::HUP
Process::Status.new(Signal::INT.value).exit_signal?.should eq Signal::INT
last_signal = Signal.values[-1]
Process::Status.new(last_signal.value).exit_signal?.should eq last_signal

unknown_signal = Signal.new(126)
Process::Status.new(unknown_signal.value).exit_signal?.should eq unknown_signal
end

it "#normal_exit? with signal code" do
Process::Status.new(0x00).normal_exit?.should be_true
Process::Status.new(0x01).normal_exit?.should be_false
Expand Down
3 changes: 1 addition & 2 deletions src/compiler/crystal/command.cr
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,7 @@ class Crystal::Command
private def exit_message(status)
case status.exit_reason
when .aborted?, .session_ended?, .terminal_disconnected?
if status.signal_exit?
signal = status.exit_signal
if signal = status.exit_signal?
if signal.kill?
"Program was killed"
else
Expand Down
34 changes: 23 additions & 11 deletions src/process/status.cr
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,20 @@ class Process::Status
{% end %}
end

# Returns the exit `Signal` or `nil` if there is none.
#
# On Windows returns always `nil`.
#
# * `#exit_reason` is a portable alternative.
def exit_signal? : Signal?
{% if flag?(:unix) && !flag?(:wasm32) %}
code = signal_code
unless code.zero?
Signal.new(code)
end
{% end %}
end

# Returns the exit code of the process if it exited normally (`#normal_exit?`).
#
# Raises `RuntimeError` if the status describes an abnormal exit.
Expand Down Expand Up @@ -278,10 +292,10 @@ class Process::Status
{% if flag?(:win32) %}
@exit_status.to_s(io)
{% else %}
if normal_exit?
exit_code.inspect(io)
if signal = exit_signal?
signal.inspect(io)
else
exit_signal.inspect(io)
exit_code.inspect(io)
end
{% end %}
io << "]"
Expand All @@ -295,15 +309,14 @@ class Process::Status
{% if flag?(:win32) %}
@exit_status.to_s(io)
{% else %}
if normal_exit?
io << exit_code
else
signal = exit_signal
if signal = exit_signal?
if name = signal.member_name
io << name
else
signal.inspect(io)
end
else
io << exit_code
end
{% end %}
end
Expand All @@ -316,11 +329,10 @@ class Process::Status
{% if flag?(:win32) %}
@exit_status.to_s
{% else %}
if normal_exit?
exit_code.to_s
else
signal = exit_signal
if signal = exit_signal?
signal.member_name || signal.inspect
else
exit_code.to_s
end
{% end %}
end
Expand Down
Loading