Merge branch 'master' into gfio

[fio.git] / mutex.h

diff --git a/mutex.h b/mutex.h
index 40cfc1ede75430c542b0b1fc5b2d17cacfbff5e4..49a66e361bc52ed7c09328578dc4a912ec1c4e83 100644 (file)
--- a/mutex.h
+++ b/mutex.h
@@ -7,22 +7,28 @@ struct fio_mutex {
        pthread_mutex_t lock;
        pthread_cond_t cond;
        int value;
+       int waiters;
+};
+
+struct fio_rwlock {
+       pthread_rwlock_t lock;
+};
 
-       int mutex_fd;
+enum {
+       FIO_MUTEX_LOCKED        = 0,
+       FIO_MUTEX_UNLOCKED      = 1,
 };
 
 extern struct fio_mutex *fio_mutex_init(int);
 extern void fio_mutex_remove(struct fio_mutex *);
-extern void fio_mutex_down(struct fio_mutex *);
-extern void fio_mutex_down_read(struct fio_mutex *);
-extern void fio_mutex_down_write(struct fio_mutex *);
 extern void fio_mutex_up(struct fio_mutex *);
-extern void fio_mutex_up_read(struct fio_mutex *);
-extern void fio_mutex_up_write(struct fio_mutex *);
+extern void fio_mutex_down(struct fio_mutex *);
+extern int fio_mutex_down_timeout(struct fio_mutex *, unsigned int);
 
-static inline struct fio_mutex *fio_mutex_rw_init(void)
-{
-       return fio_mutex_init(0);
-}
+extern void fio_rwlock_read(struct fio_rwlock *);
+extern void fio_rwlock_write(struct fio_rwlock *);
+extern void fio_rwlock_unlock(struct fio_rwlock *);
+extern struct fio_rwlock *fio_rwlock_init(void);
+extern void fio_rwlock_remove(struct fio_rwlock *);
 
 #endif