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

diff --git a/src/stdio/__lockfile.c b/src/stdio/__lockfile.c
index 82f50b42..0f60a149 100644
--- a/src/stdio/__lockfile.c
+++ b/src/stdio/__lockfile.c
@@ -1,19 +1,23 @@
 #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;
+	int owner = f->lock, tid = __pthread_self()->tid;
+	if ((owner & ~MAYBE_WAITERS) == tid)
+		return 0;
+	owner = a_cas(&f->lock, 0, tid);
+	if (!owner) return 1;
+	while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) {
+		if ((owner & MAYBE_WAITERS) ||
+		    a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner)
+			__futexwait(&f->lock, owner|MAYBE_WAITERS, 1);
 	}
-	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;
+	return 1;
+}
+
+void __unlockfile(FILE *f)
+{
+	if (a_swap(&f->lock, 0) & MAYBE_WAITERS)
+		__wake(&f->lock, 1, 1);
 }