X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=mutex.h;h=6fdf7c6dabceaa456d17f66040be3894c61556c8;hp=483e5f45369e9979b4ee43697ae00416fe87cc26;hb=62cb17de316e5aa755228fef8ce19b5f5353a3cf;hpb=07739b57f09886b41323c605b0dbda7d2c12522b

diff --git a/mutex.h b/mutex.h
index 483e5f45..6fdf7c6d 100644
--- a/mutex.h
+++ b/mutex.h
@@ -3,17 +3,36 @@
 
 #include <pthread.h>
 
-struct fio_sem {
+struct fio_mutex {
 	pthread_mutex_t lock;
 	pthread_cond_t cond;
-	unsigned int value;
+	int value;
+	int waiters;
+};
 
-	char sem_name[32];
+enum {
+	FIO_MUTEX_LOCKED	= 0,
+	FIO_MUTEX_UNLOCKED	= 1,
 };
 
-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