|
|
@@ -1,207 +0,0 @@
|
|
|
-From ab530d647c5ada5f91a21fdaa1d7efa2179ba99d Mon Sep 17 00:00:00 2001
|
|
|
-From: Carola Nitz <nitz.carola@googlemail.com>
|
|
|
-Date: Fri, 23 Feb 2018 13:16:41 +0100
|
|
|
-Subject: [PATCH 15/24] Work around lack of __thread storage qualifier on old
|
|
|
- macOS
|
|
|
-
|
|
|
----
|
|
|
- configure.ac | 4 +-
|
|
|
- include/vlc_fixups.h | 6 ++-
|
|
|
- po/POTFILES.in | 1 +
|
|
|
- src/Makefile.am | 1 +
|
|
|
- {compat => src/extras}/tdestroy.c | 67 ++++++++++++++++++-------------
|
|
|
- 5 files changed, 47 insertions(+), 32 deletions(-)
|
|
|
- rename {compat => src/extras}/tdestroy.c (59%)
|
|
|
-
|
|
|
-diff --git a/configure.ac b/configure.ac
|
|
|
-index 886b499566..26a9fb8616 100644
|
|
|
---- a/configure.ac
|
|
|
-+++ b/configure.ac
|
|
|
-@@ -643,8 +643,8 @@ dnl Check for system libs needed
|
|
|
- need_libc=false
|
|
|
-
|
|
|
- dnl Check for usual libc functions
|
|
|
--AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatat fstatvfs fork getmntent_r getenv getpwuid_r isatty memalign mkostemp mmap open_memstream newlocale pipe2 pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale])
|
|
|
--AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll posix_memalign recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf])
|
|
|
-+AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatat fstatvfs fork getmntent_r getenv getpwuid_r isatty memalign mkostemp mmap open_memstream pipe2 pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale])
|
|
|
-+AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll posix_memalign recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tfind timegm timespec_get strverscmp pathconf])
|
|
|
- AC_REPLACE_FUNCS([gettimeofday])
|
|
|
- AC_CHECK_FUNC(fdatasync,,
|
|
|
- [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
|
|
|
-diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
|
|
|
-index 8fd01da0ce..16282aae9e 100644
|
|
|
---- a/include/vlc_fixups.h
|
|
|
-+++ b/include/vlc_fixups.h
|
|
|
-@@ -505,9 +505,11 @@ void *lfind( const void *key, const void *base, size_t *nmemb,
|
|
|
- lfind((a),(b), &(unsigned){ (*(c) > UINT_MAX) ? UINT_MAX : *(c) }, (d),(e))
|
|
|
- #endif /* _WIN64 */
|
|
|
-
|
|
|
--#ifndef HAVE_TDESTROY
|
|
|
- void tdestroy( void *root, void (*free_node)(void *nodep) );
|
|
|
--#endif
|
|
|
-+# ifndef HAVE_TDESTROY
|
|
|
-+void vlc_tdestroy( void *, void (*)(void *) );
|
|
|
-+# define tdestroy vlc_tdestroy
|
|
|
-+# endif
|
|
|
-
|
|
|
- /* Random numbers */
|
|
|
- #ifndef HAVE_NRAND48
|
|
|
-diff --git a/po/POTFILES.in b/po/POTFILES.in
|
|
|
-index d2771b57ec..62b3645c30 100644
|
|
|
---- a/po/POTFILES.in
|
|
|
-+++ b/po/POTFILES.in
|
|
|
-@@ -66,6 +66,7 @@ src/config/help.c
|
|
|
- src/config/intf.c
|
|
|
- src/darwin/error.c
|
|
|
- src/extras/libc.c
|
|
|
-+src/extras/tdestroy.c
|
|
|
- src/input/access.c
|
|
|
- src/input/decoder.c
|
|
|
- src/input/decoder.h
|
|
|
-diff --git a/src/Makefile.am b/src/Makefile.am
|
|
|
-index b6c5996837..978a0674b1 100644
|
|
|
---- a/src/Makefile.am
|
|
|
-+++ b/src/Makefile.am
|
|
|
-@@ -210,6 +210,7 @@ libvlccore_la_SOURCES = \
|
|
|
- config/getopt.c \
|
|
|
- config/vlc_getopt.h \
|
|
|
- extras/libc.c \
|
|
|
-+ extras/tdestroy.c \
|
|
|
- media_source/media_source.c \
|
|
|
- media_source/media_source.h \
|
|
|
- media_source/media_tree.c \
|
|
|
-diff --git a/compat/tdestroy.c b/src/extras/tdestroy.c
|
|
|
-similarity index 59%
|
|
|
-rename from compat/tdestroy.c
|
|
|
-rename to src/extras/tdestroy.c
|
|
|
-index 6bb3480957..5c54881553 100644
|
|
|
---- a/compat/tdestroy.c
|
|
|
-+++ b/src/extras/tdestroy.c
|
|
|
-@@ -3,7 +3,7 @@
|
|
|
- * @brief replacement for GNU tdestroy()
|
|
|
- */
|
|
|
- /*****************************************************************************
|
|
|
-- * Copyright (C) 2009, 2018 Rémi Denis-Courmont
|
|
|
-+ * 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
|
|
|
-@@ -24,77 +24,88 @@
|
|
|
- # include "config.h"
|
|
|
- #endif
|
|
|
-
|
|
|
--#include <assert.h>
|
|
|
-+#if defined(HAVE_SEARCH_H) && !defined(HAVE_TDESTROY) && defined(HAVE_TFIND)
|
|
|
-+
|
|
|
- #include <stdlib.h>
|
|
|
--#ifdef HAVE_SEARCH_H
|
|
|
--# include <search.h>
|
|
|
--#endif
|
|
|
-+#include <assert.h>
|
|
|
-
|
|
|
--#ifdef HAVE_TFIND
|
|
|
--static __thread struct
|
|
|
-+#include <vlc_common.h>
|
|
|
-+#include <search.h>
|
|
|
-+
|
|
|
-+static struct
|
|
|
- {
|
|
|
- const void **tab;
|
|
|
- size_t count;
|
|
|
--} list = { NULL, 0 };
|
|
|
-+ vlc_mutex_t lock;
|
|
|
-+} list = { NULL, 0, VLC_STATIC_MUTEX };
|
|
|
-
|
|
|
--static void list_nodes(const void *node, const VISIT which, const int depth)
|
|
|
-+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 (tab == NULL)
|
|
|
-- abort();
|
|
|
-+ 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 __thread const void *smallest;
|
|
|
-+static struct
|
|
|
-+{
|
|
|
-+ const void *node;
|
|
|
-+ vlc_mutex_t lock;
|
|
|
-+} smallest = { NULL, VLC_STATIC_MUTEX };
|
|
|
-
|
|
|
--static int cmp_smallest(const void *a, const void *b)
|
|
|
-+static int cmp_smallest (const void *a, const void *b)
|
|
|
- {
|
|
|
- if (a == b)
|
|
|
- return 0;
|
|
|
-- if (a == smallest)
|
|
|
-+ if (a == smallest.node)
|
|
|
- return -1;
|
|
|
-- if (b == smallest)
|
|
|
-+ if (likely(b == smallest.node))
|
|
|
- return +1;
|
|
|
-- abort();
|
|
|
-+ abort ();
|
|
|
- }
|
|
|
-
|
|
|
--void tdestroy(void *root, void (*freenode)(void *))
|
|
|
-+void vlc_tdestroy (void *root, void (*freenode) (void *))
|
|
|
- {
|
|
|
- const void **tab;
|
|
|
- size_t count;
|
|
|
-
|
|
|
-- assert(freenode != NULL);
|
|
|
-+ assert (freenode != NULL);
|
|
|
-
|
|
|
- /* Enumerate nodes in order */
|
|
|
-- assert(list.count == 0);
|
|
|
-- twalk(root, list_nodes);
|
|
|
-+ 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++)
|
|
|
- {
|
|
|
-- void *node = (void *)(tab[i]);
|
|
|
-+ void *node = tab[i];
|
|
|
-
|
|
|
-- smallest = node;
|
|
|
-- node = tdelete(node, &root, cmp_smallest);
|
|
|
-- assert(node != NULL);
|
|
|
-+ smallest.node = node;
|
|
|
-+ node = tdelete (node, &root, cmp_smallest);
|
|
|
-+ assert (node != NULL);
|
|
|
- }
|
|
|
-+ 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);
|
|
|
-+ freenode ((void *)(tab[i]));
|
|
|
-+ free (tab);
|
|
|
- }
|
|
|
--#endif /* HAVE_TFIND */
|
|
|
-+
|
|
|
-+#endif
|
|
|
-2.21.0 (Apple Git-122.2)
|
|
|
-
|
Alexandre Janniaux