[PATCH] Easy process shared semaphores

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 89d7bf94d1c72b9ca160d0b2c4c6f21fbc9296b3..09e56d66cb4079cb013a1c9e8d55e9cafbe62d6f 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -6,7 +6,6 @@
 #include <pthread.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#include <semaphore.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -169,8 +168,8 @@ struct thread_data {
 
        char *ioscheduler;
 
-       struct drand48_data bsrange_state;
-       struct drand48_data verify_state;
+       os_random_state_t bsrange_state;
+       os_random_state_t verify_state;
 
        int shm_id;
 
@@ -205,9 +204,9 @@ struct thread_data {
        unsigned long long zone_bytes;
        unsigned long long this_io_bytes[2];
        unsigned long long last_pos;
-       sem_t mutex;
+       volatile int mutex;
 
-       struct drand48_data random_state;
+       os_random_state_t random_state;
        unsigned long *file_map;
        unsigned int num_maps;
 
@@ -237,7 +236,7 @@ struct thread_data {
        unsigned int do_disk_util;
        unsigned int override_sync;
 
-       struct drand48_data rwmix_state;
+       os_random_state_t rwmix_state;
        struct timeval rwmix_switch;
        int rwmix_ddir;
 
@@ -391,4 +390,28 @@ extern void rate_throttle(struct thread_data *, unsigned long, unsigned int);
 extern int parse_options(int, char **);
 extern int init_random_state(struct thread_data *);
 
+/*
+ * This is a pretty crappy semaphore implementation, but with the use that fio
+ * has (just signalling start/go conditions), it doesn't have to be better.
+ * Naturally this would not work for any type of contended semaphore or
+ * for real locking.
+ */
+static inline void fio_sem_init(volatile int volatile *sem, int val)
+{
+       *sem = val;
+}
+
+static inline void fio_sem_down(volatile int volatile *sem)
+{
+       while (*sem == 0)
+               usleep(10000);
+
+       (*sem)--;
+}
+
+static inline void fio_sem_up(volatile int volatile *sem)
+{
+       (*sem)++;
+}
+
 #endif