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

diff --git a/mutex.h b/mutex.h
index 483e5f45..4f3486df 100644
--- a/mutex.h
+++ b/mutex.h
@@ -3,17 +3,37 @@
 
 #include <pthread.h>
 
-struct fio_sem {
+#define FIO_MUTEX_MAGIC		0x4d555445U
+#define FIO_RWLOCK_MAGIC	0x52574c4fU
+
+struct fio_mutex {
 	pthread_mutex_t lock;
 	pthread_cond_t cond;
-	unsigned int value;
+	int value;
+	int waiters;
+	int magic;
+};
 
-	char sem_name[32];
+struct fio_rwlock {
+	pthread_rwlock_t lock;
+	int magic;
 };
 
-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);
+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_up(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_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