pthread and synccall cleanup, new __synccall_wait op

[musl] / src / internal / libc.h

diff --git a/src/internal/libc.h b/src/internal/libc.h
index 60a25ef..115cd86 100644 (file)
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -5,19 +5,14 @@
 #include <stdio.h>
 
 struct __libc {
-       int *(*errno_location)(void);
-       void (*cancelpt)(int);
-       void (*lock)(volatile int *);
-       void (*lockfile)(FILE *);
-       void (**tsd_keys)(void *);
-       void (*sigtimer)();
+       void *main_thread;
+       int threaded;
+       int canceldisable;
        int (*atexit)(void (*)(void));
        void (*fini)(void);
        void (*ldso_fini)(void);
        volatile int threads_minus_1;
        int ofl_lock;
-       int (*rsyscall)(int, long, long, long, long, long, long);
-       void (*fork_handler)(int);
        FILE *ofl_head;
 };
 
@@ -40,13 +35,14 @@ extern struct __libc *__libc_loc(void) __attribute__((const));
 
 /* Designed to avoid any overhead in non-threaded processes */
 void __lock(volatile int *);
-void __lockfile(FILE *);
+int __lockfile(FILE *);
+void __unlockfile(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_TRY CANCELPT(0)
-#define CANCELPT_END CANCELPT(-1)
+#define UNLOCK(x) (*(volatile int *)(x)=0)
+
+void __synccall(void (*)(void *), void *);
+void __synccall_wait(void);
+int __setxid(int, int, int, int);
 
 extern char **__environ;
 #define environ __environ