儲存庫 vbox 的更動 90416

時間撮記:

2021-7-29 下午09:10:03 (4 年 以前)

作者:

vboxsync

svn:sync-xref-src-repo-rev:

146016

訊息:

IPRT: Adding RTThreadQueryTerminationStatus (ring-0). bugref:6695

位置:

trunk

檔案:

• include/iprt/err.h (修改) (1 筆差異)
• include/iprt/mangling.h (修改) (1 筆差異)
• include/iprt/thread.h (修改) (1 筆差異)
• src/VBox/Runtime/Makefile.kmk (修改) (6 筆差異)
• src/VBox/Runtime/generic/RTThreadQueryTerminationStatus-stub-generic.cpp (新增)
• src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c (修改) (1 筆差異)
• src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c (修改) (1 筆差異)

trunk/include/iprt/err.h

@@ -380 +380 @@
 /** Too many references to an object. */
 #define VERR_TOO_MANY_REFERENCES            (-22423)
+/** Returned by RTThreadQueryTerminationStatus to indicate that the thread is
+ * (or should be) terminating. */
+#define VINF_THREAD_IS_TERMINATING          (22424)
 /** @} */
 

trunk/include/iprt/mangling.h

@@ -2510 +2510 @@
 # define RTThreadPreemptIsPossible                      RT_MANGLER(RTThreadPreemptIsPossible)  /* r0drv */
 # define RTThreadPreemptRestore                         RT_MANGLER(RTThreadPreemptRestore)     /* r0drv */
+# define RTThreadQueryTerminationStatus                 RT_MANGLER(RTThreadQueryTerminationStatus) /* r0drv */
 # define RTThreadSelf                                   RT_MANGLER(RTThreadSelf)
 # define RTThreadSelfAutoAdopt                          RT_MANGLER(RTThreadSelfAutoAdopt)

trunk/include/iprt/thread.h

@@ -452 +452 @@
  */
 RTDECL(bool) RTThreadIsSelfAlive(void);
+
+#ifdef IN_RING0
+/**
+ * Checks whether the specified thread is terminating.
+ *
+ * @retval  VINF_SUCCESS if not terminating.
+ * @retval  VINF_THREAD_IS_TERMINATING if terminating.
+ * @retval  VERR_INVALID_HANDLE if hThread is not NIL_RTTHREAD.
+ * @retval  VERR_NOT_SUPPORTED if the OS doesn't provide ways to check.
+ *
+ * @param   hThread     The thread to query about, NIL_RTTHREAD is an alias for
+ *                      the calling thread.  Must be NIL_RTTHREAD for now.
+ *
+ * @note    Not suppored on all OSes, so check for VERR_NOT_SUPPORTED.
+ */
+RTDECL(int) RTThreadQueryTerminationStatus(RTTHREAD hThread);
+#endif
 
 /**

trunk/src/VBox/Runtime/Makefile.kmk

@@ -3182 +3182 @@
         generic/RTAssertShouldPanic-generic.cpp \
         generic/RTLogWriteStdOut-stub-generic.cpp \
+        generic/RTMpGetCoreCount-generic.cpp \
+        generic/RTThreadQueryTerminationStatus-stub-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
         generic/mppresent-generic-online.cpp \
-        generic/RTMpGetCoreCount-generic.cpp \
         generic/rtStrFormatKernelAddress-generic.cpp \
         nt/RTErrConvertFromNtStatus.cpp \
@@ -3325 +3326 @@
         generic/RTMpGetCoreCount-generic.cpp \
         generic/RTMpOnPair-generic.cpp \
+        generic/RTThreadQueryTerminationStatus-stub-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
         generic/memsafer-generic.cpp \
@@ -3392 +3394 @@
         generic/RTMpGetSet-generic.cpp \
         generic/RTMpIsCpuOnline-generic.cpp \
+        generic/RTThreadQueryTerminationStatus-stub-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
         generic/mppresent-generic.cpp \
@@ -3513 +3516 @@
         generic/RTAssertShouldPanic-generic.cpp \
         generic/RTLogWriteDebugger-generic.cpp \
+        generic/RTThreadQueryTerminationStatus-stub-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
         generic/mppresent-generic.cpp \
@@ -3544 +3548 @@
         generic/RTLogWriteStdOut-stub-generic.cpp \
         generic/RTMpGetCoreCount-generic.cpp \
+        generic/RTThreadQueryTerminationStatus-stub-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
         generic/mppresent-generic.cpp \
@@ -3581 +3586 @@
         generic/RTAssertShouldPanic-generic.cpp \
         generic/RTMpOnPair-generic.cpp \
+        generic/RTThreadQueryTerminationStatus-stub-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
         generic/mppresent-generic.cpp \

trunk/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c

@@ -185 +185 @@
 }
 
+
+RTDECL(int) RTThreadQueryTerminationStatus(RTTHREAD hThread)
+{
+    RT_NOREF(hThread);
+    /** @todo implement. */
+    return VERR_NOT_SUPPORTED;
+}
+

trunk/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c

@@ -233 +233 @@
 RT_EXPORT_SYMBOL(RTThreadIsInInterrupt);
 
+
+RTDECL(int) RTThreadQueryTerminationStatus(RTTHREAD hThread)
+{
+    struct task_struct *pTask = current;
+    AssertReturn(hThread == NIL_RTTHREAD, VERR_NOT_SUPPORTED);
+
+    /* Check out pending signals.  ASSUMES we can get away w/o locking
+       anything because we're only reading the data.  */
+    if (sigismember(&pTask->pending.signal, SIGKILL))
+        return VINF_THREAD_IS_TERMINATING;
+
+#if RTLNX_VER_MIN(2,5,34)
+    /* Check the pending signals shared with other threads in
+       the same process/group.  ASSUME since we're alive that
+       the signal_struct won't be freed while we're looking
+       at it here... */
+    {
+# if RTLNX_VER_MIN(2,5,60)
+        struct signal_struct *pSignal = current->signal;
+# else
+        struct signal_struct *pSignal = current->sig;
+# endif
+        if (   pSignal
+            && sigismember(&pSignal->shared_pending.signal, SIGKILL))
+            return VINF_THREAD_IS_TERMINATING;
+    }
+#endif
+
+    return VINF_SUCCESS;
+}
+RT_EXPORT_SYMBOL(RTThreadQueryTerminationStatus);
+