summaryrefslogtreecommitdiff
path: root/src/stdio/flockfile.c
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2018-04-18 00:16:12 -0400
committerRich Felker <dalias@aerifal.cx>2018-04-18 14:22:49 -0400
commitc1014a812c90bab3c9c989863e4ebb129e987de6 (patch)
tree2b089a4629af56487c15a96e833814623b63ec52 /src/stdio/flockfile.c
parentc21f750727515602a9e84f2a190ee8a0a2aeb2a1 (diff)
downloadmusl-c1014a812c90bab3c9c989863e4ebb129e987de6.tar.gz
refactor flockfile not to duplicate lock mechanism logic
Diffstat (limited to 'src/stdio/flockfile.c')
-rw-r--r--src/stdio/flockfile.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/stdio/flockfile.c b/src/stdio/flockfile.c
index 6b574cf0..6806cf8b 100644
--- a/src/stdio/flockfile.c
+++ b/src/stdio/flockfile.c
@@ -1,14 +1,11 @@
#include "stdio_impl.h"
#include "pthread_impl.h"
-#define MAYBE_WAITERS 0x40000000
+void __register_locked_file(FILE *, pthread_t);
void flockfile(FILE *f)
{
- while (ftrylockfile(f)) {
- int owner = f->lock;
- if (!owner) continue;
- a_cas(&f->lock, owner, owner|MAYBE_WAITERS);
- __futexwait(&f->lock, owner|MAYBE_WAITERS, 1);
- }
+ if (!ftrylockfile(f)) return;
+ __lockfile(f);
+ __register_locked_file(f, __pthread_self());
}