projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fio 2.0.12.2
[fio.git]
/
fio.h
diff --git
a/fio.h
b/fio.h
index 15ab308488c23b1f6608e1f682d70a4696adc506..de4ca4daefa2ebc6bceb770e345be87a8d2389aa 100644
(file)
--- a/
fio.h
+++ b/
fio.h
@@
-39,7
+39,6
@@
struct thread_data;
#include "server.h"
#include "stat.h"
#include "flow.h"
#include "server.h"
#include "stat.h"
#include "flow.h"
-#include "lib/zipf.h"
#ifdef FIO_HAVE_GUASI
#include <guasi.h>
#ifdef FIO_HAVE_GUASI
#include <guasi.h>
@@
-180,6
+179,9
@@
struct thread_options {
unsigned int random_distribution;
double zipf_theta;
unsigned int random_distribution;
double zipf_theta;
+ double pareto_h;
+
+ unsigned int random_generator;
unsigned int hugepage_size;
unsigned int rw_min_bs;
unsigned int hugepage_size;
unsigned int rw_min_bs;
@@
-307,11
+309,34
@@
struct thread_options {
unsigned int sync_file_range;
};
unsigned int sync_file_range;
};
+enum {
+ TD_F_VER_BACKLOG = 1,
+ TD_F_TRIM_BACKLOG = 2,
+ TD_F_READ_IOLOG = 4,
+ TD_F_REFILL_BUFFERS = 8,
+ TD_F_SCRAMBLE_BUFFERS = 16,
+ TD_F_VER_NONE = 32,
+ TD_F_PROFILE_OPS = 64,
+};
+
+enum {
+ FIO_RAND_BS_OFF = 0,
+ FIO_RAND_VER_OFF,
+ FIO_RAND_MIX_OFF,
+ FIO_RAND_FILE_OFF,
+ FIO_RAND_BLOCK_OFF,
+ FIO_RAND_FILE_SIZE_OFF,
+ FIO_RAND_TRIM_OFF,
+ FIO_RAND_BUF_OFF,
+ FIO_RAND_NR_OFFS,
+};
+
/*
* This describes a single thread/process executing a fio job.
*/
struct thread_data {
struct thread_options o;
/*
* This describes a single thread/process executing a fio job.
*/
struct thread_data {
struct thread_options o;
+ unsigned long flags;
void *eo;
char verror[FIO_VERROR_SIZE];
pthread_t thread;
void *eo;
char verror[FIO_VERROR_SIZE];
pthread_t thread;
@@
-366,7
+391,7
@@
struct thread_data {
char *sysfs_root;
char *sysfs_root;
- unsigned long rand_seeds[
8
];
+ unsigned long rand_seeds[
FIO_RAND_NR_OFFS
];
union {
os_random_state_t bsrange_state;
union {
os_random_state_t bsrange_state;
@@
-456,11
+481,6
@@
struct thread_data {
struct frand_state __random_state;
};
struct frand_state __random_state;
};
- /*
- * Used for zipf random distribution
- */
- struct zipf_state zipf;
-
struct timeval start; /* start of this loop */
struct timeval epoch; /* time job was started */
struct timeval last_issue;
struct timeval start; /* start of this loop */
struct timeval epoch; /* time job was started */
struct timeval last_issue;
@@
-563,6
+583,7
@@
enum {
extern int exitall_on_terminate;
extern unsigned int thread_number;
extern int exitall_on_terminate;
extern unsigned int thread_number;
+extern unsigned int stat_number;
extern unsigned int nr_process, nr_thread;
extern int shm_id;
extern int groupid;
extern unsigned int nr_process, nr_thread;
extern int shm_id;
extern int groupid;
@@
-577,6
+598,7
@@
extern char *job_section;
extern int fio_gtod_offload;
extern int fio_gtod_cpu;
extern enum fio_cs fio_clock_source;
extern int fio_gtod_offload;
extern int fio_gtod_cpu;
extern enum fio_cs fio_clock_source;
+extern int fio_clock_source_set;
extern int warnings_fatal;
extern int terse_version;
extern int is_backend;
extern int warnings_fatal;
extern int terse_version;
extern int is_backend;
@@
-592,14
+614,9
@@
static inline void fio_ro_check(struct thread_data *td, struct io_u *io_u)
assert(!(io_u->ddir == DDIR_WRITE && !td_write(td)));
}
assert(!(io_u->ddir == DDIR_WRITE && !td_write(td)));
}
-#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 REAL_MAX_JOBS 2048
#define REAL_MAX_JOBS 2048
-static inline enum error_type td_error_type(enum fio_ddir ddir, int err)
+static inline enum error_type
_bit
td_error_type(enum fio_ddir ddir, int err)
{
if (err == EILSEQ)
return ERROR_TYPE_VERIFY_BIT;
{
if (err == EILSEQ)
return ERROR_TYPE_VERIFY_BIT;
@@
-691,6
+708,7
@@
enum {
TD_CREATED,
TD_INITIALIZED,
TD_RAMP,
TD_CREATED,
TD_INITIALIZED,
TD_RAMP,
+ TD_SETTING_UP,
TD_RUNNING,
TD_PRE_READING,
TD_VERIFYING,
TD_RUNNING,
TD_PRE_READING,
TD_VERIFYING,
@@
-827,6
+845,12
@@
enum {
enum {
FIO_RAND_DIST_RANDOM = 0,
FIO_RAND_DIST_ZIPF,
enum {
FIO_RAND_DIST_RANDOM = 0,
FIO_RAND_DIST_ZIPF,
+ FIO_RAND_DIST_PARETO,
+};
+
+enum {
+ FIO_RAND_GEN_TAUSWORTHE = 0,
+ FIO_RAND_GEN_LFSR,
};
#endif
};
#endif