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

improve Process#on_interrupt #13654

Closed
wants to merge 11 commits into from
Closed

improve Process#on_interrupt #13654

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
69ef77d
improve Process#on_interrupt cross platform usefulness
stakach Jul 12, 2023
0c19e58
add HUP signal handler
stakach Jul 12, 2023
202071f
help block return type detection
stakach Jul 12, 2023
020d473
fix scopes
stakach Jul 12, 2023
8a7f03c
fix scopes again
stakach Jul 12, 2023
19b4af2
Yeah was probably that I had Signal scoped incorrectly
stakach Jul 13, 2023
3faed36
Fix `Serializable` with converter parsing `null` value (#13656)
straight-shoota Jul 14, 2023
a50f3dd
Fix generated cc command for cross compile (#13661)
fnordfish Jul 14, 2023
a8e08af
Add changelog for 1.9.1 (#13669)
straight-shoota Jul 17, 2023
97aba96
Revert "Add default interrupt handlers" (#13673)
straight-shoota Jul 18, 2023
40ff827
pass details on interrupt
stakach Jul 22, 2023
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
8 changes: 7 additions & 1 deletion src/crystal/system/unix/process.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,13 @@ struct Crystal::System::Process
end

def self.on_interrupt(&handler : ->) : Nil
::Signal::INT.trap { |_signal| handler.call }
sig_handler = Proc(::Signal, Nil).new do |signal|
handler.call
signal.ignore.as(Nil)
stakach marked this conversation as resolved.
Show resolved Hide resolved
end
::Signal::INT.trap &sig_handler
::Signal::HUP.trap &sig_handler
::Signal::TERM.trap &sig_handler
end

def self.ignore_interrupts! : Nil
Expand Down
2 changes: 1 addition & 1 deletion src/crystal/system/win32/process.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ struct Crystal::System::Process
def self.on_interrupt(&@@interrupt_handler : ->) : Nil
restore_interrupts!
@@win32_interrupt_handler = handler = LibC::PHANDLER_ROUTINE.new do |event_type|
next 0 unless event_type.in?(LibC::CTRL_C_EVENT, LibC::CTRL_BREAK_EVENT)
next 0 unless event_type.in?(LibC::CTRL_C_EVENT, LibC::CTRL_BREAK_EVENT, LibC::CTRL_CLOSE_EVENT, LibC::CTRL_LOGOFF_EVENT, LibC::CTRL_SHUTDOWN_EVENT)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd suggest moving these into a constant for readability purposes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could probably remove the line entirely as I'm pretty sure these are all the possible events

@@interrupt_count.signal
1
end
Expand Down
7 changes: 5 additions & 2 deletions src/lib_c/x86_64-windows-msvc/c/consoleapi.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ lib LibC
fun GetConsoleCP : DWORD
fun GetConsoleOutputCP : DWORD

CTRL_C_EVENT = 0
CTRL_BREAK_EVENT = 1
CTRL_C_EVENT = 0
CTRL_BREAK_EVENT = 1
CTRL_CLOSE_EVENT = 2
CTRL_LOGOFF_EVENT = 5
CTRL_SHUTDOWN_EVENT = 6

alias PHANDLER_ROUTINE = DWORD -> BOOL

Expand Down