luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 07:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gthread-win32: Clean up GPrivate data in all cases

Browse Source
This commit is contained in:
Luca Bacci 2023-08-31 21:58:17 +02:00
parent 8436785a5f
commit f916621d72
3 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glib/glib-init.c
View File

@ -489,6 +489,11 @@ glib_priv_tls_callback (LPVOID hinstance,
glib_dll = hinstance; glib_dll = hinstance;
tls_callback_invoked = TRUE; tls_callback_invoked = TRUE;
break; break;
case DLL_THREAD_DETACH:
#ifdef THREADS_WIN32
g_thread_win32_thread_detach ();
#endif
break;
case DLL_PROCESS_DETACH: case DLL_PROCESS_DETACH:
glib_win32_deinit (reserved == NULL); glib_win32_deinit (reserved == NULL);
break; break;

22
glib/gthread-win32.c
View File

@ -424,28 +424,6 @@ g_system_thread_free (GRealThread *thread)
void void
g_system_thread_exit (void) g_system_thread_exit (void)
{ {
/* In static compilation, DllMain doesn't exist and so DLL_THREAD_DETACH
* case is never called and thread destroy notifications are not triggered.
* To ensure that notifications are correctly triggered in static
* compilation mode, we call directly the "detach" function here right
* before terminating the thread.
* As all win32 threads initialized through the glib API are run through
* the same proxy function g_thread_win32_proxy() which calls systematically
* g_system_thread_exit() when finishing, we obtain the same behavior as
* with dynamic compilation.
*
* WARNING: unfortunately this mechanism cannot work with threads created
* directly from the Windows API using CreateThread() or _beginthread/ex().
* It only works with threads created by using the glib API with
* g_system_thread_new(). If users need absolutely to use a thread NOT
* created with glib API under Windows and in static compilation mode, they
* should not use glib functions within their thread or they may encounter
* memory leaks when the thread finishes.
*/
#ifdef GLIB_STATIC_COMPILATION
g_thread_win32_thread_detach ();
#endif
_endthreadex (0); _endthreadex (0);
} }

13
glib/tests/private.c
View File

@ -148,19 +148,6 @@ test_private3 (void)
thread = (HANDLE) _beginthreadex (NULL, 0, private3_func, NULL, 0, &ignore); thread = (HANDLE) _beginthreadex (NULL, 0, private3_func, NULL, 0, &ignore);
WaitForSingleObject (thread, INFINITE); WaitForSingleObject (thread, INFINITE);
CloseHandle (thread); CloseHandle (thread);
/* FIXME: with static compilation on Windows this test will fail because
* it is mixing up glib threads with Microsoft native thread API. See
* comment in gthread-win32.c for g_system_thread_exit() implementation.
* Fix is not straightforward, possible solution could be to use FLS
* functions (instead of TLS) as proposed in
* https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1655
*/
if (!private3_freed)
{
g_test_skip ("FIXME: GPrivate with native win32 thread");
return;
}
} }
#else #else
{ {