simplify and optimize FILE lock handling

[oweals/musl.git] / src / internal / libc.h

diff --git a/src/internal/libc.h b/src/internal/libc.h
index e81ef7609f466d4dc2fa1b068acbc7cb87d9eaa6..bbbb3a4cc8047682f4306ea7737df293dc6c762c 100644 (file)
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -15,6 +15,9 @@ struct __libc {
        int (*rsyscall)(int, long, long, long, long, long, long);
        void (**tsd_keys)(void *);
        void (*fork_handler)(int);
+       FILE *ofl_head;
+       int ofl_lock;
+       void (*lockfile)(FILE *);
 };
 
 
@@ -36,11 +39,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