projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gfio
[fio.git]
/
fio.h
diff --git
a/fio.h
b/fio.h
index 5022cdfd300b2cf48b26309ec20fca04d152206d..1cb44e60dcd9bedc1d69405e1ab59803052b06fe 100644
(file)
--- a/
fio.h
+++ b/
fio.h
@@
-42,15
+42,11
@@
struct thread_data;
#include "stat.h"
#include "flow.h"
#include "stat.h"
#include "flow.h"
-#ifdef FIO_HAVE_GUASI
-#include <guasi.h>
-#endif
-
-#ifdef FIO_HAVE_SOLARISAIO
+#ifdef CONFIG_SOLARISAIO
#include <sys/asynch.h>
#endif
#include <sys/asynch.h>
#endif
-#ifdef
FIO_HAVE
_LIBNUMA
+#ifdef
CONFIG
_LIBNUMA
#include <linux/mempolicy.h>
#include <numa.h>
#include <linux/mempolicy.h>
#include <numa.h>
@@
-68,11
+64,34
@@
enum {
RW_SEQ_IDENT,
};
RW_SEQ_IDENT,
};
+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;
@@
-94,10
+113,13
@@
struct thread_data {
uint64_t stat_io_blocks[DDIR_RWDIR_CNT];
struct timeval iops_sample_time;
uint64_t stat_io_blocks[DDIR_RWDIR_CNT];
struct timeval iops_sample_time;
+ volatile int update_rusage;
+ struct fio_mutex *rusage_sem;
struct rusage ru_start;
struct rusage ru_end;
struct fio_file **files;
struct rusage ru_start;
struct rusage ru_end;
struct fio_file **files;
+ unsigned char *file_locks;
unsigned int files_size;
unsigned int files_index;
unsigned int nr_open_files;
unsigned int files_size;
unsigned int files_index;
unsigned int nr_open_files;
@@
-126,7
+148,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;
@@
-190,22
+212,22
@@
struct thread_data {
/*
* Rate state
*/
/*
* Rate state
*/
- u
nsigned long long
rate_bps[DDIR_RWDIR_CNT];
+ u
int64_t
rate_bps[DDIR_RWDIR_CNT];
long rate_pending_usleep[DDIR_RWDIR_CNT];
unsigned long rate_bytes[DDIR_RWDIR_CNT];
unsigned long rate_blocks[DDIR_RWDIR_CNT];
struct timeval lastrate[DDIR_RWDIR_CNT];
long rate_pending_usleep[DDIR_RWDIR_CNT];
unsigned long rate_bytes[DDIR_RWDIR_CNT];
unsigned long rate_blocks[DDIR_RWDIR_CNT];
struct timeval lastrate[DDIR_RWDIR_CNT];
- u
nsigned long long
total_io_size;
- u
nsigned long long
fill_device_size;
+ u
int64_t
total_io_size;
+ u
int64_t
fill_device_size;
unsigned long io_issues[DDIR_RWDIR_CNT];
unsigned long io_issues[DDIR_RWDIR_CNT];
- u
nsigned long long
io_blocks[DDIR_RWDIR_CNT];
- u
nsigned long long
this_io_blocks[DDIR_RWDIR_CNT];
- u
nsigned long long
io_bytes[DDIR_RWDIR_CNT];
- u
nsigned long long
io_skip_bytes;
- u
nsigned long long
this_io_bytes[DDIR_RWDIR_CNT];
- u
nsigned long long
zone_bytes;
+ u
int64_t
io_blocks[DDIR_RWDIR_CNT];
+ u
int64_t
this_io_blocks[DDIR_RWDIR_CNT];
+ u
int64_t
io_bytes[DDIR_RWDIR_CNT];
+ u
int64_t
io_skip_bytes;
+ u
int64_t
this_io_bytes[DDIR_RWDIR_CNT];
+ u
int64_t
zone_bytes;
struct fio_mutex *mutex;
/*
struct fio_mutex *mutex;
/*
@@
-254,6
+276,8
@@
struct thread_data {
struct flist_head trim_list;
unsigned long trim_entries;
struct flist_head trim_list;
unsigned long trim_entries;
+ struct flist_head next_rand_list;
+
/*
* for fileservice, how often to switch to a new file
*/
/*
* for fileservice, how often to switch to a new file
*/
@@
-304,7
+328,7
@@
enum {
int e = (err); \
(td)->error = e; \
if (!(td)->first_error) \
int e = (err); \
(td)->error = e; \
if (!(td)->first_error) \
- snprintf(td->verror, sizeof(td->verror)
- 1, "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg));
\
+ snprintf(td->verror, sizeof(td->verror)
, "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg));
\
} while (0)
} while (0)
@@
-328,18
+352,19
@@
extern int temp_stall_ts;
extern uintptr_t page_mask, page_size;
extern int read_only;
extern int eta_print;
extern uintptr_t page_mask, page_size;
extern int read_only;
extern int eta_print;
+extern int eta_new_line;
extern unsigned long done_secs;
extern char *job_section;
extern int fio_gtod_offload;
extern int fio_gtod_cpu;
extern enum fio_cs fio_clock_source;
extern unsigned long done_secs;
extern char *job_section;
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 nr_clients;
extern int log_syslog;
extern const char fio_version_string[];
extern int warnings_fatal;
extern int terse_version;
extern int is_backend;
extern int nr_clients;
extern int log_syslog;
extern const char fio_version_string[];
-extern const fio_fp64_t def_percentile_list[FIO_IO_U_LIST_MAX_LEN];
extern struct thread_data *threads;
extern struct thread_data *threads;
@@
-348,11
+373,6
@@
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
static inline enum error_type_bit td_error_type(enum fio_ddir ddir, int err)
#define REAL_MAX_JOBS 2048
static inline enum error_type_bit td_error_type(enum fio_ddir ddir, int err)
@@
-394,8
+414,6
@@
static inline int should_fsync(struct thread_data *td)
{
if (td->last_was_sync)
return 0;
{
if (td->last_was_sync)
return 0;
- if (td->o.odirect)
- return 0;
if (td_write(td) || td_rw(td) || td->o.override_sync)
return 1;
if (td_write(td) || td_rw(td) || td->o.override_sync)
return 1;
@@
-452,8
+470,8
@@
enum {
TD_NOT_CREATED = 0,
TD_CREATED,
TD_INITIALIZED,
TD_NOT_CREATED = 0,
TD_CREATED,
TD_INITIALIZED,
- TD_SETTING_UP,
TD_RAMP,
TD_RAMP,
+ TD_SETTING_UP,
TD_RUNNING,
TD_PRE_READING,
TD_VERIFYING,
TD_RUNNING,
TD_PRE_READING,
TD_VERIFYING,
@@
-538,7
+556,7
@@
static inline int __should_check_rate(struct thread_data *td,
}
static inline int should_check_rate(struct thread_data *td,
}
static inline int should_check_rate(struct thread_data *td,
- u
nsigned long
*bytes_done)
+ u
int64_t
*bytes_done)
{
int ret = 0;
{
int ret = 0;
@@
-552,6
+570,14
@@
static inline int should_check_rate(struct thread_data *td,
return ret;
}
return ret;
}
+static inline unsigned int td_max_bs(struct thread_data *td)
+{
+ unsigned int max_bs;
+
+ max_bs = max(td->o.max_bs[DDIR_READ], td->o.max_bs[DDIR_WRITE]);
+ return max(td->o.max_bs[DDIR_TRIM], max_bs);
+}
+
static inline int is_power_of_2(unsigned int val)
{
return (val != 0 && ((val & (val - 1)) == 0));
static inline int is_power_of_2(unsigned int val)
{
return (val != 0 && ((val & (val - 1)) == 0));
@@
-596,4
+622,9
@@
enum {
FIO_RAND_DIST_PARETO,
};
FIO_RAND_DIST_PARETO,
};
+enum {
+ FIO_RAND_GEN_TAUSWORTHE = 0,
+ FIO_RAND_GEN_LFSR,
+};
+
#endif
#endif