#include "arch/arch.h"
#include "os/os.h"
#include "helpers.h"
-#include "time.h"
+#include "fio_time.h"
#include "gettime.h"
-void fio_mutex_remove(struct fio_mutex *mutex)
+void __fio_mutex_remove(struct fio_mutex *mutex)
{
assert(mutex->magic == FIO_MUTEX_MAGIC);
pthread_cond_destroy(&mutex->cond);
+}
+
+void fio_mutex_remove(struct fio_mutex *mutex)
+{
+ __fio_mutex_remove(mutex);
munmap((void *) mutex, sizeof(*mutex));
}
return NULL;
}
-static int mutex_timed_out(struct timeval *t, unsigned int seconds)
+static bool mutex_timed_out(struct timeval *t, unsigned int msecs)
{
- return mtime_since_now(t) >= seconds * 1000;
+ struct timeval now;
+
+ gettimeofday(&now, NULL);
+ return mtime_since(t, &now) >= msecs;
}
-int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds)
+int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int msecs)
{
struct timeval tv_s;
struct timespec t;
assert(mutex->magic == FIO_MUTEX_MAGIC);
gettimeofday(&tv_s, NULL);
- t.tv_sec = tv_s.tv_sec + seconds;
+ t.tv_sec = tv_s.tv_sec;
t.tv_nsec = tv_s.tv_usec * 1000;
+ t.tv_sec += msecs / 1000;
+ t.tv_nsec += ((msecs * 1000000) % 1000000000);
+ if (t.tv_nsec >= 1000000000) {
+ t.tv_nsec -= 1000000000;
+ t.tv_sec++;
+ }
+
pthread_mutex_lock(&mutex->lock);
+ mutex->waiters++;
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);
- if (ret == ETIMEDOUT && !mutex_timed_out(&tv_s, seconds))
+ if (ret == ETIMEDOUT && !mutex_timed_out(&tv_s, msecs))
ret = 0;
-
- mutex->waiters--;
}
+ mutex->waiters--;
if (!ret) {
mutex->value--;
pthread_mutex_unlock(&mutex->lock);
+ return 0;
}
+ pthread_mutex_unlock(&mutex->lock);
return ret;
}
-int fio_mutex_down_trylock(struct fio_mutex *mutex)
+bool fio_mutex_down_trylock(struct fio_mutex *mutex)
{
- int ret = 1;
+ bool ret = true;
assert(mutex->magic == FIO_MUTEX_MAGIC);
pthread_mutex_lock(&mutex->lock);
if (mutex->value) {
mutex->value--;
- ret = 0;
+ ret = false;
}
pthread_mutex_unlock(&mutex->lock);
void fio_mutex_up(struct fio_mutex *mutex)
{
+ int do_wake = 0;
+
assert(mutex->magic == FIO_MUTEX_MAGIC);
pthread_mutex_lock(&mutex->lock);
read_barrier();
if (!mutex->value && mutex->waiters)
- pthread_cond_signal(&mutex->cond);
+ do_wake = 1;
mutex->value++;
pthread_mutex_unlock(&mutex->lock);
+
+ if (do_wake)
+ pthread_cond_signal(&mutex->cond);
}
void fio_rwlock_write(struct fio_rwlock *lock)