Move setup_rate() out of log.c

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 3f0af656a87e775225589239d805ff1dab418efe..e1b35ea499934054b1149b77795ddadbf5577067 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;
@@ -631,7 +635,6 @@ 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 void __finish_log(struct io_log *, const char *);
-extern int setup_rate(struct thread_data *);
 extern struct io_log *agg_io_log[2];
 extern int write_bw_log;
 extern void add_agg_sample(unsigned long, enum fio_ddir);
@@ -653,9 +656,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 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