summaryrefslogtreecommitdiff
path: root/src/stdio/flockfile.c
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-07-30 08:02:14 -0400
committerRich Felker <dalias@aerifal.cx>2011-07-30 08:02:14 -0400
commitdba68bf98fc708cea4c478278c889fc7ad802b00 (patch)
treeb90a55aaa51c72475cdb69efca7b9ddd37e50b2e /src/stdio/flockfile.c
parent7683fceedebd98dda19b1a379b92406b64ce7f92 (diff)
downloadmusl-dba68bf98fc708cea4c478278c889fc7ad802b00.tar.gz
add proper fuxed-based locking for stdio
previously, stdio used spinlocks, which would be unacceptable if we ever add support for thread priorities, and which yielded pathologically bad performance if an application attempted to use flockfile on a key file as a major/primary locking mechanism. i had held off on making this change for fear that it would hurt performance in the non-threaded case, but actually support for recursive locking had already inflicted that cost. by having the internal locking functions store a flag indicating whether they need to perform unlocking, rather than using the actual recursive lock counter, i was able to combine the conditionals at unlock time, eliminating any additional cost, and also avoid a nasty corner case where a huge number of calls to ftrylockfile could cause deadlock later at the point of internal locking. this commit also fixes some issues with usage of pthread_self conflicting with __attribute__((const)) which resulted in crashes with some compiler versions/optimizations, mainly in flockfile prior to pthread_create.
Diffstat (limited to 'src/stdio/flockfile.c')
-rw-r--r--src/stdio/flockfile.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/stdio/flockfile.c b/src/stdio/flockfile.c
index 0d4c92c2..a196c1ef 100644
--- a/src/stdio/flockfile.c
+++ b/src/stdio/flockfile.c
@@ -3,6 +3,8 @@
void flockfile(FILE *f)
{
- if (!libc.threaded) pthread_self();
- __lockfile(f);
+ while (ftrylockfile(f)) {
+ int owner = f->lock;
+ if (owner) __wait(&f->lock, &f->waiters, owner, 1);
+ }
}