X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fstdio%2F__lockfile.c;h=9d967d6eb8860c0522b9fcd8505d6e52fad19b6b;hp=82f50b421efa1a0152351c63bcb1bba90ad8fb92;hb=9cb6e6ea120cfaf1df9016883012d22fb57d43e1;hpb=5eb0d33ec0f08b123c5c10877d6258d05fa9453a

diff --git a/src/stdio/__lockfile.c b/src/stdio/__lockfile.c
index 82f50b42..9d967d6e 100644
--- a/src/stdio/__lockfile.c
+++ b/src/stdio/__lockfile.c
@@ -1,19 +1,28 @@
 #include "stdio_impl.h"
 #include "pthread_impl.h"
 
-void __lockfile(FILE *f)
+int __lockfile(FILE *f)
 {
-	int spins;
-	if (f->owner < 0) return;
-	if (f->owner && f->owner == __pthread_self()->tid) {
-		while (f->lockcount == INT_MAX);
-		f->lockcount++;
-		return;
-	}
-	spins = 100000;
-	while (a_swap(&f->lock, 1))
-		if (spins) spins--, a_spin();
-		else syscall0(__NR_sched_yield);
-	f->owner = __pthread_self()->tid;
-	f->lockcount = 1;
+	int owner, tid = __pthread_self()->tid;
+	if (f->lock == tid)
+		return 0;
+	while ((owner = a_cas(&f->lock, 0, tid)))
+		__wait(&f->lock, &f->waiters, owner, 1);
+	return 1;
+}
+
+void __unlockfile(FILE *f)
+{
+	a_store(&f->lock, 0);
+
+	/* The following read is technically invalid under situations
+	 * of self-synchronized destruction. Another thread may have
+	 * called fclose as soon as the above store has completed.
+	 * Nonetheless, since FILE objects always live in memory
+	 * obtained by malloc from the heap, it's safe to assume
+	 * the dereferences below will not fault. In the worst case,
+	 * a spurious syscall will be made. If the implementation of
+	 * malloc changes, this assumption needs revisiting. */
+
+	if (f->waiters) __wake(&f->lock, 1, 1);
 }