X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=mutex.h;h=17380de289a36cb7a76e34870db3c64efd7aa1a5;hp=40cfc1ede75430c542b0b1fc5b2d17cacfbff5e4;hb=3fb1aa3074b085273a1a80149527d9ac9b3ef1e5;hpb=9c5b52907227f8f50dc472d11601869f75b8d663

diff --git a/mutex.h b/mutex.h
index 40cfc1ed..17380de2 100644
--- a/mutex.h
+++ b/mutex.h
@@ -3,26 +3,40 @@
 
 #include <pthread.h>
 
+#define FIO_MUTEX_MAGIC		0x4d555445U
+#define FIO_RWLOCK_MAGIC	0x52574c4fU
+
 struct fio_mutex {
 	pthread_mutex_t lock;
 	pthread_cond_t cond;
 	int value;
+	int waiters;
+	int magic;
+};
+
+struct fio_rwlock {
+	pthread_rwlock_t lock;
+	int magic;
+};
 
-	int mutex_fd;
+enum {
+	FIO_MUTEX_LOCKED	= 0,
+	FIO_MUTEX_UNLOCKED	= 1,
 };
 
+extern int __fio_mutex_init(struct fio_mutex *, int);
 extern struct fio_mutex *fio_mutex_init(int);
+extern void __fio_mutex_remove(struct fio_mutex *);
 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_trylock(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