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

diff --git a/src/stdio/__lockfile.c b/src/stdio/__lockfile.c
index 82f50b42..3bf3c26b 100644
--- a/src/stdio/__lockfile.c
+++ b/src/stdio/__lockfile.c
@@ -1,19 +1,18 @@
 #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);
+	if (f->waiters) __wake(&f->lock, 1, 1);
 }