Split mutex.c and .h each into three files

[fio.git] / mutex.h

diff --git a/mutex.h b/mutex.h
index 246afeed0675678e24d2535372be5d64d8793ad1..0c39873d83af28a8f418ec663ce627ff156a6499 100644 (file)
--- a/mutex.h
+++ b/mutex.h
@@ -2,9 +2,9 @@
 #define FIO_MUTEX_H
 
 #include <pthread.h>
+#include "lib/types.h"
 
 #define FIO_MUTEX_MAGIC                0x4d555445U
-#define FIO_RWLOCK_MAGIC       0x52574c4fU
 
 struct fio_mutex {
        pthread_mutex_t lock;
@@ -14,11 +14,6 @@ struct fio_mutex {
        int magic;
 };
 
-struct fio_rwlock {
-       pthread_rwlock_t lock;
-       int magic;
-};
-
 enum {
        FIO_MUTEX_LOCKED        = 0,
        FIO_MUTEX_UNLOCKED      = 1,
@@ -26,16 +21,11 @@ enum {
 
 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_up(struct fio_mutex *);
 extern void fio_mutex_down(struct fio_mutex *);
-extern int fio_mutex_down_trylock(struct fio_mutex *);
+extern bool fio_mutex_down_trylock(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