Index: /trunk/include/iprt/thread.h =================================================================== --- /trunk/include/iprt/thread.h (revision 83123) +++ /trunk/include/iprt/thread.h (revision 83124) @@ -915,6 +915,9 @@ * This is set to NIL_RTTLS on failure. * @param pfnDestructor Optional callback function for cleaning up on - * thread termination. WARNING! This feature may not - * be implemented everywhere. + * thread termination. + * @note In static builds on windows, the destructor will only be invoked for + * IPRT threads. + * @note There are probably OS specific restrictions on what operations you + * are allowed to perform from a TLS destructor, so keep it simple. */ RTR3DECL(int) RTTlsAllocEx(PRTTLS piTls, PFNRTTLSDTOR pfnDestructor); Index: /trunk/src/VBox/Runtime/Makefile.kmk =================================================================== --- /trunk/src/VBox/Runtime/Makefile.kmk (revision 83123) +++ /trunk/src/VBox/Runtime/Makefile.kmk (revision 83124) @@ -1973,4 +1973,5 @@ $(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,8 +2197,7 @@ 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)) Index: /trunk/src/VBox/Runtime/common/misc/thread.cpp =================================================================== --- /trunk/src/VBox/Runtime/common/misc/thread.cpp (revision 83123) +++ /trunk/src/VBox/Runtime/common/misc/thread.cpp (revision 83124) @@ -664,10 +664,12 @@ 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 /* Index: /trunk/src/VBox/Runtime/include/internal/thread.h =================================================================== --- /trunk/src/VBox/Runtime/include/internal/thread.h (revision 83123) +++ /trunk/src/VBox/Runtime/include/internal/thread.h (revision 83124) @@ -265,5 +265,5 @@ #endif #ifdef RT_OS_WINDOWS -DECLHIDDEN(void) rtTlsWinDetachThread(void); /* in tls-dllmain-win.cpp */ +DECLHIDDEN(void) rtThreadWinTlsDestruction(void); /* in tls-win.cpp */ #endif Index: /trunk/src/VBox/Runtime/r3/win/dllmain-win.cpp =================================================================== --- /trunk/src/VBox/Runtime/r3/win/dllmain-win.cpp (revision 83123) +++ /trunk/src/VBox/Runtime/r3/win/dllmain-win.cpp (revision 83124) @@ -82,5 +82,5 @@ case DLL_THREAD_DETACH: - rtTlsWinDetachThread(); + rtThreadWinTlsDestruction(); rtThreadNativeDetach(); break; Index: unk/src/VBox/Runtime/r3/win/tls-dllmain-win.cpp =================================================================== --- /trunk/src/VBox/Runtime/r3/win/tls-dllmain-win.cpp (revision 83123) +++ (revision ) @@ -1,220 +1,0 @@ -/* $Id$ */ -/** @file - * IPRT - Thread Local Storage (TLS), Win32. - */ - -/* - * Copyright (C) 2008-2020 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * The contents of this file may alternatively be used under the terms - * of the Common Development and Distribution License Version 1.0 - * (CDDL) only, as it comes in the "COPYING.CDDL" file of the - * VirtualBox OSE distribution, in which case the provisions of the - * CDDL are applicable instead of those of the GPL. - * - * You may elect to license modified versions of this file under the - * terms and conditions of either the GPL or the CDDL or both. - */ - - -/********************************************************************************************************************************* -* Header Files * -*********************************************************************************************************************************/ -#define LOG_GROUP RTLOGGROUP_THREAD -#include - -#include -#include -#include -#include -#include -#include -#include -#include "internal/thread.h" - - -/********************************************************************************************************************************* -* Structures and Typedefs * -*********************************************************************************************************************************/ -typedef struct RTTLSWINDTOR -{ - RTLISTNODE ListEntry; - DWORD iTls; - PFNRTTLSDTOR pfnDestructor; -} RTTLSWINDTOR; -typedef RTTLSWINDTOR *PRTTLSWINDTOR; - - -/********************************************************************************************************************************* -* Global Variables * -*********************************************************************************************************************************/ -/** Init once for the list and critical section. */ -static RTONCE g_Once = RTONCE_INITIALIZER; -/** Critical section protecting the TLS destructor list. */ -static RTCRITSECTRW g_CritSect; -/** List of TLS destrictors (RTTLSWINDTOR). */ -static RTLISTANCHOR g_TlsDtorHead; -/** Number of desturctors in the list (helps putting of initialization). */ -static uint32_t volatile g_cTlsDtors = 0; - - -/** - * @callback_method_impl{FNRTONCE} - */ -static DECLCALLBACK(int32_t) rtTlsWinInitLock(void *pvUser) -{ - RT_NOREF(pvUser); - RTListInit(&g_TlsDtorHead); - return RTCritSectRwInit(&g_CritSect); -} - - -RTR3DECL(RTTLS) RTTlsAlloc(void) -{ - AssertCompile(sizeof(RTTLS) >= sizeof(DWORD)); - DWORD iTls = TlsAlloc(); - return iTls != TLS_OUT_OF_INDEXES ? (RTTLS)iTls : NIL_RTTLS; -} - - -RTR3DECL(int) RTTlsAllocEx(PRTTLS piTls, PFNRTTLSDTOR pfnDestructor) -{ - int rc; - if (!pfnDestructor) - { - DWORD iTls = TlsAlloc(); - if (iTls != TLS_OUT_OF_INDEXES) - { - Assert((RTTLS)iTls != NIL_RTTLS); - *piTls = (RTTLS)iTls; - Assert((DWORD)*piTls == iTls); - rc = VINF_SUCCESS; - } - else - rc = VERR_NO_MEMORY; - } - else - { - rc = RTOnce(&g_Once, rtTlsWinInitLock, NULL); - if (RT_SUCCESS(rc)) - { - PRTTLSWINDTOR pDtor = (PRTTLSWINDTOR)RTMemAlloc(sizeof(*pDtor)); - if (pDtor) - { - DWORD iTls = TlsAlloc(); - if (iTls != TLS_OUT_OF_INDEXES) - { - Assert((RTTLS)iTls != NIL_RTTLS); - *piTls = (RTTLS)iTls; - Assert((DWORD)*piTls == iTls); - - /* - * Add the destructor to the list. We keep it sorted. - */ - pDtor->iTls = iTls; - pDtor->pfnDestructor = pfnDestructor; - RTCritSectRwEnterExcl(&g_CritSect); - RTListAppend(&g_TlsDtorHead, &pDtor->ListEntry); - ASMAtomicIncU32(&g_cTlsDtors); - RTCritSectRwLeaveExcl(&g_CritSect); - - rc = VINF_SUCCESS; - } - else - rc = VERR_NO_MEMORY; - } - else - rc = VERR_NO_MEMORY; - } - } - return rc; -} - - -RTR3DECL(int) RTTlsFree(RTTLS iTls) -{ - if (iTls == NIL_RTTLS) - return VINF_SUCCESS; - if (TlsFree((DWORD)iTls)) - { - if (ASMAtomicReadU32(&g_cTlsDtors) > 0) - { - RTCritSectRwEnterExcl(&g_CritSect); - PRTTLSWINDTOR pDtor; - RTListForEach(&g_TlsDtorHead, pDtor, RTTLSWINDTOR, ListEntry) - { - if (pDtor->iTls == (DWORD)iTls) - { - RTListNodeRemove(&pDtor->ListEntry); - ASMAtomicDecU32(&g_cTlsDtors); - RTMemFree(pDtor); - break; - } - } - RTCritSectRwLeaveExcl(&g_CritSect); - } - return VINF_SUCCESS; - } - return RTErrConvertFromWin32(GetLastError()); -} - - -RTR3DECL(void *) RTTlsGet(RTTLS iTls) -{ - return TlsGetValue((DWORD)iTls); -} - - -RTR3DECL(int) RTTlsGetEx(RTTLS iTls, void **ppvValue) -{ - void *pv = TlsGetValue((DWORD)iTls); - if (pv) - { - *ppvValue = pv; - return VINF_SUCCESS; - } - - /* TlsGetValue always updates last error */ - *ppvValue = NULL; - return RTErrConvertFromWin32(GetLastError()); -} - - -RTR3DECL(int) RTTlsSet(RTTLS iTls, void *pvValue) -{ - if (TlsSetValue((DWORD)iTls, pvValue)) - return VINF_SUCCESS; - return RTErrConvertFromWin32(GetLastError()); -} - - -/** - * Called by dllmain-win.cpp when a thread detaches. - */ -DECLHIDDEN(void) rtTlsWinDetachThread(void) -{ - if (ASMAtomicReadU32(&g_cTlsDtors) > 0) - { - RTCritSectRwEnterShared(&g_CritSect); - PRTTLSWINDTOR pDtor; - RTListForEach(&g_TlsDtorHead, pDtor, RTTLSWINDTOR, ListEntry) - { - void *pvValue = TlsGetValue(pDtor->iTls); - if (pvValue != NULL) - { - pDtor->pfnDestructor(pvValue); - TlsSetValue(pDtor->iTls, NULL); - } - } - RTCritSectRwLeaveShared(&g_CritSect); - } -} - Index: /trunk/src/VBox/Runtime/r3/win/tls-win.cpp =================================================================== --- /trunk/src/VBox/Runtime/r3/win/tls-win.cpp (revision 83123) +++ /trunk/src/VBox/Runtime/r3/win/tls-win.cpp (revision 83124) @@ -33,15 +33,52 @@ #include +#include +#include +#include #include -#include -#include +#include +#include #include "internal/thread.h" -AssertCompile(sizeof(RTTLS) >= sizeof(DWORD)); +/********************************************************************************************************************************* +* Structures and Typedefs * +*********************************************************************************************************************************/ +typedef struct RTTLSWINDTOR +{ + RTLISTNODE ListEntry; + DWORD iTls; + PFNRTTLSDTOR pfnDestructor; +} RTTLSWINDTOR; +typedef RTTLSWINDTOR *PRTTLSWINDTOR; + + +/********************************************************************************************************************************* +* Global Variables * +*********************************************************************************************************************************/ +/** Init once for the list and critical section. */ +static RTONCE g_Once = RTONCE_INITIALIZER; +/** Critical section protecting the TLS destructor list. */ +static RTCRITSECTRW g_CritSect; +/** List of TLS destrictors (RTTLSWINDTOR). */ +static RTLISTANCHOR g_TlsDtorHead; +/** Number of desturctors in the list (helps putting of initialization). */ +static uint32_t volatile g_cTlsDtors = 0; + + +/** + * @callback_method_impl{FNRTONCE} + */ +static DECLCALLBACK(int32_t) rtTlsWinInitLock(void *pvUser) +{ + RT_NOREF(pvUser); + RTListInit(&g_TlsDtorHead); + return RTCritSectRwInit(&g_CritSect); +} RTR3DECL(RTTLS) RTTlsAlloc(void) { + AssertCompile(sizeof(RTTLS) >= sizeof(DWORD)); DWORD iTls = TlsAlloc(); return iTls != TLS_OUT_OF_INDEXES ? (RTTLS)iTls : NIL_RTTLS; @@ -51,15 +88,53 @@ RTR3DECL(int) RTTlsAllocEx(PRTTLS piTls, PFNRTTLSDTOR pfnDestructor) { - AssertReturn(!pfnDestructor, VERR_NOT_SUPPORTED); - DWORD iTls = TlsAlloc(); - if (iTls != TLS_OUT_OF_INDEXES) - { - Assert((RTTLS)iTls != NIL_RTTLS); - *piTls = (RTTLS)iTls; - Assert((DWORD)*piTls == iTls); - return VINF_SUCCESS; - } - - return VERR_NO_MEMORY; + int rc; + if (!pfnDestructor) + { + DWORD iTls = TlsAlloc(); + if (iTls != TLS_OUT_OF_INDEXES) + { + Assert((RTTLS)iTls != NIL_RTTLS); + *piTls = (RTTLS)iTls; + Assert((DWORD)*piTls == iTls); + rc = VINF_SUCCESS; + } + else + rc = VERR_NO_MEMORY; + } + else + { + rc = RTOnce(&g_Once, rtTlsWinInitLock, NULL); + if (RT_SUCCESS(rc)) + { + PRTTLSWINDTOR pDtor = (PRTTLSWINDTOR)RTMemAlloc(sizeof(*pDtor)); + if (pDtor) + { + DWORD iTls = TlsAlloc(); + if (iTls != TLS_OUT_OF_INDEXES) + { + Assert((RTTLS)iTls != NIL_RTTLS); + *piTls = (RTTLS)iTls; + Assert((DWORD)*piTls == iTls); + + /* + * Add the destructor to the list. We keep it sorted. + */ + pDtor->iTls = iTls; + pDtor->pfnDestructor = pfnDestructor; + RTCritSectRwEnterExcl(&g_CritSect); + RTListAppend(&g_TlsDtorHead, &pDtor->ListEntry); + ASMAtomicIncU32(&g_cTlsDtors); + RTCritSectRwLeaveExcl(&g_CritSect); + + rc = VINF_SUCCESS; + } + else + rc = VERR_NO_MEMORY; + } + else + rc = VERR_NO_MEMORY; + } + } + return rc; } @@ -70,5 +145,23 @@ return VINF_SUCCESS; if (TlsFree((DWORD)iTls)) - return VINF_SUCCESS; + { + if (ASMAtomicReadU32(&g_cTlsDtors) > 0) + { + RTCritSectRwEnterExcl(&g_CritSect); + PRTTLSWINDTOR pDtor; + RTListForEach(&g_TlsDtorHead, pDtor, RTTLSWINDTOR, ListEntry) + { + if (pDtor->iTls == (DWORD)iTls) + { + RTListNodeRemove(&pDtor->ListEntry); + ASMAtomicDecU32(&g_cTlsDtors); + RTMemFree(pDtor); + break; + } + } + RTCritSectRwLeaveExcl(&g_CritSect); + } + return VINF_SUCCESS; + } return RTErrConvertFromWin32(GetLastError()); } @@ -103,2 +196,25 @@ } + +/** + * Called by dllmain-win.cpp when a thread detaches. + */ +DECLHIDDEN(void) rtThreadWinTlsDestruction(void) +{ + if (ASMAtomicReadU32(&g_cTlsDtors) > 0) + { + RTCritSectRwEnterShared(&g_CritSect); + PRTTLSWINDTOR pDtor; + RTListForEach(&g_TlsDtorHead, pDtor, RTTLSWINDTOR, ListEntry) + { + void *pvValue = TlsGetValue(pDtor->iTls); + if (pvValue != NULL) + { + pDtor->pfnDestructor(pvValue); + TlsSetValue(pDtor->iTls, NULL); + } + } + RTCritSectRwLeaveShared(&g_CritSect); + } +} +