Changeset 54362 in vbox

Timestamp:

Feb 23, 2015 1:33:02 AM (10 years ago)

Author:

vboxsync

Message:

thread2-r0drv-solaris.c: thread_join

Location:

trunk/src/VBox/Runtime

Files:

• include/internal/thread.h (modified) (1 diff)
• r0drv/solaris/thread2-r0drv-solaris.c (modified) (3 diffs)

trunk/src/VBox/Runtime/include/internal/thread.h

@@ -75 +75 @@
      * This is not valid before rtThreadMain has been called by the new thread.  */
     pid_t                   tid;
+#endif
+#if defined(RT_OS_SOLARIS) && defined(IN_RING0)
+    /** Debug thread ID needed for thread_join. */
+    uint64_t                tid;
 #endif
     /** The user event semaphore. */

trunk/src/VBox/Runtime/r0drv/solaris/thread2-r0drv-solaris.c

@@ -88 +88 @@
 DECLHIDDEN(void) rtThreadNativeWaitKludge(PRTTHREADINT pThread)
 {
-    kthread_t *pNativeThread = (kthread_t *)pThread->Core.Key;
-    //thread_join(pNativeThread);
+    thread_join(pThread->tid);
 }
 
@@ -108 +107 @@
     PRTTHREADINT pThreadInt = (PRTTHREADINT)pvThreadInt;
 
+    /* thread_join takes the t_did value. There seems to be no interface for
+       retrieving t_did, so we have to gamble on the Solaris guys not messing
+       up its position in the _kthread struct.  We access t_intr which is
+       16 bytes earlier in the struct from semeventwait-r0drv-solaris.h, so
+       maybe we're lucky.  Maybe, but experience indicates that the odds
+       are against us... */
+    pThreadInt->tid = curthread->t_did;
+
     rtThreadMain(pThreadInt, RTThreadNativeSelf(), &pThreadInt->szName[0]);
     thread_exit();
@@ -115 +122 @@
 DECLHIDDEN(int) rtThreadNativeCreate(PRTTHREADINT pThreadInt, PRTNATIVETHREAD pNativeThread)
 {
+    kthread_t *pThread;
     RT_ASSERT_PREEMPTIBLE();
-    kthread_t *pThread = thread_create(NULL,                            /* Stack, use base */
-                                       0,                               /* Stack size */
-                                       rtThreadNativeMain,              /* Thread function */
-                                       pThreadInt,                      /* Function data */
-                                       0,                               /* Data size */
-                                       (proc_t *)RTR0ProcHandleSelf(),  /* Process handle */
-                                       TS_RUN,                          /* Ready to run */
-                                       minclsyspri                      /* Priority */
-                                       );
+
+    pThreadInt->tid = UINT64_MAX;
+
+    pThread = thread_create(NULL,                            /* Stack, use base */
+                            0,                               /* Stack size */
+                            rtThreadNativeMain,              /* Thread function */
+                            pThreadInt,                      /* Function data */
+                            0,                               /* Data size */
+                            (proc_t *)RTR0ProcHandleSelf(),  /* Process handle */
+                            TS_RUN,                          /* Ready to run */
+                            minclsyspri                      /* Priority */
+                            );
     if (RT_LIKELY(pThread))
     {