X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=mutex.h;h=5938e9592fb0505b5252587d936020717dcf4629;hp=c4b0d8edcc3e30e635b42085b095c4bb786d2343;hb=af9c9fb34e420fc4d9cf317aa0f3cf6795a5a07f;hpb=f7c9e00eee87dc4eb24fc6e6ad68af38ba2bbe98

diff --git a/mutex.h b/mutex.h
index c4b0d8ed..5938e959 100644
--- a/mutex.h
+++ b/mutex.h
@@ -3,17 +3,31 @@
 
 #include <pthread.h>
 
-struct fio_sem {
+struct fio_mutex {
 	pthread_mutex_t lock;
 	pthread_cond_t cond;
-	unsigned int value;
-
-	int sem_fd;
+	int value;
+	int waiters;
 };
 
-extern struct fio_sem *fio_sem_init(int);
-extern void fio_sem_remove(struct fio_sem *);
-extern inline void fio_sem_down(struct fio_sem *);
-extern inline void fio_sem_up(struct fio_sem *sem);
+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 int fio_mutex_down_timeout(struct fio_mutex *, unsigned int);
+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 *);
+
+static inline struct fio_mutex *fio_mutex_rw_init(void)
+{
+	return fio_mutex_init(0);
+}
+
+static inline int fio_mutex_getval(struct fio_mutex *mutex)
+{
+	return mutex->value;
+}
 
 #endif