-
Notifications
You must be signed in to change notification settings - Fork 306
Implement handling POSIX signals #1954
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the Apache 2.0 License. | ||
| // See the LICENSE file in the project root for more information. | ||
|
|
||
| #nullable enable | ||
|
|
||
| #if FEATURE_PROCESS | ||
| #if NET | ||
|
|
||
| using System; | ||
| using System.Runtime.InteropServices; | ||
| using System.Runtime.Versioning; | ||
|
|
||
| using Mono.Unix; | ||
| using Mono.Unix.Native; | ||
|
|
||
| using IronPython.Runtime; | ||
| using IronPython.Runtime.Operations; | ||
| using System.Threading.Tasks; | ||
| using Microsoft.Scripting.Runtime; | ||
| using Microsoft.Scripting.Hosting.Shell; | ||
|
|
||
| namespace IronPython.Modules { | ||
| public static partial class PythonSignal { | ||
|
|
||
| [SupportedOSPlatform("linux")] | ||
| [SupportedOSPlatform("macos")] | ||
| private class PosixSignalState : PythonSignalState { | ||
| private readonly PosixSignalRegistration?[] _signalRegistrations; | ||
| private ConsoleCancelEventHandler? _consoleHandler; | ||
|
|
||
|
|
||
| public PosixSignalState(PythonContext pc) : base(pc) { | ||
| _signalRegistrations = new PosixSignalRegistration[NSIG]; | ||
| } | ||
|
|
||
|
|
||
| protected override void Dispose(bool disposing) { | ||
| if (disposing) { | ||
| Array.ForEach(_signalRegistrations, reg => reg?.Dispose()); | ||
| Array.Clear(_signalRegistrations, 0, _signalRegistrations.Length); | ||
| } | ||
| base.Dispose(disposing); | ||
| } | ||
|
|
||
|
|
||
| public override void SetPyHandler(int signalnum, object value) { | ||
| // normalize handler reference | ||
| if (value is int i) { | ||
| value = (i == SIG_IGN) ? sig_ign : sig_dfl; | ||
| } | ||
|
|
||
| if (TryGetPyHandler(signalnum, out object? existingValue) && ReferenceEquals(existingValue, value)) { | ||
| // no change | ||
| return; | ||
| } | ||
|
|
||
| base.SetPyHandler(signalnum, value); | ||
|
|
||
| if (signalnum == SIGINT) { | ||
| // SIGINT is special, we need to disable the handler on the console so that we can handle Ctrl+C here | ||
| if (DefaultContext.DefaultPythonContext.Console is BasicConsole console) { | ||
| if (!ReferenceEquals(value, default_int_handler)) { | ||
| // save the console handler so it can be restored later if necessary | ||
| _consoleHandler ??= console.ConsoleCancelEventHandler; | ||
| // disable the console handler | ||
| console.ConsoleCancelEventHandler = null; | ||
| } else if (_consoleHandler != null) { | ||
| // default_int_handler: restore the console handler, which is de facto default_int_handler | ||
| console.ConsoleCancelEventHandler = _consoleHandler; | ||
| _consoleHandler = null; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // remember to unregister any previous handler | ||
| var oldReg = _signalRegistrations[signalnum]; | ||
|
|
||
| if (ReferenceEquals(value, sig_dfl)) { | ||
| _signalRegistrations[signalnum] = null; | ||
| } else if (ReferenceEquals(value, sig_ign)) { | ||
| _signalRegistrations[signalnum] = PosixSignalRegistration.Create((PosixSignal)signalnum, | ||
| (PosixSignalContext psc) => { | ||
| psc.Cancel = true; | ||
| }); | ||
| } else { | ||
| _signalRegistrations[signalnum] = PosixSignalRegistration.Create((PosixSignal)signalnum, | ||
| (PosixSignalContext psc) => { | ||
| // This is called on a thread from the thread pool for most signals, | ||
| // and on a dedicated thread ".NET Signal Handler" for SIGINT, SIGQUIT, and SIGTERM. | ||
| CallPythonHandler(signalnum, value); | ||
| psc.Cancel = true; | ||
| }); | ||
| } | ||
| oldReg?.Dispose(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #endif // NET | ||
| #endif // FEATURE_PROCESS | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does the
PosixSignalenum match up with thesignalnumvalues? Looking at the docs the .NET enum values are negative while thesignalnumare positive?Edit: nvm, looks like they do say you can cast raw values to the
PosixSignalenum in the remarks section. Guess that's why the enum is negative...There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, the enum values are negative and platform-independent, the positive values are actual platform-dependent signal numbers. Platform-dependent signal numbers is what CPython uses (at least on POSIX, I am still a little bit puzzled by what is going on on Windows).
I think it is a better scheme than what Mono.Unix uses with its enum values, since it is future-proof (the enum values do not cover, nor do they need to cover all available signals on a given platform).