From 5eb0d33ec0f08b123c5c10877d6258d05fa9453a Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Sat, 12 Mar 2011 21:55:45 -0500
Subject: implement flockfile api, rework stdio locking

---
 src/internal/libc.h       |  4 ++++
 src/internal/stdio_impl.h | 19 +++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'src/internal')

diff --git a/src/internal/libc.h b/src/internal/libc.h
index e81ef760..3d09bf6a 100644
--- 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,6 +39,7 @@ 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)
diff --git a/src/internal/stdio_impl.h b/src/internal/stdio_impl.h
index 1e9159f6..13e5cfd9 100644
--- 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)->owner>=0) ? (libc.lockfile((f)),0) : 0)
+#define FUNLOCK(f) ((f)->lockcount && (--(f)->lockcount || ((f)->owner=(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 *dummy5;
 	off_t off;
 	int (*flush)(FILE *);
 	void **wide_data; /* must be NULL */
@@ -59,6 +59,7 @@ struct __FILE_s {
 	off_t (*seek)(FILE *, off_t, int);
 	int mode;
 	int (*close)(FILE *);
+	int owner;
 };
 
 size_t __stdio_read(FILE *, unsigned char *, size_t);
@@ -80,15 +81,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)
-- 
cgit v1.2.1