summaryrefslogtreecommitdiff
path: root/src/internal/stdio_impl.h
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-03-12 21:55:45 -0500
committerRich Felker <dalias@aerifal.cx>2011-03-12 21:55:45 -0500
commit5eb0d33ec0f08b123c5c10877d6258d05fa9453a (patch)
tree85ff7f5397424685d89af8176ff7ce6d6f46f6e2 /src/internal/stdio_impl.h
parentd8d19f4d46284d5b6124710a5235b6fe090c013f (diff)
downloadmusl-5eb0d33ec0f08b123c5c10877d6258d05fa9453a.tar.gz
implement flockfile api, rework stdio locking
Diffstat (limited to 'src/internal/stdio_impl.h')
-rw-r--r--src/internal/stdio_impl.h19
1 files changed, 7 insertions, 12 deletions
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)