[PATCH] Easy process shared semaphores

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 4f87fb775f01f161e96ccc25283825ef9989bc33..09e56d66cb4079cb013a1c9e8d55e9cafbe62d6f 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -6,7 +6,9 @@
 #include <pthread.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#include <semaphore.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
 
 #include "list.h"
 #include "md5.h"
@@ -94,13 +96,14 @@ struct verify_header {
 struct group_run_stats {
        unsigned long long max_run[2], min_run[2];
        unsigned long long max_bw[2], min_bw[2];
-       unsigned long long io_mb[2];
+       unsigned long long io_kb[2];
        unsigned long long agg[2];
 };
 
 struct thread_data {
+       char name[64];
        char file_name[256];
-       char directory[256];
+       char *directory;
        char verror[80];
        pthread_t thread;
        int thread_number;
@@ -151,11 +154,22 @@ struct thread_data {
        os_cpu_mask_t cpumask;
        unsigned int jobnum;
        unsigned int iolog;
+       unsigned int read_iolog;
+       unsigned int write_iolog;
+       unsigned int rwmixcycle;
+       unsigned int rwmixread;
+       unsigned int nice;
 
-       char iolog_file[256];
+       char *iolog_file;
+       void *iolog_buf;
+       FILE *iolog_f;
 
-       struct drand48_data bsrange_state;
-       struct drand48_data verify_state;
+       char *sysfs_root;
+
+       char *ioscheduler;
+
+       os_random_state_t bsrange_state;
+       os_random_state_t verify_state;
 
        int shm_id;
 
@@ -190,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;
 
@@ -222,6 +236,16 @@ struct thread_data {
        unsigned int do_disk_util;
        unsigned int override_sync;
 
+       os_random_state_t rwmix_state;
+       struct timeval rwmix_switch;
+       int rwmix_ddir;
+
+       /*
+        * Pre-run and post-run shell
+        */
+       char *exec_prerun;
+       char *exec_postrun;
+
        struct list_head io_hist_list;
        struct list_head io_log_list;
 };
@@ -233,10 +257,6 @@ struct thread_data {
                snprintf(td->verror, sizeof(td->verror) - 1, "file:%s:%d, error=%s", __FILE__, __LINE__, strerror(e));  \
        } while (0)
 
-extern int parse_jobs_ini(char *);
-extern int parse_options(int, char **);
-extern void finish_log(struct thread_data *, struct io_log *, const char *);
-extern int init_random_state(struct thread_data *);
 extern struct io_u *__get_io_u(struct thread_data *);
 extern void put_io_u(struct thread_data *, struct io_u *);
 
@@ -329,4 +349,69 @@ struct io_completion_data {
 #define min(a, b)      ((a) < (b) ? (a) : (b))
 #endif
 
+/*
+ * Log exports
+ */
+extern int read_iolog_get(struct thread_data *, struct io_u *);
+extern void write_iolog_put(struct thread_data *, struct io_u *);
+extern int init_iolog(struct thread_data *td);
+extern void log_io_piece(struct thread_data *, struct io_u *);
+extern void prune_io_piece_log(struct thread_data *);
+extern void write_iolog_close(struct thread_data *);
+
+/*
+ * Logging
+ */
+extern void add_clat_sample(struct thread_data *, int, unsigned long);
+extern void add_slat_sample(struct thread_data *, int, unsigned long);
+extern void add_bw_sample(struct thread_data *, int);
+extern void show_run_stats(void);
+extern void init_disk_util(struct thread_data *);
+extern void update_rusage_stat(struct thread_data *);
+extern void update_io_ticks(void);
+extern void disk_util_timer_arm(void);
+extern void setup_log(struct io_log **);
+extern void finish_log(struct thread_data *, struct io_log *, const char *);
+extern int setup_rate(struct thread_data *);
+
+/*
+ * Time functions
+ */
+extern unsigned long utime_since(struct timeval *, struct timeval *);
+extern unsigned long mtime_since(struct timeval *, struct timeval *);
+extern unsigned long mtime_since_now(struct timeval *);
+extern unsigned long time_since_now(struct timeval *);
+extern void usec_sleep(struct thread_data *, unsigned long);
+extern void rate_throttle(struct thread_data *, unsigned long, unsigned int);
+
+/*
+ * Init functions
+ */
+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