projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename crc functions to private namespace
[fio.git]
/
mutex.c
diff --git
a/mutex.c
b/mutex.c
index bbbcccbd0587a7139b247ac4eb38350337fcd912..3b94beffc7342ae2f13879126e2da3433cb5bbf1 100644
(file)
--- a/
mutex.c
+++ b/
mutex.c
@@
-4,17
+4,22
@@
#include <stdlib.h>
#include <fcntl.h>
#include <time.h>
#include <stdlib.h>
#include <fcntl.h>
#include <time.h>
+#include <errno.h>
#include <pthread.h>
#include <sys/mman.h>
#include <pthread.h>
#include <sys/mman.h>
+#include "fio.h"
#include "log.h"
#include "mutex.h"
#include "arch/arch.h"
#include "os/os.h"
#include "helpers.h"
#include "log.h"
#include "mutex.h"
#include "arch/arch.h"
#include "os/os.h"
#include "helpers.h"
+#include "time.h"
+#include "gettime.h"
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
+28,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
+41,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
+60,7
@@
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
pthread_cond_init(&mutex->cond, &cond);
#endif
pthread_cond_init(&mutex->cond, &cond);
@@
-81,19
+81,36
@@
err:
return NULL;
}
return NULL;
}
+static int mutex_timed_out(struct timeval *t, unsigned int seconds)
+{
+ return mtime_since_now(t) >= seconds * 1000;
+}
+
int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds)
{
int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds)
{
+ struct timeval tv_s;
struct timespec t;
int ret = 0;
struct timespec t;
int ret = 0;
- clock_gettime(CLOCK_REALTIME, &t);
- t.tv_sec += seconds;
+ gettimeofday(&tv_s, NULL);
+ t.tv_sec = tv_s.tv_sec + seconds;
+ t.tv_nsec = tv_s.tv_usec * 1000;
pthread_mutex_lock(&mutex->lock);
while (!mutex->value && !ret) {
mutex->waiters++;
pthread_mutex_lock(&mutex->lock);
while (!mutex->value && !ret) {
mutex->waiters++;
+
+ /*
+ * Some platforms (FreeBSD 9?) seems to return timed out
+ * way too early, double check.
+ */
ret = pthread_cond_timedwait(&mutex->cond, &mutex->lock, &t);
ret = pthread_cond_timedwait(&mutex->cond, &mutex->lock, &t);
+ if (ret == ETIMEDOUT && !mutex_timed_out(&tv_s, seconds)) {
+ pthread_mutex_lock(&mutex->lock);
+ ret = 0;
+ }
+
mutex->waiters--;
}
mutex->waiters--;
}