reorganize the __libc structure for threaded performance issues

[musl] / src / internal / libc.h

diff --git a/src/internal/libc.h b/src/internal/libc.h
index e81ef76..60a25ef 100644 (file)
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -5,16 +5,20 @@
 #include <stdio.h>
 
 struct __libc {
-       void (*lock)(volatile int *);
+       int *(*errno_location)(void);
        void (*cancelpt)(int);
+       void (*lock)(volatile int *);
+       void (*lockfile)(FILE *);
+       void (**tsd_keys)(void *);
+       void (*sigtimer)();
        int (*atexit)(void (*)(void));
        void (*fini)(void);
        void (*ldso_fini)(void);
-       int *(*errno_location)(void);
        volatile int threads_minus_1;
+       int ofl_lock;
        int (*rsyscall)(int, long, long, long, long, long, long);
-       void (**tsd_keys)(void *);
        void (*fork_handler)(int);
+       FILE *ofl_head;
 };
 
 
@@ -36,11 +40,13 @@ extern struct __libc *__libc_loc(void) __attribute__((const));
 
 /* 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)
 #define CANCELPT(x) (libc.cancelpt ? libc.cancelpt((x)),0 : (void)(x),0)
 #define CANCELPT_BEGIN CANCELPT(1)
-#define CANCELPT_END CANCELPT(0)
+#define CANCELPT_TRY CANCELPT(0)
+#define CANCELPT_END CANCELPT(-1)
 
 extern char **__environ;
 #define environ __environ