Support for setting rated based on IOPS

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 5098ff8f615d42104f298f04867366a72256a159..a6adcb7bbc5b27cc00004e4a2949fcef13cb90f6 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
+#include <getopt.h>
 
 #include "list.h"
 #include "md5.h"
@@ -430,9 +431,12 @@ struct thread_data {
        unsigned int rate;
        unsigned int ratemin;
        unsigned int ratecycle;
+       unsigned int rate_iops;
+       unsigned int rate_iops_min;
        unsigned long rate_usec_cycle;
        long rate_pending_usleep;
        unsigned long rate_bytes;
+       unsigned long rate_blocks;
        struct timeval lastrate;
 
        unsigned long long io_size;
@@ -492,6 +496,13 @@ struct thread_data {
        unsigned int file_service_nr;
        unsigned int file_service_left;
        struct fio_file *file_service_file;
+
+       /*
+        * For generating file sizes
+        */
+       os_random_state_t file_size_state;
+       unsigned long long file_size_low;
+       unsigned long long file_size_high;
 };
 
 /*
@@ -534,6 +545,7 @@ extern FILE *f_out;
 extern FILE *f_err;
 extern int temp_stall_ts;
 extern unsigned long long mlock_size;
+extern unsigned long page_mask, page_size;
 
 extern struct thread_data *threads;
 
@@ -645,10 +657,16 @@ extern void fio_gettime(struct timeval *, void *);
 extern void set_genesis_time(void);
 
 /*
- * Init functions
+ * Init/option functions
  */
 extern int __must_check parse_options(int, char **);
-extern int __must_check init_random_state(struct thread_data *);
+extern int fio_option_parse(struct thread_data *, const char *);
+extern int fio_cmd_option_parse(struct thread_data *, const char *, char *);
+extern void fio_fill_default_options(struct thread_data *);
+extern int fio_show_option_help(const char *);
+extern void fio_options_dup_and_init(struct option *);
+#define FIO_GETOPT_JOB         0x89988998
+#define FIO_NR_OPTIONS         128
 
 /*
  * File setup/shutdown
@@ -739,6 +757,8 @@ extern void td_io_close_file(struct thread_data *, struct fio_file *);
                fprintf(stderr, ##args);        \
        } while (0)
 
+#define log_info(args...)      fprintf(f_out, ##args)
+
 FILE *get_f_out(void);
 FILE *get_f_err(void);