X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=mutex.c;h=e33e7cc8f2611a42256e72a3bceddf9e7560b1ef;hb=58483fa41bb08def4dbd3c4c9624116b643c7599;hp=ab7dc7044aa8c8e2f549da7a5e089e9e71322717;hpb=666bf1234912c3790ff1e6204596891c6ef7180c;p=fio.git diff --git a/mutex.c b/mutex.c index ab7dc704..e33e7cc8 100644 --- a/mutex.c +++ b/mutex.c @@ -11,6 +11,7 @@ #include "mutex.h" #include "arch/arch.h" #include "os/os.h" +#include "helpers.h" void fio_mutex_remove(struct fio_mutex *mutex) { @@ -32,6 +33,10 @@ struct fio_mutex *fio_mutex_init(int value) return NULL; } +#ifdef FIO_HAVE_FALLOCATE + posix_fallocate(fd, 0, sizeof(struct fio_mutex)); +#endif + if (ftruncate(fd, sizeof(struct fio_mutex)) < 0) { perror("ftruncate mutex"); goto err; @@ -64,15 +69,18 @@ struct fio_mutex *fio_mutex_init(int value) log_err("pthread_mutexattr_init: %s\n", strerror(ret)); goto err; } +#ifdef FIO_HAVE_PSHARED_MUTEX ret = pthread_mutexattr_setpshared(&attr, mflag); if (ret) { log_err("pthread_mutexattr_setpshared: %s\n", strerror(ret)); goto err; } +#endif pthread_condattr_init(&cond); +#ifdef FIO_HAVE_PSHARED_MUTEX pthread_condattr_setpshared(&cond, mflag); - pthread_condattr_setclock(&cond, CLOCK_MONOTONIC); +#endif pthread_cond_init(&mutex->cond, &cond); ret = pthread_mutex_init(&mutex->lock, &attr); @@ -81,6 +89,9 @@ struct fio_mutex *fio_mutex_init(int value) goto err; } + pthread_condattr_destroy(&cond); + pthread_mutexattr_destroy(&attr); + return mutex; err: if (mutex)