summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2017-04-21 21:57:50 -0700
committerEric Engestrom <eric.engestrom@intel.com>2019-10-16 13:45:57 +0100
commitb3028a9fb8110fd37f60e9d66dad3cde6e7b062b (patch)
tree357c26fd3de0e90f9d917e6700bc00a15f4041d7
parenta56c3e3a470eb8f13d11ca0aad5b5934de54ca1c (diff)
util: Workaround lack of flock on Solaris
v2: Replace autoconf check for flock() with meson check Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Acked-by: Eric Engestrom <eric.engestrom@intel.com>
-rw-r--r--meson.build2
-rw-r--r--src/util/disk_cache.c10
2 files changed, 11 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index c96f1ed0f7b..e1ca9559b56 100644
--- a/meson.build
+++ b/meson.build
@@ -1144,7 +1144,7 @@ foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h', 'dlfcn.h'
endif
endforeach
-foreach f : ['strtof', 'mkostemp', 'timespec_get', 'memfd_create', 'random_r']
+foreach f : ['strtof', 'mkostemp', 'timespec_get', 'memfd_create', 'random_r', 'flock']
if cc.has_function(f)
pre_args += '-DHAVE_@0@'.format(f.to_upper())
endif
diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
index 9272e9c5471..77af64ed3b0 100644
--- a/src/util/disk_cache.c
+++ b/src/util/disk_cache.c
@@ -907,7 +907,17 @@ cache_put(void *job, int thread_index)
* open with the flock held. So just let that file be responsible
* for writing the file.
*/
+#ifdef HAVE_FLOCK
err = flock(fd, LOCK_EX | LOCK_NB);
+#else
+ struct flock lock = {
+ .l_start = 0,
+ .l_len = 0, /* entire file */
+ .l_type = F_WRLCK,
+ .l_whence = SEEK_SET
+ };
+ err = fcntl(fd, F_SETLK, &lock);
+#endif
if (err == -1)
goto done;