From a37452430f93700aeb122d693959ad79d8e43ada Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Thu, 24 Mar 2011 23:16:52 -0400
Subject: simplify and optimize FILE lock handling

---
 src/stdio/ftrylockfile.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/stdio/ftrylockfile.c')

diff --git a/src/stdio/ftrylockfile.c b/src/stdio/ftrylockfile.c
index 1d0a1ff8..67f4b6a0 100644
--- a/src/stdio/ftrylockfile.c
+++ b/src/stdio/ftrylockfile.c
@@ -3,16 +3,16 @@
 
 int ftrylockfile(FILE *f)
 {
+	int tid = pthread_self()->tid;
 	if (!libc.lockfile) libc.lockfile = __lockfile;
-	if (f->owner && f->owner == pthread_self()->tid) {
+	if (f->lock == tid) {
 		if (f->lockcount == INT_MAX)
 			return -1;
 		f->lockcount++;
 		return 0;
 	}
-	if (a_swap(&f->lock, 1))
+	if (f->lock || a_cas(&f->lock, 0, tid))
 		return -1;
-	f->owner = pthread_self()->tid;
 	f->lockcount = 1;
 	return 0;
 }
-- 
cgit 1.4.1