Attachment 197961 Details for Bug 286541 – Patch to add library ctor function to delete tsd key at library exit

[patch] Patch to add library ctor function to delete tsd key at library exit

libxml2-2.6.26-cleanup-tsd-key.patch (text/plain), 1.34 KB, created by Ian Kent on 2007-09-18 01:15:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Kent

Created: 2007-09-18 01:15:23 UTC

Size: 1.34 KB

patch

obsolete

>--- libxml2-2.6.26/threads.c.cleanup-tsd-key	2005-09-05 05:09:18.000000000 +0800
>+++ libxml2-2.6.26/threads.c	2007-09-18 08:25:54.000000000 +0800
>@@ -63,6 +63,8 @@ extern int pthread_setspecific (pthread_
> extern int pthread_key_create (pthread_key_t *__key,
>                                void (*__destr_function) (void *))
> 	   __attribute((weak));
>+extern int pthread_key_delete (pthread_key_t __key)
>+	   __attribute((weak));
> extern int pthread_mutex_init ()
> 	   __attribute((weak));
> extern int pthread_mutex_destroy ()
>@@ -716,6 +718,7 @@ xmlInitThreads(void)
> 	    (pthread_getspecific != NULL) &&
> 	    (pthread_setspecific != NULL) &&
> 	    (pthread_key_create != NULL) &&
>+	    (pthread_key_delete != NULL) &&
> 	    (pthread_mutex_init != NULL) &&
> 	    (pthread_mutex_destroy != NULL) &&
> 	    (pthread_mutex_lock != NULL) &&
>@@ -767,6 +770,19 @@ xmlCleanupThreads(void)
> #endif
> }
> 
>+#ifdef HAVE_PTHREAD_H
>+void __attribute ((destructor)) xmlLibUnload(void)
>+{
>+    /* 
>+     * As a dso you can't assume that pthreads will automatically
>+     * cleanup your allocated data if you're dlclosed and worse
>+     * pthreads will try to call your now non-existent tsd destructor
>+     * when the calling application exits if the tsd key isn't deleted.
>+     */
>+    (void) pthread_key_delete(globalkey);
>+}
>+#endif
>+
> #ifdef LIBXML_THREAD_ENABLED
> /**
>  * xmlOnceInit

Actions: View | Diff

Attachments on bug 286541: 192781 | 192811 | 193181 | 193351 | 193801 | 197961