Changeset 83124 in vbox for trunk/src/VBox/Runtime

Timestamp:

Feb 20, 2020 5:23:23 PM (5 years ago)

Author:

vboxsync

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

136236

Message:

IPRT: Merged the two tls files, with the sideeffect that destructors only works for IPRT threads in non-dll setups.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• common/misc/thread.cpp (modified) (1 diff)
• include/internal/thread.h (modified) (1 diff)
• r3/win/dllmain-win.cpp (modified) (1 diff)
• r3/win/tls-win.cpp (moved) (moved from trunk/src/VBox/Runtime/r3/win/tls-dllmain-win.cpp ) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1973 +1973 @@
         $(if-expr 1,r3/win/time-win.cpp,r3/nt/time-nt.cpp) \
         r3/win/time2-win.cpp \
+        r3/win/tls-win.cpp \
         r3/win/utf16locale-win.cpp \
         r3/win/utf8-win.cpp \
@@ -2196 +2197 @@
 VBoxRT_SOURCES.x86            := $(RuntimeR3_SOURCES.x86)
 VBoxRT_SOURCES.amd64          := $(RuntimeR3_SOURCES.amd64)
-VBoxRT_SOURCES.win            := $(filter-out r3/win/tls-win.cpp, $(VBoxRT_SOURCES.win))\
+VBoxRT_SOURCES.win            += \
         r3/win/dllmain-win.cpp \
-        r3/win/tls-dllmain-win.cpp \
-        $(call TARGET_PATH,VBoxRT)/VBoxRT.def
+         $(VBoxRT_0_OUTDIR)/VBoxRT.def
 VBoxRT_INCS                   := $(RuntimeR3_INCS)
 VBoxRT_INCS.$(KBUILD_TARGET)  := $(RuntimeR3_INCS.$(KBUILD_TARGET))

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

@@ -664 +664 @@
     Assert(pThread->cRefs >= 1);
 
+    /*
+     * Destroy TLS entries.
+     */
 #ifdef IPRT_WITH_GENERIC_TLS
-    /*
-     * Destroy TLS entries.
-     */
     rtThreadTlsDestruction(pThread);
-#endif /* IPRT_WITH_GENERIC_TLS */
+#elif defined(RT_OS_WINDOWS)
+    rtThreadWinTlsDestruction();
+#endif
 
     /*

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

@@ -265 +265 @@
 #endif
 #ifdef RT_OS_WINDOWS
-DECLHIDDEN(void)         rtTlsWinDetachThread(void); /* in tls-dllmain-win.cpp */
+DECLHIDDEN(void)         rtThreadWinTlsDestruction(void); /* in tls-win.cpp */
 #endif
 

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

@@ -82 +82 @@
 
         case DLL_THREAD_DETACH:
-            rtTlsWinDetachThread();
+            rtThreadWinTlsDestruction();
             rtThreadNativeDetach();
             break;

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

@@ -200 +200 @@
  * Called by dllmain-win.cpp when a thread detaches.
  */
-DECLHIDDEN(void) rtTlsWinDetachThread(void)
+DECLHIDDEN(void) rtThreadWinTlsDestruction(void)
 {
     if (ASMAtomicReadU32(&g_cTlsDtors) > 0)