Changeset 34256 in vbox

Timestamp:

Nov 22, 2010 3:55:00 PM (14 years ago)

Author:

vboxsync

Message:

IPRT: Must clear the TLS entry holding RTTHREAD before freeing the structure or the electric fence heap may cause a crash when blocking.

Location:

trunk/src/VBox/Runtime

Files:

• common/misc/thread.cpp (modified) (1 diff)
• include/internal/thread.h (modified) (2 diffs)
• r0drv/darwin/thread2-r0drv-darwin.cpp (modified) (1 diff)
• r0drv/freebsd/thread2-r0drv-freebsd.c (modified) (1 diff)
• r0drv/nt/thread2-r0drv-nt.cpp (modified) (1 diff)
• r0drv/os2/thread2-r0drv-os2.cpp (modified) (1 diff)
• r0drv/solaris/vbi/thread2-r0drv-solaris.c (modified) (1 diff)
• r3/os2/thread-os2.cpp (modified) (1 diff)
• r3/posix/thread-posix.cpp (modified) (2 diffs)
• r3/win/thread-win.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/misc/thread.cpp

@@ -604 +604 @@
         RTSemEventMultiDestroy(hEvt2);
 
+    rtThreadNativeDestroy(pThread);
     RTMemFree(pThread);
 }

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

@@ -159 +159 @@
 
 /**
+ * Called from rtThreadDestroy so that the TLS entry and any native data in the
+ * thread structure can be cleared.
+ *
+ * @param   pThread         The thread structure.
+ */
+void rtThreadNativeDestroy(PRTTHREADINT pThread);
+
+/**
  * Sets the priority of the thread according to the thread type
  * and current process priority.
@@ -186 +194 @@
 
 /* thread.cpp */
-int rtThreadMain(PRTTHREADINT pThread, RTNATIVETHREAD NativeThread, const char *pszThreadName);
-void rtThreadBlocking(PRTTHREADINT pThread, RTTHREADSTATE enmState, uint64_t u64Block,
-                      const char *pszFile, unsigned uLine, RTUINTPTR uId);
-void rtThreadUnblocked(PRTTHREADINT pThread, RTTHREADSTATE enmCurState);
-uint32_t rtThreadRelease(PRTTHREADINT pThread);
-void rtThreadTerminate(PRTTHREADINT pThread, int rc);
+int          rtThreadMain(PRTTHREADINT pThread, RTNATIVETHREAD NativeThread, const char *pszThreadName);
+void         rtThreadBlocking(PRTTHREADINT pThread, RTTHREADSTATE enmState, uint64_t u64Block,
+                              const char *pszFile, unsigned uLine, RTUINTPTR uId);
+void         rtThreadUnblocked(PRTTHREADINT pThread, RTTHREADSTATE enmCurState);
+uint32_t     rtThreadRelease(PRTTHREADINT pThread);
+void         rtThreadTerminate(PRTTHREADINT pThread, int rc);
 PRTTHREADINT rtThreadGetByNative(RTNATIVETHREAD NativeThread);
 PRTTHREADINT rtThreadGet(RTTHREAD Thread);
-int rtThreadInit(void);
-void rtThreadTerm(void);
-void rtThreadInsert(PRTTHREADINT pThread, RTNATIVETHREAD NativeThread);
-#ifdef IN_RING3
-int rtThreadDoSetProcPriority(RTPROCPRIORITY enmPriority);
+int          rtThreadInit(void);
+void         rtThreadTerm(void);
+void         rtThreadInsert(PRTTHREADINT pThread, RTNATIVETHREAD NativeThread);
+#ifdef IN_RING3
+int          rtThreadDoSetProcPriority(RTPROCPRIORITY enmPriority);
 #endif /* !IN_RING0 */
 #ifdef IPRT_WITH_GENERIC_TLS
-void rtThreadClearTlsEntry(RTTLS iTls);
-void rtThreadTlsDestruction(PRTTHREADINT pThread); /* in tls-generic.cpp */
+void         rtThreadClearTlsEntry(RTTLS iTls);
+void         rtThreadTlsDestruction(PRTTHREADINT pThread); /* in tls-generic.cpp */
 #endif
 

trunk/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp

@@ -137 +137 @@
 
 
+void rtThreadNativeDestroy(PRTTHREADINT pThread)
+{
+    NOREF(pThread);
+}
+
+
 /**
  * Native kernel thread wrapper function.

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

@@ -99 +99 @@
 
 
+void rtThreadNativeDestroy(PRTTHREADINT pThread)
+{
+    NOREF(pThread);
+}
+
+
 /**
  * Native thread main function.

trunk/src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp

@@ -88 +88 @@
 
 
+void rtThreadNativeDestroy(PRTTHREADINT pThread)
+{
+    NOREF(pThread);
+}
+
+
 /**
  * Native kernel thread wrapper function.

trunk/src/VBox/Runtime/r0drv/os2/thread2-r0drv-os2.cpp

@@ -66 +66 @@
 
 
+void rtThreadNativeDestroy(PRTTHREADINT pThread)
+{
+    NOREF(pThread);
+}
+
+
 int rtThreadNativeCreate(PRTTHREADINT pThreadInt, PRTNATIVETHREAD pNativeThread)
 {

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

@@ -81 +81 @@
 
 
+void rtThreadNativeDestroy(PRTTHREADINT pThread)
+{
+    NOREF(pThread);
+}
+
+
 /**
  * Native thread main function.

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

@@ -95 +95 @@
 
 
+void rtThreadNativeDestroy(PRTTHREADINT pThread)
+{
+    if (pThread == *g_ppCurThread)
+        *g_ppCurThread = NULL;
+}
+
+
 /**
  * Wrapper which unpacks the params and calls thread function.

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

@@ -204 +204 @@
 
 
+void rtThreadNativeDestroy(PRTTHREADINT pThread)
+{
+    if (pThread == (PRTTHREADINT)pthread_getspecific(g_SelfKey))
+        pthread_setspecific(g_SelfKey, NULL);
+}
+
+
 /**
  * Wrapper which unpacks the params and calls thread function.
@@ -243 +250 @@
     rc = rtThreadMain(pThread, (uintptr_t)Self, &pThread->szName[0]);
 
-    pthread_setspecific(g_SelfKey, NULL);
     pthread_exit((void *)rc);
     return (void *)rc;

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

@@ -78 +78 @@
         TlsSetValue(g_dwSelfTLS, NULL);
     }
+}
+
+
+void rtThreadNativeDestroy(PRTTHREADINT pThread)
+{
+    if (pThread == (PRTTHREADINT)TlsGetValue(g_dwSelfTLS))
+        TlsSetValue(g_dwSelfTLS, NULL);
 }