#include <stdio.h>
#include <unistd.h>
#include <string.h>
-#include <getopt.h>
#include <inttypes.h>
#include <assert.h>
+struct thread_data;
+
#include "compiler/compiler.h"
#include "flist.h"
#include "fifo.h"
#include "options.h"
#include "profile.h"
#include "time.h"
+#include "lib/getopt.h"
+#include "lib/rand.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
*/
-#define FIO_IO_U_MAP_NR 8
+#define FIO_IO_U_MAP_NR 7
#define FIO_IO_U_LAT_U_NR 10
#define FIO_IO_U_LAT_M_NR 12
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;
unsigned long long io_bytes[2];
- unsigned long runtime[2];
+ unsigned long long runtime[2];
unsigned long total_run_time;
/*
char *opendir;
char *ioengine;
enum td_ddir td_ddir;
+ unsigned int rw_seq;
unsigned int kb_base;
unsigned int ddir_seq_nr;
unsigned int iodepth;
char verify_pattern[MAX_PATTERN_SIZE];
unsigned int verify_pattern_bytes;
unsigned int verify_fatal;
+ unsigned int verify_dump;
unsigned int verify_async;
unsigned long long verify_backlog;
unsigned int verify_batch;
unsigned int do_disk_util;
unsigned int override_sync;
unsigned int rand_repeatable;
+ unsigned int use_os_rand;
unsigned int write_lat_log;
unsigned int write_bw_log;
unsigned int norandommap;
unsigned int thinktime_blocks;
unsigned int fsync_blocks;
unsigned int fdatasync_blocks;
+ unsigned int barrier_blocks;
unsigned long start_delay;
unsigned long long timeout;
unsigned long long ramp_time;
unsigned int file_service_type;
unsigned int group_reporting;
unsigned int fadvise_hint;
- unsigned int fallocate;
+ enum fio_fallocate_mode fallocate_mode;
unsigned int zero_buffers;
unsigned int refill_buffers;
unsigned int time_based;
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
union {
unsigned int next_file;
os_random_state_t next_file_state;
+ struct frand_state __next_file_state;
};
int error;
int done;
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;
+ union {
+ os_random_state_t bsrange_state;
+ struct frand_state __bsrange_state;
+ };
+ union {
+ os_random_state_t verify_state;
+ struct frand_state __verify_state;
+ };
+ union {
+ os_random_state_t trim_state;
+ struct frand_state __trim_state;
+ };
unsigned int verify_batch;
+ unsigned int trim_batch;
int shm_id;
/*
* State for random io, a bitmap of blocks done vs not done
*/
- os_random_state_t random_state;
+ union {
+ os_random_state_t random_state;
+ struct frand_state __random_state;
+ };
struct timeval start; /* start of this loop */
struct timeval epoch; /* time job was started */
/*
* read/write mixed workload state
*/
- os_random_state_t rwmix_state;
+ union {
+ os_random_state_t rwmix_state;
+ struct frand_state __rwmix_state;
+ };
unsigned long rwmix_issues;
enum fio_ddir rwmix_ddir;
unsigned int ddir_seq_nr;
*/
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
*/
/*
* For generating file sizes
*/
- os_random_state_t file_size_state;
+ union {
+ os_random_state_t file_size_state;
+ struct frand_state __file_size_state;
+ };
/*
* Error counts
extern int fio_gtod_offload;
extern int fio_gtod_cpu;
extern enum fio_cs fio_clock_source;
+extern int warnings_fatal;
extern struct thread_data *threads;
assert(!(io_u->ddir == DDIR_WRITE && !td_write(td)));
}
-#define BLOCKS_PER_MAP (8 * sizeof(int))
+#define BLOCKS_PER_MAP (8 * sizeof(unsigned long))
#define TO_MAP_BLOCK(f, b) (b)
#define RAND_MAP_IDX(f, b) (TO_MAP_BLOCK(f, b) / BLOCKS_PER_MAP)
#define RAND_MAP_BIT(f, b) (TO_MAP_BLOCK(f, b) & (BLOCKS_PER_MAP - 1))
-#define MAX_JOBS (1024)
+#define REAL_MAX_JOBS 2048
#define td_non_fatal_error(e) ((e) == EIO || (e) == EILSEQ)
extern void options_mem_free(struct thread_data *);
extern void td_fill_rand_seeds(struct thread_data *);
extern void add_job_opts(const char **);
+extern char *num2str(unsigned long, int, int, int);
+
#define FIO_GETOPT_JOB 0x89988998
#define FIO_NR_OPTIONS (FIO_MAX_OPTS + 128)
if (!(cond)) { \
int *__foo = NULL; \
fprintf(stderr, "file:%s:%d, assert %s failed\n", __FILE__, __LINE__, #cond); \
- (td)->runstate = TD_EXITED; \
+ td_set_runstate((td), TD_EXITED); \
(td)->error = EFAULT; \
*__foo = 0; \
} \
return 0;
}
-/*
- * Cheesy number->string conversion, complete with carry rounding error.
- */
-static inline char *num2str(unsigned long num, int maxlen, int base, int pow2)
-{
- char postfix[] = { ' ', 'K', 'M', 'G', 'P', 'E' };
- unsigned int thousand;
- char *buf;
- int i;
-
- if (pow2)
- thousand = 1024;
- else
- thousand = 1000;
-
- buf = malloc(128);
-
- for (i = 0; base > 1; i++)
- base /= thousand;
-
- do {
- int len, carry = 0;
-
- len = sprintf(buf, "%'lu", num);
- if (len <= maxlen) {
- if (i >= 1) {
- buf[len] = postfix[i];
- buf[len + 1] = '\0';
- }
- return buf;
- }
-
- if ((num % thousand) >= (thousand / 2))
- carry = 1;
-
- num /= thousand;
- num += carry;
- i++;
- } while (i <= 5);
-
- return buf;
-}
-
static inline int __should_check_rate(struct thread_data *td,
enum fio_ddir ddir)
{
projects / fio.git / blobdiff