X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Fftrylockfile.c;h=50650585be01fc31696ad590e9b6b72d613123a9;hb=37e18b7bf307fa4a8c745feebfcba54a0ba74f30;hp=1d0a1ff8662baad6ce8593348c4179530b70ca4e;hpb=4d9cc0b399b1d6a146cb45e64c74b7ee562de7a6;p=musl

diff --git a/src/stdio/ftrylockfile.c b/src/stdio/ftrylockfile.c
index 1d0a1ff8..50650585 100644
--- a/src/stdio/ftrylockfile.c
+++ b/src/stdio/ftrylockfile.c
@@ -1,18 +1,46 @@
 #include "stdio_impl.h"
 #include "pthread_impl.h"
+#include <limits.h>
+
+void __do_orphaned_stdio_locks()
+{
+	FILE *f;
+	for (f=__pthread_self()->stdio_locks; f; f=f->next_locked)
+		a_store(&f->lock, 0x40000000);
+}
+
+void __unlist_locked_file(FILE *f)
+{
+	if (f->lockcount) {
+		if (f->next_locked) f->next_locked->prev_locked = f->prev_locked;
+		if (f->prev_locked) f->prev_locked->next_locked = f->next_locked;
+		else __pthread_self()->stdio_locks = f->next_locked;
+	}
+}
+
+void __register_locked_file(FILE *f, pthread_t self)
+{
+	f->lockcount = 1;
+	f->prev_locked = 0;
+	f->next_locked = self->stdio_locks;
+	if (f->next_locked) f->next_locked->prev_locked = f;
+	self->stdio_locks = f;
+}
 
 int ftrylockfile(FILE *f)
 {
-	if (!libc.lockfile) libc.lockfile = __lockfile;
-	if (f->owner && f->owner == pthread_self()->tid) {
-		if (f->lockcount == INT_MAX)
+	pthread_t self = __pthread_self();
+	int tid = self->tid;
+	int owner = f->lock;
+	if ((owner & ~MAYBE_WAITERS) == tid) {
+		if (f->lockcount == LONG_MAX)
 			return -1;
 		f->lockcount++;
 		return 0;
 	}
-	if (a_swap(&f->lock, 1))
+	if (owner < 0) f->lock = owner = 0;
+	if (owner || a_cas(&f->lock, 0, tid))
 		return -1;
-	f->owner = pthread_self()->tid;
-	f->lockcount = 1;
+	__register_locked_file(f, self);
 	return 0;
 }