Simplify PosixSignalRegistration implementation on Unix (#55552)

* Simplify PosixSignalRegistration implementation on Unix Bring it onto the same scheme as the Windows implementation. * Address PR feedback * Delete more dead code * Update PosixSignalRegistration.Unix.cs
dotnet · Jul 13, 2021 · 4f9deeb · 4f9deeb
1 parent ca85119
commit 4f9deeb
Show file tree

Hide file tree

Showing 7 changed files with 152 additions and 268 deletions.
diff --git a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.PosixSignal.cs b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.PosixSignal.cs
@@ -18,7 +18,7 @@ internal static partial class Sys
         internal static extern void DisablePosixSignalHandling(int signal);
 
         [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_HandleNonCanceledPosixSignal")]
-        internal static extern bool HandleNonCanceledPosixSignal(int signal, int handlersDisposed);
+        internal static extern void HandleNonCanceledPosixSignal(int signal);
 
         [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetPlatformSignalNumber")]
         [SuppressGCTransition]

diff --git a/src/libraries/Native/Unix/System.Native/pal_signal.c b/src/libraries/Native/Unix/System.Native/pal_signal.c
@@ -233,7 +233,7 @@ static void SignalHandler(int sig, siginfo_t* siginfo, void* context)
     }
 }
 
-int32_t SystemNative_HandleNonCanceledPosixSignal(int32_t signalCode, int32_t handlersDisposed)
+void SystemNative_HandleNonCanceledPosixSignal(int32_t signalCode)
 {
     switch (signalCode)
     {
@@ -276,11 +276,6 @@ int32_t SystemNative_HandleNonCanceledPosixSignal(int32_t signalCode, int32_t ha
                 // Original handler doesn't do anything.
                 break;
             }
-            if (handlersDisposed && g_hasPosixSignalRegistrations[signalCode - 1])
-            {
-                // New handlers got registered.
-                return 0;
-            }
             // Restore and invoke the original handler.
             pthread_mutex_lock(&lock);
             {
@@ -293,7 +288,6 @@ int32_t SystemNative_HandleNonCanceledPosixSignal(int32_t signalCode, int32_t ha
             kill(getpid(), signalCode);
             break;
     }
-    return 1;
 }
 
 // Entrypoint for the thread that handles signals where our handling
@@ -385,7 +379,7 @@ static void* SignalHandlerLoop(void* arg)
 
         if (!usePosixSignalHandler)
         {
-            SystemNative_HandleNonCanceledPosixSignal(signalCode, 0);
+            SystemNative_HandleNonCanceledPosixSignal(signalCode);
         }
     }
 }

diff --git a/src/libraries/Native/Unix/System.Native/pal_signal.h b/src/libraries/Native/Unix/System.Native/pal_signal.h
@@ -75,7 +75,7 @@ PALEXPORT void SystemNative_DisablePosixSignalHandling(int signalCode);
 /**
  * Performs the default runtime action for a non-canceled PosixSignal.
  */
-PALEXPORT int32_t SystemNative_HandleNonCanceledPosixSignal(int32_t signalCode, int32_t handlersDisposed);
+PALEXPORT void SystemNative_HandleNonCanceledPosixSignal(int32_t signalCode);
 
 typedef void (*ConsoleSigTtouHandler)(void);
 

diff --git a/...oreLib/src/System/Runtime/InteropServices/PosixSignalRegistration.PlatformNotSupported.cs b/...oreLib/src/System/Runtime/InteropServices/PosixSignalRegistration.PlatformNotSupported.cs
@@ -10,16 +10,9 @@ public sealed partial class PosixSignalRegistration
         private PosixSignalRegistration() { }
 
         [DynamicDependency("#ctor")] // Prevent the private ctor and the IDisposable implementation from getting linked away
-        public static partial PosixSignalRegistration Create(PosixSignal signal, Action<PosixSignalContext> handler)
-        {
-            if (handler is null)
-            {
-                throw new ArgumentNullException(nameof(handler));
-            }
-
+        private static PosixSignalRegistration Register(PosixSignal signal, Action<PosixSignalContext> handler) =>
             throw new PlatformNotSupportedException();
-        }
 
-        public partial void Dispose() { }
+        private void Unregister() { }
     }
 }