#include <stdio.h>
#include <unistd.h>
#include <string.h>
-#include <getopt.h>
#include <inttypes.h>
#include <assert.h>
#include "iolog.h"
#include "helpers.h"
#include "options.h"
+#include "profile.h"
+#include "time.h"
+#include "lib/getopt.h"
#ifdef FIO_HAVE_GUASI
#include <guasi.h>
MEM_MMAPHUGE, /* memory mapped huge file */
};
+/*
+ * offset generator types
+ */
+enum {
+ RW_SEQ_SEQ = 0,
+ RW_SEQ_IDENT,
+};
+
/*
* How many depth levels to log
*/
struct io_log *slat_log;
struct io_log *clat_log;
+ struct io_log *lat_log;
struct io_log *bw_log;
/*
*/
struct io_stat clat_stat[2]; /* completion latency */
struct io_stat slat_stat[2]; /* submission latency */
+ struct io_stat lat_stat[2]; /* total latency */
struct io_stat bw_stat[2]; /* bandwidth stats */
unsigned long long stat_io_bytes[2];
unsigned int io_u_complete[FIO_IO_U_MAP_NR];
unsigned int io_u_lat_u[FIO_IO_U_LAT_U_NR];
unsigned int io_u_lat_m[FIO_IO_U_LAT_M_NR];
- unsigned long total_io_u[2];
- unsigned long short_io_u[2];
+ unsigned long total_io_u[3];
+ unsigned long short_io_u[3];
unsigned long total_submit;
unsigned long total_complete;
char *opendir;
char *ioengine;
enum td_ddir td_ddir;
+ unsigned int rw_seq;
unsigned int kb_base;
- unsigned int ddir_nr;
+ unsigned int ddir_seq_nr;
unsigned int iodepth;
unsigned int iodepth_low;
unsigned int iodepth_batch;
unsigned int verify_pattern_bytes;
unsigned int verify_fatal;
unsigned int verify_async;
+ unsigned long long verify_backlog;
+ unsigned int verify_batch;
unsigned int use_thread;
unsigned int unlink;
unsigned int do_disk_util;
unsigned int thinktime_blocks;
unsigned int fsync_blocks;
unsigned int fdatasync_blocks;
- unsigned int start_delay;
+ unsigned long start_delay;
unsigned long long timeout;
unsigned long long ramp_time;
unsigned int overwrite;
unsigned int zero_buffers;
unsigned int refill_buffers;
unsigned int time_based;
+ unsigned int disable_lat;
unsigned int disable_clat;
unsigned int disable_slat;
unsigned int disable_bw;
unsigned int gtod_reduce;
unsigned int gtod_cpu;
unsigned int gtod_offload;
+ enum fio_cs clocksource;
+ unsigned int no_stall;
+ unsigned int trim_percentage;
+ unsigned int trim_batch;
+ unsigned int trim_zero;
+ unsigned long long trim_backlog;
char *read_iolog_file;
char *write_iolog_file;
char *bw_log_file;
char *lat_log_file;
+ char *replay_redirect;
/*
* Pre-run and post-run shell
*/
char *cgroup;
unsigned int cgroup_weight;
+ unsigned int cgroup_nodelete;
unsigned int uid;
unsigned int gid;
+
+ unsigned int sync_file_range;
};
#define FIO_VERROR_SIZE 128
unsigned int ioprio;
unsigned int ioprio_set;
unsigned int last_was_sync;
+ enum fio_ddir last_ddir;
char *mmapfile;
int mmapfd;
char *sysfs_root;
- unsigned long rand_seeds[6];
+ unsigned long rand_seeds[7];
os_random_state_t bsrange_state;
os_random_state_t verify_state;
+ os_random_state_t trim_state;
+
+ unsigned int verify_batch;
+ unsigned int trim_batch;
int shm_id;
struct timeval lastrate[2];
unsigned long long total_io_size;
+ unsigned long long fill_device_size;
unsigned long io_issues[2];
unsigned long long io_blocks[2];
os_random_state_t rwmix_state;
unsigned long rwmix_issues;
enum fio_ddir rwmix_ddir;
- unsigned int ddir_nr;
+ unsigned int ddir_seq_nr;
/*
* IO history logs for verification. We use a tree for sorting,
*/
struct rb_root io_hist_tree;
struct flist_head io_hist_list;
+ unsigned long io_hist_len;
/*
* For IO replaying
*/
struct flist_head io_log_list;
+ /*
+ * For tracking/handling discards
+ */
+ struct flist_head trim_list;
+ unsigned long trim_entries;
+
/*
* for fileservice, how often to switch to a new file
*/
unsigned int file_service_left;
struct fio_file *file_service_file;
+ unsigned int sync_file_range_nr;
+
/*
* For generating file sizes
*/
/*
* Can be overloaded by profiles
*/
- int (*fill_io_u_off)(struct thread_data *, struct io_u *);
- int (*fill_io_u_size)(struct thread_data *, struct io_u *);
+ struct prof_io_ops prof_io_ops;
+ void *prof_data;
};
/*
extern char *job_section;
extern int fio_gtod_offload;
extern int fio_gtod_cpu;
+extern enum fio_cs fio_clock_source;
extern struct thread_data *threads;
return 0;
}
-/*
- * Time functions
- */
-extern unsigned long long utime_since(struct timeval *, struct timeval *);
-extern unsigned long long utime_since_now(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 unsigned long mtime_since_genesis(void);
-extern void usec_spin(unsigned int);
-extern void usec_sleep(struct thread_data *, unsigned long);
-extern void fill_start_time(struct timeval *);
-extern void fio_gettime(struct timeval *, void *);
-extern void fio_gtod_init(void);
-extern void fio_gtod_update(void);
-extern void set_genesis_time(void);
-extern int ramp_time_over(struct thread_data *);
-extern int in_ramp_time(struct thread_data *);
-
/*
* Init/option functions
*/
char postfix[] = { ' ', 'K', 'M', 'G', 'P', 'E' };
unsigned int thousand;
char *buf;
- int i;
+ int i, mod = 0;
if (pow2)
thousand = 1024;
len = sprintf(buf, "%'lu", num);
if (len <= maxlen) {
if (i >= 1) {
+ char dec[4];
+ int j = 0;
+
+ sprintf(dec, "%u", mod);
+ if (maxlen - len >= 2) {
+ buf[len++] = '.';
+ while (maxlen - len) {
+ buf[len++] = dec[j++];
+ if (j == sizeof(dec) - 1)
+ break;
+ }
+ }
+
buf[len] = postfix[i];
buf[len + 1] = '\0';
}
if ((num % thousand) >= (thousand / 2))
carry = 1;
+ mod = num % thousand;
num /= thousand;
num += carry;
i++;
projects / fio.git / blobdiff