restore lock-skipping for processes that return to single-threaded state

[musl] / src / internal / libc.h

diff --git a/src/internal/libc.h b/src/internal/libc.h
index d6df93d..619bba8 100644 (file)
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -3,59 +3,56 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <limits.h>
 
-struct __libc {
-       int *(*errno_location)(void);
-       void (*testcancel)(void);
-       void (*lock)(volatile int *);
-       void (*lockfile)(FILE *);
-       void (*fork_handler)(int);
-       int (*atexit)(void (*)(void));
-       void (*fini)(void);
-       void (*ldso_fini)(void);
-       volatile int threads_minus_1;
-       int ofl_lock;
-       FILE *ofl_head;
-       int canceldisable;
-};
-
+struct __locale_map;
 
-#if 100*__GNUC__+__GNUC_MINOR__ >= 303 || defined(__PCC__) || defined(__TINYC__)
-extern struct __libc __libc __attribute__((visibility("hidden")));
-#define libc __libc
+struct __locale_struct {
+       const struct __locale_map *cat[6];
+};
 
-#elif !defined(__PIC__)
-extern struct __libc __libc;
-#define libc __libc
+struct tls_module {
+       struct tls_module *next;
+       void *image;
+       size_t len, size, align, offset;
+};
 
-#else
-#define USE_LIBC_ACCESSOR
-extern struct __libc *__libc_loc(void) __attribute__((const));
-#define libc (*__libc_loc())
+struct __libc {
+       char can_do_threads;
+       char threaded;
+       char secure;
+       volatile signed char need_locks;
+       int threads_minus_1;
+       size_t *auxv;
+       struct tls_module *tls_head;
+       size_t tls_size, tls_align, tls_cnt;
+       size_t page_size;
+       struct __locale_struct global_locale;
+};
 
+#ifndef PAGE_SIZE
+#define PAGE_SIZE libc.page_size
 #endif
 
+extern hidden struct __libc __libc;
+#define libc __libc
 
-/* Designed to avoid any overhead in non-threaded processes */
-void __lock(volatile int *);
-void __lockfile(FILE *);
-#define LOCK(x) (libc.threads_minus_1 ? (__lock(x),1) : ((void)(x),1))
-#define UNLOCK(x) (*(x)=0)
-
-int __rsyscall(int, long, long, long, long, long, long);
-
-extern char **__environ;
-#define environ __environ
+hidden void __init_libc(char **, char *);
+hidden void __init_tls(size_t *);
+hidden void __init_ssp(void *);
+hidden void __libc_start_init(void);
+hidden void __funcs_on_exit(void);
+hidden void __funcs_on_quick_exit(void);
+hidden void __libc_exit_fini(void);
+hidden void __fork_handler(int);
 
-#undef weak_alias
-#define weak_alias(old, new) \
-       extern __typeof(old) new __attribute__((weak, alias(#old)))
+extern hidden size_t __hwcap;
+extern hidden size_t __sysinfo;
+extern char *__progname, *__progname_full;
 
-#undef LFS64_2
-//#define LFS64_2(x, y) weak_alias(x, y)
-#define LFS64_2(x, y) extern __typeof(x) y
+extern hidden const char __libc_version[];
 
-#undef LFS64
-#define LFS64(x) LFS64_2(x, x##64)
+hidden void __synccall(void (*)(void *), void *);
+hidden int __setxid(int, int, int, int);
 
 #endif