Changeset 86725 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Oct 28, 2020 9:21:24 AM (4 years ago)

Author:

vboxsync

Message:

IPRT/thread-posix.cpp: siginterrupt is deprecated, replace with sigaction.

File:

• trunk/src/VBox/Runtime/r3/posix/thread-posix.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/posix/thread-posix.cpp

@@ -194 +194 @@
                     RT_ZERO(SigAct);
                     SigAct.sa_handler = rtThreadPosixPokeSignal;
-                    SigAct.sa_flags   = 0;
+                    SigAct.sa_flags   = 0;      /* no SA_RESTART! */
                     sigfillset(&SigAct.sa_mask);
 
@@ -249 +249 @@
         sigprocmask(SIG_BLOCK, &SigSet, NULL);
     }
-#ifdef RTTHREAD_POSIX_WITH_POKE
+
+#ifdef RTTHREAD_POSIX_WITH_POKE
+    /*
+     * bird 2020-10-28: Not entirely sure we do this, but it makes sure the signal works
+     *                  on the new thread.  Probably some pre-NPTL linux reasons.
+     */
     if (g_iSigPokeThread != -1)
+    {
+# if 1 /* siginterrupt() is typically implemented as two sigaction calls, this should be faster and w/o deprecations: */
+        struct sigaction SigActOld;
+        RT_ZERO(SigActOld);
+
+        struct sigaction SigAct;
+        RT_ZERO(SigAct);
+        SigAct.sa_handler = rtThreadPosixPokeSignal;
+        SigAct.sa_flags   = 0;          /* no SA_RESTART! */
+        sigfillset(&SigAct.sa_mask);
+
+        int rc = sigaction(g_iSigPokeThread, &SigAct, &SigActOld);
+        AssertMsg(rc == 0, ("rc=%Rrc errno=%d\n", RTErrConvertFromErrno(errno), errno));
+        AssertMsg(rc || SigActOld.sa_handler == rtThreadPosixPokeSignal, ("%p\n", SigActOld.sa_handler));
+# else
         siginterrupt(g_iSigPokeThread, 1);
+# endif
+    }
 #endif
 }