Split mutex.c and .h each into three files

[fio.git] / mutex.h

diff --git a/mutex.h b/mutex.h
index 7be0ab1b44b7c96fa4d7be645a9ff95cc9e8a0bb..0c39873d83af28a8f418ec663ce627ff156a6499 100644 (file)
--- a/mutex.h
+++ b/mutex.h
@@ -2,33 +2,30 @@
 #define FIO_MUTEX_H
 
 #include <pthread.h>
+#include "lib/types.h"
+
+#define FIO_MUTEX_MAGIC                0x4d555445U
 
 struct fio_mutex {
        pthread_mutex_t lock;
        pthread_cond_t cond;
        int value;
        int waiters;
+       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 *);
-
-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;
-}
+extern void fio_mutex_down(struct fio_mutex *);
+extern bool fio_mutex_down_trylock(struct fio_mutex *);
+extern int fio_mutex_down_timeout(struct fio_mutex *, unsigned int);
 
 #endif