#include <sys/mman.h>
#include "mutex.h"
+#include "arch/arch.h"
void fio_mutex_remove(struct fio_mutex *mutex)
{
close(mutex->mutex_fd);
- munmap(mutex, sizeof(*mutex));
+ munmap((void *) mutex, sizeof(*mutex));
}
struct fio_mutex *fio_mutex_init(int value)
goto err;
}
- mutex = mmap(NULL, sizeof(struct fio_mutex), PROT_READ | PROT_WRITE,
- MAP_SHARED, fd, 0);
+ mutex = (void *) mmap(NULL, sizeof(struct fio_mutex),
+ PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (mutex == MAP_FAILED) {
perror("mmap mutex");
close(fd);
mutex->mutex_fd = fd;
mutex->value = value;
- if (pthread_mutexattr_init(&attr)) {
+ if (pthread_mutexattr_init(&attr) < 0) {
perror("pthread_mutexattr_init");
goto err;
}
- if (pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED)) {
+ if (pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED) < 0) {
perror("pthread_mutexattr_setpshared");
goto err;
}
pthread_condattr_setpshared(&cond, PTHREAD_PROCESS_SHARED);
pthread_cond_init(&mutex->cond, &cond);
- if (pthread_mutex_init(&mutex->lock, &attr)) {
+ if (pthread_mutex_init(&mutex->lock, &attr) < 0) {
perror("pthread_mutex_init");
goto err;
}
void fio_mutex_down(struct fio_mutex *mutex)
{
pthread_mutex_lock(&mutex->lock);
- while (mutex->value == 0)
+
+ while (!mutex->value) {
+ mutex->waiters++;
pthread_cond_wait(&mutex->cond, &mutex->lock);
+ mutex->waiters--;
+ }
+
mutex->value--;
pthread_mutex_unlock(&mutex->lock);
}
void fio_mutex_up(struct fio_mutex *mutex)
{
pthread_mutex_lock(&mutex->lock);
- if (!mutex->value)
+ read_barrier();
+ if (!mutex->value && mutex->waiters)
pthread_cond_signal(&mutex->cond);
mutex->value++;
pthread_mutex_unlock(&mutex->lock);
void fio_mutex_down_write(struct fio_mutex *mutex)
{
pthread_mutex_lock(&mutex->lock);
- while (mutex->value != 0)
+
+ while (mutex->value != 0) {
+ mutex->waiters++;
pthread_cond_wait(&mutex->cond, &mutex->lock);
+ mutex->waiters--;
+ }
+
mutex->value--;
pthread_mutex_unlock(&mutex->lock);
}
void fio_mutex_down_read(struct fio_mutex *mutex)
{
pthread_mutex_lock(&mutex->lock);
- while (mutex->value < 0)
+
+ while (mutex->value < 0) {
+ mutex->waiters++;
pthread_cond_wait(&mutex->cond, &mutex->lock);
+ mutex->waiters--;
+ }
+
mutex->value++;
pthread_mutex_unlock(&mutex->lock);
}
{
pthread_mutex_lock(&mutex->lock);
mutex->value--;
- if (mutex->value >= 0)
+ read_barrier();
+ if (mutex->value >= 0 && mutex->waiters)
pthread_cond_signal(&mutex->cond);
pthread_mutex_unlock(&mutex->lock);
}
{
pthread_mutex_lock(&mutex->lock);
mutex->value++;
- if (mutex->value >= 0)
+ read_barrier();
+ if (mutex->value >= 0 && mutex->waiters)
pthread_cond_signal(&mutex->cond);
pthread_mutex_unlock(&mutex->lock);
}