Skip to content

[release/6.0] The signal enum in the native library should match the managed code. #58682

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
merged 2 commits into from
Sep 8, 2021
Merged

[release/6.0] The signal enum in the native library should match the managed code. #58682

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
7cbc169
The signal enum in the native library should match the managed code.
JamesWTruher Sep 3, 2021
0d8b1c1
PosixSignalRegistrationTests.Unix: validate signal pal mapping (#58711)
tmds Sep 7, 2021
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
4 changes: 2 additions & 2 deletions src/libraries/Native/Unix/System.Native/pal_signal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ typedef enum
PosixSignalSIGQUIT = -3,
PosixSignalSIGTERM = -4,
PosixSignalSIGCHLD = -5,
PosixSignalSIGWINCH = -6,
PosixSignalSIGCONT = -7,
PosixSignalSIGCONT = -6,
PosixSignalSIGWINCH = -7,
Copy link
Member

Choose a reason for hiding this comment

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

For reference, these values map to

runtime/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/PosixSignal.cs

Lines 28 to 33 in 721a802

[UnsupportedOSPlatform("windows")]
SIGCONT = -6,
/// <summary>Window resized</summary>
[UnsupportedOSPlatform("windows")]
SIGWINCH = -7,
.

PosixSignalSIGTTIN = -8,
PosixSignalSIGTTOU = -9,
PosixSignalSIGTSTP = -10
Expand Down
13 changes: 12 additions & 1 deletion ...InteropServices/tests/System/Runtime/InteropServices/PosixSignalRegistrationTests.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.

using Xunit;
using System.Diagnostics;
using System.Globalization;
using System.Threading;
using System.Runtime.InteropServices;
using System.Runtime.CompilerServices;
Expand Down Expand Up @@ -57,7 +59,16 @@ public void SignalHandlerCalledForKnownSignals(PosixSignal s)
semaphore.Release();
});

kill(signal);
// Use 'kill' command with signal name to validate the signal pal mapping.
string sigArg = signalStr.StartsWith("SIG") ? signalStr.Substring(3) : signalStr;
using var process = Process.Start(new ProcessStartInfo
{
FileName = "/bin/sh", // Use a shell because not all platforms include a 'kill' executable.
ArgumentList = { "-c", $"kill -s {sigArg} {Environment.ProcessId.ToString()}" }
});
process.WaitForExit();
Assert.Equal(0, process.ExitCode);

bool entered = semaphore.Wait(SuccessTimeout);
Assert.True(entered);
}, s.ToString()).Dispose();
Expand Down