simplify and optimize FILE lock handling

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

diff --git a/src/internal/stdio_impl.h b/src/internal/stdio_impl.h
index 1e9159f6f2443bd0eba52598c76159d1de840ec0..b977df6829013714e1bb52e753ade4f9abadc12f 100644 (file)
--- a/src/internal/stdio_impl.h
+++ b/src/internal/stdio_impl.h
@@ -23,8 +23,8 @@
 
 #define UNGET 4
 
-#define FLOCK(f) LOCK(&f->lock)
-#define FUNLOCK(f) UNLOCK(&f->lock)
+#define FLOCK(f) ((libc.lockfile && (f)->lock>=0) ? (libc.lockfile((f)),0) : 0)
+#define FUNLOCK(f) ((f)->lockcount && (--(f)->lockcount || ((f)->lock=0)))
 
 #define F_PERM 1
 #define F_NORD 4
@@ -50,7 +50,7 @@ struct __FILE_s {
        signed char lbf;
        int lock;
        int lockcount;
-       void *owner;
+       void *cookie;
        off_t off;
        int (*flush)(FILE *);
        void **wide_data; /* must be NULL */
@@ -80,15 +80,9 @@ int __putc_unlocked(int, FILE *);
 
 FILE *__fdopen(int, const char *);
 
-extern struct ofl
-{
-       FILE *head;
-       int lock;
-} __ofl;
-
-#define OFLLOCK() LOCK(&__ofl.lock)
-#define OFLUNLOCK() UNLOCK(&__ofl.lock)
-#define ofl_head (__ofl.head)
+#define OFLLOCK() LOCK(&libc.ofl_lock)
+#define OFLUNLOCK() UNLOCK(&libc.ofl_lock)
+#define ofl_head (libc.ofl_head)
 
 #define feof(f) ((f)->flags & F_EOF)
 #define ferror(f) ((f)->flags & F_ERR)