projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mutex fixes
[fio.git]
/
mutex.c
diff --git
a/mutex.c
b/mutex.c
index bbbcccbd0587a7139b247ac4eb38350337fcd912..24defcf515ef4d793b250a60b7e52d1386ba1bab 100644
(file)
--- a/
mutex.c
+++ b/
mutex.c
@@
-15,6
+15,7
@@
void fio_mutex_remove(struct fio_mutex *mutex)
{
void fio_mutex_remove(struct fio_mutex *mutex)
{
+ pthread_cond_destroy(&mutex->cond);
munmap((void *) mutex, sizeof(*mutex));
}
munmap((void *) mutex, sizeof(*mutex));
}
@@
-23,7
+24,7
@@
struct fio_mutex *fio_mutex_init(int value)
struct fio_mutex *mutex = NULL;
pthread_mutexattr_t attr;
pthread_condattr_t cond;
struct fio_mutex *mutex = NULL;
pthread_mutexattr_t attr;
pthread_condattr_t cond;
- int ret
, mflag
;
+ int ret;
mutex = (void *) mmap(NULL, sizeof(struct fio_mutex),
PROT_READ | PROT_WRITE,
mutex = (void *) mmap(NULL, sizeof(struct fio_mutex),
PROT_READ | PROT_WRITE,
@@
-36,22
+37,17
@@
struct fio_mutex *fio_mutex_init(int value)
mutex->value = value;
mutex->value = value;
- /*
- * Not all platforms support process shared mutexes (FreeBSD)
- */
-#ifdef FIO_HAVE_PSHARED_MUTEX
- mflag = PTHREAD_PROCESS_SHARED;
-#else
- mflag = PTHREAD_PROCESS_PRIVATE;
-#endif
-
ret = pthread_mutexattr_init(&attr);
if (ret) {
log_err("pthread_mutexattr_init: %s\n", strerror(ret));
goto err;
}
ret = pthread_mutexattr_init(&attr);
if (ret) {
log_err("pthread_mutexattr_init: %s\n", strerror(ret));
goto err;
}
+
+ /*
+ * Not all platforms support process shared mutexes (FreeBSD)
+ */
#ifdef FIO_HAVE_PSHARED_MUTEX
#ifdef FIO_HAVE_PSHARED_MUTEX
- ret = pthread_mutexattr_setpshared(&attr,
mflag
);
+ ret = pthread_mutexattr_setpshared(&attr,
PTHREAD_PROCESS_SHARED
);
if (ret) {
log_err("pthread_mutexattr_setpshared: %s\n", strerror(ret));
goto err;
if (ret) {
log_err("pthread_mutexattr_setpshared: %s\n", strerror(ret));
goto err;
@@
-60,7
+56,12
@@
struct fio_mutex *fio_mutex_init(int value)
pthread_condattr_init(&cond);
#ifdef FIO_HAVE_PSHARED_MUTEX
pthread_condattr_init(&cond);
#ifdef FIO_HAVE_PSHARED_MUTEX
- pthread_condattr_setpshared(&cond, mflag);
+ pthread_condattr_setpshared(&cond, PTHREAD_PROCESS_SHARED);
+#endif
+#ifdef FIO_HAVE_CLOCK_MONOTONIC
+ pthread_condattr_setclock(&cond, CLOCK_MONOTONIC);
+#else
+ pthread_condattr_setclock(&cond, CLOCK_REALTIME);
#endif
pthread_cond_init(&mutex->cond, &cond);
#endif
pthread_cond_init(&mutex->cond, &cond);
@@
-86,7
+87,11
@@
int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds)
struct timespec t;
int ret = 0;
struct timespec t;
int ret = 0;
+#ifdef FIO_HAVE_CLOCK_MONOTONIC
+ clock_gettime(CLOCK_MONOTONIC, &t);
+#else
clock_gettime(CLOCK_REALTIME, &t);
clock_gettime(CLOCK_REALTIME, &t);
+#endif
t.tv_sec += seconds;
pthread_mutex_lock(&mutex->lock);
t.tv_sec += seconds;
pthread_mutex_lock(&mutex->lock);