vlc | branch: master | Rémi Duraffort <[email protected]> | Mon Dec 13 14:15:04 2010 +0100| [315f8e47d9503a94bd3955e581ece46f7c175971] | committer: Rémi Duraffort
More cleaner fix when tdestroy only is missing. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=315f8e47d9503a94bd3955e581ece46f7c175971 --- compat/tdestroy.c | 109 +----------------------------------------------- include/vlc_common.h | 2 + include/vlc_fixups.h | 2 +- src/Makefile.am | 1 + src/extras/tdestroy.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++ src/libvlccore.sym | 1 + 6 files changed, 117 insertions(+), 107 deletions(-) diff --git a/compat/tdestroy.c b/compat/tdestroy.c index 7f8b2c7..63d3ddf 100644 --- a/compat/tdestroy.c +++ b/compat/tdestroy.c @@ -1,116 +1,13 @@ /***************************************************************************** - * tdestroy.c : either implement tdestroy based on existing t* functions - * or implement every t* fuctions (including tdestroy) + * tdestroy.c : implement every t* fuctions *****************************************************************************/ #ifdef HAVE_CONFIG_H # include <config.h> #endif -/** search.h is present so only tdestroy has to be implemented based on the - existing functions */ -#ifdef HAVE_SEARCH_H - -/***************************************************************************** - * Copyright (C) 2009 Rémi Denis-Courmont - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - *****************************************************************************/ - -#include <stdlib.h> -#include <assert.h> - -#include <vlc_common.h> -#include <search.h> - -static struct -{ - const void **tab; - size_t count; - vlc_mutex_t lock; -} list = { NULL, 0, VLC_STATIC_MUTEX }; - -static void list_nodes (const void *node, const VISIT which, const int depth) -{ - (void) depth; - - if (which != postorder && which != leaf) - return; - - const void **tab = realloc (list.tab, sizeof (*tab) * (list.count + 1)); - if (unlikely(tab == NULL)) - abort (); - - tab[list.count] = *(const void **)node; - list.tab = tab; - list.count++; -} - -static struct -{ - const void *node; - vlc_mutex_t lock; -} smallest = { NULL, VLC_STATIC_MUTEX }; - -static int cmp_smallest (const void *a, const void *b) -{ - if (a == b) - return 0; - if (a == smallest.node) - return -1; - if (likely(b == smallest.node)) - return +1; - abort (); -} - -void tdestroy (void *root, void (*freenode) (void *)) -{ - const void **tab; - size_t count; - - assert (freenode != NULL); - - /* Enumerate nodes in order */ - vlc_mutex_lock (&list.lock); - assert (list.count == 0); - twalk (root, list_nodes); - tab = list.tab; - count = list.count; - list.tab = NULL; - list.count = 0; - vlc_mutex_unlock (&list.lock); - - /* Destroy the tree */ - vlc_mutex_lock (&smallest.lock); - for (size_t i = 0; i < count; i++) - { - smallest.node = tab[i]; - if (tdelete (smallest.node, &root, cmp_smallest) == NULL) - abort (); - } - vlc_mutex_unlock (&smallest.lock); - assert (root == NULL); - - /* Destroy the nodes */ - for (size_t i = 0; i < count; i++) - freenode ((void *)(tab[i])); - free (tab); -} - -/** search.h is not present, so every t* function has to be implemented */ -#else // HAVE_SEARCH_H +/** search.h is not present so every t* functions has to be implemented */ +#ifndef HAVE_SEARCH_H #include <assert.h> #include <stdlib.h> diff --git a/include/vlc_common.h b/include/vlc_common.h index 3e9de44..eb23f15 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -810,6 +810,8 @@ VLC_EXPORT( void *, vlc_memalign, ( void **base, size_t alignment, size_t size ) VLC_EXPORT( int, vlc_execve, ( vlc_object_t *p_object, int i_argc, char *const *pp_argv, char *const *pp_env, const char *psz_cwd, const char *p_in, size_t i_in, char **pp_data, size_t *pi_data ) LIBVLC_USED ); #define vlc_execve(a,b,c,d,e,f,g,h,i) vlc_execve(VLC_OBJECT(a),b,c,d,e,f,g,h,i) +VLC_EXPORT( void, vlc_tdestroy, ( void *, void (*)(void *) ) ); + /* Fast large memory copy and memory set */ VLC_EXPORT( void *, vlc_memcpy, ( void *, const void *, size_t ) ); VLC_EXPORT( void *, vlc_memset, ( void *, int, size_t ) ); diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h index 6f6a6e7..ef37367 100644 --- a/include/vlc_fixups.h +++ b/include/vlc_fixups.h @@ -264,7 +264,7 @@ void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int void tdestroy( void *root, void (*free_node)(void *nodep) ); #else // HAVE_SEARCH_H # ifndef HAVE_TDESTROY -void tdestroy( void *root, void (*free_node)(void *nodep) ); +# define tdestroy vlc_tdestroy # endif #endif diff --git a/src/Makefile.am b/src/Makefile.am index 006f5c8..edc4dbe 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -455,6 +455,7 @@ SOURCES_libvlc_common = \ misc/xml.c \ misc/media_library.c \ extras/libc.c \ + extras/tdestroy.c \ misc/filter.c \ misc/filter_chain.c \ misc/http_auth.c \ diff --git a/src/extras/tdestroy.c b/src/extras/tdestroy.c new file mode 100644 index 0000000..d1a65c5 --- /dev/null +++ b/src/extras/tdestroy.c @@ -0,0 +1,109 @@ +/** + * @file tdestroy.c + * @brief replacement for GNU tdestroy() + */ +/***************************************************************************** + * Copyright (C) 2009 Rémi Denis-Courmont + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#if defined(HAVE_SEARCH_H) && !defined(HAVE_TDESTROY) + +#include <stdlib.h> +#include <assert.h> + +#include <vlc_common.h> +#include <search.h> + +static struct +{ + const void **tab; + size_t count; + vlc_mutex_t lock; +} list = { NULL, 0, VLC_STATIC_MUTEX }; + +static void list_nodes (const void *node, const VISIT which, const int depth) +{ + (void) depth; + + if (which != postorder && which != leaf) + return; + + const void **tab = realloc (list.tab, sizeof (*tab) * (list.count + 1)); + if (unlikely(tab == NULL)) + abort (); + + tab[list.count] = *(const void **)node; + list.tab = tab; + list.count++; +} + +static struct +{ + const void *node; + vlc_mutex_t lock; +} smallest = { NULL, VLC_STATIC_MUTEX }; + +static int cmp_smallest (const void *a, const void *b) +{ + if (a == b) + return 0; + if (a == smallest.node) + return -1; + if (likely(b == smallest.node)) + return +1; + abort (); +} + +void vlc_tdestroy (void *root, void (*freenode) (void *)) +{ + const void **tab; + size_t count; + + assert (freenode != NULL); + + /* Enumerate nodes in order */ + vlc_mutex_lock (&list.lock); + assert (list.count == 0); + twalk (root, list_nodes); + tab = list.tab; + count = list.count; + list.tab = NULL; + list.count = 0; + vlc_mutex_unlock (&list.lock); + + /* Destroy the tree */ + vlc_mutex_lock (&smallest.lock); + for (size_t i = 0; i < count; i++) + { + smallest.node = tab[i]; + if (tdelete (smallest.node, &root, cmp_smallest) == NULL) + abort (); + } + vlc_mutex_unlock (&smallest.lock); + assert (root == NULL); + + /* Destroy the nodes */ + for (size_t i = 0; i < count; i++) + freenode ((void *)(tab[i])); + free (tab); +} + +#endif diff --git a/src/libvlccore.sym b/src/libvlccore.sym index 10040ac..309f88d 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -606,6 +606,7 @@ vlc_sd_probe_Add vlc_sdp_Start vlc_sd_Start vlc_sd_Stop +vlc_tdestroy vlc_testcancel vlc_thread_create vlc_thread_join _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
