Commit 315f8e47 authored by Rémi Duraffort's avatar Rémi Duraffort

More cleaner fix when tdestroy only is missing.

parent 875531f7
/*****************************************************************************
* 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>
......
......@@ -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 ) );
......
......@@ -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
......
......@@ -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 \
......
/**
* @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
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment