dist_man_MANS = doc/cdecl99.1 doc/libcdecl.3
noinst_HEADERS = conf_pre.h conf_post.h common/src/help.h common/src/tap.h \
- common/src/xtra.h src/cdecl.h src/intconv.h src/scan.h \
- src/parse.h src/version.h t/declgen.h t/test.h
+ common/src/xtra.h src/cdecl.h src/intconv.h src/parse.h \
+ src/scan.h src/thread-posix.h src/thread-stdc.h \
+ src/thread-w32.h src/version.h t/declgen.h t/test.h
noinst_DATA = $(MOFILES)
exec 3>lib/symfiles.tmp 4<lib/symfiles.tmp
rm -f lib/symfiles.tmp
- shared_modules='lock tls'
+ shared_modules='lock'
set x --extract-recursive-dependencies $shared_modules; shift
(set -x; $GNULIB/gnulib-tool "$@" >&3 ) || die "gnulib-tool failed"
shared_modules=`LC_ALL=C sort -u <&4`
gnulib-local
threadlib
lock [test x"$glthreads_api" != x"none"]
-tls [test x"$glthreads_api" != x"none"]
configure.ac-early:
dnl AC_REQUIRE has the effect of making the macro expansion unconditional;
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
+#include <stdbool.h>
#include "cdecl.h"
#include "cdecl-internal.h"
#include <glthread/lock.h>
-#include <glthread/tls.h>
#include "errmsg.h"
+#if USE_POSIX_THREADS
+# include "thread-posix.h"
+#elif USE_ISOC_THREADS || USE_ISOC_AND_POSIX_THREADS
+# include "thread-stdc.h"
+#elif USE_WINDOWS_THREADS
+# include "thread-w32.h"
+#else
+static void *tls_key;
+enum { tls_key_valid = 1 };
+
+#define tls_key_init() ((void)0)
+#define tls_get() tls_key
+#define tls_set(a) (tls_key = (a), 1)
+#endif
+
struct err_state {
struct cdecl_error err;
size_t nstr;
/* This pre-initialized error is reserved for dire out-of-memory conditions. */
static struct cdecl_error err_no_mem;
-static gl_tls_key_t tls_key;
-
-static void free_err(void *err)
-{
- if (err == &err_no_mem)
- return;
-
- free(err);
-}
static void set_err(unsigned code, struct cdecl_error *err)
{
bindtextdomain("bison-runtime", BISON_LOCALEDIR);
#endif
set_err(CDECL__ENOMEM, &err_no_mem);
- gl_tls_key_init(tls_key, free_err);
+ tls_key_init();
}
static void *alloc_err_state(void *old, size_t buf_size)
state = p = realloc(old, offsetof(struct err_state, str) + buf_size);
if (state) {
state->nstr = buf_size;
+ if (!tls_set(state)) {
+ /*
+ * We have to presume that pthread_setspecific etc.
+ * cannot fail after the key has been successfully
+ * assigned once, because there seems to be no
+ * reasonable recovery from such a scenario.
+ */
+ free(p);
+ p = NULL;
+ }
} else if (old) {
/* Failed allocation, but existing state is still good */
p = old;
- } else {
- /* Failed allocation, no existing state */
- p = &err_no_mem;
}
- gl_tls_set(tls_key, p);
- return state;
+ return p;
}
static struct err_state *get_err_state(void)
void *state;
gl_once_define(static, tls_initialized)
- gl_once(tls_initialized, initialize_cb);
+ if (glthread_once(&tls_initialized, initialize_cb) || !tls_key_valid)
+ return NULL;
- state = gl_tls_get(tls_key);
- if (state == &err_no_mem)
- state = NULL;
- if (!state)
+ if (!(state = tls_get()))
return alloc_err_state(state, 100);
return state;
}
{
struct err_state *state = get_err_state();
- return state ? &state->err : NULL;
+ return state ? &state->err : &err_no_mem;
}
--- /dev/null
+/*
+ * Copyright © 2024 Nick Bowler
+ *
+ * Helpers for hosts using POSIX threading (pthreads) API.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 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 General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <pthread.h>
+
+#if USE_POSIX_THREADS_WEAK
+# pragma weak pthread_key_create
+# pragma weak pthread_getspecific
+# pragma weak pthread_setspecific
+#endif
+
+static struct {
+ union {
+ pthread_key_t mt;
+#if USE_POSIX_THREADS_WEAK
+ void *st;
+#endif
+ } u;
+
+#if USE_POSIX_THREADS_WEAK
+ signed char valid;
+#else
+ bool valid;
+#endif
+} tls_key;
+#define tls_key_valid (tls_key.valid != 0)
+
+static void tls_key_init(void)
+{
+ if (pthread_in_use())
+ tls_key.valid = !pthread_key_create(&tls_key.u.mt, free);
+ else
+ tls_key.valid = -1;
+}
+
+static void *tls_get(void)
+{
+#if USE_POSIX_THREADS_WEAK
+ if (tls_key.valid < 0)
+ return tls_key.u.st;
+#endif
+ return pthread_getspecific(tls_key.u.mt);
+}
+
+static int tls_set(void *p)
+{
+#if USE_POSIX_THREADS_WEAK
+ if (tls_key.valid < 0)
+ return (tls_key.u.st = p, 1);
+#endif
+ return !pthread_setspecific(tls_key.u.mt, p);
+}
--- /dev/null
+/*
+ * Copyright © 2024 Nick Bowler
+ *
+ * Helpers for hosts using standard C threading API.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 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 General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <threads.h>
+
+static tss_t tls_key;
+static bool tls_key_valid;
+
+static void tls_key_init(void)
+{
+ tls_key_valid = (tss_create(&tls_key, free) == thrd_success);
+}
+
+static void *tls_get(void)
+{
+ return tss_get(tls_key);
+}
+
+static int tls_set(void *p)
+{
+ return tss_set(tls_key, p) == thrd_success;
+}
--- /dev/null
+/*
+ * Copyright © 2024 Nick Bowler
+ *
+ * Helpers for hosts using native Windows threading API.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 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 General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+static DWORD tls_key;
+#define tls_key_valid (tls_key != TLS_OUT_OF_INDEXES)
+
+static void tls_key_init(void)
+{
+ tls_key = TlsAlloc();
+}
+
+static void *tls_get(void)
+{
+ return TlsGetValue(tls_key);
+}
+
+static BOOL tls_set(void *p)
+{
+ return TlsSetValue(tls_key, p);
+}
projects / cdecl99.git / commitdiff