0012-Work-around-lack-of-__thread-storage-qualifier-on-ol.patch 6.72 KB
Newer Older
1
From f48e06d158c35e5546e76e0bfde719f40b540553 Mon Sep 17 00:00:00 2001
2 3
From: Carola Nitz <nitz.carola@googlemail.com>
Date: Fri, 23 Feb 2018 13:16:41 +0100
4
Subject: [PATCH 12/21] Work around lack of __thread storage qualifier on old
5
 macOS
6 7

---
8 9
 configure.ac                      |  4 +-
 include/vlc_fixups.h              |  7 +++-
10 11
 po/POTFILES.in                    |  1 +
 src/Makefile.am                   |  1 +
12
 {compat => src/extras}/tdestroy.c | 67 ++++++++++++++++++-------------
13 14 15 16
 5 files changed, 48 insertions(+), 32 deletions(-)
 rename {compat => src/extras}/tdestroy.c (59%)

diff --git a/configure.ac b/configure.ac
17
index cfdae650b3..603b260a73 100644
18 19 20 21 22 23
--- a/configure.ac
+++ b/configure.ac
@@ -590,8 +590,8 @@ dnl Check for system libs needed
 need_libc=false
 
 dnl Check for usual libc functions
24
-AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale])
25
-AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf])
26
+AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime tdestroy uselocale])
27
+AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tfind timegm timespec_get strverscmp pathconf])
28 29 30 31
 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
32
index 6c0de2854b..8e8e406028 100644
33 34
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
35
@@ -490,9 +490,12 @@ void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void
36
 void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) );
37 38
 void *lfind( const void *key, const void *base, size_t *nmemb,
              size_t size, int(*cmp)(const void *, const void *) );
39 40 41 42 43 44 45 46 47 48 49 50
-#endif /* HAVE_SEARCH_H */
-#ifndef HAVE_TDESTROY
 void tdestroy( void *root, void (*free_node)(void *nodep) );
+#else // HAVE_SEARCH_H
+# ifndef HAVE_TDESTROY
+void vlc_tdestroy( void *, void (*)(void *) );
+#  define tdestroy vlc_tdestroy
+# endif
 #endif
 
 /* Random numbers */
diff --git a/po/POTFILES.in b/po/POTFILES.in
Felix Paul Kühne's avatar
Felix Paul Kühne committed
51
index 2b4319f140..cb7f3948e9 100644
52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -68,6 +68,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/clock.c
 src/input/clock.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 502990c70c..044169156c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -200,6 +200,7 @@ libvlccore_la_SOURCES = \
 	config/getopt.c \
 	config/vlc_getopt.h \
 	extras/libc.c \
+	extras/tdestroy.c \
 	modules/modules.h \
 	modules/modules.c \
 	modules/bank.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
-- 
Felix Paul Kühne's avatar
Felix Paul Kühne committed
207
2.19.1
208