about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-03-16 10:39:45 -0400
committerRich Felker <dalias@aerifal.cx>2011-03-16 10:39:45 -0400
commit4d9cc0b399b1d6a146cb45e64c74b7ee562de7a6 (patch)
tree20619f38692d102d4e61d23f0c52f8ad144f29d6
parent9dd7d7e3f6a90ae00e83fd98f30c48389c4f5ab2 (diff)
downloadmusl-4d9cc0b399b1d6a146cb45e64c74b7ee562de7a6.tar.gz
musl-4d9cc0b399b1d6a146cb45e64c74b7ee562de7a6.tar.xz
musl-4d9cc0b399b1d6a146cb45e64c74b7ee562de7a6.zip
optimize file locking: avoid cache-polluting writes to global storage
-rw-r--r--src/stdio/flockfile.c6
-rw-r--r--src/stdio/ftrylockfile.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/stdio/flockfile.c b/src/stdio/flockfile.c
index 1b6ef580..440a36a9 100644
--- a/src/stdio/flockfile.c
+++ b/src/stdio/flockfile.c
@@ -3,7 +3,9 @@
 
 void flockfile(FILE *f)
 {
-	pthread_self();
-	libc.lockfile = __lockfile;
+	if (!libc.lockfile) {
+		pthread_self();
+		libc.lockfile = __lockfile;
+	}
 	__lockfile(f);
 }
diff --git a/src/stdio/ftrylockfile.c b/src/stdio/ftrylockfile.c
index 725b66e7..1d0a1ff8 100644
--- a/src/stdio/ftrylockfile.c
+++ b/src/stdio/ftrylockfile.c
@@ -3,7 +3,7 @@
 
 int ftrylockfile(FILE *f)
 {
-	libc.lockfile = __lockfile;
+	if (!libc.lockfile) libc.lockfile = __lockfile;
 	if (f->owner && f->owner == pthread_self()->tid) {
 		if (f->lockcount == INT_MAX)
 			return -1;