X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2F__lockfile.c;h=6ebf6202bf189284b8d9a02d153259842a29a0cc;hb=e72ee5786b1f328da131b87388333c2e3a09b7b3;hp=93c94867868801c4d4df7dd8d3e9fb0f90648b18;hpb=a37452430f93700aeb122d693959ad79d8e43ada;p=musl

diff --git a/src/stdio/__lockfile.c b/src/stdio/__lockfile.c
index 93c94867..6ebf6202 100644
--- a/src/stdio/__lockfile.c
+++ b/src/stdio/__lockfile.c
@@ -1,20 +1,18 @@
 #include "stdio_impl.h"
 #include "pthread_impl.h"
 
-void __lockfile(FILE *f)
+int __lockfile(FILE *f)
 {
-	int spins=100000;
-	int tid;
+	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 f->lockcount = 1;
+}
 
-	if (f->lock < 0) return;
-	tid = __pthread_self()->tid;
-	if (f->lock == tid) {
-		while (f->lockcount == INT_MAX);
-		f->lockcount++;
-		return;
-	}
-	while (f->lock || a_cas(&f->lock, 0, tid))
-		if (spins) spins--, a_spin();
-		else syscall(SYS_sched_yield);
-	f->lockcount = 1;
+void __unlockfile(FILE *f)
+{
+	a_store(&f->lock, 0);
+	if (f->waiters) __wake(&f->lock, 1, 1);
 }